@@ -365,10 +365,10 @@ discard block |
||
365 | 365 | * destination, identified by $destinationParentId. Relations do not need |
366 | 366 | * to be updated, since they refer to Content. URLs are not touched. |
367 | 367 | * |
368 | - * @param mixed $sourceId |
|
369 | - * @param mixed $destinationParentId |
|
368 | + * @param integer $sourceId |
|
369 | + * @param integer $destinationParentId |
|
370 | 370 | * |
371 | - * @return bool |
|
371 | + * @return boolean|null |
|
372 | 372 | */ |
373 | 373 | public function move($sourceId, $destinationParentId) |
374 | 374 | { |
@@ -411,7 +411,7 @@ discard block |
||
411 | 411 | /** |
412 | 412 | * Sets a location to be hidden, and it self + all children to invisible. |
413 | 413 | * |
414 | - * @param mixed $id Location ID |
|
414 | + * @param integer $id Location ID |
|
415 | 415 | */ |
416 | 416 | public function hide($id) |
417 | 417 | { |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | * Sets a location to be unhidden, and self + children to visible unless a parent is hiding the tree. |
425 | 425 | * If not make sure only children down to first hidden node is marked visible. |
426 | 426 | * |
427 | - * @param mixed $id |
|
427 | + * @param integer $id |
|
428 | 428 | */ |
429 | 429 | public function unHide($id) |
430 | 430 | { |
@@ -439,10 +439,10 @@ discard block |
||
439 | 439 | * Make the location identified by $locationId1 refer to the Content |
440 | 440 | * referred to by $locationId2 and vice versa. |
441 | 441 | * |
442 | - * @param mixed $locationId1 |
|
443 | - * @param mixed $locationId2 |
|
442 | + * @param integer $locationId1 |
|
443 | + * @param integer $locationId2 |
|
444 | 444 | * |
445 | - * @return bool |
|
445 | + * @return boolean|null |
|
446 | 446 | */ |
447 | 447 | public function swap($locationId1, $locationId2) |
448 | 448 | { |
@@ -489,9 +489,9 @@ discard block |
||
489 | 489 | * main Location will get the first of its other Locations assigned as the |
490 | 490 | * new main Location. |
491 | 491 | * |
492 | - * @param mixed $locationId |
|
492 | + * @param integer $locationId |
|
493 | 493 | * |
494 | - * @return bool |
|
494 | + * @return boolean|null |
|
495 | 495 | */ |
496 | 496 | public function removeSubtree($locationId) |
497 | 497 | { |
@@ -502,7 +502,7 @@ discard block |
||
502 | 502 | * Set section on all content objects in the subtree. |
503 | 503 | * |
504 | 504 | * @param mixed $locationId |
505 | - * @param mixed $sectionId |
|
505 | + * @param integer $sectionId |
|
506 | 506 | */ |
507 | 507 | public function setSectionForSubtree($locationId, $sectionId) |
508 | 508 | { |
@@ -339,9 +339,9 @@ |
||
339 | 339 | * Return relevant content and location tags so cache can be purged reliably. |
340 | 340 | * |
341 | 341 | * @param \eZ\Publish\SPI\Persistence\Content\Location $location |
342 | - * @param array $tags Optional, can be used to specify additional tags. |
|
342 | + * @param string[] $tags Optional, can be used to specify additional tags. |
|
343 | 343 | * |
344 | - * @return array |
|
344 | + * @return string[] |
|
345 | 345 | */ |
346 | 346 | private function getCacheTags(Location $location, $tags = []) |
347 | 347 | { |
@@ -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, '/')); |
@@ -751,7 +754,7 @@ discard block |
||
751 | 754 | * Create an entry in the node assignment table. |
752 | 755 | * |
753 | 756 | * @param \eZ\Publish\SPI\Persistence\Content\Location\CreateStruct $createStruct |
754 | - * @param mixed $parentNodeId |
|
757 | + * @param string $parentNodeId |
|
755 | 758 | * @param int $type |
756 | 759 | */ |
757 | 760 | public function createNodeAssignment(CreateStruct $createStruct, $parentNodeId, $type = self::NODE_ASSIGNMENT_OP_CODE_CREATE_NOP) |
@@ -879,8 +882,8 @@ discard block |
||
879 | 882 | * |
880 | 883 | * Convert existing node assignments into real locations. |
881 | 884 | * |
882 | - * @param mixed $contentId |
|
883 | - * @param mixed $versionNo |
|
885 | + * @param integer $contentId |
|
886 | + * @param integer $versionNo |
|
884 | 887 | */ |
885 | 888 | public function createLocationsFromNodeAssignments($contentId, $versionNo) |
886 | 889 | { |
@@ -948,8 +951,8 @@ discard block |
||
948 | 951 | /** |
949 | 952 | * Updates all Locations of content identified with $contentId with $versionNo. |
950 | 953 | * |
951 | - * @param mixed $contentId |
|
952 | - * @param mixed $versionNo |
|
954 | + * @param integer $contentId |
|
955 | + * @param integer $versionNo |
|
953 | 956 | */ |
954 | 957 | public function updateLocationsContentVersionNo($contentId, $versionNo) |
955 | 958 | { |
@@ -1108,8 +1111,8 @@ discard block |
||
1108 | 1111 | * the node identified by given $locationId (current main node). |
1109 | 1112 | * Assumes that content has more than one location. |
1110 | 1113 | * |
1111 | - * @param mixed $contentId |
|
1112 | - * @param mixed $locationId |
|
1114 | + * @param integer $contentId |
|
1115 | + * @param integer $locationId |
|
1113 | 1116 | * |
1114 | 1117 | * @return array |
1115 | 1118 | */ |
@@ -1145,9 +1148,9 @@ discard block |
||
1145 | 1148 | * |
1146 | 1149 | * The associated content object is left untouched. |
1147 | 1150 | * |
1148 | - * @param mixed $locationId |
|
1151 | + * @param integer $locationId |
|
1149 | 1152 | * |
1150 | - * @return bool |
|
1153 | + * @return boolean|null |
|
1151 | 1154 | */ |
1152 | 1155 | public function trashLocation($locationId) |
1153 | 1156 | { |
@@ -1177,8 +1180,8 @@ discard block |
||
1177 | 1180 | * at the old position. If this is not possible ( because the old location |
1178 | 1181 | * does not exist any more) and exception is thrown. |
1179 | 1182 | * |
1180 | - * @param mixed $locationId |
|
1181 | - * @param mixed|null $newParentId |
|
1183 | + * @param integer $locationId |
|
1184 | + * @param integer $newParentId |
|
1182 | 1185 | * |
1183 | 1186 | * @return \eZ\Publish\SPI\Persistence\Content\Location |
1184 | 1187 | */ |
@@ -1431,10 +1434,10 @@ discard block |
||
1431 | 1434 | * Updates ezcontentobject_tree table for the given $contentId and eznode_assignment table for the given |
1432 | 1435 | * $contentId, $parentLocationId and $versionNo |
1433 | 1436 | * |
1434 | - * @param mixed $contentId |
|
1435 | - * @param mixed $locationId |
|
1436 | - * @param mixed $versionNo version number, needed to update eznode_assignment table |
|
1437 | - * @param mixed $parentLocationId parent location of location identified by $locationId, needed to update |
|
1437 | + * @param integer $contentId |
|
1438 | + * @param integer $locationId |
|
1439 | + * @param integer $versionNo version number, needed to update eznode_assignment table |
|
1440 | + * @param integer $parentLocationId parent location of location identified by $locationId, needed to update |
|
1438 | 1441 | * eznode_assignment table |
1439 | 1442 | */ |
1440 | 1443 | public function changeMainLocation($contentId, $locationId, $versionNo, $parentLocationId) |
@@ -1564,7 +1567,7 @@ discard block |
||
1564 | 1567 | * |
1565 | 1568 | * @todo Align with createNodeQueryBuilder, removing the need for both(?) |
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 | */ |
@@ -12,7 +12,6 @@ |
||
12 | 12 | use eZ\Publish\Core\Persistence\Legacy\Content\Location\Gateway; |
13 | 13 | use eZ\Publish\SPI\Persistence\Content\Location\UpdateStruct; |
14 | 14 | use eZ\Publish\SPI\Persistence\Content\Location\CreateStruct; |
15 | -use Doctrine\DBAL\DBALException; |
|
16 | 15 | use PDOException; |
17 | 16 | |
18 | 17 | /** |