@@ -7,7 +7,6 @@ |
||
7 | 7 | use FOS\RestBundle\Util\Codes; |
8 | 8 | use FOS\RestBundle\Controller\Annotations as Rest; |
9 | 9 | use FOS\RestBundle\Routing\ClassResourceInterface; |
10 | - |
|
11 | 10 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
12 | 11 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
13 | 12 | use OroCRM\Bundle\MarketingListBundle\Model\ContactInformationFieldHelper; |
@@ -3,15 +3,11 @@ |
||
3 | 3 | namespace OroCRM\Bundle\MarketingListBundle\Controller\Api\Rest; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityNotFoundException; |
6 | - |
|
7 | 6 | use FOS\RestBundle\Util\Codes; |
8 | 7 | use FOS\RestBundle\Controller\Annotations as Rest; |
9 | 8 | use FOS\RestBundle\Routing\ClassResourceInterface; |
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\SecurityBundle\Exception\ForbiddenException; |
17 | 13 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
@@ -82,7 +82,7 @@ |
||
82 | 82 | } |
83 | 83 | |
84 | 84 | /** |
85 | - * @return int |
|
85 | + * @return string |
|
86 | 86 | */ |
87 | 87 | public function getEntityId() |
88 | 88 | { |
@@ -99,7 +99,7 @@ |
||
99 | 99 | |
100 | 100 | /** |
101 | 101 | * @param \Datetime $createdAt |
102 | - * @return MarketingListItem |
|
102 | + * @return MarketingListRemovedItem |
|
103 | 103 | */ |
104 | 104 | public function setCreatedAt(\Datetime $createdAt) |
105 | 105 | { |
@@ -3,7 +3,6 @@ discard block |
||
3 | 3 | namespace OroCRM\Bundle\MarketingListBundle\Form\Handler; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | - |
|
7 | 6 | use Symfony\Bridge\Doctrine\RegistryInterface; |
8 | 7 | use Symfony\Component\Form\FormError; |
9 | 8 | use Symfony\Component\Form\FormInterface; |
@@ -12,7 +11,6 @@ discard block |
||
12 | 11 | use Symfony\Component\Validator\Constraint; |
13 | 12 | use Symfony\Component\Validator\ConstraintViolationInterface; |
14 | 13 | use Symfony\Component\Validator\ValidatorInterface; |
15 | - |
|
16 | 14 | use Oro\Bundle\SegmentBundle\Entity\Segment; |
17 | 15 | use Oro\Bundle\SegmentBundle\Entity\SegmentType; |
18 | 16 | use OroCRM\Bundle\MarketingListBundle\Entity\MarketingList; |
@@ -60,7 +60,7 @@ |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
63 | - * @param string|object $entityOrClass |
|
63 | + * @param string $entityOrClass |
|
64 | 64 | * @param string|null $type |
65 | 65 | * @return array |
66 | 66 | */ |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\PropertyAccess\PropertyAccess; |
6 | 6 | use Symfony\Component\Security\Core\Util\ClassUtils; |
7 | - |
|
8 | 7 | use Oro\Bundle\QueryDesignerBundle\Model\AbstractQueryDesigner; |
9 | 8 | use OroCRM\Bundle\MarketingListBundle\Model\ContactInformationFieldHelper; |
10 | 9 | use OroCRM\Bundle\MarketingListBundle\Entity\MarketingList; |
@@ -4,10 +4,8 @@ |
||
4 | 4 | |
5 | 5 | use OroCRM\Bundle\MarketingListBundle\Entity\MarketingList; |
6 | 6 | use OroCRM\Bundle\MarketingListBundle\Entity\MarketingListType; |
7 | - |
|
8 | 7 | use Doctrine\Common\DataFixtures\AbstractFixture; |
9 | 8 | use Doctrine\Common\Persistence\ObjectManager; |
10 | - |
|
11 | 9 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
12 | 10 | use Symfony\Component\DependencyInjection\ContainerInterface; |
13 | 11 |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace OroCRM\Bundle\MarketingListBundle\Tests\Unit\Acl\Voter; |
4 | 4 | |
5 | 5 | use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; |
6 | - |
|
7 | 6 | use Oro\Bundle\EntityBundle\ORM\DoctrineHelper; |
8 | 7 | use OroCRM\Bundle\MarketingListBundle\Acl\Voter\MarketingListSegmentVoter; |
9 | 8 |
@@ -136,6 +136,10 @@ |
||
136 | 136 | $this->assertInstanceOf('\DateTime', $this->entity->getUpdatedAt()); |
137 | 137 | } |
138 | 138 | |
139 | + /** |
|
140 | + * @param string $entityClass |
|
141 | + * @param string $entityShortName |
|
142 | + */ |
|
139 | 143 | protected function assertCollectionMethods($entityClass, $entityShortName) |
140 | 144 | { |
141 | 145 | $addMethodName = 'add' . $entityShortName; |