refactor: simplify is collection type info

.github/workflows/ci.yml

@@ -264,7 +264,7 @@ jobs:
         continue-on-error: true
 
   phpunit-components:
-    name: PHPUnit ${{ matrix.component }} (PHP ${{ matrix.php.version }} ${{ matrix.php.coverage && 'coverage' || '' }}${{ matrix.php.deprecations && 'no deprecations' || '' }})
+    name: PHPUnit ${{ matrix.component }} (PHP ${{ matrix.php.version }} ${{ matrix.php.coverage && 'coverage' || '' }}
     runs-on: ubuntu-latest
     timeout-minutes: 20
     strategy:
@@ -274,8 +274,6 @@ jobs:
           - version: '8.3'
           - version: '8.4'
             coverage: true
-          - version: '8.4'
-            deprecations: true
         component:
           - api-platform/doctrine-common
           - api-platform/doctrine-orm
@@ -309,18 +307,13 @@ jobs:
           composer global require soyuka/pmu
           composer global config allow-plugins.soyuka/pmu true --no-interaction
           composer global link . --permanent
-      - name: Allow unstable project dependencies
-        if: matrix.php.deprecations == true
-        run: |
-          cd $(composer ${{matrix.component}} --cwd)
-          composer config minimum-stability dev
       - name: Run ${{ matrix.component }} install
         run: |
           composer ${{matrix.component}} update
       - name: Run ${{ matrix.component }} tests
         run: |
           mkdir -p /tmp/build/logs/phpunit
-          composer ${{matrix.component}} test --log-junit "/tmp/build/logs/phpunit/junit.xml" ${{ matrix.php.coverage && '--coverage-clover /tmp/build/logs/phpunit/clover.xml' || '' }} ${{ matrix.php.deprecations && '--fail-on-deprecation --display-deprecations' || '' }}
+          composer ${{matrix.component}} test --log-junit "/tmp/build/logs/phpunit/junit.xml" ${{ matrix.php.coverage && '--coverage-clover /tmp/build/logs/phpunit/clover.xml' || '' }}
       - name: Upload test artifacts
         if: always()
         uses: actions/upload-artifact@v4
@@ -347,6 +340,56 @@ jobs:
           php-coveralls --coverage_clover=/tmp/build/logs/phpunit/clover.xml
         continue-on-error: true
 
+  phpunit-components-fail-deprecation:
+    name: PHPUnit no deprecations ${{ matrix.component }} (PHP ${{ matrix.php.version }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    strategy:
+      matrix:
+        php:
+          - version: '8.4'
+        component:
+          - api-platform/doctrine-common
+          - api-platform/doctrine-orm
+          - api-platform/doctrine-odm
+          - api-platform/metadata
+          - api-platform/hydra
+          - api-platform/json-api
+          - api-platform/json-schema
+          - api-platform/elasticsearch
+          - api-platform/openapi
+          - api-platform/graphql
+          - api-platform/http-cache
+          - api-platform/ramsey-uuid
+          - api-platform/serializer
+          - api-platform/state
+          - api-platform/symfony
+          - api-platform/validator
+      fail-fast: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php.version }}
+          tools: pecl, composer
+          extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite, mongodb
+          ini-values: memory_limit=-1
+      - name: Linking
+        run: |
+          composer global require soyuka/pmu
+          composer global config allow-plugins.soyuka/pmu true --no-interaction
+          composer global link . --permanent
+      - name: Run ${{ matrix.component }} install
+        run: |
+          composer ${{matrix.component}} update
+      - name: Run ${{ matrix.component }} tests
+        run: |
+          mkdir -p /tmp/build/logs/phpunit
+          cd $(composer ${{matrix.component}} --cwd)
+          ./vendor/bin/phpunit --fail-on-deprecation --display-deprecations --log-junit "/tmp/build/logs/phpunit/junit.xml" 
+
   behat:
     name: Behat (PHP ${{ matrix.php }})
     runs-on: ubuntu-latest

composer.json

@@ -114,7 +114,7 @@
         "symfony/property-info": "^6.4 || ^7.1",
         "symfony/serializer": "^6.4 || ^7.0",
         "symfony/translation-contracts": "^3.3",
-        "symfony/type-info": "^7.3-dev",
+        "symfony/type-info": "v7.3.0-BETA1",
         "symfony/web-link": "^6.4 || ^7.0",
         "willdurand/negotiation": "^3.1"
     },
