@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | * |
| 126 | 126 | * @param string $locationPath |
| 127 | 127 | * |
| 128 | - * @return \eZ\Publish\Core\REST\Server\Values\RestLocation |
|
| 128 | + * @return Values\CachedValue |
|
| 129 | 129 | */ |
| 130 | 130 | public function loadLocation($locationPath) |
| 131 | 131 | { |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | * |
| 315 | 315 | * @param mixed $contentId |
| 316 | 316 | * |
| 317 | - * @return \eZ\Publish\Core\REST\Server\Values\LocationList |
|
| 317 | + * @return Values\CachedValue |
|
| 318 | 318 | */ |
| 319 | 319 | public function loadLocationsForContent($contentId, Request $request) |
| 320 | 320 | { |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | * |
| 340 | 340 | * @param string $locationPath |
| 341 | 341 | * |
| 342 | - * @return \eZ\Publish\Core\REST\Server\Values\LocationList |
|
| 342 | + * @return Values\CachedValue |
|
| 343 | 343 | */ |
| 344 | 344 | public function loadLocationChildren($locationPath, Request $request) |
| 345 | 345 | { |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | namespace eZ\Publish\Core\REST\Server\Controller; |
| 12 | 12 | |
| 13 | 13 | use eZ\Publish\API\Repository\Exceptions\LimitationValidationException; |
| 14 | -use eZ\Publish\API\Repository\Exceptions\NotFoundException; |
|
| 14 | +use eZ\Publish\API\Repository\Exceptions\NotFoundException as APINotFoundException; |
|
| 15 | 15 | use eZ\Publish\Core\Base\Exceptions\ForbiddenException; |
| 16 | 16 | use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; |
| 17 | 17 | use eZ\Publish\Core\Base\Exceptions\UnauthorizedException; |
@@ -25,7 +25,6 @@ discard block |
||
| 25 | 25 | use eZ\Publish\API\Repository\LocationService; |
| 26 | 26 | use eZ\Publish\API\Repository\Values\User\RoleCreateStruct; |
| 27 | 27 | use eZ\Publish\API\Repository\Values\User\RoleUpdateStruct; |
| 28 | -use eZ\Publish\API\Repository\Exceptions\NotFoundException as APINotFoundException; |
|
| 29 | 28 | use Symfony\Component\HttpFoundation\Request; |
| 30 | 29 | |
| 31 | 30 | /** |
@@ -456,7 +456,7 @@ |
||
| 456 | 456 | * This is needed because the RoleService addPolicy() and addPolicyByRoleDraft() methods return the role, |
| 457 | 457 | * not the policy. |
| 458 | 458 | * |
| 459 | - * @param $role \eZ\Publish\API\Repository\Values\User\Role |
|
| 459 | + * @param \eZ\Publish\API\Repository\Values\User\Role $role \eZ\Publish\API\Repository\Values\User\Role |
|
| 460 | 460 | * |
| 461 | 461 | * @return \eZ\Publish\API\Repository\Values\User\Policy |
| 462 | 462 | */ |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | * |
| 81 | 81 | * @param $locationPath |
| 82 | 82 | * |
| 83 | - * @return \eZ\Publish\Core\REST\Server\Values\URLAliasRefList |
|
| 83 | + * @return Values\CachedValue |
|
| 84 | 84 | */ |
| 85 | 85 | public function listLocationURLAliases($locationPath, Request $request) |
| 86 | 86 | { |
@@ -61,6 +61,9 @@ |
||
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | + /** |
|
| 65 | + * @param string $parameterName |
|
| 66 | + */ |
|
| 64 | 67 | public function getParameter($parameterName, $defaultValue = null) |
| 65 | 68 | { |
| 66 | 69 | if ($this->configResolver->hasParameter($parameterName)) { |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | * |
| 26 | 26 | * @param \eZ\Publish\Core\REST\Common\Output\Visitor $visitor |
| 27 | 27 | * @param \eZ\Publish\Core\REST\Common\Output\Generator $generator |
| 28 | - * @param Policy|PolicyDraft $data |
|
| 28 | + * @param \eZ\Publish\API\Repository\Values\User\Policy $data |
|
| 29 | 29 | */ |
| 30 | 30 | public function visit(Visitor $visitor, Generator $generator, $data) |
| 31 | 31 | { |
@@ -79,6 +79,9 @@ |
||
| 79 | 79 | */ |
| 80 | 80 | private $logoutHandlers = array(); |
| 81 | 81 | |
| 82 | + /** |
|
| 83 | + * @param string $providerKey |
|
| 84 | + */ |
|
| 82 | 85 | public function __construct( |
| 83 | 86 | TokenStorageInterface $tokenStorage, |
| 84 | 87 | AuthenticationManagerInterface $authenticationManager, |
@@ -92,7 +92,7 @@ |
||
| 92 | 92 | /** |
| 93 | 93 | * Returns the session input parser. |
| 94 | 94 | * |
| 95 | - * @return \eZ\Publish\Core\REST\Server\Input\Parser\ViewInput |
|
| 95 | + * @return ViewInputOneDotOne |
|
| 96 | 96 | */ |
| 97 | 97 | protected function internalGetParser() |
| 98 | 98 | { |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | /** |
| 38 | 38 | * Gets the exception. |
| 39 | 39 | * |
| 40 | - * @return \Exception |
|
| 40 | + * @return \PHPUnit_Framework_MockObject_MockObject |
|
| 41 | 41 | */ |
| 42 | 42 | protected function getException() |
| 43 | 43 | { |
@@ -122,6 +122,9 @@ discard block |
||
| 122 | 122 | self::assertNotNull($result); |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | + /** |
|
| 126 | + * @param CachedValue $value |
|
| 127 | + */ |
|
| 125 | 128 | protected function visit($value) |
| 126 | 129 | { |
| 127 | 130 | $this->getVisitorMock()->expects($this->once())->method('visitValueObject')->with($value->value); |
@@ -160,7 +163,7 @@ discard block |
||
| 160 | 163 | } |
| 161 | 164 | |
| 162 | 165 | /** |
| 163 | - * @return ConfigResolverInterface|PHPUnit_Framework_MockObject_MockObject |
|
| 166 | + * @return ConfigResolverInterface |
|
| 164 | 167 | */ |
| 165 | 168 | protected function getConfigProviderMock() |
| 166 | 169 | { |