@@ -763,7 +763,7 @@ discard block  | 
                                                    ||
| 763 | 763 | /**  | 
                                                        
| 764 | 764 | * Test for the loadLocationChildren() method.  | 
                                                        
| 765 | 765 | *  | 
                                                        
| 766 | - * @return \eZ\Publish\API\Repository\Values\Content\Location[]  | 
                                                        |
| 766 | + * @return LocationList  | 
                                                        |
| 767 | 767 | *  | 
                                                        
| 768 | 768 | * @see \eZ\Publish\API\Repository\LocationService::loadLocationChildren($location, $offset)  | 
                                                        
| 769 | 769 | * @depends eZ\Publish\API\Repository\Tests\LocationServiceTest::testLoadLocationChildren  | 
                                                        
@@ -827,7 +827,7 @@ discard block  | 
                                                    ||
| 827 | 827 | /**  | 
                                                        
| 828 | 828 | * Test for the loadLocationChildren() method.  | 
                                                        
| 829 | 829 | *  | 
                                                        
| 830 | - * @return \eZ\Publish\API\Repository\Values\Content\Location[]  | 
                                                        |
| 830 | + * @return LocationList  | 
                                                        |
| 831 | 831 | *  | 
                                                        
| 832 | 832 | * @see \eZ\Publish\API\Repository\LocationService::loadLocationChildren($location, $offset, $limit)  | 
                                                        
| 833 | 833 | * @depends eZ\Publish\API\Repository\Tests\LocationServiceTest::testLoadLocationChildren  | 
                                                        
@@ -856,7 +856,7 @@ discard block  | 
                                                    ||
| 856 | 856 | /**  | 
                                                        
| 857 | 857 | * Test for the loadLocationChildren() method.  | 
                                                        
| 858 | 858 | *  | 
                                                        
| 859 | - * @param \eZ\Publish\API\Repository\Values\Content\Location[] $locations  | 
                                                        |
| 859 | + * @param LocationList $locations  | 
                                                        |
| 860 | 860 | *  | 
                                                        
| 861 | 861 | * @see \eZ\Publish\API\Repository\LocationService::loadLocationChildren($location, $offset, $limit)  | 
                                                        
| 862 | 862 | * @depends eZ\Publish\API\Repository\Tests\LocationServiceTest::testLoadLocationChildrenWithOffsetAndLimit  | 
                                                        
@@ -1140,7 +1140,7 @@ discard block  | 
                                                    ||
| 1140 | 1140 | * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException  | 
                                                        
| 1141 | 1141 | * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException  | 
                                                        
| 1142 | 1142 | *  | 
                                                        
| 1143 | - * @return int[]  | 
                                                        |
| 1143 | + * @return Content[]  | 
                                                        |
| 1144 | 1144 | */  | 
                                                        
| 1145 | 1145 | public function testSwapLocationForMainAndSecondaryLocation()  | 
                                                        
