symfony · devloop42 · Sep 16, 2024 · Sep 16, 2024 · Sep 16, 2024 · Sep 16, 2024
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -13,20 +13,20 @@ init:
 
 install:
     - mkdir c:\php && cd c:\php
-    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.1.0-Win32-vs16-x86.zip
-    - 7z x php-8.1.0-Win32-vs16-x86.zip -y >nul
+    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.2.0-Win32-vs16-x86.zip
+    - 7z x php-8.2.0-Win32-vs16-x86.zip -y >nul
     - cd ext
-    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.21-8.1-ts-vs16-x86.zip
-    - 7z x php_apcu-5.1.21-8.1-ts-vs16-x86.zip -y >nul
-    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_redis-5.3.7-8.1-ts-vs16-x86.zip
-    - 7z x php_redis-5.3.7-8.1-ts-vs16-x86.zip -y >nul
+    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.22-8.2-ts-vs16-x86.zip
+    - 7z x php_apcu-5.1.22-8.2-ts-vs16-x86.zip -y >nul
+    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_redis-6.0.0-dev-8.2-ts-vs16-x86.zip
+    - 7z x php_redis-6.0.0-dev-8.2-ts-vs16-x86.zip -y >nul
     - cd ..
     - copy /Y php.ini-development php.ini-min
     - echo memory_limit=-1 >> php.ini-min
     - echo serialize_precision=-1 >> php.ini-min
     - echo max_execution_time=1200 >> php.ini-min
-    - echo post_max_size=4G >> php.ini-min
-    - echo upload_max_filesize=4G >> php.ini-min
+    - echo post_max_size=2047M >> php.ini-min
+    - echo upload_max_filesize=2047M >> php.ini-min
     - echo date.timezone="America/Los_Angeles" >> php.ini-min
     - echo extension_dir=ext >> php.ini-min
     - echo extension=php_xsl.dll >> php.ini-min
@@ -35,6 +35,7 @@ install:
     - echo opcache.enable_cli=1 >> php.ini-max
     - echo extension=php_openssl.dll >> php.ini-max
     - echo extension=php_apcu.dll >> php.ini-max
+    - echo extension=php_igbinary.dll >> php.ini-max
     - echo extension=php_redis.dll >> php.ini-max
     - echo apc.enable_cli=1 >> php.ini-max
     - echo extension=php_intl.dll >> php.ini-max

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -2,3 +2,7 @@
 f4118e110a46de3ffb799e7d79bf15128d1646ea
 9519b54417c09c49496a4a6be238e63be9a73465
 ae0a783425b80b78376488619bf9106e69193fa4
+9c1e36257c4df0929179462d6b2bdd00453ac8aa
+6ae74d38e3d20d0ffcc66c7c3d28767fab76bdfb
+# Prefix all sprintf() calls
+6ce530c5e90397d88e3a76a56db266c74d651584
diff --git a/.gitattributes b/.gitattributes
@@ -5,6 +5,7 @@
 /src/Symfony/Component/Notifier/Bridge export-ignore
 /src/Symfony/Component/Runtime export-ignore
 /src/Symfony/Component/Translation/Bridge export-ignore
+/src/Symfony/Component/Emoji/Resources/data/* linguist-generated=true
 /src/Symfony/Component/Intl/Resources/data/*/* linguist-generated=true
 /src/Symfony/**/.github/workflows/close-pull-request.yml linguist-generated=true
 /src/Symfony/**/.github/PULL_REQUEST_TEMPLATE.md linguist-generated=true
diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
diff --git a/.github/get-modified-packages.php b/.github/get-modified-packages.php
@@ -19,31 +19,15 @@
 
 function getPackageType(string $packageDir): string
 {
-    if (preg_match('@Symfony/Bridge/@', $packageDir)) {
-        return 'bridge';
-    }
-
-    if (preg_match('@Symfony/Bundle/@', $packageDir)) {
-        return 'bundle';
-    }
-
-    if (preg_match('@Symfony/Component/[^/]+/Bridge/@', $packageDir)) {
-        return 'component_bridge';
-    }
-
-    if (preg_match('@Symfony/Component/@', $packageDir)) {
-        return 'component';
-    }
-
-    if (preg_match('@Symfony/Contracts/@', $packageDir)) {
-        return 'contract';
-    }
-
-    if (preg_match('@Symfony/Contracts$@', $packageDir)) {
-        return 'contracts';
-    }
-
-    throw new \LogicException();
+    return match (true) {
+        str_contains($packageDir, 'Symfony/Bridge/') => 'bridge',
+        str_contains($packageDir, 'Symfony/Bundle/') => 'bundle',
+        preg_match('@Symfony/Component/[^/]+/Bridge/@', $packageDir) => 'component_bridge',
+        str_contains($packageDir, 'Symfony/Component/') => 'component',
+        str_contains($packageDir, 'Symfony/Contracts/') => 'contract',
+        str_ends_with($packageDir, 'Symfony/Contracts') => 'contracts',
+        default => throw new \LogicException(),
+    };
 }
 
 $newPackage = [];

