@@ -520,9 +520,9 @@ |
||
520 | 520 | /** |
521 | 521 | * Get imap origin if exists. |
522 | 522 | * |
523 | - * @param $enableUseUserEmailOrigin |
|
524 | - * @param $emailOwner |
|
525 | - * @param $organization |
|
523 | + * @param boolean $enableUseUserEmailOrigin |
|
524 | + * @param User $emailOwner |
|
525 | + * @param OrganizationInterface|null $organization |
|
526 | 526 | * @return mixed|null|InternalEmailOrigin |
527 | 527 | */ |
528 | 528 | protected function getPreferedOrigin($enableUseUserEmailOrigin, $emailOwner, $organization) |
@@ -4,10 +4,8 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Collections\ArrayCollection; |
6 | 6 | use Doctrine\ORM\EntityManager; |
7 | - |
|
8 | 7 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
9 | 8 | use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser; |
10 | - |
|
11 | 9 | use Oro\Bundle\EmailBundle\Builder\EmailEntityBuilder; |
12 | 10 | use Oro\Bundle\EmailBundle\Decoder\ContentDecoder; |
13 | 11 | use Oro\Bundle\EmailBundle\Entity\Email; |
@@ -156,9 +156,9 @@ discard block |
||
156 | 156 | |
157 | 157 | /** |
158 | 158 | * @param Email $email |
159 | - * @param AutoResponseRule[]|Collection $rules |
|
159 | + * @param Collection $rules |
|
160 | 160 | * |
161 | - * @return EmailModel[]|Collection |
|
161 | + * @return Collection |
|
162 | 162 | */ |
163 | 163 | protected function createReplyEmailModels(Email $email, Collection $rules) |
164 | 164 | { |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | } |
218 | 218 | |
219 | 219 | /** |
220 | - * @param MailBox $mailbox |
|
220 | + * @param Mailbox $mailbox |
|
221 | 221 | * @param Email $email |
222 | 222 | * |
223 | 223 | * @return AutoResponseRule[]|Collection |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | |
274 | 274 | /** |
275 | 275 | * @param string $field |
276 | - * @param object $context |
|
276 | + * @param Email $context |
|
277 | 277 | * |
278 | 278 | * @return string[] |
279 | 279 | */ |
@@ -3,15 +3,11 @@ |
||
3 | 3 | namespace Oro\Bundle\EmailBundle\Manager; |
4 | 4 | |
5 | 5 | use Exception; |
6 | - |
|
7 | 6 | use Doctrine\Bundle\DoctrineBundle\Registry; |
8 | 7 | use Doctrine\Common\Collections\Collection; |
9 | - |
|
10 | 8 | use Psr\Log\LoggerInterface; |
11 | - |
|
12 | 9 | use Symfony\Component\PropertyAccess\PropertyAccess; |
13 | 10 | use Symfony\Component\PropertyAccess\PropertyAccessorInterface; |
14 | - |
|
15 | 11 | use Oro\Bundle\EmailBundle\Builder\EmailModelBuilder; |
16 | 12 | use Oro\Bundle\EmailBundle\Entity\AutoResponseRule; |
17 | 13 | use Oro\Bundle\EmailBundle\Entity\Email; |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | protected $attachmentConfig; |
47 | 47 | |
48 | 48 | /** |
49 | - * @param FileSystemMap $filesystemMap |
|
49 | + * @param FilesystemMap $filesystemMap |
|
50 | 50 | * @param EntityManager $em |
51 | 51 | * @param KernelInterface $kernel |
52 | 52 | * @param ServiceLink $securityFacadeLink |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | /** |
138 | 138 | * @param EmailAttachment $emailAttachment |
139 | 139 | * |
140 | - * @return File|null |
|
140 | + * @return File |
|
141 | 141 | */ |
142 | 142 | protected function copyEmailAttachmentToFileSystem(EmailAttachment $emailAttachment) |
143 | 143 | { |
@@ -4,14 +4,10 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Util\ClassUtils; |
6 | 6 | use Doctrine\ORM\EntityManager; |
7 | - |
|
8 | 7 | use Gaufrette\Filesystem; |
9 | - |
|
10 | 8 | use Knp\Bundle\GaufretteBundle\FilesystemMap; |
11 | - |
|
12 | 9 | use Symfony\Component\HttpKernel\KernelInterface; |
13 | 10 | use Symfony\Component\HttpFoundation\File\File as ComponentFile; |
14 | - |
|
15 | 11 | use Oro\Bundle\AttachmentBundle\Entity\Attachment; |
16 | 12 | use Oro\Bundle\AttachmentBundle\Entity\File; |
17 | 13 | use Oro\Bundle\AttachmentBundle\EntityConfig\AttachmentConfig; |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace Oro\Bundle\EmailBundle\Manager; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | - |
|
7 | 6 | use Psr\Log\LoggerAwareInterface; |
8 | 7 | use Psr\Log\LoggerAwareTrait; |
9 | - |
|
10 | 8 | use Oro\Bundle\EmailBundle\Entity\EmailUser; |
11 | 9 | use Oro\Bundle\EmailBundle\Provider\EmailFlagManagerLoaderSelector; |
12 | 10 | use Oro\Bundle\EmailBundle\Provider\EmailFlagManagerInterface; |
@@ -125,7 +125,7 @@ |
||
125 | 125 | /** |
126 | 126 | * @param Email $email |
127 | 127 | * |
128 | - * @return bool|string |
|
128 | + * @return false|string |
|
129 | 129 | */ |
130 | 130 | protected function getFromNameLink(Email $email) |
131 | 131 | { |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace Oro\Bundle\EmailBundle\Manager; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | - |
|
7 | 6 | use Symfony\Bundle\FrameworkBundle\Routing\Router; |
8 | 7 | use Symfony\Component\Routing\Exception\RouteNotFoundException; |
9 | - |
|
10 | 8 | use Oro\Bundle\EmailBundle\Entity\Email; |
11 | 9 | use Oro\Bundle\EmailBundle\Exception\LoadEmailBodyException; |
12 | 10 | use Oro\Bundle\EmailBundle\Cache\EmailCacheManager; |
@@ -5,11 +5,9 @@ |
||
5 | 5 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
6 | 6 | use Symfony\Component\DependencyInjection\ContainerInterface; |
7 | 7 | use Symfony\Component\Finder\Finder; |
8 | - |
|
9 | 8 | use Doctrine\Common\Persistence\ObjectManager; |
10 | 9 | use Doctrine\Common\DataFixtures\AbstractFixture; |
11 | 10 | use Doctrine\Common\DataFixtures\DependentFixtureInterface; |
12 | - |
|
13 | 11 | use Oro\Bundle\EmailBundle\Entity\EmailTemplate; |
14 | 12 | use Oro\Bundle\UserBundle\Entity\User; |
15 | 13 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\EmailBundle\Model\Action; |
4 | 4 | |
5 | 5 | use Doctrine\Bundle\DoctrineBundle\Registry; |
6 | - |
|
7 | 6 | use Oro\Bundle\EmailBundle\Entity\Mailbox; |
8 | 7 | use Oro\Bundle\EmailBundle\Mailbox\MailboxProcessStorage; |
9 | 8 | use Oro\Bundle\WorkflowBundle\Exception\InvalidParameterException; |
@@ -17,7 +17,6 @@ |
||
17 | 17 | * @param string $email |
18 | 18 | * @param string $name |
19 | 19 | * @param RecipientEntity|null $entity |
20 | - * @param string|null $organization |
|
21 | 20 | */ |
22 | 21 | public function __construct($email, $name, RecipientEntity $entity = null) |
23 | 22 | { |
@@ -7,9 +7,7 @@ discard block |
||
7 | 7 | use Symfony\Component\Filesystem\Filesystem; |
8 | 8 | use Symfony\Component\HttpKernel\Bundle\Bundle; |
9 | 9 | use Symfony\Component\HttpKernel\KernelInterface; |
10 | - |
|
11 | 10 | use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass; |
12 | - |
|
13 | 11 | use Oro\Bundle\EmailBundle\DependencyInjection\Compiler\EmailBodyLoaderPass; |
14 | 12 | use Oro\Bundle\EmailBundle\DependencyInjection\Compiler\EmailOwnerConfigurationPass; |
15 | 13 | use Oro\Bundle\EmailBundle\DependencyInjection\Compiler\EmailSynchronizerPass; |
@@ -17,7 +15,6 @@ discard block |
||
17 | 15 | use Oro\Bundle\EmailBundle\DependencyInjection\Compiler\MailboxProcessPass; |
18 | 16 | use Oro\Bundle\EmailBundle\DependencyInjection\Compiler\TwigSandboxConfigurationPass; |
19 | 17 | use Oro\Bundle\EmailBundle\DependencyInjection\Compiler\EmailFlagManagerLoaderPass; |
20 | -use Oro\Bundle\EmailBundle\DependencyInjection\Compiler\EmailFolderLoaderPass; |
|
21 | 18 | use Oro\Bundle\EmailBundle\DependencyInjection\Compiler\EmailRecipientsProviderPass; |
22 | 19 | |
23 | 20 | class OroEmailBundle extends Bundle |