[CS] Aligned codebase with ibexa/code-style#18 changes

alongosz · alongosz · commit 6a4ce559e83c · 2025-10-24T18:31:47.000+02:00
diff --git a/src/contracts/Repository/PermissionResolver.php b/src/contracts/Repository/PermissionResolver.php
@@ -10,7 +10,9 @@
 
 use Ibexa\Contracts\Core\Repository\Exceptions\BadStateException;
 use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation;
 use Ibexa\Contracts\Core\Repository\Values\User\LookupLimitationResult;
+use Ibexa\Contracts\Core\Repository\Values\User\Policy;
 use Ibexa\Contracts\Core\Repository\Values\User\UserReference;
 
 /**
@@ -48,8 +50,8 @@ public function setCurrentUserReference(UserReference $userReference): void;
      *
      * @phpstan-return bool|array<
      *     array{
-     *         limitation: \Ibexa\Contracts\Core\Repository\Values\User\Limitation|null,
-     *         policies: array<\Ibexa\Contracts\Core\Repository\Values\User\Policy>
+     *         limitation: Limitation|null,
+     *         policies: array<Policy>
      *     },
      * >
      */
diff --git a/src/lib/MVC/Symfony/Component/Serializer/MapNormalizer.php b/src/lib/MVC/Symfony/Component/Serializer/MapNormalizer.php
@@ -22,7 +22,7 @@ final class MapNormalizer implements NormalizerInterface, DenormalizerInterface
      * @param Map $data
      *
      * @return array{
-     *     type: class-string<\Ibexa\Core\MVC\Symfony\SiteAccess\Matcher\Map>,
+     *     type: class-string<Map>,
      *     key: string|null,
      *     map: array{},
      *     reverseMap: array{}
diff --git a/src/lib/MVC/Symfony/Component/Serializer/SiteAccessNormalizer.php b/src/lib/MVC/Symfony/Component/Serializer/SiteAccessNormalizer.php
@@ -9,6 +9,7 @@
 namespace Ibexa\Core\MVC\Symfony\Component\Serializer;
 
 use Ibexa\Core\MVC\Symfony\SiteAccess;
+use Ibexa\Core\MVC\Symfony\SiteAccess\Matcher;
 use Ibexa\Core\MVC\Symfony\SiteAccessGroup;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -77,9 +78,9 @@ public function supportsNormalization(
      * @return array{
      *     name: string,
      *     matchingType: string,
-     *     matcher: array{type: class-string<\Ibexa\Core\MVC\Symfony\SiteAccess\Matcher>, data: string|null}|null,
+     *     matcher: array{type: class-string<Matcher>, data: string|null}|null,
      *     provider: string|null,
-     *     groups: array<\Ibexa\Core\MVC\Symfony\SiteAccessGroup>
+     *     groups: array<SiteAccessGroup>
      * }
      */
     public function normalize(
diff --git a/src/lib/Repository/Validator/VersionValidator.php b/src/lib/Repository/Validator/VersionValidator.php
@@ -37,7 +37,7 @@ public function supports(ValueObject $object): bool
 
     /**
      * @phpstan-param array{
-     *     content?: \Ibexa\Contracts\Core\Repository\Values\Content\Content,
+     *     content?: Content,
      *     translations?: string[],
      * } $context
      */
diff --git a/tests/bundle/Core/ControllerArgumentResolver/LocationArgumentResolverTest.php b/tests/bundle/Core/ControllerArgumentResolver/LocationArgumentResolverTest.php
@@ -87,8 +87,8 @@ public function testResolve(): void
 
     /**
      * @return iterable<array{
-     *     \Symfony\Component\HttpFoundation\Request,
-     *     \Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata
+     *     Request,
+     *     ArgumentMetadata
      * }>
      */
     public function dataProviderForTestResolverForUnsupportedRequest(): iterable
diff --git a/tests/integration/Core/Image/ImageStorage/ImageStorageTest.php b/tests/integration/Core/Image/ImageStorage/ImageStorageTest.php
@@ -204,8 +204,8 @@ private function runCommonStoreFieldDataMocks(Field $field): BinaryFile
 
     /**
      * @return iterable<array{
-     *     \Ibexa\Contracts\Core\Persistence\Content\VersionInfo,
-     *     \Ibexa\Contracts\Core\Persistence\Content\Field
+     *     VersionInfo,
+     *     Field
      * }>
      */
     public function providerOfFieldData(): iterable
diff --git a/tests/integration/Core/Repository/FieldType/ImageIntegrationTest.php b/tests/integration/Core/Repository/FieldType/ImageIntegrationTest.php
@@ -197,7 +197,7 @@ public function getValidValidatorConfiguration(): array
      *
      * @return array{
      *     StringLengthValidator: array{
-     *          minStringLength: \stdClass,
+     *          minStringLength: stdClass,
      *     },
      * }
      */
@@ -487,7 +487,7 @@ public function testInherentCopyForNewLanguage(): void
 
     /**
      * @return array<array{
-     *     \Ibexa\Core\FieldType\Image\Value
+     *     ImageValue
      * }>
      */
     public function providerForTestIsEmptyValue(): array
@@ -499,7 +499,7 @@ public function providerForTestIsEmptyValue(): array
 
     /**
      * @return array<array{
-     *     \Ibexa\Core\FieldType\Image\Value
+     *     ImageValue
      * }>
      */
     public function providerForTestIsNotEmptyValue(): array
diff --git a/tests/integration/Core/Repository/SearchServiceBookmarkTest.php b/tests/integration/Core/Repository/SearchServiceBookmarkTest.php
@@ -74,7 +74,7 @@ public function testCriterion(
     /**
      * @return iterable<array{
      *     int,
-     *     array<\Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion>
+     *     array<Criterion>
      * }>
      */
     public function provideDataForTestCriterion(): iterable
diff --git a/tests/integration/Core/Repository/SearchServiceContentNameTest.php b/tests/integration/Core/Repository/SearchServiceContentNameTest.php
@@ -128,7 +128,7 @@ static function (SearchHit $searchHit) use ($languageCode): ?string {
 
     /**
      * @return iterable<array{
-     *     \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion,
+     *     Criterion,
      *     ?string,
      *     array<string>,
      *     int,
diff --git a/tests/integration/Core/Repository/SearchServiceImageTest.php b/tests/integration/Core/Repository/SearchServiceImageTest.php
@@ -12,6 +12,7 @@
 use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException;
 use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeDraft;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
@@ -47,16 +48,16 @@ protected function setUp(): void
      */
     public function testCriterion(
         int $expectedCount,
-        Query\Criterion $imageCriterion
+        Criterion $imageCriterion
     ): void {
         if (getenv('SEARCH_ENGINE') === 'legacy') {
             self::markTestSkipped('Image criteria are not supported in Legacy Search Engine');
         }
 
         $query = new Query();
-        $query->filter = new Query\Criterion\LogicalAnd(
+        $query->filter = new Criterion\LogicalAnd(
             [
-                new Query\Criterion\ContentTypeIdentifier(self::IMAGE_CONTENT_TYPE),
+                new Criterion\ContentTypeIdentifier(self::IMAGE_CONTENT_TYPE),
                 $imageCriterion,
             ]
         );
@@ -72,7 +73,7 @@ public function testCriterion(
     /**
      * @return iterable<array{
      *     int,
-     *     \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion
+     *     Criterion
      * }>
      */
     public function provideDataForTestCriterion(): iterable
@@ -175,7 +176,7 @@ public function provideDataForTestCriterion(): iterable
 
         yield 'Image' => [
             2,
-            new Query\Criterion\Image(
+            new Criterion\Image(
                 self::IMAGE_FIELD_DEF_IDENTIFIER,
                 [
                     'mimeTypes' => [
@@ -206,7 +207,7 @@ public function provideDataForTestCriterion(): iterable
     /**
      * @return iterable<array{
      *     int,
-     *     \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion
+     *     Criterion
      * }>
      */
     public function provideInvalidDataForTestCriterion(): iterable
@@ -258,9 +259,9 @@ public function provideInvalidDataForTestCriterion(): iterable
     /**
      * @param string|array<string> $value
      */
-    private function createMimeTypeCriterion($value): Query\Criterion\Image\MimeType
+    private function createMimeTypeCriterion($value): Criterion\Image\MimeType
     {
-        return new Query\Criterion\Image\MimeType(
+        return new Criterion\Image\MimeType(
             self::IMAGE_FIELD_DEF_IDENTIFIER,
             $value
         );
@@ -273,8 +274,8 @@ private function createMimeTypeCriterion($value): Query\Criterion\Image\MimeType
     private function createFileSizeCriterion(
         $min = 0,
         $max = null
-    ): Query\Criterion\Image\FileSize {
-        return new Query\Criterion\Image\FileSize(
+    ): Criterion\Image\FileSize {
+        return new Criterion\Image\FileSize(
             self::IMAGE_FIELD_DEF_IDENTIFIER,
             $min,
             $max
@@ -284,8 +285,8 @@ private function createFileSizeCriterion(
     private function createWidthCriterion(
         int $min = 0,
         ?int $max = null
-    ): Query\Criterion\Image\Width {
-        return new Query\Criterion\Image\Width(
+    ): Criterion\Image\Width {
+        return new Criterion\Image\Width(
             self::IMAGE_FIELD_DEF_IDENTIFIER,
             $min,
             $max
@@ -295,8 +296,8 @@ private function createWidthCriterion(
     private function createHeightCriterion(
         int $min = 0,
         ?int $max = null
-    ): Query\Criterion\Image\Height {
-        return new Query\Criterion\Image\Height(
+    ): Criterion\Image\Height {
+        return new Criterion\Image\Height(
             self::IMAGE_FIELD_DEF_IDENTIFIER,
             $min,
             $max
@@ -308,8 +309,8 @@ private function createDimensionsCriterion(
         int $maxWidth,
         int $minHeight,
         int $maxHeight
-    ): Query\Criterion\Image\Dimensions {
-        return new Query\Criterion\Image\Dimensions(
+    ): Criterion\Image\Dimensions {
+        return new Criterion\Image\Dimensions(
             self::IMAGE_FIELD_DEF_IDENTIFIER,
             [
                 'width' => [
@@ -327,9 +328,9 @@ private function createDimensionsCriterion(
     /**
      * @param string|array<string> $value
      */
-    private function createOrientationCriterion($value): Query\Criterion\Image\Orientation
+    private function createOrientationCriterion($value): Criterion\Image\Orientation
     {
-        return new Query\Criterion\Image\Orientation(
+        return new Criterion\Image\Orientation(
             self::IMAGE_FIELD_DEF_IDENTIFIER,
             $value
         );
diff --git a/tests/integration/Core/Repository/Values/User/Limitation/ChangeOwnerLimitationTest.php b/tests/integration/Core/Repository/Values/User/Limitation/ChangeOwnerLimitationTest.php
@@ -45,7 +45,7 @@ protected function setUp(): void
 
     /**
      * @return array<array{
-     *     0: \Ibexa\Contracts\Core\Repository\Values\User\User,
+     *     0: User,
      *     1: int,
      *     2: int[]
      * }>
@@ -66,7 +66,7 @@ public function getDataForGrantedAccess(): array
 
     /**
      * @return array<array{
-     *     0: \Ibexa\Contracts\Core\Repository\Values\User\User,
+     *     0: User,
      *     1: int,
      *     2: int[]
      * }>
diff --git a/tests/lib/FieldType/BaseFieldTypeTestCase.php b/tests/lib/FieldType/BaseFieldTypeTestCase.php
@@ -185,7 +185,7 @@ abstract public function provideInputForFromHash(): iterable;
      * Provides data for the getName() test.
      *
      * @phpstan-return array<array{
-     *     0: \Ibexa\Contracts\Core\FieldType\Value,
+     *     0: FieldTypeValue,
      *     1: string,
      *     2?: array<string, mixed>,
      *     3?: string
@@ -453,8 +453,8 @@ public function provideValidDataForValidate(): iterable
      *
      * @phpstan-return iterable<string, array{
      *     array<string, mixed>,
-     *     \Ibexa\Contracts\Core\FieldType\Value,
-     *     array<\Ibexa\Contracts\Core\FieldType\ValidationError>
+     *     FieldTypeValue,
+     *     array<ValidationError>
      * }>
      */
     public function provideInvalidDataForValidate(): iterable
diff --git a/tests/lib/FieldType/CheckboxTest.php b/tests/lib/FieldType/CheckboxTest.php
@@ -9,6 +9,7 @@
 
 use Ibexa\Core\Base\Exceptions\InvalidArgumentException;
 use Ibexa\Core\FieldType\Checkbox\Type as Checkbox;
+use Ibexa\Core\FieldType\Checkbox\Value;
 use Ibexa\Core\FieldType\Checkbox\Value as CheckboxValue;
 
 /**
@@ -151,7 +152,7 @@ public function testValueIsNeverEmpty(CheckboxValue $value): void
 
     /**
      * @return iterable<array{
-     *     \Ibexa\Core\FieldType\Checkbox\Value,
+     *     Value,
      * }>
      */
     public function provideForValueIsNeverEmpty(): iterable
diff --git a/tests/lib/FieldType/FieldTypeMockTest.php b/tests/lib/FieldType/FieldTypeMockTest.php
@@ -256,7 +256,7 @@ public function testApplyDefaultValidatorConfiguration(
 
     /**
      * @return iterable<array{
-     *     null|array<string, mixed>,
+     *     array<string, mixed>|null,
      *     array<string, mixed>
      * }>
      */
diff --git a/tests/lib/FieldType/ImageAssetTest.php b/tests/lib/FieldType/ImageAssetTest.php
@@ -308,7 +308,7 @@ public function testValidateValidNonEmptyAssetValue(
     /**
      * @return iterable<array{
      *     int,
-     *     array<\Ibexa\Core\FieldType\ValidationError>,
+     *     array<ValidationError>,
      * }>
      */
     public function provideDataForTestValidateValidNonEmptyAssetValue(): iterable
diff --git a/tests/lib/FieldType/KeywordTest.php b/tests/lib/FieldType/KeywordTest.php
@@ -145,7 +145,7 @@ public function provideValidDataForValidate(): iterable
     /**
      * @return iterable<string, array{
      *     0: array<string, mixed>,
-     *     1: \Ibexa\Core\FieldType\Keyword\Value,
+     *     1: KeywordValue,
      *     2: array<\Ibexa\Contracts\Core\FieldType\ValidationError>
      * }>
      */
diff --git a/tests/lib/MVC/Symfony/Routing/RequestContextFactoryTest.php b/tests/lib/MVC/Symfony/Routing/RequestContextFactoryTest.php
@@ -39,9 +39,9 @@ public function testGetContextBySimplifiedRequest(
      * @return iterable<
      *      string,
      *      array{
-     *          \Symfony\Component\Routing\RequestContext,
-     *          \Ibexa\Core\MVC\Symfony\Routing\SimplifiedRequest,
-     *          \Symfony\Component\Routing\RequestContext
+     *          RequestContext,
+     *          SimplifiedRequest,
+     *          RequestContext
      * }>
      */
     public static function getDataForTestGetContextBySimplifiedRequest(): iterable
diff --git a/tests/lib/Repository/NameSchema/NameSchemaServiceTest.php b/tests/lib/Repository/NameSchema/NameSchemaServiceTest.php
@@ -66,7 +66,7 @@ public function testResolveUrlAliasSchemaFallbackToNameSchema(): void
 
     /**
      * @return iterable<string, array{
-     *  0: array<int|string, array<string, \Ibexa\Contracts\Core\FieldType\Value>>,
+     *  0: array<int|string, array<string, Value>>,
      *  1: array<string, array<string, string>>,
      *  2: array<string>,
      *  3: array<string, string>
@@ -149,7 +149,7 @@ public function testResolveNameSchema(
      * @return array<array{
      *  0: array<string, array<string>>,
      *  1: string,
-     *  2:  array<int|string, array<string, \Ibexa\Contracts\Core\FieldType\Value>>,
+     *  2:  array<int|string, array<string, Value>>,
      *  3: array<string, string>,
      *  4: array<string, array<string, string>>,
      *  5?: array{limit?: int, sequence?: string}

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ final class MapNormalizer implements NormalizerInterface, DenormalizerInterface`
`22`	`22`	`* @param Map $data`
`23`	`23`	`*`
`24`	`24`	`* @return array{`
`25`		`- * type: class-string<\Ibexa\Core\MVC\Symfony\SiteAccess\Matcher\Map>,`
	`25`	`+ * type: class-string<Map>,`
`26`	`26`	`* key: string\|null,`
`27`	`27`	`* map: array{},`
`28`	`28`	`* reverseMap: array{}`