Merge branch 'symfony:7.4' into add-custom-comparator-to-unique-entity-contraint

Author: blibio

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | 7.4 for features / 6.4, 7.2, or 7.3 for bug fixes
+| Branch?       | 7.4 for features / 6.4, 7.3 for bug fixes
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- if yes, also update src/**/CHANGELOG.md -->
 | Deprecations? | yes/no <!-- if yes, also update UPGRADE-*.md and src/**/CHANGELOG.md -->

.github/workflows/callable-fabbot.yml

@@ -9,7 +9,7 @@ permissions:
 jobs:
   call-fabbot:
     name: Fabbot
-    uses: ./.github/workflows/callable-fabbot.yml
+    uses: symfony-tools/fabbot/.github/workflows/fabbot.yml@main
     with:
       package: Symfony
       check_license: true

.github/workflows/fabbot.yml

@@ -251,7 +251,7 @@ jobs:
           git diff --exit-code src/ || (echo '::error::Run "php .github/sync-translations.php" to fix XLIFF files.' && exit 1)
 
       - name: Run tests
-        run: ./phpunit --group integration -v
+        run: ./phpunit --group integration
         env:
           INTEGRATION_FTP_URL: 'ftp://test:test@localhost'
           REDIS_HOST: 'localhost:16379'
@@ -267,12 +267,3 @@ jobs:
           KAFKA_BROKER: 127.0.0.1:9092
           POSTGRES_HOST: localhost
           PGBOUNCER_HOST: localhost:6432
-
-      #- name: Run HTTP push tests
-      #  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
-      #    docker run --rm -e COMPOSER_ROOT_VERSION -v $(pwd):/app -v $(which composer):/usr/local/bin/composer -v $(which vulcain):/usr/local/bin/vulcain -w /app php:8.1-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push
-      #    sudo rm -rf .phpunit
-      #    [ -d .phpunit.bak ] && mv .phpunit.bak .phpunit

.github/workflows/integration-tests.yml

@@ -85,10 +85,10 @@ jobs:
 
       - name: Run intl-data tests
         run: |
-          ./phpunit --group intl-data --exclude-group intl-data-isolate -v
-          ./phpunit --group intl-data --filter testWhenEnvVarNotSet -v
-          ./phpunit --group intl-data --filter testWhenEnvVarSetFalse -v
-          ./phpunit --group intl-data --filter testWhenEnvVarSetTrue -v
+          ./phpunit --group intl-data --exclude-group intl-data-isolate
+          ./phpunit --group intl-data --filter testWhenEnvVarNotSet
+          ./phpunit --group intl-data --filter testWhenEnvVarSetFalse
+          ./phpunit --group intl-data --filter testWhenEnvVarSetTrue
 
       - name: Test intl-data with compressed data
         run: |
@@ -100,7 +100,7 @@ jobs:
           ./phpunit src/Symfony/Component/Intl
 
       - name: Run Emoji tests
-        run: ./phpunit src/Symfony/Component/Emoji -v
+        run: ./phpunit src/Symfony/Component/Emoji
 
       - name: Test Emoji with compressed data
         run: |

.github/workflows/intl-data-tests.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-24.04
 
     env:
-      php-version: '8.2'
+      php-version: '8.4'
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -43,17 +43,13 @@ 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.6 php-http/discovery psr/event-dispatcher mongodb/mongodb jetbrains/phpstorm-stubs
+          composer require --no-progress --ansi --no-plugins psalm/phar:@stable phpunit/phpunit:^11.5 php-http/discovery psr/event-dispatcher mongodb/mongodb jetbrains/phpstorm-stubs
 
       - name: Generate Psalm baseline
         run: |
           git checkout composer.json
           git checkout -m ${{ github.base_ref }}
 
-          # @todo intersection types are broken in Psalm
-          # @see https://github.com/vimeo/psalm/issues/7520
-          sed -i 's/Uuid&/Uuid|/' src/Symfony/Component/Uid/Factory/TimeBasedUuidFactory.php
-          sed -i 's/Interface&/Interface|/' src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MigratingSessionHandler.php
           ./vendor/bin/psalm.phar --set-baseline=.github/psalm/psalm.baseline.xml --no-progress
           git checkout -m FETCH_HEAD