symfony · symfonyaml · May 2, 2024 · May 3, 2024 · May 3, 2024 · May 4, 2024
diff --git a/.gitattributes b/.gitattributes
@@ -6,3 +6,5 @@
 /src/Symfony/Component/Runtime export-ignore
 /src/Symfony/Component/Translation/Bridge export-ignore
 /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/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | 7.1 for features / 5.4, 6.4, or 7.0 for bug fixes <!-- see below -->
+| Branch?       | 7.2 for features / 5.4, 6.4, and 7.1 for bug fixes <!-- see below -->
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- please update src/**/CHANGELOG.md files -->
 | Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->

diff --git a/.github/deprecations-baseline.json b/.github/deprecations-baseline.json
diff --git a/.github/sync-packages.php b/.github/sync-packages.php
@@ -0,0 +1,57 @@
+<?php
+
+if ('cli' !== PHP_SAPI) {
+    echo "This script can only be run from the command line.\n";
+    exit(1);
+}
+
+$mainRepo = 'https://github.com/symfony/symfony';
+exec('find src -name composer.json', $packages);
+
+foreach ($packages as $package) {
+    $package = dirname($package);
+    $c = file_get_contents($package.'/.gitattributes');
+    $c = preg_replace('{^/\.git.*+\n}m', '', $c);
+    $c .= "/.git* export-ignore\n";
+    file_put_contents($package.'/.gitattributes', $c);
+
+    @mkdir($package.'/.github');
+    file_put_contents($package.'/.github/PULL_REQUEST_TEMPLATE.md', <<<EOTXT
+        Please do not submit any Pull Requests here. They will be closed.
+        ---
+
+        Please submit your PR here instead:
+        {$mainRepo}
+
+        This repository is what we call a "subtree split": a read-only subset of that main repository.
+        We're looking forward to your PR there!
+
+        EOTXT
+    );
+
+    @mkdir($package.'/.github/workflows');
+    file_put_contents($package.'/.github/workflows/close-pull-request.yml', <<<EOTXT
+        name: Close Pull Request
+
+        on:
+          pull_request_target:
+            types: [opened]
+
+        jobs:
+          run:
+            runs-on: ubuntu-latest
+            steps:
+            - uses: superbrothers/close-pull-request@v3
+              with:
+                comment: |
+                  Thanks for your Pull Request! We love contributions.
+
+                  However, you should instead open your PR on the main repository:
+                  {$mainRepo}
+
+                  This repository is what we call a "subtree split": a read-only subset of that main repository.
+                  We're looking forward to your PR there!
+
+        EOTXT
+    );
+}
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -44,6 +44,13 @@ jobs:
           LDAP_PORT_NUMBER: 3389
           LDAP_USERS: a
           LDAP_PASSWORDS: a
+      ftp:
+        image: onekilo79/ftpd_test
+        ports:
+          - 21:21
+          - 30000-30009:30000-30009
+        volumes:
+          - ./:/hostmount
       redis:
         image: redis:6.2.8
         ports:
@@ -99,24 +106,46 @@ jobs:
         ports:
           - 4566:4566
       zookeeper:
-        image: wurstmeister/zookeeper:3.4.6
+        image: zookeeper
       kafka:
-        image: wurstmeister/kafka:2.12-2.0.1
+        image: bitnami/kafka:3.7
         ports:
           - 9092:9092
         env:
-          KAFKA_AUTO_CREATE_TOPICS_ENABLE: false
-          KAFKA_CREATE_TOPICS: 'test-topic:1:1:compact'
-          KAFKA_ADVERTISED_HOST_NAME: 127.0.0.1
-          KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181'
-          KAFKA_ADVERTISED_PORT: 9092
+          KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: false
+          ALLOW_PLAINTEXT_LISTENER: 'yes'
+          KAFKA_CFG_ADVERTISED_LISTENERS: 'PLAINTEXT://127.0.0.1:9092'
+          KAFKA_CFG_LISTENERS: 'PLAINTEXT://:9092'
+          KAFKA_CFG_ZOOKEEPER_CONNECT: 'zookeeper:2181'
+        options: --name=kafka
+      frankenphp:
+        image: dunglas/frankenphp:1.1.0
+        ports:
+          - 80:80
+          - 8681:81
+          - 8682:82
+          - 8683:83
+          - 8684:84
+        volumes:
+          - ${{ github.workspace }}:/symfony
+        env:
+          SERVER_NAME: 'http://localhost http://localhost:81 http://localhost:82 http://localhost:83 http://localhost:84'
+          CADDY_SERVER_EXTRA_DIRECTIVES: |
+            route /http-client* {
+              root * /symfony/src/Symfony/Component/HttpClient/Tests/Fixtures/response-functional/
+              php_server
+            }
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Init Kafka topics
+        run: |
+          docker exec kafka /opt/bitnami/kafka/bin/kafka-topics.sh --create --topic test-topic --bootstrap-server kafka:9092
+
       - name: Install system dependencies
         run: |
           echo "::group::apt-get update"
