Merge branch '6.4' into 7.2

* 6.4:
  [Validator] review cs tran
  Fix building packages in the CI
  implicitly run all Composer commands non-interactively
  [FrameworkBundle] ensureKernelShutdown in tearDownAfterClass

Author: nicolas-grekas

.github/build-packages.php

@@ -1,8 +1,14 @@
 <?php
 
-require __DIR__.'/vendor/autoload.php';
-
-use Composer\MetadataMinifier\MetadataMinifier;
+// Logic inspired from composer/metadata-minifier
+function expandComposerMetadata(array $versions): array
+{
+    array_reduce($versions, function ($carry, $version) use (&$expandedVersions) {
+        return $expandedVersions[] = array_filter(array_merge($carry, $version), fn ($v) => '__unset' !== $v);
+    }, []);
+
+    return $expandedVersions ?? [];
+}
 
 if (3 > $_SERVER['argc']) {
     echo "Usage: branch version dir1 dir2 ... dirN\n";
@@ -56,24 +62,14 @@
 
     $packages[$package->name][$package->version] = $package;
 
-    if (false !== $taggedReleases = @file_get_contents('https://repo.packagist.org/p2/'.$package->name.'.json')) {
-        $versions = MetadataMinifier::expand(json_decode($taggedReleases, true)['packages'][$package->name]);
+    foreach (['.json', '~dev.json'] as $ext) {
+        $versions = @file_get_contents('https://repo.packagist.org/p2/'.$package->name.$ext) ?: '[]';
+        $versions = json_decode($versions, true)['packages'][$package->name] ?? [];
 
-        foreach ($versions as $v => $p) {
-            $packages[$package->name] += [$v => $p];
+        foreach (expandComposerMetadata($versions) as $p) {
+            $packages[$package->name] += [$p['version'] => $p];
         }
     }
-
-    if (false !== $devReleases = @file_get_contents('https://repo.packagist.org/p2/'.$package->name.'~dev.json')) {
-        $versions = MetadataMinifier::expand(json_decode($taggedReleases, true)['packages'][$package->name]);
-    } else {
-        $versions = sprintf('{"packages":{"%s":{"%s":%s}}}', $package->name, $package->version, file_get_contents($dir.'/composer.json'));
-        $versions = json_decode($versions, true)['packages'][$package->name];
-    }
-
-    foreach ($versions as $v => $p) {
-        $packages[$package->name] += [$v => $p];
-    }
 }
 
 file_put_contents('packages.json', json_encode(compact('packages'), $flags));

.github/composer.json

@@ -92,18 +92,12 @@ jobs:
 
           # Create local composer packages for each patched components and reference them in composer.json files when cross-testing components
           if [[ ! "${{ matrix.mode }}" = *-deps ]]; then
-              cd .github
-              composer install
-              php ./build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit
-              cd ..
+              php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit
           else
             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
-            cd .github
-            composer install
-            php ./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)
-            cd ..
+            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

.github/workflows/unit-tests.yml

@@ -138,6 +138,7 @@
     'COMPOSER' => 'composer.json',
     'COMPOSER_VENDOR_DIR' => 'vendor',
     'COMPOSER_BIN_DIR' => 'bin',
+    'COMPOSER_NO_INTERACTION' => '1',
     'SYMFONY_SIMPLE_PHPUNIT_BIN_DIR' => __DIR__,
 ];
 
@@ -234,13 +235,13 @@
     @copy("$PHPUNIT_VERSION_DIR/phpunit.xsd", 'phpunit.xsd');
     chdir("$PHPUNIT_VERSION_DIR");
     if ($SYMFONY_PHPUNIT_REMOVE) {
-        $passthruOrFail("$COMPOSER remove --no-update --no-interaction ".$SYMFONY_PHPUNIT_REMOVE);
+        $passthruOrFail("$COMPOSER remove --no-update ".$SYMFONY_PHPUNIT_REMOVE);
     }
     if ($SYMFONY_PHPUNIT_REQUIRE) {
-        $passthruOrFail("$COMPOSER require --no-update --no-interaction ".$SYMFONY_PHPUNIT_REQUIRE);
+        $passthruOrFail("$COMPOSER require --no-update ".$SYMFONY_PHPUNIT_REQUIRE);
     }
     if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
-        $passthruOrFail("$COMPOSER require --no-update --no-interaction phpunit/phpunit-mock-objects \"~3.1.0\"");
+        $passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
     }
 
     if (preg_match('{\^((\d++\.)\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[2].'99', \PHP_VERSION, '<')) {
@@ -256,13 +257,13 @@
         if (realpath($p) === realpath($path)) {
             $path = $p;
         }
-        $passthruOrFail("$COMPOSER require --no-update --no-interaction symfony/phpunit-bridge \"*@dev\"");
+        $passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
         $passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', \DIRECTORY_SEPARATOR, $path)));
         if ('\\' === \DIRECTORY_SEPARATOR) {
             file_put_contents('composer.json', preg_replace('/^( {8})"phpunit-bridge": \{$/m', "$0\n$1    ".'"options": {"symlink": false},', file_get_contents('composer.json')));
         }
     } else {
-        $passthruOrFail("$COMPOSER require --no-update --no-interaction symfony/phpunit-bridge \"*\"");
+        $passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*\"");
     }
     $prevRoot = getenv('COMPOSER_ROOT_VERSION');
     putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");

src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Test;
 
+use PHPUnit\Framework\Attributes\AfterClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
@@ -112,8 +113,11 @@ protected static function createKernel(array $options = []): KernelInterface
 
     /**
      * Shuts the kernel down if it was used in the test - called by the tearDown method by default.
+     *
+     * @afterClass
      */
-    protected static function ensureKernelShutdown()
+    #[AfterClass]
+    public static function ensureKernelShutdown()
     {
         if (null !== static::$kernel) {
             static::$kernel->boot();

src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php

@@ -468,7 +468,7 @@
             </trans-unit>
             <trans-unit id="121">
                 <source>This value is not a valid Twig template.</source>
-                <target state="needs-review-translation">Tato hodnota není platná šablona Twig.</target>
+                <target>Tato hodnota není platná Twig šablona.</target>
             </trans-unit>
         </body>
     </file>