@@ -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 | { |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | * |
136 | 136 | * @param $groupPath |
137 | 137 | * |
138 | - * @return \eZ\Publish\Core\REST\Server\Values\RestUserGroup |
|
138 | + * @return Values\CachedValue |
|
139 | 139 | */ |
140 | 140 | public function loadUserGroup($groupPath) |
141 | 141 | { |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | * |
173 | 173 | * @param $userId |
174 | 174 | * |
175 | - * @return \eZ\Publish\Core\REST\Server\Values\RestUser |
|
175 | + * @return Values\CachedValue |
|
176 | 176 | */ |
177 | 177 | public function loadUser($userId) |
178 | 178 | { |
@@ -705,7 +705,7 @@ discard block |
||
705 | 705 | * |
706 | 706 | * @param $groupPath |
707 | 707 | * |
708 | - * @return \eZ\Publish\Core\REST\Server\Values\UserGroupList|\eZ\Publish\Core\REST\Server\Values\UserGroupRefList |
|
708 | + * @return Values\CachedValue |
|
709 | 709 | */ |
710 | 710 | public function loadSubUserGroups($groupPath, Request $request) |
711 | 711 | { |
@@ -761,7 +761,7 @@ discard block |
||
761 | 761 | * |
762 | 762 | * @param $userId |
763 | 763 | * |
764 | - * @return \eZ\Publish\Core\REST\Server\Values\UserGroupRefList |
|
764 | + * @return Values\CachedValue |
|
765 | 765 | */ |
766 | 766 | public function loadUserGroupsOfUser($userId, Request $request) |
767 | 767 | { |
@@ -801,7 +801,7 @@ discard block |
||
801 | 801 | * |
802 | 802 | * @param $groupPath |
803 | 803 | * |
804 | - * @return \eZ\Publish\Core\REST\Server\Values\UserList|\eZ\Publish\Core\REST\Server\Values\UserRefList |
|
804 | + * @return Values\CachedValue |
|
805 | 805 | */ |
806 | 806 | public function loadUsersFromGroup($groupPath, Request $request) |
807 | 807 | { |
@@ -1061,7 +1061,7 @@ discard block |
||
1061 | 1061 | * |
1062 | 1062 | * @param string $sessionId |
1063 | 1063 | * |
1064 | - * @return \eZ\Publish\Core\REST\Server\Values\NoContent |
|
1064 | + * @return Values\DeletedUserSession |
|
1065 | 1065 | * |
1066 | 1066 | * @throws RestNotFoundException |
1067 | 1067 | */ |
@@ -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; |
@@ -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 | { |
@@ -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, |
@@ -139,7 +139,7 @@ |
||
139 | 139 | /** |
140 | 140 | * Get the field type parser mock object. |
141 | 141 | * |
142 | - * @return \eZ\Publish\Core\REST\Common\Input\FieldTypeParser; |
|
142 | + * @return \eZ\Publish\Core\REST\Common\Input\FieldTypeParser |
|
143 | 143 | */ |
144 | 144 | private function getFieldTypeParserMock() |
145 | 145 | { |
@@ -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 | { |