@@ -211,10 +211,6 @@
     },
     "type": "library",
     "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/symfony/type-info"
-        },
         {"type": "vcs", "url": "https://github.com/soyuka/phpunit"}
     ]
 }

phpstan.neon.dist

@@ -62,10 +62,6 @@ parameters:
 			paths:
 				- tests/Fixtures/TestBundle/Document/
 				- src/Metadata/Tests/Fixtures/ApiResource/
-		-
-			message: '#Parameter \#1 \$constraint of method#'
-			paths:
-				- tests/Symfony/Validator/Metadata/Property/Restriction/
 		- '#Access to an undefined property Prophecy\\Prophecy\\ObjectProphecy<(\\?[a-zA-Z0-9_]+)+>::\$[a-zA-Z0-9_]+#'
 		# https://github.com/phpstan/phpstan-symfony/issues/76
 		-

src/Doctrine/Common/composer.json

@@ -35,7 +35,7 @@
         "doctrine/orm": "^2.17 || ^3.0",
         "phpspec/prophecy-phpunit": "^2.2",
         "phpunit/phpunit": "11.5.x-dev",
-        "symfony/type-info": "^7.3-dev"
+        "symfony/type-info": "v7.3.0-BETA1"
     },
     "conflict": {
         "doctrine/persistence": "<1.3"
@@ -76,10 +76,6 @@
         "test": "./vendor/bin/phpunit"
     },
     "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/symfony/type-info"
-        },
         {
             "type": "vcs",
             "url": "https://github.com/soyuka/phpunit"

src/Doctrine/Odm/Tests/PropertyInfo/DoctrineExtractorTest.php

@@ -27,6 +27,7 @@
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Types\Type as MongoDbType;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\PropertyInfo\Type as LegacyType;
 use Symfony\Component\TypeInfo\Type;
@@ -83,7 +84,7 @@
         );
     }
 
-    #[\PHPUnit\Framework\Attributes\Group('legacy')]
+    #[IgnoreDeprecations]
     #[\PHPUnit\Framework\Attributes\DataProvider('legacyTypesProvider')]
     public function testExtractLegacy(string $property, ?array $type = null): void
     {
@@ -96,7 +97,7 @@
         $this->assertEquals($type, $this->createExtractor()->getType(DoctrineDummy::class, $property));
     }
 
-    #[\PHPUnit\Framework\Attributes\Group('legacy')]
+    #[IgnoreDeprecations]
     public function testExtractWithEmbedOneLegacy(): void
     {
         $expectedTypes = [
@@ -123,7 +124,7 @@
         );
     }
 
-    #[\PHPUnit\Framework\Attributes\Group('legacy')]
+    #[IgnoreDeprecations]
     public function testExtractWithEmbedManyLegacy(): void
     {
         $expectedTypes = [
@@ -153,7 +154,7 @@
         );
     }
 
-    #[\PHPUnit\Framework\Attributes\Group('legacy')]
+    #[IgnoreDeprecations]
     public function testExtractEnumLegacy(): void
     {
         $this->assertEquals([new LegacyType(LegacyType::BUILTIN_TYPE_OBJECT, false, EnumString::class)], $this->createExtractor()->getTypes(DoctrineEnum::class, 'enumString'));
@@ -168,6 +169,7 @@
         $this->assertNull($this->createExtractor()->getType(DoctrineEnum::class, 'enumCustom'));
     }
 
