@@ -9,10 +9,9 @@ |
||
| 9 | 9 | namespace eZ\Publish\Core\MVC\Symfony\SiteAccess\Tests; |
| 10 | 10 | |
| 11 | 11 | use eZ\Publish\Core\MVC\Symfony\SiteAccess; |
| 12 | -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement; |
|
| 12 | +use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement as URIElementMatcher; |
|
| 13 | 13 | use PHPUnit\Framework\TestCase; |
| 14 | 14 | use eZ\Publish\Core\MVC\Symfony\SiteAccess\Router; |
| 15 | -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement as URIElementMatcher; |
|
| 16 | 15 | use eZ\Publish\Core\MVC\Symfony\Routing\SimplifiedRequest; |
| 17 | 16 | use eZ\Publish\Core\MVC\Symfony\SiteAccess\MatcherBuilder; |
| 18 | 17 | use Psr\Log\LoggerInterface; |
@@ -150,6 +150,9 @@ |
||
| 150 | 150 | return $content; |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | + /** |
|
| 154 | + * @param string $tpl |
|
| 155 | + */ |
|
| 153 | 156 | private function getTemplatePath($tpl) |
| 154 | 157 | { |
| 155 | 158 | return 'templates/' . $tpl; |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | * Will contain always a complete list of fields. |
| 141 | 141 | * |
| 142 | 142 | * @param \eZ\Publish\SPI\Persistence\Content\CreateStruct $struct Content creation struct. |
| 143 | - * @param mixed $versionNo Used by self::copy() to maintain version numbers |
|
| 143 | + * @param integer $versionNo Used by self::copy() to maintain version numbers |
|
| 144 | 144 | * |
| 145 | 145 | * @return \eZ\Publish\SPI\Persistence\Content Content value object |
| 146 | 146 | */ |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | /** |
| 357 | 357 | * Returns the metadata object for a content identified by $remoteId. |
| 358 | 358 | * |
| 359 | - * @param mixed $remoteId |
|
| 359 | + * @param string $remoteId |
|
| 360 | 360 | * |
| 361 | 361 | * @return \eZ\Publish\SPI\Persistence\Content\ContentInfo |
| 362 | 362 | */ |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | * |
| 373 | 373 | * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException If version is not found |
| 374 | 374 | * |
| 375 | - * @param int|string $contentId |
|
| 375 | + * @param integer $contentId |
|
| 376 | 376 | * @param int $versionNo Version number to load |
| 377 | 377 | * |
| 378 | 378 | * @return \eZ\Publish\SPI\Persistence\Content\VersionInfo |
@@ -524,7 +524,7 @@ discard block |
||
| 524 | 524 | * |
| 525 | 525 | * @param int $contentId |
| 526 | 526 | * |
| 527 | - * @return bool |
|
| 527 | + * @return boolean|null |
|
| 528 | 528 | */ |
| 529 | 529 | public function deleteContent($contentId) |
| 530 | 530 | { |
@@ -556,7 +556,7 @@ discard block |
||
| 556 | 556 | * @param int $contentId |
| 557 | 557 | * @param int $versionNo |
| 558 | 558 | * |
| 559 | - * @return bool |
|
| 559 | + * @return boolean|null |
|
| 560 | 560 | */ |
| 561 | 561 | public function deleteVersion($contentId, $versionNo) |
| 562 | 562 | { |
@@ -677,7 +677,7 @@ discard block |
||
| 677 | 677 | * |
| 678 | 678 | * @todo Should the existence verifications happen here or is this supposed to be handled at a higher level? |
| 679 | 679 | * |
| 680 | - * @param mixed $relationId |
|
| 680 | + * @param integer $relationId |
|
| 681 | 681 | * @param int $type {@see \eZ\Publish\API\Repository\Values\Content\Relation::COMMON, |
| 682 | 682 | * \eZ\Publish\API\Repository\Values\Content\Relation::EMBED, |
| 683 | 683 | * \eZ\Publish\API\Repository\Values\Content\Relation::LINK, |
@@ -691,7 +691,7 @@ discard block |
||
| 691 | 691 | /** |
| 692 | 692 | * Loads relations from $sourceContentId. Optionally, loads only those with $type and $sourceContentVersionNo. |
| 693 | 693 | * |
| 694 | - * @param mixed $sourceContentId Source Content ID |
|
| 694 | + * @param integer $sourceContentId Source Content ID |
|
| 695 | 695 | * @param mixed|null $sourceContentVersionNo Source Content Version, null if not specified |
| 696 | 696 | * @param int|null $type {@see \eZ\Publish\API\Repository\Values\Content\Relation::COMMON, |
| 697 | 697 | * \eZ\Publish\API\Repository\Values\Content\Relation::EMBED, |
@@ -712,7 +712,7 @@ discard block |
||
| 712 | 712 | * |
| 713 | 713 | * Only loads relations against published versions. |
| 714 | 714 | * |
| 715 | - * @param mixed $destinationContentId Destination Content ID |
|
| 715 | + * @param integer $destinationContentId Destination Content ID |
|
| 716 | 716 | * @param int|null $type {@see \eZ\Publish\API\Repository\Values\Content\Relation::COMMON, |
| 717 | 717 | * \eZ\Publish\API\Repository\Values\Content\Relation::EMBED, |
| 718 | 718 | * \eZ\Publish\API\Repository\Values\Content\Relation::LINK, |
@@ -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 | { |
@@ -1126,9 +1126,9 @@ discard block |
||
| 1126 | 1126 | /** |
| 1127 | 1127 | * Returns a handler to test with $methods mocked. |
| 1128 | 1128 | * |
| 1129 | - * @param array $methods |
|
| 1129 | + * @param string[] $methods |
|
| 1130 | 1130 | * |
| 1131 | - * @return \eZ\Publish\Core\Persistence\Legacy\Content\Type\Handler |
|
| 1131 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
| 1132 | 1132 | */ |
| 1133 | 1133 | protected function getPartlyMockedHandler(array $methods) |
| 1134 | 1134 | { |
@@ -1163,7 +1163,7 @@ discard block |
||
| 1163 | 1163 | /** |
| 1164 | 1164 | * Returns a mapper mock. |
| 1165 | 1165 | * |
| 1166 | - * @param array $methods |
|
| 1166 | + * @param string[] $methods |
|
| 1167 | 1167 | * |
| 1168 | 1168 | * @return \eZ\Publish\Core\Persistence\Legacy\Content\Type\Mapper |
| 1169 | 1169 | */ |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | /** |
| 384 | 384 | * Returns a Mapper with conversion methods mocked. |
| 385 | 385 | * |
| 386 | - * @return Mapper |
|
| 386 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
| 387 | 387 | */ |
| 388 | 388 | protected function getNonConvertingMapper() |
| 389 | 389 | { |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | /** |
| 414 | 414 | * Returns a converter registry mock. |
| 415 | 415 | * |
| 416 | - * @return \eZ\Publish\Core\Persistence\Legacy\Content\FieldValue\ConverterRegistry |
|
| 416 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
| 417 | 417 | */ |
| 418 | 418 | protected function getConverterRegistryMock() |
| 419 | 419 | { |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | /** |
| 27 | 27 | * Tests the section parser. |
| 28 | 28 | * |
| 29 | - * @return \eZ\Publish\API\Repository\Values\Content\Content |
|
| 29 | + * @return \eZ\Publish\Core\REST\Client\Values\ContentType\FieldDefinition |
|
| 30 | 30 | */ |
| 31 | 31 | public function testParse() |
| 32 | 32 | { |
@@ -89,7 +89,7 @@ |
||
| 89 | 89 | /** |
| 90 | 90 | * Get FieldTypeProcessor mock object. |
| 91 | 91 | * |
| 92 | - * @return \eZ\Publish\Core\REST\Common\FieldTypeProcessor |
|
| 92 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
| 93 | 93 | */ |
| 94 | 94 | protected function getAProcessorMock() |
| 95 | 95 | { |
@@ -547,7 +547,7 @@ discard block |
||
| 547 | 547 | /** |
| 548 | 548 | * Returns the LocationCreate parser mock object. |
| 549 | 549 | * |
| 550 | - * @return \eZ\Publish\Core\REST\Server\Input\Parser\LocationCreate |
|
| 550 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
| 551 | 551 | */ |
| 552 | 552 | private function getLocationCreateParserMock() |
| 553 | 553 | { |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | /** |
| 565 | 565 | * Get the content service mock object. |
| 566 | 566 | * |
| 567 | - * @return \eZ\Publish\API\Repository\ContentService |
|
| 567 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
| 568 | 568 | */ |
| 569 | 569 | protected function getContentServiceMock() |
| 570 | 570 | { |
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | /** |
| 595 | 595 | * Get the content type service mock object. |
| 596 | 596 | * |
| 597 | - * @return \eZ\Publish\API\Repository\ContentTypeService |
|
| 597 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
| 598 | 598 | */ |
| 599 | 599 | protected function getContentTypeServiceMock() |
| 600 | 600 | { |