@@ -723,7 +723,7 @@ |
||
723 | 723 | * Instantiates a new location create class. |
724 | 724 | * |
725 | 725 | * @param mixed $parentLocationId the parent under which the new location should be created |
726 | - * @param eZ\Publish\API\Repository\Values\ContentType\ContentType|null $contentType |
|
726 | + * @param null|ContentType $contentType |
|
727 | 727 | * |
728 | 728 | * @return \eZ\Publish\API\Repository\Values\Content\LocationCreateStruct |
729 | 729 | */ |
@@ -209,8 +209,8 @@ discard block |
||
209 | 209 | * @todo Either move to async/batch or find ways toward optimizing away operations per object. |
210 | 210 | * @todo Optionally retain dates and set creator |
211 | 211 | * |
212 | - * @param mixed $sourceId |
|
213 | - * @param mixed $destinationParentId |
|
212 | + * @param integer $sourceId |
|
213 | + * @param integer $destinationParentId |
|
214 | 214 | * @param int|null $newOwnerId |
215 | 215 | * |
216 | 216 | * @return Location the newly created Location. |
@@ -368,10 +368,10 @@ discard block |
||
368 | 368 | * destination, identified by $destinationParentId. Relations do not need |
369 | 369 | * to be updated, since they refer to Content. URLs are not touched. |
370 | 370 | * |
371 | - * @param mixed $sourceId |
|
372 | - * @param mixed $destinationParentId |
|
371 | + * @param integer $sourceId |
|
372 | + * @param integer $destinationParentId |
|
373 | 373 | * |
374 | - * @return bool |
|
374 | + * @return boolean|null |
|
375 | 375 | */ |
376 | 376 | public function move($sourceId, $destinationParentId) |
377 | 377 | { |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | /** |
415 | 415 | * Sets a location to be hidden, and it self + all children to invisible. |
416 | 416 | * |
417 | - * @param mixed $id Location ID |
|
417 | + * @param integer $id Location ID |
|
418 | 418 | */ |
419 | 419 | public function hide($id) |
420 | 420 | { |
@@ -427,7 +427,7 @@ discard block |
||
427 | 427 | * Sets a location to be unhidden, and self + children to visible unless a parent is hiding the tree. |
428 | 428 | * If not make sure only children down to first hidden node is marked visible. |
429 | 429 | * |
430 | - * @param mixed $id |
|
430 | + * @param integer $id |
|
431 | 431 | */ |
432 | 432 | public function unHide($id) |
433 | 433 | { |
@@ -442,10 +442,10 @@ discard block |
||
442 | 442 | * Make the location identified by $locationId1 refer to the Content |
443 | 443 | * referred to by $locationId2 and vice versa. |
444 | 444 | * |
445 | - * @param mixed $locationId1 |
|
446 | - * @param mixed $locationId2 |
|
445 | + * @param integer $locationId1 |
|
446 | + * @param integer $locationId2 |
|
447 | 447 | * |
448 | - * @return bool |
|
448 | + * @return boolean|null |
|
449 | 449 | */ |
450 | 450 | public function swap($locationId1, $locationId2) |
451 | 451 | { |
@@ -492,9 +492,9 @@ discard block |
||
492 | 492 | * main Location will get the first of its other Locations assigned as the |
493 | 493 | * new main Location. |
494 | 494 | * |
495 | - * @param mixed $locationId |
|
495 | + * @param integer $locationId |
|
496 | 496 | * |
497 | - * @return bool |
|
497 | + * @return boolean|null |
|
498 | 498 | */ |
499 | 499 | public function removeSubtree($locationId) |
500 | 500 | { |
@@ -505,7 +505,7 @@ discard block |
||
505 | 505 | * Set section on all content objects in the subtree. |
506 | 506 | * |
507 | 507 | * @param mixed $locationId |
508 | - * @param mixed $sectionId |
|
508 | + * @param integer $sectionId |
|
509 | 509 | */ |
510 | 510 | public function setSectionForSubtree($locationId, $sectionId) |
511 | 511 | { |
@@ -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 | */ |
@@ -9,7 +9,6 @@ |
||
9 | 9 | namespace eZ\Publish\API\Repository\Tests; |
10 | 10 | |
11 | 11 | use eZ\Publish\API\Repository\Exceptions\UnauthorizedException; |
12 | -use eZ\Publish\API\Repository\Values\Content\Location; |
|
13 | 12 | use eZ\Publish\API\Repository\Values\User\Limitation\ObjectStateLimitation; |
14 | 13 | use eZ\Publish\Core\Repository\Repository; |
15 | 14 | use eZ\Publish\Core\Repository\TrashService; |
@@ -70,7 +70,7 @@ |
||
70 | 70 | /** |
71 | 71 | * Returns a list of filters to add to the existing list. |
72 | 72 | * |
73 | - * @return array An array of filters |
|
73 | + * @return Twig_SimpleFilter[] An array of filters |
|
74 | 74 | */ |
75 | 75 | public function getFilters() |
76 | 76 | { |
@@ -109,6 +109,7 @@ discard block |
||
109 | 109 | } |
110 | 110 | |
111 | 111 | /** |
112 | + * @param string $method |
|
112 | 113 | * @return HttpRequest |
113 | 114 | */ |
114 | 115 | public function createHttpRequest($method, $uri, $contentType = '', $acceptType = '') |
@@ -170,6 +171,9 @@ discard block |
||
170 | 171 | return $errorMessageString; |
171 | 172 | } |
172 | 173 | |
174 | + /** |
|
175 | + * @param string $header |
|
176 | + */ |
|
173 | 177 | protected function assertHttpResponseHasHeader(HttpResponse $response, $header, $expectedValue = null) |
174 | 178 | { |
175 | 179 | $headerValue = $response->getHeader($header); |
@@ -179,6 +183,9 @@ discard block |
||
179 | 183 | } |
180 | 184 | } |
181 | 185 | |
186 | + /** |
|
187 | + * @param string $typeString |
|
188 | + */ |
|
182 | 189 | protected function generateMediaTypeString($typeString) |
183 | 190 | { |
184 | 191 | return "application/vnd.ez.api.$typeString"; |
@@ -209,7 +216,7 @@ discard block |
||
209 | 216 | /** |
210 | 217 | * @param string $string The value of the folders name field |
211 | 218 | * @param string $parentLocationId The REST id of the parent location |
212 | - * @param null $remoteId |
|
219 | + * @param string $remoteId |
|
213 | 220 | * |
214 | 221 | * @return array created Content, as an array |
215 | 222 | */ |
@@ -294,6 +301,9 @@ discard block |
||
294 | 301 | return $folderLocations; |
295 | 302 | } |
296 | 303 | |
304 | + /** |
|
305 | + * @param string $string |
|
306 | + */ |
|
297 | 307 | protected function addTestSuffix($string) |
298 | 308 | { |
299 | 309 | if (!isset(self::$testSuffix)) { |
@@ -62,9 +62,9 @@ discard block |
||
62 | 62 | * Search User with given username, optionally at given location. |
63 | 63 | * |
64 | 64 | * @param string $username name of User to search for |
65 | - * @param string $parentGroupLocationId where to search, in User Group tree |
|
65 | + * @param string $parentGroupId where to search, in User Group tree |
|
66 | 66 | * |
67 | - * @return User found |
|
67 | + * @return null|\eZ\Publish\API\Repository\Values\User\User found |
|
68 | 68 | */ |
69 | 69 | public function searchUserByLogin($username, $parentGroupId = null) |
70 | 70 | { |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | * @param string $name name of User Group to search for |
96 | 96 | * @param string $parentLocationId (optional) parent location id to search in |
97 | 97 | * |
98 | - * @return search results |
|
98 | + * @return \eZ\Publish\API\Repository\Values\Content\Search\SearchHit[] results |
|
99 | 99 | */ |
100 | 100 | public function searchUserGroups($name, $parentLocationId = null) |
101 | 101 | { |
@@ -118,12 +118,12 @@ discard block |
||
118 | 118 | /** |
119 | 119 | * Create user inside given User Group; DELETES existing User if login already exists! |
120 | 120 | * |
121 | - * @param $username username of the user to create |
|
122 | - * @param $email email address of user to create |
|
123 | - * @param $password account password for user to create |
|
124 | - * @param $parentGroup pathstring wherein to create user |
|
121 | + * @param string $username username of the user to create |
|
122 | + * @param string $email email address of user to create |
|
123 | + * @param string $password account password for user to create |
|
124 | + * @param \eZ\Publish\API\Repository\Values\User\UserGroup $parentGroup pathstring wherein to create user |
|
125 | 125 | * |
126 | - * @return eZ\Publish\API\Repository\Values\User\User |
|
126 | + * @return \eZ\Publish\API\Repository\Values\User\User |
|
127 | 127 | */ |
128 | 128 | protected function createUser($username, $email, $password, $parentGroup = null, $fields = []) |
129 | 129 | { |
@@ -317,6 +317,9 @@ discard block |
||
317 | 317 | return false; |
318 | 318 | } |
319 | 319 | |
320 | + /** |
|
321 | + * @param integer $type |
|
322 | + */ |
|
320 | 323 | public function createPasswordHash($login, $password, $type) |
321 | 324 | { |
322 | 325 | switch ($type) { |
@@ -44,7 +44,6 @@ discard block |
||
44 | 44 | * @param array $headers An array of response headers |
45 | 45 | * @param bool $public Files are public by default |
46 | 46 | * @param null|string $contentDisposition The type of Content-Disposition to set automatically with the filename |
47 | - * @param bool $autoEtag Whether the ETag header should be automatically set |
|
48 | 47 | * @param bool $autoLastModified Whether the Last-Modified header should be automatically set |
49 | 48 | */ |
50 | 49 | public function __construct(BinaryFile $binaryFile, IOServiceInterface $ioService, $status = 200, $headers = [], $public = true, $contentDisposition = null, $autoLastModified = true) |
@@ -63,12 +62,11 @@ discard block |
||
63 | 62 | /** |
64 | 63 | * Sets the file to stream. |
65 | 64 | * |
66 | - * @param \SplFileInfo|string $file The file to stream |
|
65 | + * @param BinaryFile $file The file to stream |
|
67 | 66 | * @param string $contentDisposition |
68 | - * @param bool $autoEtag |
|
69 | 67 | * @param bool $autoLastModified |
70 | 68 | * |
71 | - * @return BinaryFileResponse |
|
69 | + * @return BinaryStreamResponse |
|
72 | 70 | */ |
73 | 71 | public function setFile($file, $contentDisposition = null, $autoLastModified = true) |
74 | 72 | { |