@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Collections\Collection; |
6 | 6 | use Doctrine\Common\Collections\ArrayCollection; |
7 | - |
|
8 | 7 | use Oro\Bundle\WorkflowBundle\Exception\UnknownAttributeException; |
9 | 8 | |
10 | 9 | class AttributeManager |
@@ -3,9 +3,7 @@ |
||
3 | 3 | namespace Oro\Bundle\WorkflowBundle\Model; |
4 | 4 | |
5 | 5 | use Doctrine\Common\Collections\Collection; |
6 | - |
|
7 | 6 | use Oro\Component\ConfigExpression\ExpressionInterface; |
8 | - |
|
9 | 7 | use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; |
10 | 8 | use Oro\Bundle\WorkflowBundle\Exception\ForbiddenTransitionException; |
11 | 9 | use Oro\Bundle\WorkflowBundle\Model\Action\ActionInterface; |
@@ -4,9 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Collections\Collection; |
6 | 6 | use Doctrine\Common\Collections\ArrayCollection; |
7 | - |
|
8 | 7 | use Oro\Component\ConfigExpression\ExpressionFactory as ConditionFactory; |
9 | - |
|
10 | 8 | use Oro\Bundle\WorkflowBundle\Configuration\WorkflowConfiguration; |
11 | 9 | use Oro\Bundle\WorkflowBundle\Exception\AssemblerException; |
12 | 10 | use Oro\Bundle\WorkflowBundle\Form\Type\WorkflowTransitionType; |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Collections\Collection; |
6 | 6 | use Doctrine\Common\Collections\ArrayCollection; |
7 | - |
|
8 | 7 | use Oro\Bundle\WorkflowBundle\Exception\InvalidTransitionException; |
9 | 8 | |
10 | 9 | class TransitionManager |
@@ -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 |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Doctrine\Common\Persistence\ManagerRegistry; |
6 | 6 | use Doctrine\Common\Collections\Collection; |
7 | 7 | use Doctrine\ORM\EntityManager; |
8 | - |
|
9 | 8 | use Oro\Bundle\EntityBundle\ORM\DoctrineHelper; |
10 | 9 | use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; |
11 | 10 | use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; |
@@ -360,7 +360,7 @@ |
||
360 | 360 | } |
361 | 361 | |
362 | 362 | /** |
363 | - * @param $entityClass |
|
363 | + * @param string $entityClass |
|
364 | 364 | * @return ConfigInterface |
365 | 365 | * @throws WorkflowException |
366 | 366 | */ |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use JMS\Serializer\JsonSerializationVisitor; |
6 | 6 | use JMS\Serializer\Context; |
7 | - |
|
8 | 7 | use Oro\Bundle\EntityBundle\ORM\DoctrineHelper; |
9 | 8 | use Oro\Bundle\WorkflowBundle\Model\WorkflowResult; |
10 | 9 |
@@ -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 | { |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace Oro\Bundle\WorkflowBundle\Tests\Functional\Controller\Api\Rest; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | - |
|
7 | 6 | use Oro\Bundle\TestFrameworkBundle\Entity\WorkflowAwareEntity; |
8 | 7 | use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; |
9 | - |
|
10 | 8 | use Oro\Bundle\WorkflowBundle\Tests\Functional\DataFixtures\LoadWorkflowDefinitions; |
11 | 9 | use Oro\Bundle\WorkflowBundle\Model\WorkflowManager; |
12 | 10 |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Bundle\DoctrineBundle\Registry; |
6 | 6 | use Doctrine\ORM\EntityManager; |
7 | - |
|
8 | 7 | use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; |
9 | 8 | use Oro\Bundle\UserBundle\Entity\User; |
10 | 9 | use Oro\Bundle\WorkflowBundle\Entity\ProcessDefinition; |