Merge pull request #4603 from soyuka/merge-26

Merge 2.6 onto main

Author: soyuka

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - '8.0'
+          - '8.1'
       fail-fast: false
     steps:
       - name: Checkout
@@ -40,7 +40,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - '8.0'
+          - '8.1'
       fail-fast: false
     env:
       APP_DEBUG: '1' # https://github.com/phpstan/phpstan-symfony/issues/37
@@ -65,6 +65,8 @@ jobs:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
+      - name: Allow unstable project dependencies
+        run: composer config minimum-stability dev
       - name: Update project dependencies
         run: composer update --no-interaction --no-progress --ansi
       - name: Require Symfony components
@@ -82,11 +84,14 @@ jobs:
         continue-on-error: true
       - name: Clear test app cache
         run: |
-          tests/Fixtures/app/console cache:clear --ansi
+          rm -Rf tests/Fixtures/app/var/cache/*
+          tests/Fixtures/app/console cache:warmup
       - name: Run PHPStan analysis
         env:
           SYMFONY_PHPUNIT_VERSION: '9.5'
-        run: ./vendor/bin/phpstan analyse --no-interaction --no-progress --ansi
+        run: 
+          ./vendor/bin/phpstan --version
+          ./vendor/bin/phpstan analyse --no-interaction --no-progress --ansi
 
   phpunit:
     name: PHPUnit (PHP ${{ matrix.php }})
@@ -100,8 +105,9 @@ jobs:
           - '7.3'
           - '7.4'
           - '8.0'
+          - '8.1'
         include:
-          - php: '8.0'
+          - php: '8.1'
             coverage: true
       fail-fast: false
     steps:
@@ -192,8 +198,9 @@ jobs:
           - '7.3'
           - '7.4'
           - '8.0'
+          - '8.1'
         include:
-          - php: '8.0'
+          - php: '8.1'
             coverage: true
       fail-fast: false
     steps:
@@ -207,10 +214,6 @@ jobs:
           extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite
           coverage: pcov
           ini-values: memory_limit=-1
-      - name: Set Composer platform config
-        if: (startsWith(matrix.php, '8.0'))
-        run: |
-          composer config platform.php 7.4.99
       - name: Get composer cache directory
         id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
@@ -242,13 +245,13 @@ jobs:
       - name: Install PHPUnit
         run: vendor/bin/simple-phpunit --version
       - name: Clear test app cache
-        if: (!startsWith(matrix.php, '8.0'))
+        if: (!startsWith(matrix.php, '8.'))
         run: tests/Fixtures/app/console cache:clear --ansi
       - name: Clear test app cache (php 8.0)
-        if: (startsWith(matrix.php, '8.0'))
+        if: (startsWith(matrix.php, '8.'))
         run: rm -Rf tests/Fixtures/app/var/cache/*
       - name: Run Behat tests
-        if: (!startsWith(matrix.php, '8.0'))
+        if: (!startsWith(matrix.php, '8.'))
         run: |
           mkdir -p build/logs/behat
           if [ "$COVERAGE" = '1' ]; then
@@ -261,7 +264,7 @@ jobs:
             fi
           fi
       - name: Run Behat tests
-        if: (startsWith(matrix.php, '8.0'))
+        if: (startsWith(matrix.php, '8.'))
         run: |
           mkdir -p build/logs/behat
           if [ "$COVERAGE" = '1' ]; then
@@ -355,10 +358,10 @@ jobs:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
+      - name: Require Symfony components
+        run: composer require symfony/intl symfony/uid --dev --no-interaction --no-progress --ansi --no-update
       - name: Update project dependencies
         run: composer update --no-interaction --no-progress --ansi --prefer-lowest
-      - name: Require Symfony components
-        run: composer require symfony/uid --dev --no-interaction --no-progress --ansi
       - name: Clear test app cache
         run: tests/Fixtures/app/console cache:clear --ansi
       - name: Install PHPUnit
@@ -395,10 +398,10 @@ jobs:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
+      - name: Require Symfony components
+        run: composer require symfony/intl symfony/uid --dev --no-interaction --no-progress --ansi --no-update
       - name: Update project dependencies
         run: composer update --no-interaction --no-progress --ansi --prefer-lowest
-      - name: Require Symfony components
-        run: composer require symfony/uid --dev --no-interaction --no-progress --ansi
       - name: Install PHPUnit
         run: vendor/bin/simple-phpunit --version
       - name: Clear test app cache
@@ -604,6 +607,7 @@ jobs:
         php:
           - '7.4'
           - '8.0'
+          - '8.1'
       fail-fast: false
     env:
       APP_ENV: elasticsearch
@@ -693,15 +697,13 @@ jobs:
         run: vendor/bin/simple-phpunit
 
   phpunit-symfony-next:
-    name: PHPUnit (PHP ${{ matrix.php }}) (Symfony ${{ matrix.symfony }})
+    name: PHPUnit (PHP ${{ matrix.php }}) (Symfony dev)
     runs-on: ubuntu-latest
     timeout-minutes: 20
     strategy:
       matrix:
         php:
-          - '8.0'
-        symfony:
-          - '5.4'
+          - '8.1'
       fail-fast: false
     env:
       # See https://github.com/doctrine/DoctrineMongoDBBundle/pull/673
@@ -713,7 +715,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring 
           coverage: none
@@ -734,21 +736,7 @@ jobs:
       - name: Update project dependencies
         run: composer update --no-interaction --no-progress --ansi
       - name: Require Symfony components
-        run: composer require symfony/uid --dev --no-interaction --no-progress --ansi
-      - name: Flag held back Symfony packages
-        env:
-          symfony_version: ${{ matrix.symfony }}
-        run: |
-          version_pattern=$symfony_version.x-dev
-          if [ "${symfony_version%.4}" != "$symfony_version" ]; then
-            current_major=${symfony_version%.4}
-            next_major=$((current_major + 1))
-            version_pattern=$version_pattern'|'$next_major.0.x-dev'|'dev-master
-          fi
-          version_pattern=$(echo "$version_pattern" | sed -r 's/\./\\./g')
-          symfony_packages=$(composer show symfony/* | tr -s ' ' '\t' | cut -f1-2 | grep -vE 'polyfill|contracts|mercure')
-          ! echo "$symfony_packages" | grep -vE "$version_pattern"
-        continue-on-error: true
+        run: composer require symfony/intl symfony/uid --dev --no-interaction --no-progress --ansi
       - name: Install PHPUnit
         run: vendor/bin/simple-phpunit --version
       - name: Clear test app cache
@@ -757,23 +745,21 @@ jobs:
         run: vendor/bin/simple-phpunit
 
   behat-symfony-next:
-    name: Behat (PHP ${{ matrix.php }}) (Symfony ${{ matrix.symfony }})
+    name: Behat (PHP ${{ matrix.php }}) (Symfony dev)
     runs-on: ubuntu-latest
     timeout-minutes: 20
     strategy:
       matrix:
         php:
-          - '8.0'
-        symfony:
-          - '5.4'
+          - '8.1'
       fail-fast: false
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring 
           coverage: none
@@ -796,21 +782,7 @@ jobs:
       - name: Update project dependencies
         run: composer update --no-interaction --no-progress --ansi
       - name: Require Symfony components
-        run: composer require symfony/uid --dev --no-interaction --no-progress --ansi
-      - name: Flag held back Symfony packages
-        env:
-          symfony_version: ${{ matrix.symfony }}
-        run: |
-          version_pattern=$symfony_version.x-dev
-          if [ "${symfony_version%.4}" != "$symfony_version" ]; then
-            current_major=${symfony_version%.4}
-            next_major=$((current_major + 1))
-            version_pattern=$version_pattern'|'$next_major.0.x-dev'|'dev-master
-          fi
-          version_pattern=$(echo "$version_pattern" | sed -r 's/\./\\./g')
-          symfony_packages=$(composer show symfony/* | tr -s ' ' '\t' | cut -f1-2 | grep -vE 'polyfill|contracts|mercure')
-          ! echo "$symfony_packages" | grep -vE "$version_pattern"
-        continue-on-error: true
+        run: composer require symfony/intl symfony/uid --dev --no-interaction --no-progress --ansi
       - name: Install PHPUnit
         run: vendor/bin/simple-phpunit --version
       - name: Clear test app cache
@@ -825,7 +797,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - '8.0'
+          - '8.1'
       fail-fast: false
     steps:
       - name: Checkout
@@ -906,7 +878,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - '8.0'
+          - '8.1'
       fail-fast: false
     steps:
       - name: Checkout
@@ -965,6 +937,7 @@ jobs:
         php:
           - '7.4'
           - '8.0'
+          - '8.1'
       fail-fast: false
     env:
       APP_ENV: sqlite
@@ -990,7 +963,7 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Set Composer platform config
-        if: (startsWith(matrix.php, '8.0'))
+        if: (startsWith(matrix.php, '8.'))
         run: |
             composer config platform.php 7.4.99
       - name: Update project dependencies
@@ -1013,6 +986,7 @@ jobs:
         php:
           - '7.4'
           - '8.0'
+          - '8.1'
       fail-fast: false
     env:
       APP_ENV: sqlite
@@ -1038,7 +1012,7 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Set Composer platform config
-        if: (startsWith(matrix.php, '8.0'))
+        if: (startsWith(matrix.php, '8.'))
         run: |
             composer config platform.php 7.4.99
       - name: Update project dependencies
@@ -1145,7 +1119,7 @@ jobs:
           mkdir -p build/logs/behat
           vendor/bin/behat --out=std --format=progress --format=junit --out=build/logs/behat/junit --profile=default --no-interaction --tags='~@php8'
       - name: Run Behat tests
-        if: (startsWith(matrix.php, '8.0'))
+        if: (startsWith(matrix.php, '8.'))
         run: |
           mkdir -p build/logs/behat
           vendor/bin/behat --out=std --format=progress --format=junit --out=build/logs/behat/junit --profile=default --no-interaction

CHANGELOG.md

@@ -45,6 +45,12 @@
 * Add support for `security_post_validation` attribute
 * Mark the GraphQL subsystem as stable (#4500)
 
+## 2.6.7
+
+* feat: compatibility with Symfony 6 (#4503, #4582, #4604, #4564)
+* feat: compatibility with PHP 8.1 (#4503, #4582, #4604)
+* fix: pass the child context when normalizing nested non-resource objects (#4521)
+
 ## 2.6.6
 
 * fix(json-schema): consider `SplFileInfo` class as a binary type (#4332)