[Finder] Check PHP version before applying a workaround for a PHP bug

alebo · fabpot · commit cba206ab18b8 · 2016-01-25T08:54:54.000+01:00
diff --git a/src/Symfony/Component/Finder/Iterator/FilterIterator.php b/src/Symfony/Component/Finder/Iterator/FilterIterator.php
@@ -12,9 +12,10 @@
 namespace Symfony\Component\Finder\Iterator;
 
 /**
- * This iterator just overrides the rewind method in order to correct a PHP bug.
+ * This iterator just overrides the rewind method in order to correct a PHP bug,
+ * which existed before version 5.5.23/5.6.7.
  *
- * @see https://bugs.php.net/bug.php?id=49104
+ * @see https://bugs.php.net/68557
  *
  * @author Alex Bogomazov
  */
@@ -28,18 +29,19 @@ abstract class FilterIterator extends \FilterIterator
      */
     public function rewind()
     {
+        if (PHP_VERSION_ID > 50607 || (PHP_VERSION_ID > 50523 && PHP_VERSION_ID < 50600)) {
+            parent::rewind();
+
+            return;
+        }
+
         $iterator = $this;
         while ($iterator instanceof \OuterIterator) {
             $innerIterator = $iterator->getInnerIterator();
 
-            if ($innerIterator instanceof RecursiveDirectoryIterator) {
-                if ($innerIterator->isRewindable()) {
-                    $innerIterator->next();
-                    $innerIterator->rewind();
-                }
-            } elseif ($iterator->getInnerIterator() instanceof \FilesystemIterator) {
-                $iterator->getInnerIterator()->next();
-                $iterator->getInnerIterator()->rewind();
+            if ($innerIterator instanceof \FilesystemIterator) {
+                $innerIterator->next();
+                $innerIterator->rewind();
             }
             $iterator = $iterator->getInnerIterator();
         }
diff --git a/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php b/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
@@ -118,8 +118,10 @@ public function rewind()
             return;
         }
 
-        // @see https://bugs.php.net/bug.php?id=49104
-        parent::next();
+        // @see https://bugs.php.net/68557
+        if (PHP_VERSION_ID < 50523 || PHP_VERSION_ID >= 50600 && PHP_VERSION_ID < 50607) {
+            parent::next();
+        }
 
         parent::rewind();
     }
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -458,7 +458,7 @@ public function testNotContainsOnDirectory()
      * Searching in multiple locations involves AppendIterator which does an unnecessary rewind which leaves FilterIterator
      * with inner FilesystemIterator in an invalid state.
      *
-     * @see https://bugs.php.net/bug.php?id=49104
+     * @see https://bugs.php.net/68557
      */
     public function testMultipleLocations()
     {
@@ -468,8 +468,12 @@ public function testMultipleLocations()
         );
 
         // it is expected that there are test.py test.php in the tmpDir
-        $finder = $this->buildFinder();
-        $finder->in($locations)->depth('< 1')->name('test.php');
+        $finder = new Finder();
+        $finder->in($locations)
+            // the default flag IGNORE_DOT_FILES fixes the problem indirectly
+            // so we set it to false for better isolation
+            ->ignoreDotFiles(false)
+            ->depth('< 1')->name('test.php');
 
         $this->assertCount(1, $finder);
     }
@@ -479,7 +483,7 @@ public function testMultipleLocations()
      * AppendIterator which does an unnecessary rewind which leaves
      * FilterIterator with inner FilesystemIterator in an invalid state.
      *
-     * @see https://bugs.php.net/bug.php?id=49104
+     * @see https://bugs.php.net/68557
      */
     public function testMultipleLocationsWithSubDirectories()
     {
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/FilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/FilterIteratorTest.php
@@ -43,8 +43,9 @@ public function testFilterFilesystemIterators()
             ++$c;
         }
 
-        // This would fail with \FilterIterator but works with Symfony\Component\Finder\Iterator\FilterIterator
-        // see https://bugs.php.net/bug.php?id=49104
+        // This would fail in php older than 5.5.23/5.6.7 with \FilterIterator
+        // but works with Symfony\Component\Finder\Iterator\FilterIterator
+        // see https://bugs.php.net/68557
         $this->assertEquals(1, $c);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,10 @@ public function rewind()`
`118`	`118`	`return;`
`119`	`119`	`}`
`120`	`120`
`121`		`- // @see https://bugs.php.net/bug.php?id=49104`
`122`		`- parent::next();`
	`121`	`+ // @see https://bugs.php.net/68557`
	`122`	`+ if (PHP_VERSION_ID < 50523 \|\| PHP_VERSION_ID >= 50600 && PHP_VERSION_ID < 50607) {`
	`123`	`+ parent::next();`
	`124`	`+ }`
`123`	`125`
`124`	`126`	`parent::rewind();`
`125`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ public function testNotContainsOnDirectory()`
`458`	`458`	`* Searching in multiple locations involves AppendIterator which does an unnecessary rewind which leaves FilterIterator`
`459`	`459`	`* with inner FilesystemIterator in an invalid state.`
`460`	`460`	`*`
`461`		`- * @see https://bugs.php.net/bug.php?id=49104`
	`461`	`+ * @see https://bugs.php.net/68557`
`462`	`462`	`*/`
`463`	`463`	`public function testMultipleLocations()`
`464`	`464`	`{`
`@@ -468,8 +468,12 @@ public function testMultipleLocations()`
`468`	`468`	`);`
`469`	`469`
`470`	`470`	`// it is expected that there are test.py test.php in the tmpDir`
`471`		`- $finder = $this->buildFinder();`
`472`		`- $finder->in($locations)->depth('< 1')->name('test.php');`
	`471`	`+ $finder = new Finder();`
	`472`	`+ $finder->in($locations)`
	`473`	`+ // the default flag IGNORE_DOT_FILES fixes the problem indirectly`
	`474`	`+ // so we set it to false for better isolation`
	`475`	`+ ->ignoreDotFiles(false)`
	`476`	`+ ->depth('< 1')->name('test.php');`
`473`	`477`
`474`	`478`	`$this->assertCount(1, $finder);`
`475`	`479`	`}`
`@@ -479,7 +483,7 @@ public function testMultipleLocations()`
`479`	`483`	`* AppendIterator which does an unnecessary rewind which leaves`
`480`	`484`	`* FilterIterator with inner FilesystemIterator in an invalid state.`
`481`	`485`	`*`
`482`		`- * @see https://bugs.php.net/bug.php?id=49104`
	`486`	`+ * @see https://bugs.php.net/68557`
`483`	`487`	`*/`
`484`	`488`	`public function testMultipleLocationsWithSubDirectories()`
`485`	`489`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,9 @@ public function testFilterFilesystemIterators()`
`43`	`43`	`++$c;`
`44`	`44`	`}`
`45`	`45`
`46`		`- // This would fail with \FilterIterator but works with Symfony\Component\Finder\Iterator\FilterIterator`
`47`		`- // see https://bugs.php.net/bug.php?id=49104`
	`46`	`+ // This would fail in php older than 5.5.23/5.6.7 with \FilterIterator`
	`47`	`+ // but works with Symfony\Component\Finder\Iterator\FilterIterator`
	`48`	`+ // see https://bugs.php.net/68557`
`48`	`49`	`$this->assertEquals(1, $c);`
`49`	`50`	`}`
`50`	`51`	`}`