diff --git a/.github/patch-types.php b/.github/patch-types.php
@@ -27,7 +27,6 @@
         case false !== strpos($file, '/src/Symfony/Bridge/Doctrine/Middleware/Debug/'):
         case false !== strpos($file, '/src/Symfony/Bridge/Doctrine/Tests/Fixtures/LegacyQueryMock.php'):
         case false !== strpos($file, '/src/Symfony/Bridge/PhpUnit/'):
-        case false !== strpos($file, '/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/ContainerAwareController.php'):
         case false !== strpos($file, '/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php'):
         case false !== strpos($file, '/src/Symfony/Component/Cache/Tests/Fixtures/DriverWrapper.php'):
         case false !== strpos($file, '/src/Symfony/Component/Config/Tests/Fixtures/BadFileName.php'):
@@ -47,6 +46,7 @@
         case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/'):
         case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/TestServiceSubscriberIntersectionWithTrait.php'):
         case false !== strpos($file, '/src/Symfony/Component/ErrorHandler/Tests/Fixtures/'):
+        case false !== strpos($file, '/src/Symfony/Component/HttpClient/Internal/'):
         case false !== strpos($file, '/src/Symfony/Component/Form/Tests/Fixtures/Answer.php'):
         case false !== strpos($file, '/src/Symfony/Component/Form/Tests/Fixtures/Number.php'):
         case false !== strpos($file, '/src/Symfony/Component/Form/Tests/Fixtures/Suit.php'):
@@ -59,6 +59,7 @@
         case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/NotLoadableClass.php'):
         case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/ReflectionIntersectionTypeFixture.php'):
         case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/ReflectionUnionTypeWithIntersectionFixture.php'):
+        case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/VirtualProperty.php'):
         case false !== strpos($file, '/src/Symfony/Component/VarExporter/Internal'):
         case false !== strpos($file, '/src/Symfony/Component/VarExporter/Tests/Fixtures/'):
         case false !== strpos($file, '/src/Symfony/Component/Cache/Traits/RelayProxy.php'):

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -23,12 +23,12 @@ jobs:
 
     strategy:
       matrix:
-        php: ['8.1']
+        php: ['8.2']
       fail-fast: false
 
     services:
       postgres:
-        image: postgres:10.6-alpine
+        image: postgres:16-alpine
         ports:
           - 5432:5432
         env:
@@ -173,10 +173,10 @@ jobs:
 
       - name: Configure Couchbase
         run: |
-          curl -s -u 'username=Administrator&password=111111' -X POST http://localhost:8091/node/controller/setupServices -d 'services=kv%2Cn1ql%2Cindex%2Cfts'
-          curl -s -X POST http://localhost:8091/settings/web -d 'username=Administrator&password=111111&port=SAME'
-          curl -s -u Administrator:111111 -X POST http://localhost:8091/pools/default/buckets -d 'ramQuotaMB=100&bucketType=ephemeral&name=cache'
-          curl -s -u Administrator:111111 -X POST  http://localhost:8091/pools/default -d 'memoryQuota=256'
+          curl -s -u 'username=Administrator&password=111111@' -X POST http://localhost:8091/node/controller/setupServices -d 'services=kv%2Cn1ql%2Cindex%2Cfts'
+          curl -s -X POST http://localhost:8091/settings/web -d 'username=Administrator&password=111111%40&port=SAME'
+          curl -s -u Administrator:111111@ -X POST http://localhost:8091/pools/default/buckets -d 'ramQuotaMB=100&bucketType=ephemeral&name=cache'
+          curl -s -u Administrator:111111@ -X POST http://localhost:8091/pools/default -d 'memoryQuota=256'
 
       - name: Create FTP fixtures
         run: |
@@ -248,7 +248,7 @@ jobs:
           PGBOUNCER_HOST: localhost:6432
 
       #- name: Run HTTP push tests
-      #  if: matrix.php == '8.1'
+      #  if: matrix.php == '8.2'
       #  run: |
       #    [ -d .phpunit ] && mv .phpunit .phpunit.bak
       #    wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/vulcain_0.1.3_Linux_x86_64.tar.gz -O - | tar xz && mv vulcain /usr/local/bin

diff --git a/.github/workflows/intl-data-tests.yml b/.github/workflows/intl-data-tests.yml
@@ -1,15 +1,21 @@
-name: Intl data
+name: Intl/Emoji data
 
 on:
   push:
     paths:
