@@ -169,7 +169,7 @@ |
||
169 | 169 | |
170 | 170 | /** |
171 | 171 | * @param \PHPUnit_Framework_MockObject_MockObject $qb |
172 | - * @param object $entity |
|
172 | + * @param Customer $entity |
|
173 | 173 | * @param int|null $id |
174 | 174 | * @param array $config |
175 | 175 | * @param AutomaticDiscovery $service |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\Validator\Constraint; |
6 | 6 | use Symfony\Component\Validator\ConstraintValidator; |
7 | - |
|
8 | 7 | use OroCRM\Bundle\TaskBundle\Validator\Constraints\DueDateRequired; |
9 | 8 | use OroCRM\Bundle\TaskBundle\Entity\Task; |
10 | 9 |
@@ -3,16 +3,13 @@ |
||
3 | 3 | namespace OroCRM\Bundle\MarketingListBundle\Datagrid\Extension; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\Query\Expr\Andx; |
6 | -use Doctrine\ORM\Query\Expr\From; |
|
7 | 6 | use Doctrine\ORM\Query\Expr\Func; |
8 | 7 | use Doctrine\ORM\QueryBuilder; |
9 | - |
|
10 | 8 | use Oro\Bundle\DataGridBundle\Datagrid\Builder; |
11 | 9 | use Oro\Bundle\DataGridBundle\Extension\AbstractExtension; |
12 | 10 | use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource; |
13 | 11 | use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface; |
14 | 12 | use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; |
15 | - |
|
16 | 13 | use OroCRM\Bundle\MarketingListBundle\Model\MarketingListHelper; |
17 | 14 | |
18 | 15 | /** |
@@ -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 | { |
@@ -80,7 +80,7 @@ |
||
80 | 80 | /** |
81 | 81 | * Get entity contact information fields. |
82 | 82 | * |
83 | - * @param string|object $entity |
|
83 | + * @param string $entity |
|
84 | 84 | * @return array |
85 | 85 | */ |
86 | 86 | public function getEntityContactInformationColumns($entity) |
@@ -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\Validator\Constraint; |
6 | 6 | use Symfony\Component\Validator\ConstraintValidator; |
7 | - |
|
8 | 7 | use OroCRM\Bundle\TaskBundle\Validator\Constraints\DueDateRequired; |
9 | 8 | use OroCRM\Bundle\TaskBundle\Entity\Task; |
10 | 9 |
@@ -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; |
@@ -4,17 +4,13 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\Form\FormInterface; |
6 | 6 | use Symfony\Component\HttpFoundation\Response; |
7 | - |
|
8 | 7 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
9 | 8 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
10 | 9 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
11 | 10 | use FOS\RestBundle\Routing\ClassResourceInterface; |
12 | - |
|
13 | 11 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
14 | - |
|
15 | 12 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
16 | 13 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
17 | - |
|
18 | 14 | use Oro\Bundle\SoapBundle\Form\Handler\ApiFormHandler; |
19 | 15 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
20 | 16 | use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager; |
@@ -962,7 +962,7 @@ |
||
962 | 962 | /** |
963 | 963 | * Get opportunities |
964 | 964 | * |
965 | - * @return Opportunity[] |
|
965 | + * @return ArrayCollection |
|
966 | 966 | */ |
967 | 967 | public function getOpportunities() |
968 | 968 | { |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace OroCRM\Bundle\TestFrameworkBundle\Tests\Performance; |
4 | 4 | |
5 | 5 | use Symfony\Bundle\FrameworkBundle\Console\Application; |
6 | - |
|
7 | 6 | use Symfony\Component\HttpKernel\Kernel; |
8 | 7 | use Symfony\Component\DependencyInjection\Container; |
9 | - |
|
10 | 8 | use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; |
11 | 9 | |
12 | 10 | class LoadTest extends WebTestCase |