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

alebo · alebo · commit de24c817eb4e · 2015-12-25T01:44:23.000+03:00
5.5.23/5.6.7 bug.
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/bug.php?id=68557
  *
  * @author Alex Bogomazov
  */
@@ -28,22 +29,24 @@ abstract class FilterIterator extends \FilterIterator
      */
     public function rewind()
     {
-        $iterator = $this;
-        while ($iterator instanceof \OuterIterator) {
-            $innerIterator = $iterator->getInnerIterator();
+        if (version_compare(PHP_VERSION, '5.5.23', '<')
+            or (version_compare(PHP_VERSION, '5.6.0', '>=') and version_compare(PHP_VERSION, '5.6.7', '<'))) {
+            $iterator = $this;
+            while ($iterator instanceof \OuterIterator) {
+                $innerIterator = $iterator->getInnerIterator();
 
-            if ($innerIterator instanceof RecursiveDirectoryIterator) {
-                if ($innerIterator->isRewindable()) {
-                    $innerIterator->next();
-                    $innerIterator->rewind();
+                if ($innerIterator instanceof RecursiveDirectoryIterator) {
+                    if ($innerIterator->isRewindable()) {
+                        $innerIterator->next();
+                        $innerIterator->rewind();
+                    }
+                } elseif ($iterator->getInnerIterator() instanceof \FilesystemIterator) {
+                    $iterator->getInnerIterator()->next();
+                    $iterator->getInnerIterator()->rewind();
                 }
-            } elseif ($iterator->getInnerIterator() instanceof \FilesystemIterator) {
-                $iterator->getInnerIterator()->next();
-                $iterator->getInnerIterator()->rewind();
+                $iterator = $iterator->getInnerIterator();
             }
-            $iterator = $iterator->getInnerIterator();
         }
-
         parent::rewind();
     }
 }
diff --git a/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php b/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
@@ -118,8 +118,11 @@ public function rewind()
             return;
         }
 
-        // @see https://bugs.php.net/bug.php?id=49104
-        parent::next();
+        // @see https://bugs.php.net/bug.php?id=68557
+        if (version_compare(PHP_VERSION, '5.5.23', '<')
+            or (version_compare(PHP_VERSION, '5.6.0', '>=') and version_compare(PHP_VERSION, '5.6.7', '<'))) {
+            parent::next();
+        }
 
         parent::rewind();
     }
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/bug.php?id=68557
         $this->assertEquals(1, $c);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,11 @@ 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/bug.php?id=68557`
	`122`	`+ if (version_compare(PHP_VERSION, '5.5.23', '<')`
	`123`	`+ or (version_compare(PHP_VERSION, '5.6.0', '>=') and version_compare(PHP_VERSION, '5.6.7', '<'))) {`
	`124`	`+ parent::next();`
	`125`	`+ }`
`123`	`126`
`124`	`127`	`parent::rewind();`
`125`	`128`	`}`
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/bug.php?id=68557`
`48`	`49`	`$this->assertEquals(1, $c);`
`49`	`50`	`}`
`50`	`51`	`}`