+      - 'src/Symfony/Component/Emoji/*.php'
+      - 'src/Symfony/Component/Emoji/Resources/data/**'
+      - 'src/Symfony/Component/Emoji/Tests/*Test.php'
       - 'src/Symfony/Component/Intl/*.php'
       - 'src/Symfony/Component/Intl/Util/GitRepository.php'
       - 'src/Symfony/Component/Intl/Resources/data/**'
       - 'src/Symfony/Component/Intl/Tests/*Test.php'
       - 'src/Symfony/Component/Intl/Tests/Util/GitRepositoryTest.php'
   pull_request:
     paths:
+      - 'src/Symfony/Component/Emoji/*.php'
+      - 'src/Symfony/Component/Emoji/Resources/data/**'
+      - 'src/Symfony/Component/Emoji/Tests/*Test.php'
       - 'src/Symfony/Component/Intl/*.php'
       - 'src/Symfony/Component/Intl/Util/GitRepository.php'
       - 'src/Symfony/Component/Intl/Resources/data/**'
@@ -29,7 +35,7 @@ permissions:
 
 jobs:
   tests:
-    name: Intl data
+    name: Intl/Emoji data
     runs-on: Ubuntu-20.04
 
     steps:
@@ -57,7 +63,7 @@ jobs:
           coverage: "none"
           extensions: "zip,intl-${{env.SYMFONY_ICU_VERSION}}"
           ini-values: "memory_limit=-1"
-          php-version: "8.1"
+          php-version: "8.2"
 
       - name: Install dependencies
         run: |
@@ -80,15 +86,23 @@ jobs:
       - name: Run intl-data tests
         run: ./phpunit --group intl-data -v
 
-      - name: Test with compressed data
+      - name: Test intl-data with compressed data
         run: |
           [ -f src/Symfony/Component/Intl/Resources/data/locales/en.php ]
           [ ! -f src/Symfony/Component/Intl/Resources/data/locales/en.php.gz ]
-          [ -f src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-en.php ]
-          [ ! -f src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-en.php.gz ]
           src/Symfony/Component/Intl/Resources/bin/compress
           [ ! -f src/Symfony/Component/Intl/Resources/data/locales/en.php ]
           [ -f src/Symfony/Component/Intl/Resources/data/locales/en.php.gz ]
-          [ ! -f src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-en.php ]
-          [ -f src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-en.php.gz ]
           ./phpunit src/Symfony/Component/Intl
+
+      - name: Run Emoji tests
+        run: ./phpunit src/Symfony/Component/Emoji -v
+
+      - name: Test Emoji with compressed data
+        run: |
+          [ -f src/Symfony/Component/Emoji/Resources/data/emoji-en.php ]
+          [ ! -f src/Symfony/Component/Emoji/Resources/data/emoji-en.php.gz ]
+          src/Symfony/Component/Emoji/Resources/bin/compress
+          [ ! -f src/Symfony/Component/Emoji/Resources/data/emoji-en.php ]
+          [ -f src/Symfony/Component/Emoji/Resources/data/emoji-en.php.gz ]
+          ./phpunit src/Symfony/Component/Emoji
diff --git a/.github/workflows/package-tests.yml b/.github/workflows/package-tests.yml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Find packages
         id: find-packages
-        run: echo "packages=$(php .github/get-modified-packages.php $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | grep -v src/Symfony/Component/Intl/Resources/emoji |jq -R -s -c 'split("\n")[:-1]') $(git diff --name-only origin/${{ github.base_ref }} HEAD | grep src/ | jq -R -s -c 'split("\n")[:-1]'))" >> $GITHUB_OUTPUT
+        run: echo "packages=$(php .github/get-modified-packages.php $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | grep -v src/Symfony/Component/Emoji/Resources/bin |jq -R -s -c 'split("\n")[:-1]') $(git diff --name-only origin/${{ github.base_ref }} HEAD | grep src/ | jq -R -s -c 'split("\n")[:-1]'))" >> $GITHUB_OUTPUT
 
       - name: Verify meta files are correct
         run: |

diff --git a/.github/workflows/phpunit-bridge.yml b/.github/workflows/phpunit-bridge.yml
@@ -32,7 +32,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           coverage: "none"
-          php-version: "7.1"
+          php-version: "7.2"
 
       - name: Lint
         run: find ./src/Symfony/Bridge/PhpUnit -name '*.php' | grep -v -e /Tests/ -e ForV7 -e ForV8 -e ForV9 -e ConstraintLogicTrait | parallel -j 4 php -l {}
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: Ubuntu-20.04
 
     env:
