@@ -123,7 +123,7 @@ |
||
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | /** |
| 126 | - * @return ContainerInterface |
|
| 126 | + * @return ContainerAwareInterface |
|
| 127 | 127 | */ |
| 128 | 128 | protected function getContainer() |
| 129 | 129 | { |
@@ -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; |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | /** |
| 136 | 136 | * Gets the owning organization id for the given user id |
| 137 | 137 | * |
| 138 | - * @param int|string $userId |
|
| 138 | + * @param string $userId |
|
| 139 | 139 | * @return int|string|null |
| 140 | 140 | */ |
| 141 | 141 | public function getUserOrganizationId($userId) |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | /** |
| 162 | 162 | * Gets the owning business unit id for the given user id |
| 163 | 163 | * |
| 164 | - * @param int|string $userId |
|
| 164 | + * @param string $userId |
|
| 165 | 165 | * @return int|string|null |
| 166 | 166 | */ |
| 167 | 167 | public function getUserBusinessUnitId($userId) |
@@ -310,8 +310,8 @@ discard block |
||
| 310 | 310 | /** |
| 311 | 311 | * Add the given business unit to the tree |
| 312 | 312 | * |
| 313 | - * @param int|string $businessUnitId |
|
| 314 | - * @param int|string|null $owningOrganizationId |
|
| 313 | + * @param string $businessUnitId |
|
| 314 | + * @param null|string $owningOrganizationId |
|
| 315 | 315 | * |
| 316 | 316 | * @deprecated 1.8.0:2.1.0 use OwnerTree::addLocalEntity method |
| 317 | 317 | */ |
@@ -110,7 +110,7 @@ |
||
| 110 | 110 | |
| 111 | 111 | /** |
| 112 | 112 | * @param Query $query |
| 113 | - * @param $expr |
|
| 113 | + * @param \Oro\Bundle\SearchBundle\Query\Criteria\ExpressionBuilder $expr |
|
| 114 | 114 | */ |
| 115 | 115 | protected function addOrganizationLimits(Query $query, $expr) |
| 116 | 116 | { |
@@ -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; |
@@ -346,6 +346,9 @@ discard block |
||
| 346 | 346 | ); |
| 347 | 347 | } |
| 348 | 348 | |
| 349 | + /** |
|
| 350 | + * @param ObjectIdentity $oid |
|
| 351 | + */ |
|
| 349 | 352 | protected function getAcl($oid = null, $entriesInheriting = true) |
| 350 | 353 | { |
| 351 | 354 | static $id = 1; |
@@ -385,7 +388,7 @@ discard block |
||
| 385 | 388 | |
| 386 | 389 | /** |
| 387 | 390 | * @param string $permission |
| 388 | - * @param object $object |
|
| 391 | + * @param TestEntity $object |
|
| 389 | 392 | * @return array|null may return null if permission/object combination is not supported |
| 390 | 393 | */ |
| 391 | 394 | private function getMasks($permission, $object) |
@@ -395,7 +398,7 @@ discard block |
||
| 395 | 398 | |
| 396 | 399 | /** |
| 397 | 400 | * @param string $permission |
| 398 | - * @param mixed $object |
|
| 401 | + * @param TestEntity $object |
|
| 399 | 402 | * @return MaskBuilder |
| 400 | 403 | */ |
| 401 | 404 | private function getMaskBuilder($permission, $object) |
@@ -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; |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | /** |
| 66 | 66 | * @param bool $isSupports |
| 67 | 67 | * @param string $group |
| 68 | - * @return \PHPUnit_Framework_MockObject_MockObject|AclGroupProviderInterface |
|
| 68 | + * @return AclGroupProviderInterface |
|
| 69 | 69 | */ |
| 70 | 70 | protected function getAclGroupProviderMock($isSupports = true, $group = '') |
| 71 | 71 | { |
@@ -436,6 +436,11 @@ |
||
| 436 | 436 | ); |
| 437 | 437 | } |
| 438 | 438 | |
| 439 | + /** |
|
| 440 | + * @param boolean $granting |
|
| 441 | + * @param integer $mask |
|
| 442 | + * @param string $strategy |
|
| 443 | + */ |
|
| 439 | 444 | private function getAce( |
| 440 | 445 | $sid, |
| 441 | 446 | $granting = null, |
@@ -352,6 +352,10 @@ discard block |
||
| 352 | 352 | $this->assertFalse($p->containsKey('EDIT')); |
| 353 | 353 | } |
| 354 | 354 | |
| 355 | + /** |
|
| 356 | + * @param string $extensionKey |
|
| 357 | + * @param ObjectIdentity $rootOid |
|
| 358 | + */ |
|
| 355 | 359 | private function initSavePrivileges($extensionKey, $rootOid) |
| 356 | 360 | { |
| 357 | 361 | $this->extension->expects($this->any()) |
@@ -364,6 +368,11 @@ discard block |
||
| 364 | 368 | ->method('adaptRootMask') |
| 365 | 369 | ->will( |
| 366 | 370 | $this->returnCallback( |
| 371 | + |
|
| 372 | + /** |
|
| 373 | + * @param string $mask |
|
| 374 | + * @param ObjectIdentity $object |
|
| 375 | + */ |
|
| 367 | 376 | function ($mask, $object) { |
| 368 | 377 | return $mask; |
| 369 | 378 | } |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | /** |
| 51 | 51 | * @param array $securityConfig |
| 52 | - * @return \PHPUnit_Framework_MockObject_MockObject|ExtendedContainerBuilder |
|
| 52 | + * @return ExtendedContainerBuilder |
|
| 53 | 53 | */ |
| 54 | 54 | protected function getContainerBuilder(array $securityConfig) |
| 55 | 55 | { |
@@ -173,7 +173,7 @@ |
||
| 173 | 173 | |
| 174 | 174 | /** |
| 175 | 175 | * @param bool $supports |
| 176 | - * @return AccessLevelOwnershipDecisionMakerInterface|\PHPUnit_Framework_MockObject_MockObject |
|
| 176 | + * @return AccessLevelOwnershipDecisionMakerInterface |
|
| 177 | 177 | */ |
| 178 | 178 | protected function getOwnershipDecisionMakerMock($supports = true) |
| 179 | 179 | { |