@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * @throws InvalidArgumentType On invalid $contentType |
| 234 | 234 | * |
| 235 | 235 | * @param \eZ\Publish\SPI\Persistence\Content\Field[] $spiFields |
| 236 | - * @param ContentType|SPIType $contentType |
|
| 236 | + * @param ContentType $contentType |
|
| 237 | 237 | * @param array $prioritizedLanguages A language priority, filters returned fields and is used as prioritized language code on |
| 238 | 238 | * returned value object. If not given all languages are returned. |
| 239 | 239 | * @param string|null $alwaysAvailableLanguage Language code fallback if a given field is not found in $prioritizedLanguages |
@@ -640,7 +640,7 @@ discard block |
||
| 640 | 640 | * @param \eZ\Publish\API\Repository\Values\Content\Location $parentLocation |
| 641 | 641 | * @param mixed $mainLocation |
| 642 | 642 | * @param mixed $contentId |
| 643 | - * @param mixed $contentVersionNo |
|
| 643 | + * @param null|integer $contentVersionNo |
|
| 644 | 644 | * |
| 645 | 645 | * @return \eZ\Publish\SPI\Persistence\Content\Location\CreateStruct |
| 646 | 646 | */ |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
| 121 | - * @return \eZ\Publish\API\Repository\LocationService|\PHPUnit\Framework\MockObject\MockObject |
|
| 121 | + * @return LocationService |
|
| 122 | 122 | */ |
| 123 | 123 | public function getLocationServiceMock() |
| 124 | 124 | { |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | /** |
| 129 | - * @return \eZ\Publish\API\Repository\ContentService|\PHPUnit\Framework\MockObject\MockObject |
|
| 129 | + * @return ContentService |
|
| 130 | 130 | */ |
| 131 | 131 | public function getContentServiceMock() |
| 132 | 132 | { |
@@ -17,9 +17,8 @@ |
||
| 17 | 17 | use eZ\Publish\Core\Repository\Values\ContentType\ContentType; |
| 18 | 18 | use eZ\Publish\Core\REST\Common\Tests\Output\ValueObjectVisitorBaseTest; |
| 19 | 19 | use eZ\Publish\Core\REST\Server\Output\ValueObjectVisitor; |
| 20 | -use eZ\Publish\Core\Repository\Values\Content; |
|
| 21 | -use eZ\Publish\Core\REST\Server\Values\RestExecutedView; |
|
| 22 | 20 | use eZ\Publish\Core\Repository\Values\Content as ApiValues; |
| 21 | +use eZ\Publish\Core\REST\Server\Values\RestExecutedView; |
|
| 23 | 22 | |
| 24 | 23 | class RestExecutedViewTest extends ValueObjectVisitorBaseTest |
| 25 | 24 | { |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | /** |
| 142 | - * @return \PHPUnit\Framework\MockObject\MockObject|\eZ\Publish\Core\Repository\Helper\ContentTypeDomainMapper |
|
| 142 | + * @return ContentTypeDomainMapper |
|
| 143 | 143 | */ |
| 144 | 144 | protected function getContentTypeDomainMapperMock() |
| 145 | 145 | { |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | * |
| 251 | 251 | * @param int $id |
| 252 | 252 | * |
| 253 | - * @return \eZ\Publish\API\Repository\Values\User\User |
|
| 253 | + * @return null|\eZ\Publish\API\Repository\Values\User\UserReference |
|
| 254 | 254 | */ |
| 255 | 255 | protected function getStubbedUser($id) |
| 256 | 256 | { |
@@ -56,6 +56,7 @@ |
||
| 56 | 56 | |
| 57 | 57 | /** |
| 58 | 58 | * Assert that the elements are. |
| 59 | + * @param \eZ\Publish\API\Repository\Values\Content\Search\SearchResult $searchResult |
|
| 59 | 60 | */ |
| 60 | 61 | protected function assertSearchResults($expectedIds, $searchResult) |
| 61 | 62 | { |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | /** |
| 94 | 94 | * Returns a content mapper mock. |
| 95 | 95 | * |
| 96 | - * @return \eZ\Publish\Core\Persistence\Legacy\Content\Mapper |
|
| 96 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
| 97 | 97 | */ |
| 98 | 98 | protected function getContentMapperMock() |
| 99 | 99 | { |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | /** |
| 150 | 150 | * Returns a content field handler mock. |
| 151 | 151 | * |
| 152 | - * @return \eZ\Publish\Core\Persistence\Legacy\Content\FieldHandler |
|
| 152 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
| 153 | 153 | */ |
| 154 | 154 | protected function getContentFieldHandlerMock() |
| 155 | 155 | { |
@@ -28,9 +28,16 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | class HandlerLocationSortTest extends AbstractTestCase |
| 30 | 30 | { |
| 31 | + /** |
|
| 32 | + * @param \eZ\Publish\API\Repository\Values\Content\Search\SearchResult $searchResult |
|
| 33 | + */ |
|
| 31 | 34 | protected function getIds($searchResult) |
| 32 | 35 | { |
| 33 | 36 | $ids = array_map( |
| 37 | + |
|
| 38 | + /** |
|
| 39 | + * @param \eZ\Publish\API\Repository\Values\Content\Search\SearchResult $hit |
|
| 40 | + */ |
|
| 34 | 41 | function ($hit) { |
| 35 | 42 | return $hit->valueObject->id; |
| 36 | 43 | }, |
@@ -106,7 +113,7 @@ discard block |
||
| 106 | 113 | /** |
| 107 | 114 | * Returns a location mapper mock. |
| 108 | 115 | * |
| 109 | - * @return \eZ\Publish\Core\Persistence\Legacy\Content\Location\Mapper |
|
| 116 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
| 110 | 117 | */ |
| 111 | 118 | protected function getLocationMapperMock() |
| 112 | 119 | { |
@@ -166,7 +166,7 @@ |
||
| 166 | 166 | /** |
| 167 | 167 | * Returns a location mapper mock. |
| 168 | 168 | * |
| 169 | - * @return \eZ\Publish\Core\Persistence\Legacy\Content\Location\Mapper |
|
| 169 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
| 170 | 170 | */ |
| 171 | 171 | protected function getLocationMapperMock() |
| 172 | 172 | { |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | /** |
| 94 | 94 | * Returns a content mapper mock. |
| 95 | 95 | * |
| 96 | - * @return \eZ\Publish\Core\Persistence\Legacy\Content\Mapper |
|
| 96 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
| 97 | 97 | */ |
| 98 | 98 | protected function getContentMapperMock() |
| 99 | 99 | { |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | /** |
| 150 | 150 | * Returns a content field handler mock. |
| 151 | 151 | * |
| 152 | - * @return \eZ\Publish\Core\Persistence\Legacy\Content\FieldHandler |
|
| 152 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
| 153 | 153 | */ |
| 154 | 154 | protected function getContentFieldHandlerMock() |
| 155 | 155 | { |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | /** |
| 248 | 248 | * Returns data for the first level children of the location identified by given $locationId. |
| 249 | 249 | * |
| 250 | - * @param mixed $locationId |
|
| 250 | + * @param integer $locationId |
|
| 251 | 251 | * |
| 252 | 252 | * @return array |
| 253 | 253 | */ |
@@ -374,6 +374,9 @@ discard block |
||
| 374 | 374 | } |
| 375 | 375 | } |
| 376 | 376 | |
| 377 | + /** |
|
| 378 | + * @param string $pathString |
|
| 379 | + */ |
|
| 377 | 380 | private function isHiddenByParent($pathString, array $rows) |
| 378 | 381 | { |
| 379 | 382 | $parentNodeIds = explode('/', trim($pathString, '/')); |
@@ -574,10 +577,10 @@ discard block |
||
| 574 | 577 | * Make the location identified by $locationId1 refer to the Content |
| 575 | 578 | * referred to by $locationId2 and vice versa. |
| 576 | 579 | * |
| 577 | - * @param mixed $locationId1 |
|
| 578 | - * @param mixed $locationId2 |
|
| 580 | + * @param integer $locationId1 |
|
| 581 | + * @param integer $locationId2 |
|
| 579 | 582 | * |
| 580 | - * @return bool |
|
| 583 | + * @return boolean|null |
|
| 581 | 584 | */ |
| 582 | 585 | public function swap($locationId1, $locationId2) |
| 583 | 586 | { |
@@ -734,7 +737,7 @@ discard block |
||
| 734 | 737 | * Create an entry in the node assignment table. |
| 735 | 738 | * |
| 736 | 739 | * @param \eZ\Publish\SPI\Persistence\Content\Location\CreateStruct $createStruct |
| 737 | - * @param mixed $parentNodeId |
|
| 740 | + * @param string $parentNodeId |
|
| 738 | 741 | * @param int $type |
| 739 | 742 | */ |
| 740 | 743 | public function createNodeAssignment(CreateStruct $createStruct, $parentNodeId, $type = self::NODE_ASSIGNMENT_OP_CODE_CREATE_NOP) |
@@ -862,8 +865,8 @@ discard block |
||
| 862 | 865 | * |
| 863 | 866 | * Convert existing node assignments into real locations. |
| 864 | 867 | * |
| 865 | - * @param mixed $contentId |
|
| 866 | - * @param mixed $versionNo |
|
| 868 | + * @param integer $contentId |
|
| 869 | + * @param integer $versionNo |
|
| 867 | 870 | */ |
| 868 | 871 | public function createLocationsFromNodeAssignments($contentId, $versionNo) |
| 869 | 872 | { |
@@ -931,8 +934,8 @@ discard block |
||
| 931 | 934 | /** |
| 932 | 935 | * Updates all Locations of content identified with $contentId with $versionNo. |
| 933 | 936 | * |
| 934 | - * @param mixed $contentId |
|
| 935 | - * @param mixed $versionNo |
|
| 937 | + * @param integer $contentId |
|
| 938 | + * @param integer $versionNo |
|
| 936 | 939 | */ |
| 937 | 940 | public function updateLocationsContentVersionNo($contentId, $versionNo) |
| 938 | 941 | { |
@@ -1091,8 +1094,8 @@ discard block |
||
| 1091 | 1094 | * the node identified by given $locationId (current main node). |
| 1092 | 1095 | * Assumes that content has more than one location. |
| 1093 | 1096 | * |
| 1094 | - * @param mixed $contentId |
|
| 1095 | - * @param mixed $locationId |
|
| 1097 | + * @param integer $contentId |
|
| 1098 | + * @param integer $locationId |
|
| 1096 | 1099 | * |
| 1097 | 1100 | * @return array |
| 1098 | 1101 | */ |
@@ -1128,9 +1131,9 @@ discard block |
||
| 1128 | 1131 | * |
| 1129 | 1132 | * The associated content object is left untouched. |
| 1130 | 1133 | * |
| 1131 | - * @param mixed $locationId |
|
| 1134 | + * @param integer $locationId |
|
| 1132 | 1135 | * |
| 1133 | - * @return bool |
|
| 1136 | + * @return boolean|null |
|
| 1134 | 1137 | */ |
| 1135 | 1138 | public function trashLocation($locationId) |
| 1136 | 1139 | { |
@@ -1159,8 +1162,8 @@ discard block |
||
| 1159 | 1162 | * at the old position. If this is not possible ( because the old location |
| 1160 | 1163 | * does not exist any more) and exception is thrown. |
| 1161 | 1164 | * |
| 1162 | - * @param mixed $locationId |
|
| 1163 | - * @param mixed|null $newParentId |
|
| 1165 | + * @param integer $locationId |
|
| 1166 | + * @param integer $newParentId |
|
| 1164 | 1167 | * |
| 1165 | 1168 | * @return \eZ\Publish\SPI\Persistence\Content\Location |
| 1166 | 1169 | */ |
@@ -1413,10 +1416,10 @@ discard block |
||
| 1413 | 1416 | * Updates ezcontentobject_tree table for the given $contentId and eznode_assignment table for the given |
| 1414 | 1417 | * $contentId, $parentLocationId and $versionNo |
| 1415 | 1418 | * |
| 1416 | - * @param mixed $contentId |
|
| 1417 | - * @param mixed $locationId |
|
| 1418 | - * @param mixed $versionNo version number, needed to update eznode_assignment table |
|
| 1419 | - * @param mixed $parentLocationId parent location of location identified by $locationId, needed to update |
|
| 1419 | + * @param integer $contentId |
|
| 1420 | + * @param integer $locationId |
|
| 1421 | + * @param integer $versionNo version number, needed to update eznode_assignment table |
|
| 1422 | + * @param integer $parentLocationId parent location of location identified by $locationId, needed to update |
|
| 1420 | 1423 | * eznode_assignment table |
| 1421 | 1424 | */ |
| 1422 | 1425 | public function changeMainLocation($contentId, $locationId, $versionNo, $parentLocationId) |
@@ -1546,7 +1549,7 @@ discard block |
||
| 1546 | 1549 | * |
| 1547 | 1550 | * @todo Align with createNodeQueryBuilder, removing the need for both(?) |
| 1548 | 1551 | * |
| 1549 | - * @param array $columns list of columns to fetch |
|
| 1552 | + * @param string[] $columns list of columns to fetch |
|
| 1550 | 1553 | * |
| 1551 | 1554 | * @return \Doctrine\DBAL\Query\QueryBuilder |
| 1552 | 1555 | */ |