@@ -4,15 +4,11 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Symfony\Component\HttpFoundation\Response; |
| 6 | 6 | use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
| 7 | - |
|
| 8 | 7 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
| 9 | 8 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
| 10 | 9 | use FOS\RestBundle\Controller\FOSRestController; |
| 11 | -use FOS\RestBundle\Controller\Annotations\QueryParam; |
|
| 12 | -use FOS\RestBundle\Controller\Annotations\Get; |
|
| 13 | 10 | use FOS\RestBundle\Util\Codes; |
| 14 | 11 | use FOS\RestBundle\Controller\Annotations as Rest; |
| 15 | - |
|
| 16 | 12 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
| 17 | 13 | |
| 18 | 14 | /** |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | * @param string $entityName |
| 313 | 313 | * @param string $id |
| 314 | 314 | * |
| 315 | - * @return array |
|
| 315 | + * @return JsonResponse |
|
| 316 | 316 | * |
| 317 | 317 | * @Route( |
| 318 | 318 | * "/delete/{entityName}/item/{id}", |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | * |
| 351 | 351 | * @param string $permission |
| 352 | 352 | * @param string $entityName |
| 353 | - * @return bool |
|
| 353 | + * @return boolean|null |
|
| 354 | 354 | * @throws AccessDeniedException |
| 355 | 355 | */ |
| 356 | 356 | private function checkAccess($permission, $entityName) |
@@ -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; |
@@ -141,7 +141,7 @@ |
||
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
| 144 | - * @param $entity |
|
| 144 | + * @param SomeEntity $entity |
|
| 145 | 145 | * @param string $method |
| 146 | 146 | * @param int $count |
| 147 | 147 | */ |
@@ -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; |
@@ -96,7 +96,7 @@ |
||
| 96 | 96 | * @param \PHPUnit_Framework_MockObject_MockObject|null $emMock |
| 97 | 97 | * @param boolean $isReturnManager |
| 98 | 98 | * |
| 99 | - * @return \PHPUnit_Framework_MockObject_MockObject |
|
| 99 | + * @return \Doctrine\Common\Persistence\ManagerRegistry |
|
| 100 | 100 | */ |
| 101 | 101 | protected function getDoctrineMock($emMock = null, $isReturnManager = true) |
| 102 | 102 | { |
@@ -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; |
@@ -107,7 +107,7 @@ |
||
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | /** |
| 110 | - * @return UserInterface|null |
|
| 110 | + * @return UserInterface |
|
| 111 | 111 | */ |
| 112 | 112 | protected function getUser() |
| 113 | 113 | { |
@@ -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 | |
@@ -118,7 +118,7 @@ |
||
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
| 121 | - * @return ConfigLogDiff[]|ArrayCollection |
|
| 121 | + * @return ConfigLogDiff[] |
|
| 122 | 122 | */ |
| 123 | 123 | public function getDiffs() |
| 124 | 124 | { |
@@ -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; |
@@ -174,7 +174,7 @@ |
||
| 174 | 174 | /** |
| 175 | 175 | * @param array $classMap [class_name => entity_config_id, ...] |
| 176 | 176 | * |
| 177 | - * @return array [entity_config_id => [field_name => is_configurable, ...], ...] |
|
| 177 | + * @return string [entity_config_id => [field_name => is_configurable, ...], ...] |
|
| 178 | 178 | */ |
| 179 | 179 | protected function loadConfigurableFields(array $classMap) |
| 180 | 180 | { |
@@ -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; |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | /** |
| 151 | 151 | * @param string $className |
| 152 | 152 | * |
| 153 | - * @return EntityMetadata|null |
|
| 153 | + * @return \Metadata\ClassMetadata|null |
|
| 154 | 154 | */ |
| 155 | 155 | public function getEntityMetadata($className) |
| 156 | 156 | { |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | } |
| 559 | 559 | |
| 560 | 560 | /** |
| 561 | - * @param array $models |
|
| 561 | + * @param ConfigModel[] $models |
|
| 562 | 562 | * |
| 563 | 563 | * @SuppressWarnings(PHPMD.NPathComplexity) |
| 564 | 564 | */ |
@@ -4,17 +4,13 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Symfony\Component\HttpFoundation\JsonResponse; |
| 6 | 6 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
| 7 | - |
|
| 8 | 7 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 9 | 8 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 10 | - |
|
| 11 | 9 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
| 12 | 10 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
| 13 | 11 | use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationToken; |
| 14 | - |
|
| 15 | 12 | use Oro\Bundle\UserBundle\Entity\User; |
| 16 | 13 | use Oro\Bundle\UserBundle\Entity\UserApi; |
| 17 | - |
|
| 18 | 14 | use Oro\Bundle\OrganizationBundle\Entity\Manager\BusinessUnitManager; |
| 19 | 15 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
| 20 | 16 | |
@@ -200,7 +200,7 @@ |
||
| 200 | 200 | * |
| 201 | 201 | * @param string $scope |
| 202 | 202 | * @param string $code |
| 203 | - * @param mixed $value |
|
| 203 | + * @param string $value |
|
| 204 | 204 | * @return ConfigModelIndexValue |
| 205 | 205 | */ |
| 206 | 206 | abstract protected function createIndexedValue($scope, $code, $value); |