From e22369596f76368bb7b84d3e0be035bffe055963 Mon Sep 17 00:00:00 2001
From: Fabian Wiget <fabian.wiget@abf.ch>
Date: Thu, 6 Jan 2022 12:12:18 +0100
Subject: [PATCH 1/3] Fix incompatible return types in ODS\SheetIterator

---
 src/Spout/Reader/ODS/SheetIterator.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Spout/Reader/ODS/SheetIterator.php b/src/Spout/Reader/ODS/SheetIterator.php
index b2cb8b8..10a0c93 100644
--- a/src/Spout/Reader/ODS/SheetIterator.php
+++ b/src/Spout/Reader/ODS/SheetIterator.php
@@ -79,7 +79,7 @@ class SheetIterator implements IteratorInterface
      * @throws \Box\Spout\Common\Exception\IOException If unable to open the XML file containing sheets' data
      * @return void
      */
-    public function rewind()
+    public function rewind() : void
     {
         $this->xmlReader->close();
 
@@ -103,7 +103,7 @@ class SheetIterator implements IteratorInterface
      *
      * @return array Associative array [STYLE_NAME] => [IS_SHEET_VISIBLE]
      */
-    private function readSheetsVisibility()
+    private function readSheetsVisibility() : array
     {
         $sheetsVisibility = [];
 
@@ -132,7 +132,7 @@ class SheetIterator implements IteratorInterface
      *
      * @return bool
      */
-    public function valid()
+    public function valid() : bool
     {
         return $this->hasFoundSheet;
     }
@@ -143,7 +143,7 @@ class SheetIterator implements IteratorInterface
      *
      * @return void
      */
-    public function next()
+    public function next() : void
     {
         $this->hasFoundSheet = $this->xmlReader->readUntilNodeFound(self::XML_NODE_TABLE);
 
@@ -156,9 +156,9 @@ class SheetIterator implements IteratorInterface
      * Return the current element
      * @see http://php.net/manual/en/iterator.current.php
      *
-     * @return \Box\Spout\Reader\ODS\Sheet
+     * @return Sheet
      */
-    public function current()
+    public function current() : Sheet
     {
         $escapedSheetName = $this->xmlReader->getAttribute(self::XML_ATTRIBUTE_TABLE_NAME);
         $sheetName = $this->escaper->unescape($escapedSheetName);
@@ -186,7 +186,7 @@ class SheetIterator implements IteratorInterface
      * @param string|null $activeSheetName Name of the sheet that was defined as active or NULL if none defined
      * @return bool Whether the current sheet was defined as the active one
      */
-    private function isSheetActive($sheetName, $sheetIndex, $activeSheetName)
+    private function isSheetActive($sheetName, $sheetIndex, $activeSheetName) : bool
     {
         // The given sheet is active if its name matches the defined active sheet's name
         // or if no information about the active sheet was found, it defaults to the first sheet.
@@ -202,7 +202,7 @@ class SheetIterator implements IteratorInterface
      * @param string $sheetStyleName Name of the sheet style
      * @return bool Whether the current sheet is visible
      */
-    private function isSheetVisible($sheetStyleName)
+    private function isSheetVisible($sheetStyleName) : bool
     {
         return isset($this->sheetsVisibility[$sheetStyleName]) ?
             $this->sheetsVisibility[$sheetStyleName] :
@@ -215,7 +215,7 @@ class SheetIterator implements IteratorInterface
      *
      * @return int
      */
-    public function key()
+    public function key() : int
     {
         return $this->currentSheetIndex + 1;
     }
@@ -225,7 +225,7 @@ class SheetIterator implements IteratorInterface
      *
      * @return void
      */
-    public function end()
+    public function end() : void
     {
         $this->xmlReader->close();
     }

From 09b42171e5752acefe07d48319b152ceff5c6ec6 Mon Sep 17 00:00:00 2001
From: Fabian Wiget <fabian.wiget@abf.ch>
Date: Thu, 6 Jan 2022 12:14:57 +0100
Subject: [PATCH 2/3] Fix incompatible return types in XLSX\SheetIterator

---
 src/Spout/Reader/XLSX/SheetIterator.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Spout/Reader/XLSX/SheetIterator.php b/src/Spout/Reader/XLSX/SheetIterator.php
index 81f481c..8a50dcf 100644
--- a/src/Spout/Reader/XLSX/SheetIterator.php
+++ b/src/Spout/Reader/XLSX/SheetIterator.php
@@ -38,7 +38,7 @@ class SheetIterator implements IteratorInterface
      *
      * @return void
      */
-    public function rewind()
+    public function rewind() : void
     {
         $this->currentSheetIndex = 0;
     }
@@ -49,7 +49,7 @@ class SheetIterator implements IteratorInterface
      *
      * @return bool
      */
-    public function valid()
+    public function valid() : bool
     {
         return ($this->currentSheetIndex < \count($this->sheets));
     }
@@ -60,7 +60,7 @@ class SheetIterator implements IteratorInterface
      *
      * @return void
      */
-    public function next()
+    public function next() : void
     {
         // Using isset here because it is way faster than array_key_exists...
         if (isset($this->sheets[$this->currentSheetIndex])) {
@@ -75,9 +75,9 @@ class SheetIterator implements IteratorInterface
      * Return the current element
      * @see http://php.net/manual/en/iterator.current.php
      *
-     * @return \Box\Spout\Reader\XLSX\Sheet
+     * @return Sheet
      */
-    public function current()
+    public function current() : Sheet
     {
         return $this->sheets[$this->currentSheetIndex];
     }
@@ -88,7 +88,7 @@ class SheetIterator implements IteratorInterface
      *
      * @return int
      */
-    public function key()
+    public function key() : int
     {
         return $this->currentSheetIndex + 1;
     }
@@ -98,7 +98,7 @@ class SheetIterator implements IteratorInterface
      *
      * @return void
      */
-    public function end()
+    public function end() : void
     {
         // make sure we are not leaking memory in case the iteration stopped before the end
         foreach ($this->sheets as $sheet) {

From 08a76b84a3b0e2565ab7d1e1c961cfe285df1d56 Mon Sep 17 00:00:00 2001
From: Fabian Wiget <fabian.wiget@abf.ch>
Date: Thu, 6 Jan 2022 12:17:53 +0100
Subject: [PATCH 3/3] Fix incompatible return types in Wrapper\XMLReader

---
 src/Spout/Reader/Wrapper/XMLReader.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Spout/Reader/Wrapper/XMLReader.php b/src/Spout/Reader/Wrapper/XMLReader.php
index 5c2d2e8..ea123d6 100644
--- a/src/Spout/Reader/Wrapper/XMLReader.php
+++ b/src/Spout/Reader/Wrapper/XMLReader.php
@@ -83,7 +83,7 @@ class XMLReader extends \XMLReader
      * @throws \Box\Spout\Reader\Exception\XMLProcessingException If an error/warning occurred
      * @return bool TRUE on success or FALSE on failure
      */
-    public function read()
+    public function read() : bool
     {
         $this->useXMLInternalErrors();
 
@@ -119,7 +119,7 @@ class XMLReader extends \XMLReader
      * @throws \Box\Spout\Reader\Exception\XMLProcessingException If an error/warning occurred
      * @return bool TRUE on success or FALSE on failure
      */
-    public function next($localName = null)
+    public function next($localName = null) : bool
     {
         $this->useXMLInternalErrors();