Merge 4.1

Author: soyuka

.github/workflows/ci.yml

@@ -264,15 +264,19 @@ jobs:
         continue-on-error: true
 
   phpunit-components:
-    name: PHPUnit ${{ matrix.component }} (PHP ${{ matrix.php }})
+    name: PHPUnit ${{ matrix.component }} (PHP ${{ matrix.php.version }} ${{ matrix.php.deprecations && 'no deprecations' || '' }})
     runs-on: ubuntu-latest
     timeout-minutes: 20
     strategy:
       matrix:
         php:
-          - '8.2'
-          - '8.3'
-          - '8.4'
+          - version: '8.2'
+          - version: '8.3'
+          - version: '8.4'
+          - version: '8.4'
+            coverage: true
+          - version: '8.4'
+            deprecations: true
         component:
           - api-platform/doctrine-common
           - api-platform/doctrine-orm
@@ -290,32 +294,33 @@ jobs:
           - api-platform/state
           - api-platform/symfony
           - api-platform/validator
-        include:
-          - php: '8.2'
-          - php: '8.3'
-          - php: '8.4'
-            coverage: true
       fail-fast: false
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php }}
+          php-version: ${{ matrix.php.version }}
           tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite, mongodb
           ini-values: memory_limit=-1
+      - name: Allow unstable project dependencies
+        if: matrix.php.deprecations == true
+        run: composer config minimum-stability dev
       - name: Run ${{ matrix.component }} install
         run: |
           composer global require soyuka/pmu
           composer global config allow-plugins.soyuka/pmu true --no-interaction
           composer global link . --permanent
           composer ${{matrix.component}} update
+      - name: Patch phpunit
+        if: matrix.php.deprecations == true
+        run: git apply --directory vendor/phpunit/phpunit .github/patches/phpunit.patch
       - 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.coverage && '--coverage-clover /tmp/build/logs/phpunit/clover.xml' || '' }}
+          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' || '' }}
       - name: Upload test artifacts
         if: always()
         uses: actions/upload-artifact@v4

src/Metadata/Resource/Factory/OperationDefaultsTrait.php

@@ -16,7 +16,6 @@
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\CollectionOperationInterface;
 use ApiPlatform\Metadata\Delete;
-use ApiPlatform\Metadata\Error;
 use ApiPlatform\Metadata\Exception\RuntimeException;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
@@ -32,6 +31,7 @@
 use ApiPlatform\Metadata\Patch;
 use ApiPlatform\Metadata\Post;
 use ApiPlatform\Metadata\Util\CamelCaseToSnakeCaseNameConverter;
+use ApiPlatform\State\ApiResource\Error;
 use ApiPlatform\State\CreateProvider;
 use ApiPlatform\Validator\Exception\ValidationException;
 use Psr\Log\LoggerInterface;