Merge branch '5.4' into 6.2

* 5.4:
  [Finder] Fix initial directory is opened twice
  typo fix
  Fix test
  Fix some return types in tests

Author: nicolas-grekas

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

@@ -6,24 +6,6 @@ head=$(sed '/^diff /Q' .github/expected-missing-return-types.diff)
 (echo "$head" && echo && git diff -U2 src/) > .github/expected-missing-return-types.diff
 git checkout composer.json src/
 
-diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
-index f52a1ce1e9..1fb72535e1 100644
---- a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
-+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
-@@ -285,5 +285,5 @@ class QueryMock extends AbstractQuery
-      * @return array|string
-      */
--    public function getSQL()
-+    public function getSQL(): array|string
-     {
-     }
-@@ -292,5 +292,5 @@ class QueryMock extends AbstractQuery
-      * @return Result|int
-      */
--    protected function _doExecute()
-+    protected function _doExecute(): Result|int
-     {
-     }
 diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
 index bb5560a7b5..be86cbf98e 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -35,17 +17,6 @@ index bb5560a7b5..be86cbf98e 100644
 +    protected static function getContainer(): Container
      {
          if (!static::$booted) {
-diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
-index 67355d9030..b2006ecd2f 100644
---- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
-+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
-@@ -449,5 +449,5 @@ class ProfilerControllerTest extends WebTestCase
-      * @return MockObject&DumpDataCollector
-      */
--    private function createDumpDataCollector(): MockObject
-+    private function createDumpDataCollector(): MockObject&DumpDataCollector
-     {
-         $dumpDataCollector = $this->createMock(DumpDataCollector::class);
 diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 index b27ca37529..5b80175850 100644
 --- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
@@ -352,7 +323,7 @@ index 895c155e07..3955c902d4 100644
      {
          try {
 diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
-index f5d33682ff..e644489097 100644
+index b9a784ec21..a7f252787d 100644
 --- a/src/Symfony/Component/DependencyInjection/Container.php
 +++ b/src/Symfony/Component/DependencyInjection/Container.php
 @@ -110,5 +110,5 @@ class Container implements ContainerInterface, ResetInterface

src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php

@@ -281,17 +281,11 @@ public function __construct()
     {
     }
 
-    /**
-     * @return array|string
-     */
-    public function getSQL()
+    public function getSQL(): array|string
     {
     }
 
-    /**
-     * @return Result|int
-     */
-    protected function _doExecute()
+    protected function _doExecute(): Result|int
     {
     }
 }

src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php

@@ -445,10 +445,7 @@ public function testDumpPanel()
         $this->assertDefaultPanel($dumpDataCollector->getName(), $profile);
     }
 
-    /**
-     * @return MockObject&DumpDataCollector
-     */
-    private function createDumpDataCollector(): MockObject
+    private function createDumpDataCollector(): MockObject&DumpDataCollector
     {
         $dumpDataCollector = $this->createMock(DumpDataCollector::class);
         $dumpDataCollector

src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php

@@ -88,7 +88,7 @@ public function process(ContainerBuilder $container)
 
                     if (null !== ($class = $container->getDefinition($id)->getClass()) && ($r = $container->getReflectionClass($class, false)) && !$r->hasMethod($event['method'])) {
                         if (!$r->hasMethod('__invoke')) {
-                            throw new InvalidArgumentException(sprintf('None of the "%s" or "__invoke" methods exist for the service "foo". Please define the "method" attribute on "kernel.event_listener" tags.', $event['method'], $id));
+                            throw new InvalidArgumentException(sprintf('None of the "%s" or "__invoke" methods exist for the service "%s". Please define the "method" attribute on "kernel.event_listener" tags.', $event['method'], $id));
                         }
 
                         $event['method'] = '__invoke';

src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php

@@ -24,6 +24,7 @@
 class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
 {
     private bool $ignoreUnreadableDirs;
+    private bool $ignoreFirstRewind = true;
     private ?bool $rewindable = null;
 
     // these 3 properties take part of the performance optimization to avoid redoing the same work in all iterations
@@ -102,7 +103,6 @@ public function getChildren(): \RecursiveDirectoryIterator
                 $children->ignoreUnreadableDirs = $this->ignoreUnreadableDirs;
 
                 // performance optimization to avoid redoing the same work in all children
-                $children->rewindable = &$this->rewindable;
                 $children->rootPath = $this->rootPath;
             }
 
@@ -112,36 +112,23 @@ public function getChildren(): \RecursiveDirectoryIterator
         }
     }
 
-    /**
-     * Do nothing for non rewindable stream.
-     */
-    public function rewind(): void
+    public function next(): void
     {
-        if (false === $this->isRewindable()) {
-            return;
-        }
+        $this->ignoreFirstRewind = false;
 
-        parent::rewind();
+        parent::next();
     }
 
-    /**
-     * Checks if the stream is rewindable.
-     */
-    public function isRewindable(): bool
+    public function rewind(): void
     {
-        if (null !== $this->rewindable) {
-            return $this->rewindable;
-        }
-
-        if (false !== $stream = @opendir($this->getPath())) {
-            $infos = stream_get_meta_data($stream);
-            closedir($stream);
+        // some streams like FTP are not rewindable, ignore the first rewind after creation,
+        // as newly created DirectoryIterator does not need to be rewound
+        if ($this->ignoreFirstRewind) {
+            $this->ignoreFirstRewind = false;
 
-            if ($infos['seekable']) {
-                return $this->rewindable = true;
-            }
+            return;
         }
 
-        return $this->rewindable = false;
+        parent::rewind();
     }
 }

src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php

@@ -15,16 +15,19 @@
 
 class RecursiveDirectoryIteratorTest extends IteratorTestCase
 {
+    protected function setUp(): void
+    {
+        if (!\in_array('ftp', stream_get_wrappers(), true) || !\ini_get('allow_url_fopen')) {
+            $this->markTestSkipped('Unsupported stream "ftp".');
+        }
+    }
+
     /**
      * @group network
      */
     public function testRewindOnFtp()
     {
-        try {
-            $i = new RecursiveDirectoryIterator('ftp://speedtest:[email protected]/', \RecursiveDirectoryIterator::SKIP_DOTS);
-        } catch (\UnexpectedValueException $e) {
-            $this->markTestSkipped('Unsupported stream "ftp".');
-        }
+        $i = new RecursiveDirectoryIterator('ftp://speedtest:[email protected]/', \RecursiveDirectoryIterator::SKIP_DOTS);
 
         $i->rewind();
 
@@ -36,11 +39,7 @@ public function testRewindOnFtp()
      */
     public function testSeekOnFtp()
     {
-        try {
-            $i = new RecursiveDirectoryIterator('ftp://speedtest:[email protected]/', \RecursiveDirectoryIterator::SKIP_DOTS);
-        } catch (\UnexpectedValueException $e) {
-            $this->markTestSkipped('Unsupported stream "ftp".');
-        }
+        $i = new RecursiveDirectoryIterator('ftp://speedtest:[email protected]/', \RecursiveDirectoryIterator::SKIP_DOTS);
 
         $contains = [
             'ftp://speedtest:[email protected]'.\DIRECTORY_SEPARATOR.'test100Mb.db',

src/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php

@@ -74,8 +74,10 @@ public function cloneVar($var): Data
 
 class MockDumper implements DataDumperInterface
 {
-    public function dump(Data $data)
+    public function dump(Data $data): ?string
     {
         echo '+'.$data->getValue();
+
+        return null;
     }
 }

src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php

@@ -174,7 +174,7 @@ public function eraseCredentials()
     {
     }
 
-    public function getUsername()
+    public function getUsername(): string
     {
     }