bug #18065 [Finder] Partially revert #17134 to fix a regression (jakzal)

fabpot · fabpot · commit 15ccef769001 · 2016-03-09T14:08:09.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Finder] Partially revert #17134 to fix a regression | Q | A | ------------- | --- | Branch | 2.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #18013 | License | MIT | Doc PR | - Commits ------- ead1824 [Finder] Partially revert #17134 to fix a regression
diff --git a/src/Symfony/Component/Finder/Iterator/FilterIterator.php b/src/Symfony/Component/Finder/Iterator/FilterIterator.php
@@ -39,11 +39,18 @@ public function rewind()
         while ($iterator instanceof \OuterIterator) {
             $innerIterator = $iterator->getInnerIterator();
 
-            if ($innerIterator instanceof \FilesystemIterator) {
+            if ($innerIterator instanceof RecursiveDirectoryIterator) {
+                // this condition is necessary for iterators to work properly with non-local filesystems like ftp
+                if ($innerIterator->isRewindable()) {
+                    $innerIterator->next();
+                    $innerIterator->rewind();
+                }
+            } elseif ($innerIterator instanceof \FilesystemIterator) {
                 $innerIterator->next();
                 $innerIterator->rewind();
             }
-            $iterator = $iterator->getInnerIterator();
+
+            $iterator = $innerIterator;
         }
 
         parent::rewind();