-      php-version: '8.1'
+      php-version: '8.2'
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -43,7 +43,7 @@ jobs:
           ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
           export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
           composer remove --dev --no-update --no-interaction symfony/phpunit-bridge
-          composer require --no-progress --ansi --no-plugins psalm/phar:@stable phpunit/phpunit:^9.5 php-http/discovery psr/event-dispatcher mongodb/mongodb jetbrains/phpstorm-stubs
+          composer require --no-progress --ansi --no-plugins psalm/phar:@stable phpunit/phpunit:^9.6 php-http/discovery psr/event-dispatcher mongodb/mongodb jetbrains/phpstorm-stubs
 
       - name: Generate Psalm baseline
         run: |

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - php: '8.1'
+          - php: '8.2'
           - php: '8.2'
             mode: high-deps
           - php: '8.2'
@@ -96,7 +96,7 @@ jobs:
             echo SYMFONY_DEPRECATIONS_HELPER=weak >> $GITHUB_ENV
             cp composer.json composer.json.orig
             echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json
-            php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | grep -v src/Symfony/Component/Intl/Resources/emoji)
+            php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | grep -v src/Symfony/Component/Emoji/Resources/bin)
             mv composer.json composer.json.phpunit
             mv composer.json.orig composer.json
           fi
@@ -144,19 +144,19 @@ jobs:
           echo "::endgroup::"
 
       - name: Patch return types
-        if: "matrix.php == '8.1' && ! matrix.mode"
+        if: "matrix.php == '8.2' && ! matrix.mode"
         run: |
           patch -sp1 < .github/expected-missing-return-types.diff
           git add .
           composer install -q --optimize-autoloader || composer install --optimize-autoloader
-          SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php
+          SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.2' php .github/patch-types.php
           git checkout src/Symfony/Contracts/Service/ResetInterface.php
-          SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php # ensure the script is idempotent
+          SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.2' php .github/patch-types.php # ensure the script is idempotent
           git checkout src/Symfony/Contracts/Service/ResetInterface.php
           git diff --exit-code
 
       - name: Check return types
-        if: "matrix.php == '8.1' && ! matrix.mode"
+        if: "matrix.php == '8.2' && ! matrix.mode"
         run: |
           php .github/patch-types.php lint
 
@@ -228,12 +228,12 @@ jobs:
             script -e -c './phpunit --group tty' /dev/null
 
       - name: Run tests with SIGCHLD enabled PHP
-        if: "matrix.php == '8.1' && ! matrix.mode"
+        if: "matrix.php == '8.2' && ! matrix.mode"
         run: |
           mkdir build
           cd build
-          wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.1.2-pcntl-sigchild.tar.bz2
-          tar -xjf php-8.1.2-pcntl-sigchild.tar.bz2
+          wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.2.0-pcntl-sigchild.tar.bz2
+          tar -xjf php-8.2.0-pcntl-sigchild.tar.bz2
           cd ..
 
           mkdir -p /opt/php/lib

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -31,17 +31,8 @@
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'protected_to_private' => false,
-        'no_superfluous_phpdoc_tags' => [
-            'remove_inheritdoc' => true,
-            'allow_unused_params' => true, // for future-ready params, to be replaced with https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7377
-        ],
         'header_comment' => ['header' => $fileHeaderComment],
-        // TODO: Remove once the "compiler_optimized" set includes "sprintf"
-        'native_function_invocation' => ['include' => ['@compiler_optimized', 'sprintf'], 'scope' => 'namespaced', 'strict' => true],
-        'nullable_type_declaration' => true,
-        'nullable_type_declaration_for_default_null_value' => true,
-        'modernize_strpos' => true,
-        'get_class_to_class_keyword' => true,
+        'trailing_comma_in_multiline' => ['elements' => ['arrays', 'match', 'parameters']],
     ])
     ->setRiskyAllowed(true)
     ->setFinder(
@@ -52,6 +43,7 @@
             ->exclude([
                 // explicit trigger_error tests
                 'Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/',
+                'Symfony/Component/Emoji/Resources/',
                 'Symfony/Component/Intl/Resources/data/',
             ])
             // explicit tests for ommited @param type, against `no_superfluous_phpdoc_tags`
@@ -61,8 +53,6 @@
             ->notPath('Symfony/Bridge/PhpUnit/SymfonyTestsListener.php')
             ->notPath('#Symfony/Bridge/PhpUnit/.*Mock\.php#')
             ->notPath('#Symfony/Bridge/PhpUnit/.*Legacy#')
-            // file content autogenerated by `var_export`
-            ->notPath('Symfony/Component/Translation/Tests/Fixtures/resources.php')
             // explicit trigger_error tests
             ->notPath('Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php')
             // stop removing spaces on the end of the line in strings