Merge branch '6.4' into 7.2

* 6.4:
  -
  CS fixes

Author: nicolas-grekas

.git-blame-ignore-revs

@@ -4,5 +4,5 @@ f4118e110a46de3ffb799e7d79bf15128d1646ea
 ae0a783425b80b78376488619bf9106e69193fa4
 9c1e36257c4df0929179462d6b2bdd00453ac8aa
 6ae74d38e3d20d0ffcc66c7c3d28767fab76bdfb
-# Prefix all sprintf() calls
 6ce530c5e90397d88e3a76a56db266c74d651584
+77bd236b8da064c90b19b84a35becfb3e43348db

.github/expected-missing-return-types.diff

@@ -578,7 +578,7 @@ diff --git a/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php
 diff --git a/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php b/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php
 --- a/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php
 +++ b/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php
-@@ -15,5 +15,5 @@ final class DummyWithPhpDoc
+@@ -32,5 +32,5 @@ final class DummyWithPhpDoc
       * @return Dummy
       */
 -    public function getNextDummy(mixed $dummy): mixed
@@ -613,14 +613,14 @@ diff --git a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php b/sr
 diff --git a/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php b/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
 --- a/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
 +++ b/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
-@@ -172,5 +172,5 @@ class ProxyHelperTest extends TestCase
+@@ -173,5 +173,5 @@ class ProxyHelperTest extends TestCase
      {
          yield 'not type hinted __unserialize method' => [new class {
 -            public function __unserialize($array)
 +            public function __unserialize($array): void
              {
              }
-@@ -192,5 +192,5 @@ class ProxyHelperTest extends TestCase
+@@ -193,5 +193,5 @@ class ProxyHelperTest extends TestCase
 
          yield 'type hinted __unserialize method' => [new class {
 -            public function __unserialize(array $array)

src/Symfony/Bridge/Doctrine/Middleware/Debug/Driver.php

@@ -36,7 +36,7 @@ public function connect(array $params): ConnectionInterface
     {
         $connection = parent::connect($params);
 
-        if ('void' !== (string) (new \ReflectionMethod(DriverInterface\Connection::class, 'commit'))->getReturnType()) {
+        if ('void' !== (string) (new \ReflectionMethod(ConnectionInterface::class, 'commit'))->getReturnType()) {
             return new DBAL3\Connection(
                 $connection,
                 $this->debugDataHolder,

src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php

@@ -60,6 +60,7 @@ public function loadTokenBySeries(string $series): PersistentTokenInterface
         $row = $stmt->fetchNumeric() ?: throw new TokenNotFoundException('No token found.');
 
         [$class, $username, $value, $last_used] = $row;
+
         return new PersistentToken($class, $username, $series, $value, new \DateTimeImmutable($last_used));
     }
 

src/Symfony/Bridge/Doctrine/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php

@@ -74,8 +74,7 @@ public function testTransformReadableCollection()
             3 => 'bar',
         ];
 
-        $collection = new class($array) implements ReadableCollection
-        {
+        $collection = new class($array) implements ReadableCollection {
             public function __construct(private readonly array $array)
             {
             }
@@ -172,7 +171,7 @@ public function getIterator(): \Traversable
 
             public function count(): int
             {
-                return count($this->array);
+                return \count($this->array);
             }
         };
 

src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderPostgresTest.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bridge\Doctrine\Tests\Security\RememberMe;
 
 use Doctrine\DBAL\Configuration;

src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php

@@ -84,9 +84,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             ['Architecture', (\PHP_INT_SIZE * 8).' bits'],
             ['Intl locale', class_exists(\Locale::class, false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a'],
             ['Timezone', date_default_timezone_get().' (<comment>'.(new \DateTimeImmutable())->format(\DateTimeInterface::W3C).'</>)'],
-            ['OPcache', \extension_loaded('Zend OPcache') ? (filter_var(\ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
-            ['APCu', \extension_loaded('apcu') ? (filter_var(\ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
-            ['Xdebug', \extension_loaded('xdebug') ? ($xdebugMode && 'off' !== $xdebugMode ? 'Enabled (' . $xdebugMode . ')' : 'Not enabled') : 'Not installed'],
+            ['OPcache', \extension_loaded('Zend OPcache') ? (filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
+            ['APCu', \extension_loaded('apcu') ? (filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
+            ['Xdebug', \extension_loaded('xdebug') ? ($xdebugMode && 'off' !== $xdebugMode ? 'Enabled ('.$xdebugMode.')' : 'Not enabled') : 'Not installed'],
         ];
 
         $io->table([], $rows);

src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php

@@ -64,7 +64,7 @@ public function __construct(
         parent::__construct();
 
         if (!method_exists($writer, 'getFormats')) {
-            throw new \InvalidArgumentException(sprintf('The writer class "%s" does not implement the "getFormats()" method.', $writer::class));
+            throw new \InvalidArgumentException(\sprintf('The writer class "%s" does not implement the "getFormats()" method.', $writer::class));
         }
     }
 

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php

@@ -276,10 +276,10 @@ public function testValidatorEmailValidationMode(string $mode)
 
         $this->createContainerFromClosure(function (ContainerBuilder $container) use ($mode) {
             $container->loadFromExtension('framework', [
-                    'annotations' => false,
-                    'http_method_override' => false,
-                    'handle_all_throwables' => true,
-                    'php_errors' => ['log' => true],
+                'annotations' => false,
+                'http_method_override' => false,
+                'handle_all_throwables' => true,
+                'php_errors' => ['log' => true],
                 'validation' => [
                     'email_validation_mode' => $mode,
                 ],

src/Symfony/Bundle/SecurityBundle/Tests/SecurityTest.php

@@ -154,7 +154,7 @@ public function testLogin()
             ->method('getProvidedServices')
             ->willReturn([
                 'security.authenticator.custom.dev' => $authenticator,
-                'security.authenticator.remember_me.main' => $authenticator
+                'security.authenticator.remember_me.main' => $authenticator,
             ])
         ;
         $firewallAuthenticatorLocator
@@ -287,7 +287,7 @@ public function testLoginFailsWhenTooManyAuthenticatorsFound()
             ->method('getProvidedServices')
             ->willReturn([
                 'security.authenticator.custom.main' => $authenticator,
-                'security.authenticator.other.main' => $authenticator
+                'security.authenticator.other.main' => $authenticator,
             ])
         ;