[Finder] Partially revert #17134 to fix a regression

jakzal · jakzal · commit 89ed2e4764f0 · 2016-03-08T15:56:51.000Z
diff --git a/src/Symfony/Component/Finder/Iterator/FilterIterator.php b/src/Symfony/Component/Finder/Iterator/FilterIterator.php
@@ -39,11 +39,17 @@ public function rewind()
         while ($iterator instanceof \OuterIterator) {
             $innerIterator = $iterator->getInnerIterator();
 
-            if ($innerIterator instanceof \FilesystemIterator) {
+            if ($innerIterator instanceof RecursiveDirectoryIterator) {
+                if ($innerIterator->isRewindable()) {
+                    $innerIterator->next();
+                    $innerIterator->rewind();
+                }
+            } elseif ($innerIterator instanceof \FilesystemIterator) {
                 $innerIterator->next();
                 $innerIterator->rewind();
             }
-            $iterator = $iterator->getInnerIterator();
+
+            $iterator = $innerIterator;
         }
 
         parent::rewind();
