@@ -6,9 +6,7 @@ |
||
6 | 6 | use Doctrine\Common\Collections\Collection; |
7 | 7 | use Doctrine\Common\Util\ClassUtils; |
8 | 8 | use Doctrine\ORM\EntityManager; |
9 | - |
|
10 | 9 | use Symfony\Component\HttpFoundation\Request; |
11 | - |
|
12 | 10 | use Oro\Bundle\EmailBundle\Form\Model\EmailAttachment; |
13 | 11 | use Oro\Bundle\EmailBundle\Form\Model\Factory; |
14 | 12 | use Oro\Bundle\EmailBundle\Provider\EmailAttachmentProvider; |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | |
216 | 216 | /** |
217 | 217 | * @param EmailEntity $emailEntity |
218 | - * @param $templatePath |
|
218 | + * @param string|null $templatePath |
|
219 | 219 | * |
220 | 220 | * @return null|string |
221 | 221 | */ |
@@ -232,8 +232,8 @@ discard block |
||
232 | 232 | } |
233 | 233 | |
234 | 234 | /** |
235 | - * @param $prefix |
|
236 | - * @param $subject |
|
235 | + * @param string $prefix |
|
236 | + * @param string $subject |
|
237 | 237 | * |
238 | 238 | * @return string |
239 | 239 | */ |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | /** |
249 | 249 | * @param string $entityClass |
250 | 250 | * @param string $entityId |
251 | - * @return object |
|
251 | + * @return \Oro\Bundle\EmailBundle\Model\EmailTemplateInterface |
|
252 | 252 | */ |
253 | 253 | public function getTargetEntity($entityClass, $entityId) |
254 | 254 | { |
@@ -4,10 +4,8 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Util\ClassUtils; |
6 | 6 | use Doctrine\ORM\EntityManager; |
7 | - |
|
8 | 7 | use Symfony\Component\Security\Core\User\UserInterface; |
9 | 8 | use Symfony\Component\Templating\EngineInterface; |
10 | - |
|
11 | 9 | use Oro\Bundle\EmailBundle\Cache\EmailCacheManager; |
12 | 10 | use Oro\Bundle\EmailBundle\Entity\Email as EmailEntity; |
13 | 11 | use Oro\Bundle\EmailBundle\Entity\EmailOwnerInterface; |
@@ -4,12 +4,10 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Bundle\DoctrineBundle\Registry; |
6 | 6 | use Doctrine\ORM\EntityRepository; |
7 | - |
|
8 | 7 | use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; |
9 | 8 | use Symfony\Component\Console\Input\InputInterface; |
10 | 9 | use Symfony\Component\Console\Input\InputOption; |
11 | 10 | use Symfony\Component\Console\Output\OutputInterface; |
12 | - |
|
13 | 11 | use Oro\Bundle\EmailBundle\Entity\Email; |
14 | 12 | use Oro\Bundle\EmailBundle\Manager\AutoResponseManager; |
15 | 13 |
@@ -7,11 +7,8 @@ |
||
7 | 7 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
8 | 8 | use FOS\RestBundle\Controller\Annotations\Get; |
9 | 9 | use FOS\RestBundle\Util\Codes; |
10 | - |
|
11 | 10 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
12 | - |
|
13 | 11 | use Symfony\Component\HttpFoundation\Response; |
14 | - |
|
15 | 12 | use Oro\Bundle\SoapBundle\Request\Parameters\Filter\StringToArrayParameterFilter; |
16 | 13 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestGetController; |
17 | 14 | use Oro\Bundle\EmailBundle\Entity\EmailRecipient; |
@@ -6,11 +6,8 @@ |
||
6 | 6 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
7 | 7 | use FOS\RestBundle\Controller\Annotations\Get; |
8 | 8 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
9 | - |
|
10 | 9 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
11 | - |
|
12 | 10 | use Symfony\Component\HttpFoundation\Response; |
13 | - |
|
14 | 11 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestGetController; |
15 | 12 | |
16 | 13 | /** |
@@ -6,12 +6,8 @@ |
||
6 | 6 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
7 | 7 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
8 | 8 | use FOS\RestBundle\Controller\Annotations\Get; |
9 | -use FOS\RestBundle\Controller\Annotations\Delete; |
|
10 | - |
|
11 | 9 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
12 | - |
|
13 | 10 | use Symfony\Component\HttpFoundation\Response; |
14 | - |
|
15 | 11 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
16 | 12 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
17 | 13 | use Oro\Bundle\SoapBundle\Request\Parameters\Filter\StringToArrayParameterFilter; |
@@ -6,14 +6,9 @@ |
||
6 | 6 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
7 | 7 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
8 | 8 | use FOS\RestBundle\Controller\Annotations\Get; |
9 | -use FOS\RestBundle\Controller\Annotations\Delete; |
|
10 | - |
|
11 | 9 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
12 | - |
|
13 | 10 | use Symfony\Component\HttpFoundation\Response; |
14 | - |
|
15 | 11 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
16 | -use Oro\Bundle\SecurityBundle\SecurityFacade; |
|
17 | 12 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestGetController; |
18 | 13 | |
19 | 14 | /** |
@@ -7,13 +7,9 @@ |
||
7 | 7 | use FOS\RestBundle\Controller\Annotations\Delete; |
8 | 8 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
9 | 9 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
10 | - |
|
11 | 10 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
12 | - |
|
13 | 11 | use Symfony\Component\HttpFoundation\Response; |
14 | - |
|
15 | 12 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; |
16 | - |
|
17 | 13 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
18 | 14 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
19 | 15 | use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationToken; |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\EmailBundle\Controller\Api\Soap; |
4 | 4 | |
5 | 5 | use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; |
6 | - |
|
7 | 6 | use Oro\Bundle\EmailBundle\Cache\EmailCacheManager; |
8 | 7 | use Oro\Bundle\EmailBundle\Entity\Email; |
9 | 8 | use Oro\Bundle\EmailBundle\Entity\EmailAttachmentContent; |