broadcoder
diff --git a/‎src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Finder/Tests/FinderTest.php
Lines changed: 26 additions & 0 deletions b/‎src/Symfony/Component/Finder/Tests/FinderTest.php
Lines changed: 26 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Finder/Tests/Fixtures/one/a b/‎src/Symfony/Component/Finder/Tests/Fixtures/one/a
diff --git a/‎src/Symfony/Component/Finder/Tests/Fixtures/one/b/c.neon b/‎src/Symfony/Component/Finder/Tests/Fixtures/one/b/c.neon
diff --git a/‎src/Symfony/Component/Finder/Tests/Fixtures/one/b/d.neon b/‎src/Symfony/Component/Finder/Tests/Fixtures/one/b/d.neon
diff --git a/‎src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php
Lines changed: 37 additions & 0 deletions b/‎src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php
Lines changed: 37 additions & 0 deletions
@@ -38,4 +38,12 @@ public function current()
     {
         return new SplFileInfo(parent::current()->getPathname(), $this->getSubPath(), $this->getSubPathname());
     }
+
+    public function rewind()
+    {
+        // @see https://bugs.php.net/bug.php?id=49104
+        parent::next();
+
+        parent::rewind();
+    }
 }
@@ -459,4 +459,30 @@ public function testMultipleLocations()
 
         $this->assertEquals(1, count($finder));
     }
+
+    /**
+     * Searching in multiple locations with sub directories involves
+     * AppendIterator which does an unnecessary rewind which leaves
+     * FilterIterator with inner FilesystemIterator in an ivalid state.
+     *
+     * @see https://bugs.php.net/bug.php?id=49104
+     */
+    public function testMultipleLocationsWithSubDirectories()
+    {
+        $locations = array(
+            __DIR__.'/Fixtures/one',
+            self::$files[8],
+        );
+
+        $finder = new Finder();
+        $finder->in($locations)->depth('< 10')->name('*.neon');
+
+        $expected = array(
+            __DIR__.'/Fixtures/one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'c.neon',
+            __DIR__.'/Fixtures/one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'d.neon',
+        );
+
+        $this->assertIterator($expected, $finder);
+        $this->assertIteratorInForeach($expected, $finder);
+    }
 }
@@ -29,4 +29,41 @@ protected function assertOrderedIterator($expected, \Traversable $iterator)
 
         $this->assertEquals($expected, array_values($values));
     }
+
+    /**
+     * Same as IteratorTestCase::assertIterator with foreach usage
+     *
+     * @param array $expected
+     * @param \Traversable $iterator
+     */
+    protected function assertIteratorInForeach($expected, \Traversable $iterator)
+    {
+        $values = array();
+        foreach ($iterator as $file) {
+            $this->assertInstanceOf('Symfony\\Component\\Finder\\SplFileInfo', $file);
+            $values[] = $file->getPathname();
+        }
+
+        sort($values);
+        sort($expected);
+
+        $this->assertEquals($expected, array_values($values));
+    }
+
+    /**
+     * Same as IteratorTestCase::assertOrderedIterator with foreach usage
+     *
+     * @param array $expected
+     * @param \Traversable $iterator
+     */
+    protected function assertOrderedIteratorInForeach($expected, \Traversable $iterator)
+    {
+        $values = array();
+        foreach ($iterator as $file) {
+            $this->assertInstanceOf('Symfony\\Component\\Finder\\SplFileInfo', $file);
+            $values[] = $file->getPathname();
+        }
+
+        $this->assertEquals($expected, array_values($values));
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,12 @@ public function current()`
`38`	`38`	`{`
`39`	`39`	`return new SplFileInfo(parent::current()->getPathname(), $this->getSubPath(), $this->getSubPathname());`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+ public function rewind()`
	`43`	`+ {`
	`44`	`+ // @see https://bugs.php.net/bug.php?id=49104`
	`45`	`+ parent::next();`
	`46`	`+`
	`47`	`+ parent::rewind();`
	`48`	`+ }`
`41`	`49`	`}`