@@ -26,7 +26,7 @@ |
||
| 26 | 26 | * |
| 27 | 27 | * @param \eZ\Publish\Core\REST\Common\Output\Visitor $visitor |
| 28 | 28 | * @param \eZ\Publish\Core\REST\Common\Output\Generator $generator |
| 29 | - * @param Role|RoleDraft $data |
|
| 29 | + * @param \eZ\Publish\Core\REST\Server\Values\RestRole $data |
|
| 30 | 30 | */ |
| 31 | 31 | public function visit(Visitor $visitor, Generator $generator, $data) |
| 32 | 32 | { |
@@ -198,7 +198,7 @@ |
||
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | /** |
| 201 | - * @return \PHPUnit_Framework_MockObject_MockObject|\eZ\Publish\Core\REST\Common\Output\Generator |
|
| 201 | + * @return \eZ\Publish\Core\REST\Common\Output\Generator |
|
| 202 | 202 | */ |
| 203 | 203 | protected function getInnerGeneratorMock() |
| 204 | 204 | { |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | 36 | * ResourceRouteReference constructor. |
| 37 | - * @param array $route |
|
| 37 | + * @param string $route |
|
| 38 | 38 | * @param $loadParameters |
| 39 | 39 | * @param string $mediaType The media-type name (ContentInfo, Location) of the resource. If null, the default will be used. |
| 40 | 40 | */ |
@@ -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(); |
@@ -15,10 +15,9 @@ |
||
| 15 | 15 | use eZ\Publish\API\Repository\Values\Content\Search\SearchResult; |
| 16 | 16 | use eZ\Publish\Core\REST\Common\Tests\Output\ValueObjectVisitorBaseTest; |
| 17 | 17 | use eZ\Publish\Core\REST\Server\Output\ValueObjectVisitor; |
| 18 | -use eZ\Publish\Core\Repository\Values\Content; |
|
| 18 | +use eZ\Publish\Core\Repository\Values\Content as ApiValues; |
|
| 19 | 19 | use eZ\Publish\Core\REST\Server\Values\ResourceRouteReference; |
| 20 | 20 | use eZ\Publish\Core\REST\Server\Values\RestExecutedView; |
| 21 | -use eZ\Publish\Core\Repository\Values\Content as ApiValues; |
|
| 22 | 21 | |
| 23 | 22 | class RestExecutedViewTest extends ValueObjectVisitorBaseTest |
| 24 | 23 | { |
@@ -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 | { |