| 1146 | 1146 |      { | 
                                                        
@@ -2342,7 +2342,7 @@ discard block  | 
                                                    ||
| 2342 | 2342 | * Assert generated aliases to expected alias return.  | 
                                                        
| 2343 | 2343 | *  | 
                                                        
| 2344 | 2344 | * @param \eZ\Publish\API\Repository\URLAliasService $urlAliasService  | 
                                                        
| 2345 | - * @param array $expectedAliases  | 
                                                        |
| 2345 | + * @param string[] $expectedAliases  | 
                                                        |
| 2346 | 2346 | */  | 
                                                        
| 2347 | 2347 | protected function assertGeneratedAliases($urlAliasService, array $expectedAliases)  | 
                                                        
| 2348 | 2348 |      { | 
                                                        
@@ -2354,7 +2354,7 @@ discard block  | 
                                                    ||
| 2354 | 2354 | |
| 2355 | 2355 | /**  | 
                                                        
| 2356 | 2356 | * @param \eZ\Publish\API\Repository\URLAliasService $urlAliasService  | 
                                                        
| 2357 | - * @param array $expectedSubItemAliases  | 
                                                        |
| 2357 | + * @param string[] $expectedSubItemAliases  | 
                                                        |
| 2358 | 2358 | */  | 
                                                        
| 2359 | 2359 | private function assertAliasesBeforeCopy($urlAliasService, array $expectedSubItemAliases)  | 
                                                        
| 2360 | 2360 |      { | 
                                                        
@@ -96,7 +96,7 @@ discard block  | 
                                                    ||
| 96 | 96 | *  | 
                                                        
| 97 | 97 | * @todo optimize  | 
                                                        
| 98 | 98 | *  | 
                                                        
| 99 | - * @param mixed $remoteId  | 
                                                        |
| 99 | + * @param string $remoteId  | 
                                                        |
| 100 | 100 | *  | 
                                                        
| 101 | 101 | * @return array  | 
                                                        
| 102 | 102 | */  | 
                                                        
@@ -250,7 +250,7 @@ discard block  | 
                                                    ||
| 250 | 250 | /**  | 
                                                        
| 251 | 251 | * Returns data for the first level children of the location identified by given $locationId.  | 
                                                        
| 252 | 252 | *  | 
                                                        
| 253 | - * @param mixed $locationId  | 
                                                        |
| 253 | + * @param integer $locationId  | 
                                                        |
| 254 | 254 | *  | 
                                                        
| 255 | 255 | * @return array  | 
                                                        
| 256 | 256 | */  | 
                                                        
@@ -377,6 +377,9 @@ discard block  | 
                                                    ||
| 377 | 377 | }  | 
                                                        
| 378 | 378 | }  | 
                                                        
| 379 | 379 | |
| 380 | + /**  | 
                                                        |
| 381 | + * @param string $pathString  | 
                                                        |
| 382 | + */  | 
                                                        |
| 380 | 383 | private function isHiddenByParent($pathString, array $rows)  | 
                                                        
| 381 | 384 |      { | 
                                                        
| 382 | 385 |          $parentNodeIds = explode('/', trim($pathString, '/')); | 
                                                        
@@ -577,8 +580,8 @@ discard block  | 
                                                    ||
| 577 | 580 | * Make the location identified by $locationId1 refer to the Content  | 
                                                        
| 578 | 581 | * referred to by $locationId2 and vice versa.  | 
                                                        
| 579 | 582 | *  | 
                                                        
| 580 | - * @param mixed $locationId1  | 
                                                        |
| 581 | - * @param mixed $locationId2  | 
                                                        |
| 583 | + * @param integer $locationId1  | 
                                                        |
| 584 | + * @param integer $locationId2  | 
                                                        |
| 582 | 585 | *  | 
                                                        
| 583 | 586 | * @return bool  | 
                                                        
| 584 | 587 | */  | 
                                                        
@@ -754,7 +757,7 @@ discard block  | 
                                                    ||
| 754 | 757 | * Create an entry in the node assignment table.  | 
                                                        
| 755 | 758 | *  | 
                                                        
| 756 | 759 | * @param \eZ\Publish\SPI\Persistence\Content\Location\CreateStruct $createStruct  | 
                                                        
| 757 | - * @param mixed $parentNodeId  | 
                                                        |
| 760 | + * @param string $parentNodeId  | 
                                                        |
| 758 | 761 | * @param int $type  | 
                                                        
| 759 | 762 | */  | 
                                                        
| 760 | 763 | public function createNodeAssignment(CreateStruct $createStruct, $parentNodeId, $type = self::NODE_ASSIGNMENT_OP_CODE_CREATE_NOP)  | 
                                                        
@@ -882,8 +885,8 @@ discard block  | 
                                                    ||
| 882 | 885 | *  | 
                                                        
| 883 | 886 | * Convert existing node assignments into real locations.  | 
                                                        
| 884 | 887 | *  | 
                                                        
| 885 | - * @param mixed $contentId  | 
                                                        |
| 886 | - * @param mixed $versionNo  | 
                                                        |
| 888 | + * @param integer $contentId  | 
                                                        |
| 889 | + * @param integer $versionNo  | 
                                                        |
| 887 | 890 | */  | 
                                                        
| 888 | 891 | public function createLocationsFromNodeAssignments($contentId, $versionNo)  | 
                                                        
| 889 | 892 |      { | 
                                                        
@@ -951,8 +954,8 @@ discard block  | 
                                                    ||
| 951 | 954 | /**  | 
                                                        
| 952 | 955 | * Updates all Locations of content identified with $contentId with $versionNo.  | 
                                                        
| 953 | 956 | *  | 
                                                        
| 954 | - * @param mixed $contentId  | 
                                                        |
| 955 | - * @param mixed $versionNo  | 
                                                        |
| 957 | + * @param integer $contentId  | 
                                                        |
| 958 | + * @param integer $versionNo  | 
                                                        |
| 956 | 959 | */  | 
                                                        
| 957 | 960 | public function updateLocationsContentVersionNo($contentId, $versionNo)  | 
                                                        
| 958 | 961 |      { | 
                                                        
@@ -1111,8 +1114,8 @@ discard block  | 
                                                    ||
| 1111 | 1114 | * the node identified by given $locationId (current main node).  | 
                                                        
| 1112 | 1115 | * Assumes that content has more than one location.  | 
                                                        
| 1113 | 1116 | *  | 
                                                        
| 1114 | - * @param mixed $contentId  | 
                                                        |
| 1115 | - * @param mixed $locationId  | 
                                                        |
| 1117 | + * @param integer $contentId  | 
                                                        |
| 1118 | + * @param integer $locationId  | 
                                                        |
| 1116 | 1119 | *  | 
                                                        
| 1117 | 1120 | * @return array  | 
                                                        
| 1118 | 1121 | */  | 
                                                        
@@ -1148,9 +1151,9 @@ discard block  | 
                                                    ||
| 1148 | 1151 | *  | 
                                                        
| 1149 | 1152 | * The associated content object is left untouched.  | 
                                                        
| 1150 | 1153 | *  | 
                                                        
| 1151 | - * @param mixed $locationId  | 
                                                        |
| 1154 | + * @param integer $locationId  | 
                                                        |
| 1152 | 1155 | *  | 
                                                        
| 1153 | - * @return bool  | 
                                                        |
| 1156 | + * @return boolean|null  | 
                                                        |
| 1154 | 1157 | */  | 
                                                        
| 1155 | 1158 | public function trashLocation($locationId)  | 
                                                        
| 1156 | 1159 |      { | 
                                                        
@@ -1179,8 +1182,8 @@ discard block  | 
                                                    ||
| 1179 | 1182 | * at the old position. If this is not possible ( because the old location  | 
                                                        
| 1180 | 1183 | * does not exist any more) and exception is thrown.  | 
                                                        
| 1181 | 1184 | *  | 
                                                        
| 1182 | - * @param mixed $locationId  | 
                                                        |
| 1183 | - * @param mixed|null $newParentId  | 
                                                        |
| 1185 | + * @param integer $locationId  | 
                                                        |
| 1186 | + * @param integer $newParentId  | 
                                                        |
| 1184 | 1187 | *  | 
                                                        
| 1185 | 1188 | * @return \eZ\Publish\SPI\Persistence\Content\Location  | 
                                                        
| 1186 | 1189 | */  | 
                                                        
@@ -1433,10 +1436,10 @@ discard block  | 
                                                    ||
| 1433 | 1436 | * Updates ezcontentobject_tree table for the given $contentId and eznode_assignment table for the given  | 
                                                        
| 1434 | 1437 | * $contentId, $parentLocationId and $versionNo  | 
                                                        
| 1435 | 1438 | *  | 
                                                        
| 1436 | - * @param mixed $contentId  | 
                                                        |
| 1437 | - * @param mixed $locationId  | 
                                                        |
| 1438 | - * @param mixed $versionNo version number, needed to update eznode_assignment table  | 
                                                        |
| 1439 | - * @param mixed $parentLocationId parent location of location identified by $locationId, needed to update  | 
                                                        |
| 1439 | + * @param integer $contentId  | 
                                                        |
| 1440 | + * @param integer $locationId  | 
                                                        |
| 1441 | + * @param integer $versionNo version number, needed to update eznode_assignment table  | 
                                                        |
| 1442 | + * @param integer $parentLocationId parent location of location identified by $locationId, needed to update  | 
                                                        |
| 1440 | 1443 | * eznode_assignment table  | 
                                                        
| 1441 | 1444 | */  | 
                                                        
| 1442 | 1445 | public function changeMainLocation($contentId, $locationId, $versionNo, $parentLocationId)  | 
                                                        
@@ -1564,7 +1567,7 @@ discard block  | 
                                                    ||
| 1564 | 1567 | /**  | 
                                                        
| 1565 | 1568 | * Get Query Builder for fetching data of all Locations except the Root node.  | 
                                                        
| 1566 | 1569 | *  | 
                                                        
| 1567 | - * @param array $columns list of columns to fetch  | 
                                                        |
| 1570 | + * @param string[] $columns list of columns to fetch  | 
                                                        |
| 1568 | 1571 | *  | 
                                                        
| 1569 | 1572 | * @return \Doctrine\DBAL\Query\QueryBuilder  | 
                                                        
| 1570 | 1573 | */  |