@@ -84,7 +84,6 @@ |
||
84 | 84 | /** |
85 | 85 | * Create new entity |
86 | 86 | * |
87 | - * @param mixed $_ [optional] Arguments will be passed to createEntity method of manager (result of getManager) |
|
88 | 87 | * |
89 | 88 | * @return mixed |
90 | 89 | */ |
@@ -4,16 +4,13 @@ |
||
4 | 4 | |
5 | 5 | use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; |
6 | 6 | use Symfony\Component\Form\Test\FormIntegrationTestCase; |
7 | - |
|
8 | 7 | use Oro\Bundle\WorkflowBundle\Form\EventListener\DefaultValuesListener; |
9 | 8 | use Oro\Bundle\WorkflowBundle\Form\EventListener\InitActionsListener; |
10 | 9 | use Oro\Bundle\WorkflowBundle\Form\EventListener\RequiredAttributesListener; |
11 | 10 | use Oro\Bundle\WorkflowBundle\Form\Type\WorkflowAttributesType; |
12 | - |
|
13 | 11 | use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; |
14 | 12 | use Oro\Bundle\WorkflowBundle\Entity\WorkflowStep; |
15 | 13 | use Oro\Bundle\WorkflowBundle\Entity\WorkflowDefinition; |
16 | - |
|
17 | 14 | use Oro\Bundle\WorkflowBundle\Model\Step; |
18 | 15 | use Oro\Bundle\WorkflowBundle\Model\Attribute; |
19 | 16 | use Oro\Bundle\WorkflowBundle\Model\WorkflowData; |
@@ -4,21 +4,16 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\ORM\QueryBuilder; |
6 | 6 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
7 | - |
|
8 | 7 | use Oro\Bundle\SearchBundle\Event\PrepareResultItemEvent; |
9 | 8 | use Symfony\Component\HttpFoundation\Response; |
10 | 9 | use Symfony\Component\HttpFoundation\JsonResponse; |
11 | - |
|
12 | -use Doctrine\ORM\Query; |
|
13 | 10 | use Doctrine\ORM\UnitOfWork; |
14 | 11 | use Doctrine\ORM\Proxy\Proxy; |
15 | 12 | use Doctrine\Common\Collections\Criteria; |
16 | - |
|
17 | 13 | use FOS\RestBundle\Util\Codes; |
18 | 14 | use FOS\RestBundle\View\View; |
19 | 15 | use FOS\RestBundle\Controller\FOSRestController; |
20 | 16 | use FOS\RestBundle\Request\ParamFetcherInterface; |
21 | - |
|
22 | 17 | use Oro\Bundle\EntityBundle\ORM\SqlQueryBuilder; |
23 | 18 | use Oro\Bundle\SearchBundle\Query\Query as SearchQuery; |
24 | 19 | use Oro\Bundle\SearchBundle\Query\Result\Item as SearchResultItem; |
@@ -29,7 +29,6 @@ discard block |
||
29 | 29 | /** |
30 | 30 | * Create new |
31 | 31 | * |
32 | - * @param mixed $_ [optional] Arguments will be passed to createEntity method |
|
33 | 32 | * @return integer |
34 | 33 | */ |
35 | 34 | public function handleCreateRequest() |
@@ -43,7 +42,6 @@ discard block |
||
43 | 42 | /** |
44 | 43 | * Create new entity |
45 | 44 | * |
46 | - * @param mixed $_ [optional] Arguments will be passed to createEntity method of manager (result of getManager) |
|
47 | 45 | * @return mixed |
48 | 46 | */ |
49 | 47 | protected function createEntity() |
@@ -4,9 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\EventManager; |
6 | 6 | use Doctrine\DBAL\Driver\Connection; |
7 | - |
|
8 | 7 | use Symfony\Component\Filesystem\Filesystem; |
9 | - |
|
10 | 8 | use Oro\Component\TestUtils\ORM\Mocks\DriverMock; |
11 | 9 | use Oro\Component\TestUtils\ORM\Mocks\EntityManagerMock; |
12 | 10 |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | * @param null $orderBy |
235 | 235 | * @param array $joins |
236 | 236 | * |
237 | - * @return QueryBuilder|SqlQueryBuilder|SearchQuery|null |
|
237 | + * @return QueryBuilder |
|
238 | 238 | */ |
239 | 239 | public function getListQueryBuilder($limit = 10, $page = 1, $criteria = [], $orderBy = null, $joins = []) |
240 | 240 | { |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | * @param array $criteria |
352 | 352 | * @param null $orderBy |
353 | 353 | * |
354 | - * @return array|Criteria |
|
354 | + * @return Criteria |
|
355 | 355 | */ |
356 | 356 | protected function prepareQueryCriteria($limit = 10, $page = 1, $criteria = [], $orderBy = null) |
357 | 357 | { |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | * Get order by |
400 | 400 | * |
401 | 401 | * @param $orderBy |
402 | - * @return array|null |
|
402 | + * @return string[] |
|
403 | 403 | */ |
404 | 404 | protected function getOrderBy($orderBy) |
405 | 405 | { |
@@ -4,16 +4,13 @@ |
||
4 | 4 | |
5 | 5 | use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; |
6 | 6 | use Symfony\Component\Form\Test\FormIntegrationTestCase; |
7 | - |
|
8 | 7 | use Oro\Bundle\WorkflowBundle\Form\EventListener\DefaultValuesListener; |
9 | 8 | use Oro\Bundle\WorkflowBundle\Form\EventListener\InitActionsListener; |
10 | 9 | use Oro\Bundle\WorkflowBundle\Form\EventListener\RequiredAttributesListener; |
11 | 10 | use Oro\Bundle\WorkflowBundle\Form\Type\WorkflowAttributesType; |
12 | - |
|
13 | 11 | use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; |
14 | 12 | use Oro\Bundle\WorkflowBundle\Entity\WorkflowStep; |
15 | 13 | use Oro\Bundle\WorkflowBundle\Entity\WorkflowDefinition; |
16 | - |
|
17 | 14 | use Oro\Bundle\WorkflowBundle\Model\Step; |
18 | 15 | use Oro\Bundle\WorkflowBundle\Model\Attribute; |
19 | 16 | use Oro\Bundle\WorkflowBundle\Model\WorkflowData; |
@@ -85,7 +85,7 @@ |
||
85 | 85 | |
86 | 86 | /** |
87 | 87 | * @param string $key |
88 | - * @param null $default |
|
88 | + * @param string $default |
|
89 | 89 | * |
90 | 90 | * @return null |
91 | 91 | */ |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Component\PropertyAccess\Tests\Unit; |
4 | 4 | |
5 | 5 | use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException; |
6 | - |
|
7 | 6 | use Oro\Component\PropertyAccess\PropertyAccessor; |
8 | 7 | use Oro\Component\PropertyAccess\Tests\Unit\Fixtures\TestClass; |
9 | 8 | use Oro\Component\PropertyAccess\Tests\Unit\Fixtures\TestClassMagicCall; |
@@ -11,6 +11,11 @@ |
||
11 | 11 | { |
12 | 12 | protected $query; |
13 | 13 | |
14 | + /** |
|
15 | + * @param integer $a |
|
16 | + * @param integer $b |
|
17 | + * @param integer $c |
|
18 | + */ |
|
14 | 19 | public function __construct($a, $b, $c) |
15 | 20 | { |
16 | 21 | $arbitrary = "nothing important here"; |
@@ -2,13 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace Oro\Bundle\TagBundle\Entity; |
4 | 4 | |
5 | -use Doctrine\ORM\Query\Expr; |
|
6 | 5 | use Doctrine\ORM\EntityManager; |
7 | 6 | use Doctrine\Common\Util\ClassUtils; |
8 | 7 | use Doctrine\Common\Collections\ArrayCollection; |
9 | - |
|
10 | 8 | use Symfony\Bundle\FrameworkBundle\Routing\Router; |
11 | - |
|
12 | 9 | use Oro\Bundle\SecurityBundle\SecurityFacade; |
13 | 10 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
14 | 11 | use Oro\Bundle\UserBundle\Entity\User; |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | /** |
125 | 125 | * Adds multiple tags on the given entity |
126 | 126 | * |
127 | - * @param Collection|Tag[] $tags Array of Tag objects |
|
127 | + * @param Tag[] $tags Array of Tag objects |
|
128 | 128 | * @param object $entity entity |
129 | 129 | */ |
130 | 130 | public function addTags($tags, $entity) |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | * |
154 | 154 | * @param object $entity |
155 | 155 | * @param User|null $owner |
156 | - * @param Collection|Tag[]|int[] $tags |
|
156 | + * @param Collection $tags |
|
157 | 157 | * |
158 | 158 | * @return int |
159 | 159 | */ |
@@ -417,7 +417,7 @@ discard block |
||
417 | 417 | /** |
418 | 418 | * @param Tag $tag |
419 | 419 | * |
420 | - * @return callable |
|
420 | + * @return \Closure |
|
421 | 421 | * |
422 | 422 | * @@deprecated |
423 | 423 | */ |
@@ -57,6 +57,7 @@ |
||
57 | 57 | |
58 | 58 | /** |
59 | 59 | * {@inheritdoc} |
60 | + * @param integer $tagId |
|
60 | 61 | */ |
61 | 62 | public function getResults($tagId) |
62 | 63 | { |
@@ -4,9 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\EventManager; |
6 | 6 | use Doctrine\DBAL\Driver\Connection; |
7 | - |
|
8 | 7 | use Symfony\Component\Filesystem\Filesystem; |
9 | - |
|
10 | 8 | use Oro\Component\TestUtils\ORM\Mocks\DriverMock; |
11 | 9 | use Oro\Component\TestUtils\ORM\Mocks\EntityManagerMock; |
12 | 10 |
@@ -127,6 +127,10 @@ discard block |
||
127 | 127 | } |
128 | 128 | } |
129 | 129 | |
130 | + /** |
|
131 | + * @param \Oro\Bundle\UserBundle\Tests\Selenium\Pages\Login $login |
|
132 | + * @param string $role |
|
133 | + */ |
|
130 | 134 | public function deleteAcl($login, $role, $username, $tagName) |
131 | 135 | { |
132 | 136 | /** @var Roles $login*/ |
@@ -143,6 +147,10 @@ discard block |
||
143 | 147 | ->checkContextMenu($tagName, 'Delete'); |
144 | 148 | } |
145 | 149 | |
150 | + /** |
|
151 | + * @param \Oro\Bundle\UserBundle\Tests\Selenium\Pages\Login $login |
|
152 | + * @param string $role |
|
153 | + */ |
|
146 | 154 | public function updateAcl($login, $role, $username, $tagName) |
147 | 155 | { |
148 | 156 | /** @var Roles $login*/ |
@@ -159,6 +167,10 @@ discard block |
||
159 | 167 | ->checkContextMenu($tagName, 'Update'); |
160 | 168 | } |
161 | 169 | |
170 | + /** |
|
171 | + * @param \Oro\Bundle\UserBundle\Tests\Selenium\Pages\Login $login |
|
172 | + * @param string $role |
|
173 | + */ |
|
162 | 174 | public function createAcl($login, $role, $username) |
163 | 175 | { |
164 | 176 | /** @var Roles $login*/ |
@@ -175,6 +187,10 @@ discard block |
||
175 | 187 | ->assertElementNotPresent("//div[@class = 'container-fluid']//a[contains(., 'Create Tag')]"); |
176 | 188 | } |
177 | 189 | |
190 | + /** |
|
191 | + * @param \Oro\Bundle\UserBundle\Tests\Selenium\Pages\Login $login |
|
192 | + * @param string $role |
|
193 | + */ |
|
178 | 194 | public function viewListAcl($login, $role, $username) |
179 | 195 | { |
180 | 196 | /** @var Roles $login*/ |
@@ -191,6 +207,10 @@ discard block |
||
191 | 207 | ->assertTitle('403 - Forbidden'); |
192 | 208 | } |
193 | 209 | |
210 | + /** |
|
211 | + * @param \Oro\Bundle\UserBundle\Tests\Selenium\Pages\Login $login |
|
212 | + * @param string $roleName |
|
213 | + */ |
|
194 | 214 | public function unassignGlobalAcl($login, $roleName, $tagName) |
195 | 215 | { |
196 | 216 | $username = 'user' . mt_rand(); |
@@ -229,6 +249,10 @@ discard block |
||
229 | 249 | ); |
230 | 250 | } |
231 | 251 | |
252 | + /** |
|
253 | + * @param \Oro\Bundle\UserBundle\Tests\Selenium\Pages\Login $login |
|
254 | + * @param string $role |
|
255 | + */ |
|
232 | 256 | public function assignAcl($login, $role, $username) |
233 | 257 | { |
234 | 258 | /** @var Roles $login*/ |