[Finder] Fix iterator return types

Signed-off-by: Alexander M. Turek <me@derrabus.de>
symfony · Jul 15, 2021 · cbf2e51 · cbf2e51
1 parent 87ece50
commit cbf2e51
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/Iterator/RecursiveDirectoryIterator.php b/Iterator/RecursiveDirectoryIterator.php
@@ -58,6 +58,7 @@ public function __construct(string $path, int $flags, bool $ignoreUnreadableDirs
      *
      * @return SplFileInfo File information
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         // the logic here avoids redoing the same work in all iterations
@@ -82,6 +83,7 @@ public function current()
      *
      * @throws AccessDeniedException
      */
+    #[\ReturnTypeWillChange]
     public function getChildren()
     {
         try {
@@ -109,7 +111,10 @@ public function getChildren()
 
     /**
      * Do nothing for non rewindable stream.
+     *
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         if (false === $this->isRewindable()) {

diff --git a/Tests/Iterator/FileTypeFilterIteratorTest.php b/Tests/Iterator/FileTypeFilterIteratorTest.php
@@ -65,17 +65,17 @@ public function getAcceptData()
 
 class InnerTypeIterator extends \ArrayIterator
 {
-    public function current()
+    public function current(): \SplFileInfo
     {
         return new \SplFileInfo(parent::current());
     }
 
-    public function isFile()
+    public function isFile(): bool
     {
         return $this->current()->isFile();
     }
 
-    public function isDir()
+    public function isDir(): bool
     {
         return $this->current()->isDir();
     }

diff --git a/Tests/Iterator/FilenameFilterIteratorTest.php b/Tests/Iterator/FilenameFilterIteratorTest.php
@@ -42,7 +42,7 @@ public function getAcceptData()
 
 class InnerNameIterator extends \ArrayIterator
 {
-    public function current()
+    public function current(): \SplFileInfo
     {
         return new \SplFileInfo(parent::current());
     }

diff --git a/Tests/Iterator/MockSplFileInfo.php b/Tests/Iterator/MockSplFileInfo.php
@@ -48,7 +48,7 @@ public function __construct($param)
         }
     }
 
-    public function isFile()
+    public function isFile(): bool
     {
         if (null === $this->type) {
             return false !== strpos($this->getFilename(), 'file');
@@ -57,7 +57,7 @@ public function isFile()
         return self::TYPE_FILE === $this->type;
     }
 
-    public function isDir()
+    public function isDir(): bool
     {
         if (null === $this->type) {
             return false !== strpos($this->getFilename(), 'directory');
@@ -66,13 +66,9 @@ public function isDir()
         return self::TYPE_DIRECTORY === $this->type;
     }
 
-    public function isReadable()
+    public function isReadable(): bool
     {
-        if (null === $this->mode) {
-            return preg_match('/r\+/', $this->getFilename());
-        }
-
-        return preg_match('/r\+/', $this->mode);
+        return (bool) preg_match('/r\+/', $this->mode ?? $this->getFilename());
     }
 
     public function getContents()

diff --git a/Tests/Iterator/SizeRangeFilterIteratorTest.php b/Tests/Iterator/SizeRangeFilterIteratorTest.php
@@ -48,22 +48,22 @@ public function getAcceptData()
 
 class InnerSizeIterator extends \ArrayIterator
 {
-    public function current()
+    public function current(): \SplFileInfo
     {
         return new \SplFileInfo(parent::current());
     }
 
-    public function getFilename()
+    public function getFilename(): string
     {
         return parent::current();
     }
 
-    public function isFile()
+    public function isFile(): bool
     {
         return $this->current()->isFile();
     }
 
-    public function getSize()
+    public function getSize(): int
     {
         return $this->current()->getSize();
     }