From cd6629890162f447edd2c343c5b45fe0dfa8f8fe Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Sun, 14 Aug 2022 23:43:52 +0200
Subject: [PATCH 1/2] Adjust `extractAllCellReferencesInRange()` method to
 allow a worksheet in the reference

---
 src/PhpSpreadsheet/Cell/Coordinate.php        | 21 +++++++++++-
 src/PhpSpreadsheet/Worksheet/Worksheet.php    | 23 +++++++++----
 testing/cellReferenceTest.php                 | 28 ++++++++++++++++
 .../CellExtractAllCellReferencesInRange.php   | 33 +++++++++++++++++++
 4 files changed, 98 insertions(+), 7 deletions(-)
 create mode 100644 testing/cellReferenceTest.php

diff --git a/src/PhpSpreadsheet/Cell/Coordinate.php b/src/PhpSpreadsheet/Cell/Coordinate.php
index 50678397..2fca6212 100644
--- a/src/PhpSpreadsheet/Cell/Coordinate.php
+++ b/src/PhpSpreadsheet/Cell/Coordinate.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
@@ -349,6 +350,19 @@ abstract class Coordinate
      */
     public static function extractAllCellReferencesInRange($cellRange): array
     {
+        if (substr_count($cellRange, '!') > 1) {
+            throw new Exception('3-D Range References are not supported');
+        }
+
+        [$worksheet, $cellRange] = Worksheet::extractSheetTitle($cellRange, true);
+        $quoted = '';
+        if ($worksheet > '') {
+            $quoted = Worksheet::nameRequiresQuotes($worksheet) ? "'" : '';
+            if (substr($worksheet, 0, 1) === "'" && substr($worksheet, -1, 1) === "'") {
+                $worksheet = substr($worksheet, 1, -1);
+            }
+            $worksheet = str_replace("'", "''", $worksheet);
+        }
         [$ranges, $operators] = self::getCellBlocksFromRangeString($cellRange);
 
         $cells = [];
@@ -364,7 +378,12 @@ abstract class Coordinate
 
         $cellList = array_merge(...$cells);
 
-        return self::sortCellReferenceArray($cellList);
+        return array_map(
+            function ($cellAddress) use ($worksheet, $quoted) {
+                return ($worksheet !== '') ? "{$quoted}{$worksheet}{$quoted}!{$cellAddress}" : $cellAddress;
+            },
+            self::sortCellReferenceArray($cellList)
+        );
     }
 
     private static function processRangeSetOperators(array $operators, array $cells): array
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
index e89043c8..3464a321 100644
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -32,14 +32,16 @@ use PhpOffice\PhpSpreadsheet\Style\Style;
 class Worksheet implements IComparable
 {
     // Break types
-    const BREAK_NONE = 0;
-    const BREAK_ROW = 1;
-    const BREAK_COLUMN = 2;
+    public const BREAK_NONE = 0;
+    public const BREAK_ROW = 1;
+    public const BREAK_COLUMN = 2;
 
     // Sheet state
-    const SHEETSTATE_VISIBLE = 'visible';
-    const SHEETSTATE_HIDDEN = 'hidden';
-    const SHEETSTATE_VERYHIDDEN = 'veryHidden';
+    public const SHEETSTATE_VISIBLE = 'visible';
+    public const SHEETSTATE_HIDDEN = 'hidden';
+    public const SHEETSTATE_VERYHIDDEN = 'veryHidden';
+
+    protected const SHEET_NAME_REQUIRES_NO_QUOTES = '/^[_\p{L}][_\p{L}\p{N}]*$/mui';
 
     /**
      * Maximum 31 characters allowed for sheet title.
@@ -3051,7 +3053,11 @@ class Worksheet implements IComparable
      * Extract worksheet title from range.
      *
      * Example: extractSheetTitle("testSheet!A1") ==> 'A1'
+     * Example: extractSheetTitle("testSheet!A1:C3") ==> 'A1:C3'
      * Example: extractSheetTitle("'testSheet 1'!A1", true) ==> ['testSheet 1', 'A1'];
+     * Example: extractSheetTitle("'testSheet 1'!A1:C3", true) ==> ['testSheet 1', 'A1:C3'];
+     * Example: extractSheetTitle("A1", true) ==> ['', 'A1'];
+     * Example: extractSheetTitle("A1:C3", true) ==> ['', 'A1:C3']
      *
      * @param string $range Range to extract title from
      * @param bool $returnRange Return range? (see example)
@@ -3450,4 +3456,9 @@ class Worksheet implements IComparable
     {
         return $this->codeName !== null;
     }
+
+    public static function nameRequiresQuotes(string $sheetName): bool
+    {
+        return preg_match(self::SHEET_NAME_REQUIRES_NO_QUOTES, $sheetName) !== 1;
+    }
 }
diff --git a/testing/cellReferenceTest.php b/testing/cellReferenceTest.php
new file mode 100644
index 00000000..c8d1659c
--- /dev/null
+++ b/testing/cellReferenceTest.php
@@ -0,0 +1,28 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+
+error_reporting(E_ALL);
+set_time_limit(0);
+
+date_default_timezone_set('UTC');
+
+// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
+require_once __DIR__ . '/../vendor/autoload.php';
+
+$cellRange1 = Coordinate::extractAllCellReferencesInRange('D3');
+var_dump($cellRange1);
+$cellRange2 = Coordinate::extractAllCellReferencesInRange('D3:E4');
+var_dump($cellRange2);
+$cellRange3 = Coordinate::extractAllCellReferencesInRange('Sheet1!D3');
+var_dump($cellRange3);
+$cellRange4 = Coordinate::extractAllCellReferencesInRange('Sheet1!D3:E4');
+var_dump($cellRange4);
+
+$cellRange11 = Coordinate::extractAllCellReferencesInRange('D3:E4 D4:F6');
+var_dump($cellRange11);
+$cellRange12 = Coordinate::extractAllCellReferencesInRange('D3:E4,D4:F6');
+var_dump($cellRange12);
+
+$cellRange5 = Coordinate::extractAllCellReferencesInRange('Sheet1!D3:Sheet2!E4');
+var_dump($cellRange5);
diff --git a/tests/data/CellExtractAllCellReferencesInRange.php b/tests/data/CellExtractAllCellReferencesInRange.php
index a2ecbdd2..192500ce 100644
--- a/tests/data/CellExtractAllCellReferencesInRange.php
+++ b/tests/data/CellExtractAllCellReferencesInRange.php
@@ -130,4 +130,37 @@ return [
         ],
         'Z2:AA3',
     ],
+    [
+        [
+            'Sheet1!D3',
+        ],
+        'Sheet1!D3',
+    ],
+    [
+        [
+            'Sheet1!D3',
+            'Sheet1!E3',
+            'Sheet1!D4',
+            'Sheet1!E4',
+        ],
+        'Sheet1!D3:E4',
+    ],
+    [
+        [
+            "'Sheet 1'!D3",
+            "'Sheet 1'!E3",
+            "'Sheet 1'!D4",
+            "'Sheet 1'!E4",
+        ],
+        "'Sheet 1'!D3:E4",
+    ],
+    [
+        [
+            "'Mark''s Sheet'!D3",
+            "'Mark''s Sheet'!E3",
+            "'Mark''s Sheet'!D4",
+            "'Mark''s Sheet'!E4",
+        ],
+        "'Mark's Sheet'!D3:E4",
+    ],
 ];

From b0f7e83dc2e82287f575b659b388cef6a281647c Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Mon, 15 Aug 2022 06:33:31 +0200
Subject: [PATCH 2/2] Fix phpstan baseline

---
 phpstan-baseline.neon | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 596e1e10..c6d769d5 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1060,11 +1060,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Calculation/TextData/Text.php
 
-		-
-			message: "#^Elseif branch is unreachable because previous condition is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Cell.php
-
 		-
 			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\:\\:getFormulaAttributes\\(\\) has no return type specified\\.$#"
 			count: 1