diff --git a/src/Symfony/Component/Finder/Iterator/FilterIterator.php b/src/Symfony/Component/Finder/Iterator/FilterIterator.php
index f4da44c4cdd59..24adeb68f9040 100644
--- 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
index 3f65d69269756..402033a5c2816 100644
--- 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
index cee8bd7530767..624d4547e519e 100644
--- 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
index 41e05a0a7b390..4f12d142e7f27 100644
--- 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);
}
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy