@@ -6,9 +6,8 @@  | 
                                                    ||
| 6 | 6 | */  | 
                                                        
| 7 | 7 | namespace eZ\Publish\Core\MVC\Symfony\SiteAccess\Tests;  | 
                                                        
| 8 | 8 | |
| 9 | -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIText;  | 
                                                        |
| 10 | -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Router;  | 
                                                        |
| 11 | 9 | use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIText as URITextMatcher;  | 
                                                        
| 10 | +use eZ\Publish\Core\MVC\Symfony\SiteAccess\Router;  | 
                                                        |
| 12 | 11 | use eZ\Publish\Core\MVC\Symfony\Routing\SimplifiedRequest;  | 
                                                        
| 13 | 12 | use Psr\Log\LoggerInterface;  | 
                                                        
| 14 | 13 | |
@@ -7,9 +7,8 @@  | 
                                                    ||
| 7 | 7 | namespace eZ\Publish\Core\MVC\Symfony\SiteAccess\Tests;  | 
                                                        
| 8 | 8 | |
| 9 | 9 | use eZ\Publish\Core\MVC\Symfony\SiteAccess;  | 
                                                        
| 10 | -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement;  | 
                                                        |
| 11 | -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Router;  | 
                                                        |
| 12 | 10 | use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement as URIElementMatcher;  | 
                                                        
| 11 | +use eZ\Publish\Core\MVC\Symfony\SiteAccess\Router;  | 
                                                        |
| 13 | 12 | use eZ\Publish\Core\MVC\Symfony\Routing\SimplifiedRequest;  | 
                                                        
| 14 | 13 | use Psr\Log\LoggerInterface;  | 
                                                        
| 15 | 14 | |
@@ -7,9 +7,8 @@  | 
                                                    ||
| 7 | 7 | namespace eZ\Publish\Core\MVC\Symfony\SiteAccess\Tests;  | 
                                                        
| 8 | 8 | |
| 9 | 9 | use eZ\Publish\Core\MVC\Symfony\SiteAccess;  | 
                                                        
| 10 | -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement;  | 
                                                        |
| 11 | -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Router;  | 
                                                        |
| 12 | 10 | use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement as URIElementMatcher;  | 
                                                        
| 11 | +use eZ\Publish\Core\MVC\Symfony\SiteAccess\Router;  | 
                                                        |
| 13 | 12 | use eZ\Publish\Core\MVC\Symfony\Routing\SimplifiedRequest;  | 
                                                        
| 14 | 13 | use Psr\Log\LoggerInterface;  | 
                                                        
| 15 | 14 | |
@@ -260,6 +260,9 @@  | 
                                                    ||
| 260 | 260 | }  | 
                                                        
| 261 | 261 | }  | 
                                                        
| 262 | 262 | |
| 263 | + /**  | 
                                                        |
| 264 | + * @param integer $timestamp  | 
                                                        |
| 265 | + */  | 
                                                        |
| 263 | 266 | private function createDateTime(?int $timestamp): ?DateTimeInterface  | 
                                                        
| 264 | 267 |      { | 
                                                        
| 265 | 268 |          if ($timestamp > 0) { | 
                                                        
@@ -423,8 +423,8 @@ discard block  | 
                                                    ||
| 423 | 423 | /**  | 
                                                        
| 424 | 424 | * Insert assignment of $typeId to $groupId.  | 
                                                        
| 425 | 425 | *  | 
                                                        
| 426 | - * @param mixed $groupId  | 
                                                        |
| 427 | - * @param mixed $typeId  | 
                                                        |
| 426 | + * @param integer $groupId  | 
                                                        |
| 427 | + * @param integer $typeId  | 
                                                        |
| 428 | 428 | * @param int $status  | 
                                                        
| 429 | 429 | */  | 
                                                        
| 430 | 430 | public function insertGroupAssignment($groupId, $typeId, $status)  | 
                                                        
@@ -455,8 +455,8 @@ discard block  | 
                                                    ||
| 455 | 455 | /**  | 
                                                        
| 456 | 456 | * Deletes a group assignments for a Type.  | 
                                                        
| 457 | 457 | *  | 
                                                        
| 458 | - * @param mixed $groupId  | 
                                                        |
| 459 | - * @param mixed $typeId  | 
                                                        |
| 458 | + * @param integer $groupId  | 
                                                        |
| 459 | + * @param integer $typeId  | 
                                                        |
| 460 | 460 | * @param int $status  | 
                                                        
| 461 | 461 | */  | 
                                                        
| 462 | 462 | public function deleteGroupAssignment($groupId, $typeId, $status)  | 
                                                        
@@ -505,7 +505,7 @@ discard block  | 
                                                    ||
| 505 | 505 | /**  | 
                                                        
| 506 | 506 | * Loads data about Group with $identifier.  | 
                                                        
| 507 | 507 | *  | 
                                                        
| 508 | - * @param mixed $identifier  | 
                                                        |
| 508 | + * @param string $identifier  | 
                                                        |
| 509 | 509 | *  | 
                                                        
| 510 | 510 | * @return string[][]  | 
                                                        
| 511 | 511 | */  | 
                                                        
@@ -564,7 +564,7 @@ discard block  | 
                                                    ||
| 564 | 564 | /**  | 
                                                        
| 565 | 565 | * Loads data for all Types in $status in $groupId.  | 
                                                        
| 566 | 566 | *  | 
                                                        
| 567 | - * @param mixed $groupId  | 
                                                        |
| 567 | + * @param integer $groupId  | 
                                                        |
| 568 | 568 | * @param int $status  | 
                                                        
| 569 | 569 | *  | 
                                                        
| 570 | 570 | * @return string[][]  | 
                                                        
@@ -585,7 +585,7 @@ discard block  | 
                                                    ||
| 585 | 585 | /**  | 
                                                        
| 586 | 586 | * Inserts a $fieldDefinition for $typeId.  | 
                                                        
| 587 | 587 | *  | 
                                                        
| 588 | - * @param mixed $typeId  | 
                                                        |
| 588 | + * @param integer $typeId  | 
                                                        |
| 589 | 589 | * @param int $status  | 
                                                        
| 590 | 590 | * @param \eZ\Publish\SPI\Persistence\Content\Type\FieldDefinition $fieldDefinition  | 
                                                        
| 591 | 591 | * @param \eZ\Publish\Core\Persistence\Legacy\Content\StorageFieldDefinition $storageFieldDef  | 
                                                        
@@ -803,9 +803,9 @@ discard block  | 
                                                    ||
| 803 | 803 | /**  | 
                                                        
| 804 | 804 | * Deletes a field definition.  | 
                                                        
| 805 | 805 | *  | 
                                                        
| 806 | - * @param mixed $typeId  | 
                                                        |
| 806 | + * @param integer $typeId  | 
                                                        |
| 807 | 807 | * @param int $status  | 
                                                        
| 808 | - * @param mixed $fieldDefinitionId  | 
                                                        |
| 808 | + * @param integer $fieldDefinitionId  | 
                                                        |
| 809 | 809 | */  | 
                                                        
| 810 | 810 | public function deleteFieldDefinition($typeId, $status, $fieldDefinitionId)  | 
                                                        
| 811 | 811 |      { | 
                                                        
@@ -846,7 +846,7 @@ discard block  | 
                                                    ||
| 846 | 846 | /**  | 
                                                        
| 847 | 847 | * Updates a $fieldDefinition for $typeId.  | 
                                                        
| 848 | 848 | *  | 
                                                        
| 849 | - * @param mixed $typeId  | 
                                                        |
| 849 | + * @param integer $typeId  | 
                                                        |
| 850 | 850 | * @param int $status  | 
                                                        
| 851 | 851 | * @param \eZ\Publish\SPI\Persistence\Content\Type\FieldDefinition $fieldDefinition  | 
                                                        
| 852 | 852 | * @param \eZ\Publish\Core\Persistence\Legacy\Content\StorageFieldDefinition $storageFieldDef  | 
                                                        
@@ -989,9 +989,8 @@ discard block  | 
                                                    ||
| 989 | 989 | /**  | 
                                                        
| 990 | 990 | * Update a type with $updateStruct.  | 
                                                        
| 991 | 991 | *  | 
                                                        
| 992 | - * @param mixed $typeId  | 
                                                        |
| 992 | + * @param integer $typeId  | 
                                                        |
| 993 | 993 | * @param int $status  | 
                                                        
| 994 | - * @param \eZ\Publish\SPI\Persistence\Content\Type\UpdateStruct $updateStruct  | 
                                                        |
| 995 | 994 | */  | 
                                                        
| 996 | 995 | public function updateType($typeId, $status, Type $type)  | 
                                                        
| 997 | 996 |      { | 
                                                        
@@ -1034,7 +1033,7 @@ discard block  | 
                                                    ||
| 1034 | 1033 | /**  | 
                                                        
| 1035 | 1034 | * Loads an array with data about $typeId in $status.  | 
                                                        
| 1036 | 1035 | *  | 
                                                        
| 1037 | - * @param mixed $typeId  | 
                                                        |
| 1036 | + * @param integer $typeId  | 
                                                        |
| 1038 | 1037 | * @param int $status  | 
                                                        
| 1039 | 1038 | *  | 
                                                        
| 1040 | 1039 | * @return array Data rows.  | 
                                                        
@@ -1076,7 +1075,7 @@ discard block  | 
                                                    ||
| 1076 | 1075 | * Loads an array with data about the type referred to by $remoteId in  | 
                                                        
| 1077 | 1076 | * $status.  | 
                                                        
| 1078 | 1077 | *  | 
                                                        
| 1079 | - * @param mixed $remoteId  | 
                                                        |
| 1078 | + * @param string $remoteId  | 
                                                        |
| 1080 | 1079 | * @param int $status  | 
                                                        
| 1081 | 1080 | *  | 
                                                        
| 1082 | 1081 | * @return array(int=>array(string=>mixed)) Data rows.  | 
                                                        
@@ -57,7 +57,7 @@ discard block  | 
                                                    ||
| 57 | 57 | * Creates a Content from the given $struct and $currentVersionNo.  | 
                                                        
| 58 | 58 | *  | 
                                                        
| 59 | 59 | * @param \eZ\Publish\SPI\Persistence\Content\CreateStruct $struct  | 
                                                        
| 60 | - * @param mixed $currentVersionNo  | 
                                                        |
| 60 | + * @param integer $currentVersionNo  | 
                                                        |
| 61 | 61 | *  | 
                                                        
| 62 | 62 | * @return \eZ\Publish\SPI\Persistence\Content\ContentInfo  | 
                                                        
| 63 | 63 | */  | 
                                                        
@@ -92,7 +92,7 @@ discard block  | 
                                                    ||
| 92 | 92 | * Creates a new version for the given $struct and $versionNo.  | 
                                                        
| 93 | 93 | *  | 
                                                        
| 94 | 94 | * @param \eZ\Publish\SPI\Persistence\Content\CreateStruct $struct  | 
                                                        
| 95 | - * @param mixed $versionNo  | 
                                                        |
| 95 | + * @param integer $versionNo  | 
                                                        |
| 96 | 96 | *  | 
                                                        
| 97 | 97 | * @return \eZ\Publish\SPI\Persistence\Content\VersionInfo  | 
                                                        
| 98 | 98 | */  | 
                                                        
@@ -125,7 +125,7 @@ discard block  | 
                                                    ||
| 125 | 125 | * Creates a new version for the given $content.  | 
                                                        
| 126 | 126 | *  | 
                                                        
| 127 | 127 | * @param \eZ\Publish\SPI\Persistence\Content $content  | 
                                                        
| 128 | - * @param mixed $versionNo  | 
                                                        |
| 128 | + * @param integer $versionNo  | 
                                                        |
| 129 | 129 | * @param mixed $userId  | 
                                                        
| 130 | 130 | * @param string|null $languageCode  | 
                                                        
| 131 | 131 | *  | 
                                                        
@@ -20,6 +20,9 @@ discard block  | 
                                                    ||
| 20 | 20 |  { | 
                                                        
| 21 | 21 | private const URL_CONTENT_TYPE_IDENTIFIER = 'link_ct';  | 
                                                        
| 22 | 22 | |
| 23 | + /**  | 
                                                        |
| 24 | + * @param integer $expectedTotalCount  | 
                                                        |
| 25 | + */  | 
                                                        |
| 23 | 26 | protected function doTestFindUrls(URLQuery $query, array $expectedUrls, $expectedTotalCount = null, $ignoreOrder = true)  | 
                                                        
| 24 | 27 |      { | 
                                                        
| 25 | 28 | $repository = $this->getRepository();  | 
                                                        
@@ -37,6 +40,9 @@ discard block  | 
                                                    ||
| 37 | 40 | $this->assertSearchResultItems($searchResult, $expectedUrls, $ignoreOrder);  | 
                                                        
| 38 | 41 | }  | 
                                                        
| 39 | 42 | |
| 43 | + /**  | 
                                                        |
| 44 | + * @param boolean $ignoreOrder  | 
                                                        |
| 45 | + */  | 
                                                        |
| 40 | 46 | protected function assertSearchResultItems(SearchResult $searchResult, array $expectedUrls, $ignoreOrder)  | 
                                                        
| 41 | 47 |      { | 
                                                        
| 42 | 48 | $this->assertCount(count($expectedUrls), $searchResult->items);  | 
                                                        
@@ -127,7 +127,7 @@  | 
                                                    ||
| 127 | 127 | * @param \eZ\Publish\API\Repository\Values\Content\Query\Criterion $criterion  | 
                                                        
| 128 | 128 | * @param array $languageSettings  | 
                                                        
| 129 | 129 | *  | 
                                                        
| 130 | - * @return \eZ\Publish\Core\Persistence\Database\Expression  | 
                                                        |
| 130 | + * @return string  | 
                                                        |
| 131 | 131 | *  | 
                                                        
| 132 | 132 | * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException  | 
                                                        
| 133 | 133 | * @throws \eZ\Publish\Core\Persistence\Legacy\Content\FieldValue\Converter\Exception\NotFound  | 
                                                        
@@ -17,7 +17,6 @@  | 
                                                    ||
| 17 | 17 | use eZ\Publish\Core\Persistence\Database\SelectQuery;  | 
                                                        
| 18 | 18 | use eZ\Publish\SPI\Persistence\Content\Type\Handler as ContentTypeHandler;  | 
                                                        
| 19 | 19 | use eZ\Publish\SPI\Persistence\Content\Language\Handler as LanguageHandler;  | 
                                                        
| 20 | -use eZ\Publish\Core\Persistence\Database\Expression;  | 
                                                        |
| 21 | 20 | |
| 22 | 21 | /**  | 
                                                        
| 23 | 22 | * Field criterion handler.  |