@@ -59,6 +59,9 @@ |
||
59 | 59 | self::assertFalse($checker->needsExpansion('Location.urlAliases')); |
60 | 60 | } |
61 | 61 | |
62 | + /** |
|
63 | + * @param string $headerValue |
|
64 | + */ |
|
62 | 65 | private function buildRequestStackWithHeader($headerValue) |
63 | 66 | { |
64 | 67 | $requestStack = new RequestStack(); |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | } |
226 | 226 | |
227 | 227 | /** |
228 | - * @return \eZ\Publish\Core\REST\Server\Output\PathExpansion\ValueLoaders\UriValueLoader|\PHPUnit_Framework_MockObject_MockObject |
|
228 | + * @return \eZ\Publish\Core\REST\Server\Output\PathExpansion\ValueLoaders\UriValueLoader |
|
229 | 229 | */ |
230 | 230 | protected function getValueLoaderMock() |
231 | 231 | { |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | } |
240 | 240 | |
241 | 241 | /** |
242 | - * @return \eZ\Publish\Core\REST\Server\Output\PathExpansion\PathExpansionChecker|\PHPUnit_Framework_MockObject_MockObject |
|
242 | + * @return \eZ\Publish\Core\REST\Server\Output\PathExpansion\PathExpansionChecker |
|
243 | 243 | */ |
244 | 244 | protected function getPathExpansionCheckerMock() |
245 | 245 | { |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | } |
254 | 254 | |
255 | 255 | /** |
256 | - * @return \eZ\Publish\Core\REST\Common\Output\ValueObjectVisitorDispatcher|\PHPUnit_Framework_MockObject_MockObject |
|
256 | + * @return \eZ\Publish\Core\REST\Common\Output\ValueObjectVisitorDispatcher |
|
257 | 257 | */ |
258 | 258 | protected function getValueObjectVisitorDispatcherMock() |
259 | 259 | { |
@@ -46,7 +46,7 @@ |
||
46 | 46 | } |
47 | 47 | |
48 | 48 | /** |
49 | - * @return \PHPUnit_Framework_MockObject_MockObject|\eZ\Publish\Core\REST\Server\Output\PathExpansion\ValueLoaders\UriValueLoader |
|
49 | + * @return \eZ\Publish\Core\REST\Server\Output\PathExpansion\ValueLoaders\UriValueLoader |
|
50 | 50 | */ |
51 | 51 | protected function getInnerLoaderMock() |
52 | 52 | { |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * @param string $tag The tag key |
98 | 98 | * @param string $digest The digest hash to store representing the cache item. |
99 | 99 | * |
100 | - * @return bool|void |
|
100 | + * @return false|null |
|
101 | 101 | */ |
102 | 102 | private function saveTag($tag, $digest) |
103 | 103 | { |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | * |
132 | 132 | * @param \Symfony\Component\HttpFoundation\Request $request |
133 | 133 | * |
134 | - * @return bool True if purge was successful. False otherwise |
|
134 | + * @return boolean|null True if purge was successful. False otherwise |
|
135 | 135 | */ |
136 | 136 | public function purgeByRequest(Request $request) |
137 | 137 | { |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | * |
174 | 174 | * @deprecated Use cache:clear, with multi tagging theoretically there shouldn't be need to delete all anymore from core. |
175 | 175 | * |
176 | - * @return bool |
|
176 | + * @return boolean|null |
|
177 | 177 | */ |
178 | 178 | public function purgeAllContent() |
179 | 179 | { |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | * |
187 | 187 | * @param string $tag |
188 | 188 | * |
189 | - * @return bool |
|
189 | + * @return false|null |
|
190 | 190 | */ |
191 | 191 | private function purgeByCacheTag($tag) |
192 | 192 | { |
@@ -100,7 +100,7 @@ |
||
100 | 100 | /** |
101 | 101 | * Returns an array of allowed IPs for Http PURGE requests. |
102 | 102 | * |
103 | - * @return array |
|
103 | + * @return string[] |
|
104 | 104 | */ |
105 | 105 | protected function getInternalAllowedIPs() |
106 | 106 | { |
@@ -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"; |
@@ -5,7 +5,6 @@ |
||
5 | 5 | */ |
6 | 6 | namespace eZ\Publish\Core\REST\Server\HttpCache\Controller; |
7 | 7 | |
8 | -use eZ\Publish\API\Repository\Values\Content\ContentInfo; |
|
9 | 8 | use eZ\Publish\Core\REST\Server\Values\CachedValue; |
10 | 9 | use Symfony\Component\HttpFoundation\Request; |
11 | 10 |