From b83e972caea3cd22e7aaf65c5cffff1d49b46b69 Mon Sep 17 00:00:00 2001
From: Ignace Nyamagana Butera <nyamsprod@gmail.com>
Date: Wed, 6 Oct 2021 23:09:10 +0200
Subject: [PATCH] improve PHP8.1 compliance

---
 src/MapIterator.php |  3 ++-
 src/Stream.php      | 13 ++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/MapIterator.php b/src/MapIterator.php
index ce042eff..64dc5a35 100644
--- a/src/MapIterator.php
+++ b/src/MapIterator.php
@@ -14,6 +14,7 @@
 namespace League\Csv;
 
 use IteratorIterator;
+use ReturnTypeWillChange;
 use Traversable;
 
 /**
@@ -42,7 +43,7 @@ public function __construct(Traversable $iterator, callable $callable)
     /**
      * @return mixed The value of the current element.
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function current()
     {
         return ($this->callable)(parent::current(), parent::key());
diff --git a/src/Stream.php b/src/Stream.php
index bad6466d..b986025c 100644
--- a/src/Stream.php
+++ b/src/Stream.php
@@ -13,6 +13,7 @@
 
 namespace League\Csv;
 
+use ReturnTypeWillChange;
 use SeekableIterator;
 use SplFileObject;
 use TypeError;
@@ -318,11 +319,8 @@ public function fputcsv(array $fields, string $delimiter = ',', string $enclosur
      * Get line number.
      *
      * @see http://php.net/manual/en/SplFileObject.key.php
-     *
-     * @return int
      */
-    #[\ReturnTypeWillChange]
-    public function key()
+    public function key(): int
     {
         return $this->offset;
     }
@@ -363,11 +361,8 @@ public function rewind(): void
      * Not at EOF.
      *
      * @see http://php.net/manual/en/SplFileObject.valid.php
-     *
-     * @return bool
      */
-    #[\ReturnTypeWillChange]
-    public function valid()
+    public function valid(): bool
     {
         if (0 !== ($this->flags & SplFileObject::READ_AHEAD)) {
             return $this->current() !== false;
@@ -383,7 +378,7 @@ public function valid()
      *
      * @return mixed The value of the current element.
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function current()
     {
         if (false !== $this->value) {