@@ -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 | { |
@@ -25,9 +25,8 @@ |
||
| 25 | 25 | use eZ\Publish\API\Repository\Values\User\UserGroupRoleAssignment; |
| 26 | 26 | use eZ\Publish\API\Repository\Values\User\User as RepositoryUser; |
| 27 | 27 | use eZ\Publish\API\Repository\Exceptions as ApiExceptions; |
| 28 | -use eZ\Publish\Core\REST\Common\Exceptions\NotFoundException as RestNotFoundException; |
|
| 29 | -use eZ\Publish\Core\REST\Server\Exceptions\ForbiddenException; |
|
| 30 | 28 | use eZ\Publish\Core\REST\Common\Exceptions\NotFoundException; |
| 29 | +use eZ\Publish\Core\REST\Server\Exceptions\ForbiddenException; |
|
| 31 | 30 | use eZ\Publish\Core\Base\Exceptions\UnauthorizedException; |
| 32 | 31 | use Symfony\Component\DependencyInjection\ContainerInterface; |
| 33 | 32 | use Symfony\Component\HttpFoundation\Request; |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | * |
| 142 | 142 | * @param $groupPath |
| 143 | 143 | * |
| 144 | - * @return \eZ\Publish\Core\REST\Server\Values\RestUserGroup |
|
| 144 | + * @return Values\CachedValue |
|
| 145 | 145 | */ |
| 146 | 146 | public function loadUserGroup($groupPath) |
| 147 | 147 | { |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | * |
| 179 | 179 | * @param $userId |
| 180 | 180 | * |
| 181 | - * @return \eZ\Publish\Core\REST\Server\Values\RestUser |
|
| 181 | + * @return Values\CachedValue |
|
| 182 | 182 | */ |
| 183 | 183 | public function loadUser($userId) |
| 184 | 184 | { |
@@ -711,7 +711,7 @@ discard block |
||
| 711 | 711 | * |
| 712 | 712 | * @param $groupPath |
| 713 | 713 | * |
| 714 | - * @return \eZ\Publish\Core\REST\Server\Values\UserGroupList|\eZ\Publish\Core\REST\Server\Values\UserGroupRefList |
|
| 714 | + * @return Values\CachedValue |
|
| 715 | 715 | */ |
| 716 | 716 | public function loadSubUserGroups($groupPath, Request $request) |
| 717 | 717 | { |
@@ -767,7 +767,7 @@ discard block |
||
| 767 | 767 | * |
| 768 | 768 | * @param $userId |
| 769 | 769 | * |
| 770 | - * @return \eZ\Publish\Core\REST\Server\Values\UserGroupRefList |
|
| 770 | + * @return Values\CachedValue |
|
| 771 | 771 | */ |
| 772 | 772 | public function loadUserGroupsOfUser($userId, Request $request) |
| 773 | 773 | { |
@@ -807,7 +807,7 @@ discard block |
||
| 807 | 807 | * |
| 808 | 808 | * @param $groupPath |
| 809 | 809 | * |
| 810 | - * @return \eZ\Publish\Core\REST\Server\Values\UserList|\eZ\Publish\Core\REST\Server\Values\UserRefList |
|
| 810 | + * @return Values\CachedValue |
|
| 811 | 811 | */ |
| 812 | 812 | public function loadUsersFromGroup($groupPath, Request $request) |
| 813 | 813 | { |
@@ -13,7 +13,6 @@ |
||
| 13 | 13 | use eZ\Publish\Core\REST\Server\Input\Parser\Criterion as CriterionParser; |
| 14 | 14 | use eZ\Publish\Core\REST\Common\Input\ParsingDispatcher; |
| 15 | 15 | use eZ\Publish\Core\REST\Common\Exceptions; |
| 16 | -use eZ\Publish\API\Repository\Values\Content\Query; |
|
| 17 | 16 | use eZ\Publish\Core\REST\Server\Values\RestViewInput; |
| 18 | 17 | |
| 19 | 18 | /** |
@@ -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 | { |