+    #[IgnoreDeprecations]
     public static function legacyTypesProvider(): array
     {
         return [
@@ -258,7 +260,7 @@
         $this->assertNull($this->createExtractor()->getProperties('Not\Exist'));
     }
 
-    #[\PHPUnit\Framework\Attributes\Group('legacy')]
+    #[IgnoreDeprecations]
     public function testGetTypesCatchExceptionLegacy(): void
     {
         $this->assertNull($this->createExtractor()->getTypes('Not\Exist', 'baz'));
@@ -278,7 +280,7 @@
         $this->assertNull($extractor->isReadable(DoctrineGeneratedValue::class, 'foo'));
     }
 
-    #[\PHPUnit\Framework\Attributes\Group('legacy')]
+    #[IgnoreDeprecations]
     public function testGetTypesWithEmbedManyOmittingTargetDocumentLegacy(): void
     {
         $actualTypes = $this->createExtractor()->getTypes(

src/Doctrine/Odm/composer.json

@@ -30,7 +30,7 @@
         "api-platform/state": "^4.1",
         "doctrine/mongodb-odm": "^2.10",
         "symfony/property-info": "^6.4 || ^7.1",
-        "symfony/type-info": "^7.3-dev"
+        "symfony/type-info": "v7.3.0-BETA1"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^2.11",
@@ -76,10 +76,6 @@
         "test": "./vendor/bin/phpunit"
     },
     "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/symfony/type-info"
-        },
         {
             "type": "vcs",
             "url": "https://github.com/soyuka/phpunit"

src/Doctrine/Orm/composer.json

@@ -40,7 +40,7 @@
         "symfony/framework-bundle": "^6.4 || ^7.0",
         "symfony/property-access": "^6.4 || ^7.0",
         "symfony/serializer": "^6.4 || ^7.0",
-        "symfony/type-info": "^7.3-dev",
+        "symfony/type-info": "v7.3.0-BETA1",
         "symfony/uid": "^6.4 || ^7.0",
         "symfony/validator": "^6.4 || ^7.0",
         "symfony/yaml": "^6.4 || ^7.0"
@@ -76,10 +76,6 @@
         "test": "./vendor/bin/phpunit"
     },
     "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/symfony/type-info"
-        },
         {
             "type": "vcs",
             "url": "https://github.com/soyuka/phpunit"

src/Documentation/composer.json

@@ -40,10 +40,6 @@
         "phpunit/phpunit": "11.5.x-dev"
     },
     "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/symfony/type-info"
-        },
         {
             "type": "vcs",
             "url": "https://github.com/soyuka/phpunit"

src/Elasticsearch/Tests/Extension/SortExtensionTest.php

@@ -20,6 +20,7 @@
 use ApiPlatform\Metadata\GetCollection;
 use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Metadata\ResourceClassResolverInterface;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
@@ -53,6 +54,7 @@
         self::assertEquals(['sort' => [['name' => ['order' => 'asc']], ['bar' => ['order' => 'desc']]]], $sortExtension->applyToCollection([], Foo::class, (new GetCollection())->withOrder(['name', 'bar' => 'desc'])));
     }
 
+    #[IgnoreDeprecations]
     public function testApplyToCollectionWithNestedProperty(): void
     {
         $fooType = Type::list(Type::object(Foo::class));

src/Elasticsearch/Tests/Metadata/Resource/Factory/ElasticsearchProviderResourceMetadataCollectionFactoryTest.php

@@ -16,9 +16,9 @@
 use ApiPlatform\Elasticsearch\Metadata\Resource\Factory\ElasticsearchProviderResourceMetadataCollectionFactory;
 use ApiPlatform\Elasticsearch\Tests\Fixtures\Foo;
 use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
-use ApiPlatform\Metadata\Tests\Fixtures\Metadata\Get;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 

src/Elasticsearch/composer.json

@@ -33,7 +33,7 @@
         "symfony/property-access": "^6.4 || ^7.0",
         "symfony/property-info": "^6.4 || ^7.1",
         "symfony/serializer": "^6.4 || ^7.0",
-        "symfony/type-info": "^7.3-dev",
+        "symfony/type-info": "v7.3.0-BETA1",
         "symfony/uid": "^6.4 || ^7.0"
     },
     "require-dev": {
@@ -76,10 +76,6 @@
         "test": "./vendor/bin/phpunit"
     },
     "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/symfony/type-info"
