Merge 4.3

Author: soyuka

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ concurrency:
 
 env:
   COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  COMPOSER_ROOT_VERSION: "4.2.x-dev"
+  COMPOSER_ROOT_VERSION: "4.3.x-dev"
 
 jobs:
   architecture:
@@ -227,7 +227,7 @@ jobs:
           mkdir -p /tmp/openapi
           tests/Fixtures/app/console api:openapi:export --output=/tmp/openapi/openapi.json --no-ansi
       - name: Lint OpenAPI spec with Redocly
-        run: redocly lint /tmp/openapi/openapi.json
+        run: redocly lint --config .redocly.yaml /tmp/openapi/openapi.json
 
   phpunit:
     name: PHPUnit (PHP ${{ matrix.php }})
@@ -1472,6 +1472,13 @@ jobs:
           composer global link ../src/Laravel --permanent
           composer config minimum-stability dev
           composer config prefer-stable true
-          composer require api-platform/laravel:"@dev"
+          composer require api-platform/laravel:"@dev" -W
           php ./artisan api-platform:install
         working-directory: 'test-api-platform-install'
+      - name: Smoke test
+        run: |
+          php ./artisan serve &
+          sleep 2
+          curl -f http://127.0.0.1:8000/api || exit 1
+          kill %1
+        working-directory: 'test-api-platform-install'

.github/workflows/release.yml

@@ -61,3 +61,21 @@ jobs:
         env:
           GH_TOKEN: ${{ steps.generate_token.outputs.token }}
         run: gh workflow run -R api-platform/api-platform release.yml -f tag=${{ github.ref_name }}
+
+  dispatch-demo-update:
+    name: Dispatch Demo Update
+    runs-on: ubuntu-latest
+    needs: split
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - name: Generate App Token
+        id: generate_token
+        uses: tibdex/github-app-token@v2
+        with:
+          app_id: ${{ secrets.API_PLATFORM_APP_ID }}
+          private_key: ${{ secrets.API_PLATFORM_APP_PRIVATE_KEY }}
+
+      - name: Update demo
+        env:
+          GH_TOKEN: ${{ steps.generate_token.outputs.token }}
+        run: gh workflow run -R api-platform/demo upgrade-api-platform.yml

.redocly.lint-ignore.yaml

@@ -0,0 +1,7 @@
+extends:
+  - recommended
+rules:
+  operation-4xx-response: off
+  no-enum-type-mismatch: off
+  no-unused-components: off
+  struct: off

.redocly.yaml

@@ -50,7 +50,7 @@
             "dev-3.4": "3.4.x-dev",
             "dev-4.1": "4.1.x-dev",
             "dev-4.2": "4.2.x-dev",
-            "dev-main": "4.3.x-dev"
+            "dev-main": "4.4.x-dev"
         },
         "symfony": {
             "require": "^6.4 || ^7.1 || ^8.0"

CHANGELOG.md

@@ -31,7 +31,7 @@
      </line>
  </file>
  <file path="src/Metadata/Resource/Factory/MetadataCollectionFactoryTrait.php">
-  <line number="249" hash="29843c95ea9de65e8e7867216969c55e2c33d9e2">
+  <line number="252" hash="29843c95ea9de65e8e7867216969c55e2c33d9e2">
    <issue><![CDATA[Since api-platform/core 4.2: Having multiple "#[ApiResource]" attributes with the same "shortName" "SecuredDummy" on class "ApiPlatform\Tests\Fixtures\TestBundle\Entity\SecuredDummy" is deprecated and will result in automatic short name deduplication in API Platform 5.x. Set "defaults.extra_properties.deduplicate_resource_short_names" to "true" in the API Platform configuration to enable it now.]]></issue>
    <issue><![CDATA[Since api-platform/core 4.2: Having multiple "#[ApiResource]" attributes with the same "shortName" "RelatedDummy" on class "ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy" is deprecated and will result in automatic short name deduplication in API Platform 5.x. Set "defaults.extra_properties.deduplicate_resource_short_names" to "true" in the API Platform configuration to enable it now.]]></issue>
    <issue><![CDATA[Since api-platform/core 4.2: Having multiple "#[ApiResource]" attributes with the same "shortName" "Question" on class "ApiPlatform\Tests\Fixtures\TestBundle\Entity\Question" is deprecated and will result in automatic short name deduplication in API Platform 5.x. Set "defaults.extra_properties.deduplicate_resource_short_names" to "true" in the API Platform configuration to enable it now.]]></issue>

composer.json

@@ -60,14 +60,15 @@ public function getDescription(string $resourceClass): array
                 $isCollection = str_ends_with($filterParameterName, '[]');
 
                 $enumValues = array_map(static fn (\BackedEnum $case) => $case->value, $this->enumTypes[$property]::cases());
+                $enumType = \is_int($enumValues[0] ?? null) ? 'integer' : 'string';
 
                 $schema = $isCollection
-                    ? ['type' => 'array', 'items' => ['type' => 'string', 'enum' => $enumValues]]
-                    : ['type' => 'string', 'enum' => $enumValues];
+                    ? ['type' => 'array', 'items' => ['type' => $enumType, 'enum' => $enumValues]]
+                    : ['type' => $enumType, 'enum' => $enumValues];
 
                 $description[$filterParameterName] = [
                     'property' => $propertyName,
-                    'type' => 'string',
+                    'type' => $enumType,
                     'required' => false,
                     'is_collection' => $isCollection,
                     'schema' => $schema,

phpunit.baseline.xml

@@ -28,7 +28,11 @@ public function getOpenApiParameters(Parameter $parameter): OpenApiParameter|arr
             return new OpenApiParameter(name: $parameter->getKey(), in: 'query');
         }
 
-        $arraySchema = ['type' => 'array', 'items' => $schema ?? ['type' => 'string']];
+        if ('array' === ($schema['type'] ?? null)) {
+            $arraySchema = $schema;
+        } else {
+            $arraySchema = ['type' => 'array', 'items' => $schema ?? ['type' => 'string']];
+        }
 
         return new OpenApiParameter(name: $parameter->getKey().'[]', in: 'query', style: 'deepObject', explode: true, schema: $arraySchema);
     }

src/Doctrine/Common/Filter/BackedEnumFilterTrait.php

@@ -61,7 +61,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "4.3.x-dev",
+            "dev-main": "4.4.x-dev",
             "dev-4.2": "4.2.x-dev",
             "dev-3.4": "3.4.x-dev",
             "dev-4.1": "4.1.x-dev"
@@ -76,5 +76,7 @@
     },
     "scripts": {
         "test": "./vendor/bin/phpunit"
-    }
+    },
+    "minimum-stability": "beta",
+    "prefer-stable": true
 }