@@ -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; |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | |
60 | 60 | /** |
61 | 61 | * @param User $user |
62 | - * @param $maxEmailsDisplay |
|
62 | + * @param integer $maxEmailsDisplay |
|
63 | 63 | * |
64 | 64 | * @return array |
65 | 65 | */ |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | /** |
118 | 118 | * @param Email $email |
119 | 119 | * |
120 | - * @return bool|string |
|
120 | + * @return false|string |
|
121 | 121 | */ |
122 | 122 | protected function getFromNameLink(Email $email) |
123 | 123 | { |
@@ -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; |
@@ -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 |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\EmailBundle\Provider; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | - |
|
7 | 6 | use Oro\Bundle\AttachmentBundle\Provider\AttachmentProvider; |
8 | 7 | use Oro\Bundle\EmailBundle\Entity\Email; |
9 | 8 | use Oro\Bundle\EmailBundle\Form\Model\Factory; |
@@ -229,7 +229,7 @@ |
||
229 | 229 | |
230 | 230 | /** |
231 | 231 | * @param EmailRecipientsProviderArgs $args |
232 | - * @param object|null $object |
|
232 | + * @param \Oro\Bundle\EmailBundle\Entity\EmailOwnerInterface|null $object |
|
233 | 233 | * |
234 | 234 | * @return bool |
235 | 235 | */ |
@@ -6,11 +6,9 @@ |
||
6 | 6 | use Doctrine\Common\Util\ClassUtils; |
7 | 7 | use Doctrine\ORM\Mapping\ClassMetadata; |
8 | 8 | use Doctrine\ORM\QueryBuilder; |
9 | - |
|
10 | 9 | use Symfony\Component\Translation\TranslatorInterface; |
11 | 10 | use Symfony\Component\PropertyAccess\PropertyAccess; |
12 | 11 | use Symfony\Component\PropertyAccess\PropertyAccessor; |
13 | - |
|
14 | 12 | use Oro\Bundle\EmailBundle\Entity\Repository\EmailAwareRepository; |
15 | 13 | use Oro\Bundle\EmailBundle\Model\CategorizedRecipient; |
16 | 14 | use Oro\Bundle\EmailBundle\Model\EmailRecipientsProviderArgs; |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\EmailBundle\Provider; |
4 | 4 | |
5 | 5 | use Symfony\Component\Translation\TranslatorInterface; |
6 | - |
|
7 | 6 | use Oro\Bundle\EmailBundle\Model\EmailRecipientsProviderArgs; |
8 | 7 | use Oro\Bundle\EmailBundle\Model\Recipient; |
9 | 8 | use Oro\Bundle\EmailBundle\Provider\EmailRecipientsHelper; |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | * @param EmailTemplateInterface $template |
144 | 144 | * @param array $templateParams |
145 | 145 | * |
146 | - * @return array first element is email subject, second - message |
|
146 | + * @return string[] first element is email subject, second - message |
|
147 | 147 | */ |
148 | 148 | public function compileMessage(EmailTemplateInterface $template, array $templateParams = []) |
149 | 149 | { |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | * @param string $template |
207 | 207 | * @param object $entity |
208 | 208 | * |
209 | - * @return EmailTemplate |
|
209 | + * @return string |
|
210 | 210 | */ |
211 | 211 | protected function processDefaultFilters($template, $entity) |
212 | 212 | { |
@@ -4,13 +4,10 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\PropertyAccess\PropertyAccess; |
6 | 6 | use Symfony\Component\PropertyAccess\PropertyAccessor; |
7 | - |
|
8 | 7 | use Symfony\Component\Security\Core\Util\ClassUtils; |
9 | 8 | use Symfony\Component\Translation\TranslatorInterface; |
10 | - |
|
11 | 9 | use Doctrine\Common\Cache\Cache; |
12 | 10 | use Doctrine\Common\Util\Inflector; |
13 | - |
|
14 | 11 | use Oro\Bundle\EmailBundle\Entity\EmailTemplate; |
15 | 12 | use Oro\Bundle\EmailBundle\Entity\EmailTemplateTranslation; |
16 | 13 | use Oro\Bundle\EmailBundle\Model\EmailTemplateInterface; |
@@ -5,9 +5,7 @@ |
||
5 | 5 | use Doctrine\Common\Util\ClassUtils; |
6 | 6 | use Doctrine\Common\Util\Inflector; |
7 | 7 | use Doctrine\Common\Persistence\ManagerRegistry; |
8 | - |
|
9 | 8 | use Symfony\Component\Translation\TranslatorInterface; |
10 | - |
|
11 | 9 | use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; |
12 | 10 | use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; |
13 | 11 | use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper; |