@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | /** |
| 146 | - * @return \eZ\Publish\Core\REST\Common\RequestParser|\PHPUnit_Framework_MockObject_MockObject |
|
| 146 | + * @return RequestParser |
|
| 147 | 147 | */ |
| 148 | 148 | protected function getRequestParser() |
| 149 | 149 | { |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | /** |
| 158 | - * @return \Symfony\Component\Routing\RouterInterface|\PHPUnit_Framework_MockObject_MockObject |
|
| 158 | + * @return \Symfony\Component\Routing\RouterInterface |
|
| 159 | 159 | */ |
| 160 | 160 | protected function getRouterMock() |
| 161 | 161 | { |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | /** |
| 198 | - * @return \Symfony\Component\Routing\RouterInterface|\PHPUnit_Framework_MockObject_MockObject |
|
| 198 | + * @return \Symfony\Component\Routing\RouterInterface |
|
| 199 | 199 | */ |
| 200 | 200 | protected function getTemplatedRouterMock() |
| 201 | 201 | { |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | * |
| 49 | 49 | * @param RMF\Request $request |
| 50 | 50 | * |
| 51 | - * @return bool |
|
| 51 | + * @return null|false |
|
| 52 | 52 | */ |
| 53 | 53 | public function authenticate(RMF\Request $request) |
| 54 | 54 | { |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | * |
| 46 | 46 | * @param RMF\Request $request |
| 47 | 47 | * |
| 48 | - * @return bool |
|
| 48 | + * @return boolean|null |
|
| 49 | 49 | */ |
| 50 | 50 | public function authenticate(RMF\Request $request) |
| 51 | 51 | { |
@@ -721,7 +721,7 @@ |
||
| 721 | 721 | * |
| 722 | 722 | * @deprecated Since platform 1.0. Forwards the request to the new /views location, but returns a 301. |
| 723 | 723 | * |
| 724 | - * @return \eZ\Publish\Core\REST\Server\Values\RestExecutedView |
|
| 724 | + * @return \Symfony\Component\HttpFoundation\Response |
|
| 725 | 725 | */ |
| 726 | 726 | public function createView() |
| 727 | 727 | { |
@@ -612,7 +612,7 @@ |
||
| 612 | 612 | * @throws \eZ\Publish\Core\REST\Server\Exceptions\ForbiddenException |
| 613 | 613 | * @throws \eZ\Publish\Core\REST\Common\Exceptions\NotFoundException |
| 614 | 614 | * |
| 615 | - * @return \eZ\Publish\Core\REST\Server\Values\FieldDefinitionList |
|
| 615 | + * @return Values\RestFieldDefinition |
|
| 616 | 616 | */ |
| 617 | 617 | public function updateContentTypeDraftFieldDefinition($contentTypeId, $fieldDefinitionId, Request $request) |
| 618 | 618 | { |
@@ -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)) { |