Fix merge

nicolas-grekas · nicolas-grekas · commit 0b5de934200f · 2023-07-06T11:11:34.000+02:00
diff --git a/Iterator/RecursiveDirectoryIterator.php b/Iterator/RecursiveDirectoryIterator.php
@@ -25,7 +25,6 @@ class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
 {
     private bool $ignoreUnreadableDirs;
     private bool $ignoreFirstRewind = true;
-    private ?bool $rewindable = null;
 
     // these 3 properties take part of the performance optimization to avoid redoing the same work in all iterations
     private string $rootPath;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator`
`25`	`25`	`{`
`26`	`26`	`private bool $ignoreUnreadableDirs;`
`27`	`27`	`private bool $ignoreFirstRewind = true;`
`28`		`- private ?bool $rewindable = null;`
`29`	`28`
`30`	`29`	`// these 3 properties take part of the performance optimization to avoid redoing the same work in all iterations`
`31`	`30`	`private string $rootPath;`