@@ -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 | { |
@@ -111,6 +111,7 @@ discard block |
||
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | /** |
| 114 | + * @param string $method |
|
| 114 | 115 | * @return HttpRequest |
| 115 | 116 | */ |
| 116 | 117 | public function createHttpRequest($method, $uri, $contentType = '', $acceptType = '') |
@@ -172,6 +173,9 @@ discard block |
||
| 172 | 173 | return $errorMessageString; |
| 173 | 174 | } |
| 174 | 175 | |
| 176 | + /** |
|
| 177 | + * @param string $header |
|
| 178 | + */ |
|
| 175 | 179 | protected function assertHttpResponseHasHeader(HttpResponse $response, $header, $expectedValue = null) |
| 176 | 180 | { |
| 177 | 181 | $headerValue = $response->getHeader($header); |
@@ -181,6 +185,9 @@ discard block |
||
| 181 | 185 | } |
| 182 | 186 | } |
| 183 | 187 | |
| 188 | + /** |
|
| 189 | + * @param string $typeString |
|
| 190 | + */ |
|
| 184 | 191 | protected function generateMediaTypeString($typeString) |
| 185 | 192 | { |
| 186 | 193 | return "application/vnd.ez.api.$typeString"; |