@@ -234,7 +234,7 @@ |
||
234 | 234 | * |
235 | 235 | * @param array $options |
236 | 236 | * @param string $name |
237 | - * @return mixed |
|
237 | + * @return string|null |
|
238 | 238 | */ |
239 | 239 | protected function getAndRemoveOption(array &$options, $name) |
240 | 240 | { |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | * @param string $enumCode The target enum identifier |
271 | 271 | * @param bool $isMultiple Indicates whether several options can be selected for this enum |
272 | 272 | * or it supports only one selected option |
273 | - * @param bool|string[] $immutable Indicates whether the changing the list of enum values and |
|
273 | + * @param boolean $immutable Indicates whether the changing the list of enum values and |
|
274 | 274 | * public flag is allowed or not. More details can be found |
275 | 275 | * in entity_config.yml |
276 | 276 | * @param array $options |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | * Adds one-to-many relation |
342 | 342 | * |
343 | 343 | * @param Schema $schema |
344 | - * @param Table|string $table A Table object or table name |
|
344 | + * @param Table $table A Table object or table name |
|
345 | 345 | * @param string $associationName A relation name |
346 | 346 | * @param Table|string $targetTable A Table object or table name |
347 | 347 | * @param string[] $targetTitleColumnNames Column names are used to show a title of related entity |
@@ -525,7 +525,7 @@ discard block |
||
525 | 525 | * Adds many-to-one relation |
526 | 526 | * |
527 | 527 | * @param Schema $schema |
528 | - * @param Table|string $table A Table object or table name |
|
528 | + * @param Table $table A Table object or table name |
|
529 | 529 | * @param string $associationName A relation name |
530 | 530 | * @param Table|string $targetTable A Table object or table name |
531 | 531 | * @param string $targetColumnName A column name is used to show related entity |
@@ -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; |
@@ -226,6 +226,9 @@ discard block |
||
226 | 226 | } |
227 | 227 | } |
228 | 228 | |
229 | + /** |
|
230 | + * @param string $associationName |
|
231 | + */ |
|
229 | 232 | protected function renameManyToOneExtendField( |
230 | 233 | Schema $schema, |
231 | 234 | QueryBag $queries, |
@@ -247,6 +250,9 @@ discard block |
||
247 | 250 | } |
248 | 251 | } |
249 | 252 | |
253 | + /** |
|
254 | + * @param string $associationName |
|
255 | + */ |
|
250 | 256 | protected function renameOneToManyExtendField( |
251 | 257 | Schema $schema, |
252 | 258 | QueryBag $queries, |
@@ -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 |
@@ -267,7 +267,7 @@ |
||
267 | 267 | } |
268 | 268 | |
269 | 269 | /** |
270 | - * @return \PHPUnit_Framework_MockObject_MockObject|ConstraintValidatorFactoryInterface |
|
270 | + * @return ConstraintValidatorFactoryInterface |
|
271 | 271 | */ |
272 | 272 | protected function getConstraintValidatorFactory() |
273 | 273 | { |
@@ -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; |
@@ -490,6 +490,11 @@ |
||
490 | 490 | ); |
491 | 491 | } |
492 | 492 | |
493 | + /** |
|
494 | + * @param string $className |
|
495 | + * @param string $fieldName |
|
496 | + * @param string $fieldType |
|
497 | + */ |
|
493 | 498 | protected function setExpectationForGetFields($className, $fieldName, $fieldType, array $extendFieldConfig = []) |
494 | 499 | { |
495 | 500 | $extendConfig = new Config(new FieldConfigId('extend', $className, $fieldName, $fieldType)); |
@@ -65,7 +65,7 @@ |
||
65 | 65 | * @param string $className |
66 | 66 | * @param string $fieldName |
67 | 67 | * |
68 | - * @return Config|null |
|
68 | + * @return \Oro\Bundle\EntityConfigBundle\Config\ConfigInterface|null |
|
69 | 69 | */ |
70 | 70 | public function findExtendFieldConfig($className, $fieldName) |
71 | 71 | { |
@@ -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; |
@@ -3,15 +3,11 @@ |
||
3 | 3 | namespace Oro\Bundle\EntityMergeBundle\Controller; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | - |
|
7 | 6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
8 | 7 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
9 | - |
|
10 | 8 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
11 | -use Symfony\Component\Validator\Constraint; |
|
12 | 9 | use Symfony\Component\Validator\ConstraintViolation; |
13 | 10 | use Symfony\Component\Validator\ValidatorInterface; |
14 | - |
|
15 | 11 | use Oro\Bundle\EntityMergeBundle\Exception\ValidationException; |
16 | 12 | use Oro\Bundle\DataGridBundle\Extension\MassAction\MassActionDispatcher; |
17 | 13 | use Oro\Bundle\EntityMergeBundle\Data\EntityData; |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | protected $propertyAccessor; |
16 | 16 | |
17 | 17 | /** |
18 | - * @return PropertyAccessor |
|
18 | + * @return string |
|
19 | 19 | */ |
20 | 20 | public function getName() |
21 | 21 | { |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | * |
28 | 28 | * @param string $entity |
29 | 29 | * @param FieldMetadata $metadata |
30 | - * @return string |
|
30 | + * @return boolean |
|
31 | 31 | */ |
32 | 32 | public function supports($entity, FieldMetadata $metadata) |
33 | 33 | { |
@@ -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; |
@@ -37,7 +37,7 @@ |
||
37 | 37 | * |
38 | 38 | * @param string $entity |
39 | 39 | * @param FieldMetadata $metadata |
40 | - * @return string |
|
40 | + * @return boolean |
|
41 | 41 | */ |
42 | 42 | public function supports($entity, FieldMetadata $metadata) |
43 | 43 | { |
@@ -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 |