From 000e6088c98675882c595e3f8023a49410b34814 Mon Sep 17 00:00:00 2001
From: Patrick Brouwers <patrickbrouwersfilm@gmail.com>
Date: Wed, 3 Mar 2021 21:34:45 +0100
Subject: [PATCH] Reverted Scrutinzer fix in Xslx Reader listWorksheetInfo
 (#1895)

---
 CHANGELOG.md                                  |  4 ++--
 src/PhpSpreadsheet/Reader/Xlsx.php            |  3 ++-
 tests/PhpSpreadsheetTests/Reader/XlsxTest.php | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 419869bd..b59bbe9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
-- Nothing.
+- Fixed issue with Xlsx@listWorksheetInfo not returning any data
 
 ## 1.17.1 - 2021-03-01
 
@@ -697,4 +697,4 @@ For a comprehensive list of all class changes, and a semi-automated migration pa
 
 ## Previous versions of PHPExcel
 
-The changelog for the project when it was called PHPExcel is [still available](./CHANGELOG.PHPExcel.md).
\ No newline at end of file
+The changelog for the project when it was called PHPExcel is [still available](./CHANGELOG.PHPExcel.md).
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
index bf754591..219a49fb 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -187,7 +187,8 @@ class Xlsx extends BaseReader
                 );
                 if ($xmlWorkbook->sheets) {
                     $dir = dirname($rel['Target']);
-                    foreach ($xmlWorkbook->sheets->sheet->children() as $eleSheet) {
+                    /** @var SimpleXMLElement $eleSheet */
+                    foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
                         $tmpInfo = [
                             'worksheetName' => (string) $eleSheet['name'],
                             'lastColumnLetter' => 'A',
diff --git a/tests/PhpSpreadsheetTests/Reader/XlsxTest.php b/tests/PhpSpreadsheetTests/Reader/XlsxTest.php
index b326c142..cb84a3b7 100644
--- a/tests/PhpSpreadsheetTests/Reader/XlsxTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/XlsxTest.php
@@ -55,6 +55,25 @@ class XlsxTest extends TestCase
         }
     }
 
+    public function testListWorksheetInfo(): void
+    {
+        $filename = 'tests/data/Reader/XLSX/rowColumnAttributeTest.xlsx';
+        $reader = new Xlsx();
+        $actual = $reader->listWorksheetInfo($filename);
+
+        $expected = [
+            [
+                'worksheetName' => 'Sheet1',
+                'lastColumnLetter' => 'F',
+                'lastColumnIndex' => 5,
+                'totalRows' => '6',
+                'totalColumns' => 6,
+            ],
+        ];
+
+        self::assertEquals($expected, $actual);
+    }
+
     public function testLoadXlsxRowColumnAttributes(): void
     {
         $filename = 'tests/data/Reader/XLSX/rowColumnAttributeTest.xlsx';