@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | } |
56 | 56 | |
57 | 57 | /** |
58 | - * @return Collection|Step[] |
|
58 | + * @return Collection |
|
59 | 59 | */ |
60 | 60 | public function getSteps() |
61 | 61 | { |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | /** |
66 | 66 | * Get steps sorted by order. |
67 | 67 | * |
68 | - * @return Collection|Step[] |
|
68 | + * @return ArrayCollection |
|
69 | 69 | */ |
70 | 70 | public function getOrderedSteps() |
71 | 71 | { |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | /** |
62 | 62 | * Get mapped field path by field name. |
63 | 63 | * |
64 | - * @param string|PropertyPathInterface $propertyPath |
|
65 | - * @return null|string |
|
64 | + * @param string $propertyPath |
|
65 | + * @return PropertyPathInterface |
|
66 | 66 | */ |
67 | 67 | protected function getMappedPath($propertyPath) |
68 | 68 | { |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | * Get property path for array as first accessor. |
82 | 82 | * |
83 | 83 | * @param string $path |
84 | - * @return string |
|
84 | + * @return PropertyPath |
|
85 | 85 | */ |
86 | 86 | protected function getConstructedPropertyPath($path) |
87 | 87 | { |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | |
327 | 327 | /** |
328 | 328 | * @param Proxy $entity |
329 | - * @return object|Proxy|null |
|
329 | + * @return null|Proxy |
|
330 | 330 | */ |
331 | 331 | protected function extractProxyEntity(Proxy $entity) |
332 | 332 | { |
@@ -4,12 +4,9 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Persistence\Proxy; |
6 | 6 | use Doctrine\ORM\EntityNotFoundException; |
7 | - |
|
8 | 7 | use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException; |
9 | -use Symfony\Component\PropertyAccess\PropertyAccess; |
|
10 | 8 | use Symfony\Component\PropertyAccess\PropertyPath; |
11 | 9 | use Symfony\Component\PropertyAccess\PropertyPathInterface; |
12 | - |
|
13 | 10 | use Oro\Component\PropertyAccess\PropertyAccessor; |
14 | 11 | |
15 | 12 | class WorkflowData implements \ArrayAccess, \IteratorAggregate, \Countable |
@@ -211,6 +211,7 @@ |
||
211 | 211 | /** |
212 | 212 | * @param string |
213 | 213 | * @param string|null $workflowName |
214 | + * @param string $entityClass |
|
214 | 215 | */ |
215 | 216 | protected function assertActiveWorkflow($entityClass, $workflowName) |
216 | 217 | { |
@@ -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 |
@@ -232,10 +232,10 @@ |
||
232 | 232 | } |
233 | 233 | |
234 | 234 | /** |
235 | - * @param array $entityAcls |
|
235 | + * @param WorkflowEntityAcl[] $entityAcls |
|
236 | 236 | * @param string|null $entityClass |
237 | 237 | * @param int|null $entityIdentifier |
238 | - * @param array $aclIdentities |
|
238 | + * @param WorkflowEntityAclIdentity[] $aclIdentities |
|
239 | 239 | */ |
240 | 240 | protected function setRegistryRepositories( |
241 | 241 | array $entityAcls = [], |
@@ -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; |
@@ -193,7 +193,7 @@ |
||
193 | 193 | |
194 | 194 | /** |
195 | 195 | * @param array $uowExpectedCalls |
196 | - * @return \PHPUnit_Framework_MockObject_MockObject|\Doctrine\ORM\EntityManager |
|
196 | + * @return \Doctrine\ORM\EntityManagerInterface |
|
197 | 197 | */ |
198 | 198 | protected function getPostFlushEntityManagerMock(array $uowExpectedCalls) |
199 | 199 | { |
@@ -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; |
@@ -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; |
@@ -117,6 +117,9 @@ discard block |
||
117 | 117 | $listAction->execute(array()); |
118 | 118 | } |
119 | 119 | |
120 | + /** |
|
121 | + * @return \Oro\Bundle\WorkflowBundle\Model\Action\ActionInterface |
|
122 | + */ |
|
120 | 123 | protected function getExceptionAction() |
121 | 124 | { |
122 | 125 | $action = $this->getMockBuilder('Oro\Bundle\WorkflowBundle\Model\Action\ActionInterface') |
@@ -127,6 +130,10 @@ discard block |
||
127 | 130 | ->method('execute') |
128 | 131 | ->will( |
129 | 132 | $this->returnCallback( |
133 | + |
|
134 | + /** |
|
135 | + * @return \Oro\Bundle\WorkflowBundle\Model\Action\ActionInterface |
|
136 | + */ |
|
130 | 137 | function () { |
131 | 138 | throw new \Exception('TEST'); |
132 | 139 | } |
@@ -35,7 +35,7 @@ |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | /** |
38 | - * @return \PHPUnit_Framework_MockObject_MockObject |
|
38 | + * @return \Oro\Bundle\WorkflowBundle\Model\AttributeGuesser |
|
39 | 39 | */ |
40 | 40 | protected function getAttributeGuesser() |
41 | 41 | { |
@@ -317,7 +317,7 @@ |
||
317 | 317 | /** |
318 | 318 | * @param string $templateType |
319 | 319 | * @param array $configuration |
320 | - * @param $actualTransition |
|
320 | + * @param Transition $actualTransition |
|
321 | 321 | */ |
322 | 322 | protected function assertTemplate($templateType, $configuration, $actualTransition) |
323 | 323 | { |