Merge branch 'php81/prevent-returntype-will-change-notices' of https:…

…//github.com/jrfnl/PHP_CodeSniffer
squizlabs · Aug 26, 2021 · 915a694 · 915a694
2 parents 5be0b00 + be8fe72
commit 915a694
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/Files/FileList.php b/src/Files/FileList.php
@@ -16,6 +16,7 @@
 use PHP_CodeSniffer\Ruleset;
 use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Exceptions\DeepExitException;
+use ReturnTypeWillChange;
 
 class FileList implements \Iterator, \Countable
 {
@@ -169,6 +170,7 @@ private function getFilterClass()
      *
      * @return void
      */
+    #[ReturnTypeWillChange]
     public function rewind()
     {
         reset($this->files);
@@ -181,6 +183,7 @@ public function rewind()
      *
      * @return \PHP_CodeSniffer\Files\File
      */
+    #[ReturnTypeWillChange]
     public function current()
     {
         $path = key($this->files);
@@ -198,6 +201,7 @@ public function current()
      *
      * @return void
      */
+    #[ReturnTypeWillChange]
     public function key()
     {
         return key($this->files);
@@ -210,6 +214,7 @@ public function key()
      *
      * @return void
      */
+    #[ReturnTypeWillChange]
     public function next()
     {
         next($this->files);
@@ -222,6 +227,7 @@ public function next()
      *
      * @return boolean
      */
+    #[ReturnTypeWillChange]
     public function valid()
     {
         if (current($this->files) === false) {
@@ -238,6 +244,7 @@ public function valid()
      *
      * @return integer
      */
+    #[ReturnTypeWillChange]
     public function count()
     {
         return $this->numFiles;

diff --git a/src/Filters/Filter.php b/src/Filters/Filter.php
@@ -12,6 +12,7 @@
 use PHP_CodeSniffer\Util;
 use PHP_CodeSniffer\Ruleset;
 use PHP_CodeSniffer\Config;
+use ReturnTypeWillChange;
 
 class Filter extends \RecursiveFilterIterator
 {
@@ -89,6 +90,7 @@ public function __construct($iterator, $basedir, Config $config, Ruleset $rulese
      *
      * @return bool
      */
+    #[ReturnTypeWillChange]
     public function accept()
     {
         $filePath = $this->current();
@@ -130,6 +132,7 @@ public function accept()
      *
      * @return \RecursiveIterator
      */
+    #[ReturnTypeWillChange]
     public function getChildren()
     {
         $filterClass = get_called_class();