@@ -139,6 +168,11 @@ jobs:
           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: |
+          mkdir -p ./ftpusers/test/pub
+          touch ./ftpusers/test/pub/example ./ftpusers/test/readme.txt
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -176,9 +210,22 @@ jobs:
           ./phpunit install
           echo "::endgroup::"
 
+      - name: Check for changes in translation files
+        id: changed-translation-files
+        run: |
+          echo 'changed='$((git diff --quiet HEAD~1 HEAD -- 'src/**/Resources/translations/*.xlf' || (echo 'true' && exit 1)) && echo 'false') >> $GITHUB_OUTPUT
+
+      - name: Check Translation Status
+        if: steps.changed-translation-files.outputs.changed == 'true'
+        run: |
+          php src/Symfony/Component/Translation/Resources/bin/translation-status.php -v
+          php .github/sync-translations.php
+          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
         env:
+          INTEGRATION_FTP_URL: 'ftp://test:test@localhost'
           REDIS_HOST: 'localhost:16379'
           REDIS_AUTHENTICATED_HOST: 'localhost:16380'
           REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
@@ -199,15 +246,3 @@ jobs:
       #    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.0-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push
       #    sudo rm -rf .phpunit
       #    [ -d .phpunit.bak ] && mv .phpunit.bak .phpunit
-
-      - name: Check for changes in translation files
-        id: changed-translation-files
-        run: |
-          echo 'changed='$((git diff --quiet HEAD~1 HEAD -- 'src/**/Resources/translations/*.xlf' || (echo 'true' && exit 1)) && echo 'false') >> $GITHUB_OUTPUT
-
-      - name: Check Translation Status
-        if: steps.changed-translation-files.outputs.changed == 'true'
-        run: |
-          php src/Symfony/Component/Translation/Resources/bin/translation-status.php -v
-          php .github/sync-translations.php
-          git diff --exit-code src/ || (echo 'Run "php .github/sync-translations.php" to fix XLIFF files.' && exit 1)
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -34,6 +34,7 @@ jobs:
             mode: low-deps
           - php: '8.3'
           - php: '8.4'
+            extensions: amqp,apcu,igbinary,intl,mbstring,memcached,redis
             #mode: experimental
       fail-fast: false
 
@@ -51,7 +52,7 @@ jobs:
           coverage: "none"
           ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
           php-version: "${{ matrix.php }}"
-          extensions: "${{ env.extensions }}"
+          extensions: "${{ matrix.extensions || env.extensions }}"
           tools: flex
 
       - name: Configure environment

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -23,15 +23,19 @@
 EOF;
 
 return (new PhpCsFixer\Config())
+    // @see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/pull/7777
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
     ->setRules([
         '@PHP71Migration' => true,
         '@PHPUnit75Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'protected_to_private' => false,
-        'native_constant_invocation' => ['strict' => false],
-        'nullable_type_declaration_for_default_null_value' => true,
         '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,
     ])
     ->setRiskyAllowed(true)
     ->setFinder(
@@ -40,29 +44,27 @@
             ->append([__FILE__])
             ->notPath('#/Fixtures/#')
             ->exclude([
-                // directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
-                // fixture templates
-                'Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom',
-                // resource templates
-                'Symfony/Bundle/FrameworkBundle/Resources/views/Form',
                 // explicit trigger_error tests
                 'Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/',
                 'Symfony/Component/Intl/Resources/data/',
             ])
+            // explicit tests for ommited @param type, against `no_superfluous_phpdoc_tags`
+            ->notPath('Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php')
+            ->notPath('Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php')
             // Support for older PHPunit version
             ->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')
-            // file content autogenerated by `VarExporter::export`
-            ->notPath('Symfony/Component/Serializer/Tests/Fixtures/serializer.class.metadata.php')
-            // test template
-            ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
             // explicit trigger_error tests
             ->notPath('Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php')
             // stop removing spaces on the end of the line in strings
             ->notPath('Symfony/Component/Messenger/Tests/Command/FailedMessagesShowCommandTest.php')
+            // svg
+            ->notPath('Symfony/Component/ErrorHandler/Resources/assets/images/symfony-ghost.svg.php')
+            // HTML templates
+            ->notPath('#Symfony/.*\.html\.php#')
     )
     ->setCacheFile('.php-cs-fixer.cache')
 ;