Skip to content

Commit d33c18a

Browse files
authored
Merge pull request #286 from stephane-monnot/feature/fixdocblockissues
Improve idea completion
2 parents cdb93fe + 0592aa1 commit d33c18a

File tree

7 files changed

+15
-8
lines changed

7 files changed

+15
-8
lines changed

Entity/Thread.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,28 @@
99
use FOS\MessageBundle\Model\ParticipantInterface;
1010

1111
use FOS\MessageBundle\Model\ThreadMetadata as ModelThreadMetadata;
12+
use FOS\MessageBundle\Model\ThreadMetadata;
1213

1314
abstract class Thread extends BaseThread
1415
{
1516
/**
1617
* Messages contained in this thread
1718
*
18-
* @var Collection of MessageInterface
19+
* @var Collection|MessageInterface[]
1920
*/
2021
protected $messages;
2122

2223
/**
2324
* Users participating in this conversation
2425
*
25-
* @var Collection of ParticipantInterface
26+
* @var Collection|ParticipantInterface[]
2627
*/
2728
protected $participants;
2829

2930
/**
3031
* Thread metadata
3132
*
32-
* @var Collection of ThreadMetadata
33+
* @var Collection|ThreadMetadata[]
3334
*/
3435
protected $metadata;
3536

@@ -71,7 +72,7 @@ public function getParticipants()
7172
* Since the ORM schema does not map the participants collection field, it
7273
* must be created on demand.
7374
*
74-
* @return ArrayCollection
75+
* @return ArrayCollection|ParticipantInterface[]
7576
*/
7677
protected function getParticipantsCollection()
7778
{

Model/Message.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ abstract class Message implements MessageInterface
5151
/**
5252
* Collection of MessageMetadata
5353
*
54-
* @var Collection of MessageMetadata
54+
* @var Collection|MessageMetadata[]
5555
*/
5656
protected $metadata;
5757

Model/Thread.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,21 @@ abstract class Thread implements ThreadInterface
3737
/**
3838
* Messages contained in this thread
3939
*
40-
* @var Collection of MessageInterface
40+
* @var Collection|MessageInterface[]
4141
*/
4242
protected $messages;
4343

4444
/**
4545
* Thread metadata
4646
*
47-
* @var Collection of ThreadMetadata
47+
* @var Collection|ThreadMetadata[]
4848
*/
4949
protected $metadata;
5050

5151
/**
5252
* Users participating in this conversation
5353
*
54-
* @var Collection of ParticipantInterface
54+
* @var Collection|ParticipantInterface[]
5555
*/
5656
protected $participants;
5757

Provider/Provider.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace FOS\MessageBundle\Provider;
44

5+
use FOS\MessageBundle\Model\ThreadInterface;
56
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
67
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
78
use FOS\MessageBundle\ModelManager\ThreadManagerInterface;

Provider/ProviderInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace FOS\MessageBundle\Provider;
44

5+
use FOS\MessageBundle\Model\ThreadInterface;
6+
57
/**
68
* Provides threads for the current authenticated user
79
*

Search/Finder.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace FOS\MessageBundle\Search;
44

5+
use FOS\MessageBundle\Model\ThreadInterface;
56
use FOS\MessageBundle\ModelManager\ThreadManagerInterface;
67
use FOS\MessageBundle\Security\ParticipantProviderInterface;
78

Search/FinderInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace FOS\MessageBundle\Search;
44

5+
use FOS\MessageBundle\Model\ThreadInterface;
6+
57
/**
68
* Finds threads of a participant, matching a given query
79
*

0 commit comments

Comments
 (0)