-        },
         {
             "type": "vcs",
             "url": "https://github.com/soyuka/phpunit"

src/GraphQl/Tests/Type/TypeConverterTest.php

@@ -30,14 +30,14 @@
 use GraphQL\Type\Definition\EnumType;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type as GraphQLType;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\PropertyInfo\Type as LegacyType;
 use Symfony\Component\TypeInfo\Type;
-use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 
 /**
  * @author Alan Poulain <contact@alanpoulain.eu>

src/GraphQl/Type/FieldsBuilder.php

@@ -45,8 +45,8 @@
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 use Symfony\Component\TypeInfo\Type;
 use Symfony\Component\TypeInfo\Type\CollectionType;
-use Symfony\Component\TypeInfo\TypeIdentifier;
 use Symfony\Component\TypeInfo\Type\ObjectType;
+use Symfony\Component\TypeInfo\TypeIdentifier;
 
 /**
  * Builds the GraphQL fields.

src/GraphQl/composer.json

@@ -26,7 +26,7 @@
         "api-platform/serializer": "^4.1",
         "symfony/property-info": "^6.4 || ^7.1",
         "symfony/serializer": "^6.4 || ^7.0",
-        "symfony/type-info": "^7.2",
+        "symfony/type-info": "v7.3.0-BETA1",
         "webonyx/graphql-php": "^15.0",
         "willdurand/negotiation": "^3.1"
     },
@@ -80,10 +80,6 @@
         "test": "./vendor/bin/phpunit"
     },
     "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/symfony/type-info"
-        },
         {
             "type": "vcs",
             "url": "https://github.com/soyuka/phpunit"

src/Hal/Serializer/ItemNormalizer.php

@@ -21,6 +21,7 @@
 use ApiPlatform\Metadata\ResourceClassResolverInterface;
 use ApiPlatform\Metadata\UrlGeneratorInterface;
 use ApiPlatform\Metadata\Util\ClassInfoTrait;
+use ApiPlatform\Metadata\Util\TypeHelper;
 use ApiPlatform\Serializer\AbstractItemNormalizer;
 use ApiPlatform\Serializer\CacheKeyTrait;
 use ApiPlatform\Serializer\ContextTrait;
@@ -39,7 +40,6 @@
 use Symfony\Component\TypeInfo\Type\CollectionType;
 use Symfony\Component\TypeInfo\Type\CompositeTypeInterface;
 use Symfony\Component\TypeInfo\Type\ObjectType;
-use Symfony\Component\TypeInfo\Type\WrappingTypeInterface;
 
 /**
  * Converts between objects and array including HAL metadata.
@@ -212,17 +212,8 @@ private function getComponents(object $object, ?string $format, array $context):
                         $isOne = $className && $this->resourceClassResolver->isResourceClass($className);
                     }
                 } elseif ($type instanceof Type) {
-                    $typeIsCollection = function (Type $type) use (&$typeIsCollection, &$valueType): bool {
-                        return match (true) {
-                            $type instanceof CollectionType => null !== $valueType = $type->getCollectionValueType(),
-                            $type instanceof WrappingTypeInterface => $type->wrappedTypeIsSatisfiedBy($typeIsCollection),
-                            $type instanceof CompositeTypeInterface => $type->composedTypesAreSatisfiedBy($typeIsCollection),
-                            default => false,
-                        };
-                    };
-
-                    if ($type->isSatisfiedBy($typeIsCollection)) {
-                        $isMany = $valueType->isSatisfiedBy($typeIsResourceClass);
+                    if ($type->isSatisfiedBy(fn ($t) => $t instanceof CollectionType)) {
+                        $isMany = TypeHelper::getCollectionValueType($type)?->isSatisfiedBy($typeIsResourceClass);
                     } else {
                         $isOne = $type->isSatisfiedBy($typeIsResourceClass);
                     }