@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\EmailBundle\Datagrid; |
4 | 4 | |
5 | 5 | use Doctrine\Bundle\DoctrineBundle\Registry; |
6 | - |
|
7 | -use Oro\Bundle\EmailBundle\Entity\EmailOrigin; |
|
8 | 6 | use Oro\Bundle\EmailBundle\Entity\Mailbox; |
9 | 7 | use Oro\Bundle\EmailBundle\Entity\Manager\MailboxManager; |
10 | 8 | use Oro\Bundle\SecurityBundle\SecurityFacade; |
@@ -46,7 +46,7 @@ |
||
46 | 46 | * Returns a list of mailboxes available to user logged under organization. |
47 | 47 | * |
48 | 48 | * @param User|integer $user User or user id |
49 | - * @param Organization $organization|null |
|
49 | + * @param Organization $organization |
|
50 | 50 | * |
51 | 51 | * @return Collection|Mailbox[] Array or collection of Mailboxes |
52 | 52 | */ |
@@ -73,7 +73,7 @@ |
||
73 | 73 | * If no organization is provided, does not filter by it (useful when looking for mailboxes across organizations). |
74 | 74 | * |
75 | 75 | * @param User|integer $user User or user id |
76 | - * @param Organization|integer|null $organization |
|
76 | + * @param Organization $organization |
|
77 | 77 | * |
78 | 78 | * @return \Doctrine\ORM\QueryBuilder |
79 | 79 | */ |
@@ -4,12 +4,10 @@ discard block |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Util\ClassUtils; |
6 | 6 | use Doctrine\ORM\QueryBuilder; |
7 | - |
|
8 | 7 | use Symfony\Bundle\FrameworkBundle\Routing\Router; |
9 | 8 | use Symfony\Component\Routing\Exception\RouteNotFoundException; |
10 | 9 | use Symfony\Component\PropertyAccess\PropertyAccess; |
11 | 10 | use Symfony\Component\Security\Core\SecurityContextInterface; |
12 | - |
|
13 | 11 | use Oro\Bundle\ActivityListBundle\Entity\ActivityList; |
14 | 12 | use Oro\Bundle\ActivityListBundle\Entity\ActivityOwner; |
15 | 13 | use Oro\Bundle\ActivityListBundle\Model\ActivityListDateProviderInterface; |
@@ -27,7 +25,6 @@ discard block |
||
27 | 25 | use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink; |
28 | 26 | use Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationContextTokenInterface; |
29 | 27 | use Oro\Bundle\UIBundle\Tools\HtmlTagHelper; |
30 | -use Oro\Bundle\EmailBundle\Mailbox\MailboxProcessStorage; |
|
31 | 28 | |
32 | 29 | /** |
33 | 30 | * For the Email activity in the case when EmailAddress does not have owner(User|Organization), |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | } |
137 | 137 | |
138 | 138 | /** |
139 | - * @param string[]|string $commandName |
|
139 | + * @param string $commandName |
|
140 | 140 | * @param string[]|string|null $arguments |
141 | 141 | * @param string[]|string|null $states |
142 | 142 | * |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | * @param string $connector |
190 | 190 | * @param int|null $code |
191 | 191 | * |
192 | - * @return Status[]|\Iterator |
|
192 | + * @return BufferedQueryResultIterator |
|
193 | 193 | */ |
194 | 194 | public function getConnectorStatuses(Integration $integration, $connector, $code = null) |
195 | 195 | { |