Merge branch 'master' into issue4521

oleibman · web-flow · commit 3eff3b475aaa · 2025-07-04T12:54:53.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,8 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Fixed
 
 - Recognize application/x-empty mimetype. [Issue #4521](https://github.com/PHPOffice/PhpSpreadsheet/issues/4521) [PR #4524](https://github.com/PHPOffice/PhpSpreadsheet/pull/4524)
+- Micro-optimization in getSheetByName. [PR #4499](https://github.com/PHPOffice/PhpSpreadsheet/pull/4499)
+- Bug in resizeMatricesExtend. [Issue #4451](https://github.com/PHPOffice/PhpSpreadsheet/issues/4451) [PR #4474](https://github.com/PHPOffice/PhpSpreadsheet/pull/4474)
 
 ## 2025-06-22 - 4.4.0
 
diff --git a/composer.lock b/composer.lock
diff --git a/docs/topics/The Dating Game.md b/docs/topics/The Dating Game.md
@@ -14,20 +14,20 @@ Open/Libre Office and Gnumeric don't have this limitation, and negative date/tim
 To write a date in a cell using PhpSpreadsheet, we need to calculate the serialized Excel datestamp for that date. Methods to do this are available in the Shared\Date class, which provides a number of methods for conversion between different date options typically used in PHP applications (Unix timestamp, PHP DateTime objects and some recognisable formatted strings) and the Excel serialized value; and vice versa.
 
  - Shared\Date::convertIsoDate()
-   - Converts a date/time in [ISO-8601 standard format](https://en.wikipedia.org/wiki/ISO_8601) to an Excel serialized timestamp
+     - Converts a date/time in [ISO-8601 standard format](https://en.wikipedia.org/wiki/ISO_8601) to an Excel serialized timestamp
  - Shared\Date::PHPToExcel()
-   - Converts a Unix timestamp, a PHP DateTime object, or a recognisable formatted string to an Excel serialized timestamp
+     - Converts a Unix timestamp, a PHP DateTime object, or a recognisable formatted string to an Excel serialized timestamp
  - Shared\Date::dateTimeToExcel()
-   - Converts a Unix timestamp to an Excel serialized timestamp
+     - Converts a Unix timestamp to an Excel serialized timestamp
  - Shared\Date::timestampToExcel()
-   - Converts a PHP DateTime object to an Excel serialized timestamp
+     - Converts a PHP DateTime object to an Excel serialized timestamp
  - Shared\Date::formattedPHPToExcel()
-   - Converts year, month, day, hour, minute, and second to an Excel serialized timestamp
+     - Converts year, month, day, hour, minute, and second to an Excel serialized timestamp
  - Shared\Date::excelToDateTimeObject()
-   - Converts an Excel serialized timestamp to a PHP DateTime object
+     - Converts an Excel serialized timestamp to a PHP DateTime object
  - Shared\Date::excelToTimestamp()
-   - Converts an Excel serialized timestamp to a Unix timestamp.
-   - The use of Unix timestamps, and therefore this function, is discouraged: they are not Y2038-safe on a 32-bit system, and have no timezone info.
+     - Converts an Excel serialized timestamp to a Unix timestamp.
+     - The use of Unix timestamps, and therefore this function, is discouraged: they are not Y2038-safe on a 32-bit system, and have no timezone info.
 
 We probably also want to set the number format mask for the cell so that it will be displayed as a human-readable date.
 ```php
diff --git a/docs/topics/defined-names.md b/docs/topics/defined-names.md
@@ -545,17 +545,18 @@ $this->spreadsheet->addDefinedName(
 ### Naming Names
 
 The names that you assign to Defined Name must follow the following set of rules:
+
  - The first character of a name must be one of the following characters:
-   - letter (including UTF-8 letters)
-   - underscore (`_`)
+     - letter (including UTF-8 letters)
+     - underscore (`_`)
  - Remaining characters in the name can be
-   - letters (including UTF-8 letters)
-   - numbers (including UTF-8 numbers)
-   - periods (`.`)
-   - underscore characters (`_`)
+     - letters (including UTF-8 letters)
+     - numbers (including UTF-8 numbers)
+     - periods (`.`)
+     - underscore characters (`_`)
  - The following are not allowed:
-   - Space characters are not allowed as part of a name.
-   - Names can't look like cell addresses, such as A35 or R2C2
+     - Space characters are not allowed as part of a name.
+     - Names can't look like cell addresses, such as A35 or R2C2
  - Names are not case sensitive. For example, `North` and `NORTH` are treated as the same name.
 
 ### Limitations
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -852,15 +852,15 @@ private static function resizeMatricesExtend(array &$matrix1, array &$matrix2, i
             if ($matrix2Columns < $matrix1Columns) {
                 for ($i = 0; $i < $matrix2Rows; ++$i) {
                     /** @var mixed[][] $matrix2 */
-                    $x = $matrix2[$i][$matrix2Columns - 1];
+                    $x = ($matrix2Columns === 1) ? $matrix2[$i][0] : null;
                     for ($j = $matrix2Columns; $j < $matrix1Columns; ++$j) {
                         $matrix2[$i][$j] = $x;
                     }
                 }
             }
             if ($matrix2Rows < $matrix1Rows) {
-                $x = $matrix2[$matrix2Rows - 1];
-                for ($i = 0; $i < $matrix1Rows; ++$i) {
+                $x = ($matrix2Rows === 1) ? $matrix2[0] : array_fill(0, $matrix2Columns, null);
+                for ($i = $matrix2Rows; $i < $matrix1Rows; ++$i) {
                     $matrix2[$i] = $x;
                 }
             }
@@ -870,15 +870,15 @@ private static function resizeMatricesExtend(array &$matrix1, array &$matrix2, i
             if ($matrix1Columns < $matrix2Columns) {
                 for ($i = 0; $i < $matrix1Rows; ++$i) {
                     /** @var mixed[][] $matrix1 */
-                    $x = $matrix1[$i][$matrix1Columns - 1];
+                    $x = ($matrix1Columns === 1) ? $matrix1[$i][0] : null;
                     for ($j = $matrix1Columns; $j < $matrix2Columns; ++$j) {
                         $matrix1[$i][$j] = $x;
                     }
                 }
             }
             if ($matrix1Rows < $matrix2Rows) {
-                $x = $matrix1[$matrix1Rows - 1];
-                for ($i = 0; $i < $matrix2Rows; ++$i) {
+                $x = ($matrix1Rows === 1) ? $matrix1[0] : array_fill(0, $matrix1Columns, null);
+                for ($i = $matrix1Rows; $i < $matrix2Rows; ++$i) {
                     $matrix1[$i] = $x;
                 }
             }
@@ -2375,15 +2375,15 @@ private function executeNumericBinaryOperation(mixed $operand1, mixed $operand2,
             for ($row = 0; $row < $rows; ++$row) {
                 for ($column = 0; $column < $columns; ++$column) {
                     /** @var mixed[][] $operand1 */
-                    if ($operand1[$row][$column] === null) {
+                    if (($operand1[$row][$column] ?? null) === null) {
                         $operand1[$row][$column] = 0;
                     } elseif (!self::isNumericOrBool($operand1[$row][$column])) {
                         $operand1[$row][$column] = self::makeError($operand1[$row][$column]);
 
                         continue;
                     }
                     /** @var mixed[][] $operand2 */
-                    if ($operand2[$row][$column] === null) {
+                    if (($operand2[$row][$column] ?? null) === null) {
                         $operand2[$row][$column] = 0;
                     } elseif (!self::isNumericOrBool($operand2[$row][$column])) {
                         $operand1[$row][$column] = self::makeError($operand2[$row][$column]);
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php b/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php
@@ -62,7 +62,7 @@ private static function filterByRow(array $lookupArray, array $matchArray): arra
 
         return array_filter(
             array_values($lookupArray),
-            fn ($index): bool => (bool) $matchArray[$index],
+            fn ($index): bool => (bool) ($matchArray[$index] ?? null),
             ARRAY_FILTER_USE_KEY
         );
     }
diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php
@@ -691,10 +691,10 @@ public function getAllSheets(): array
      */
     public function getSheetByName(string $worksheetName): ?Worksheet
     {
-        $worksheetCount = count($this->workSheetCollection);
-        for ($i = 0; $i < $worksheetCount; ++$i) {
-            if (strcasecmp($this->workSheetCollection[$i]->getTitle(), trim($worksheetName, "'")) === 0) {
-                return $this->workSheetCollection[$i];
+        $trimWorksheetName = trim($worksheetName, "'");
+        foreach ($this->workSheetCollection as $worksheet) {
+            if (strcasecmp($worksheet->getTitle(), $trimWorksheetName) === 0) {
+                return $worksheet;
             }
         }
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Issue4451Test.php b/tests/PhpSpreadsheetTests/Calculation/Issue4451Test.php
@@ -0,0 +1,128 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+use ReflectionMethod;
+
+class Issue4451Test extends TestCase
+{
+    public static function testReflect(): void
+    {
+        // Sample matrices to test with
+        $matrix1 = [[1], [3]];
+        $matrix2 = [[5], [8], [11]];
+
+        // Use reflection to make the protected method accessible
+        $calculation = new Calculation();
+        $reflectionMethod = new ReflectionMethod(Calculation::class, 'resizeMatricesExtend');
+        $reflectionMethod->setAccessible(true);
+
+        // Call the method using reflection
+        $reflectionMethod->invokeArgs($calculation, [&$matrix1, &$matrix2, count($matrix1), 1, count($matrix2), 1]);
+
+        self::assertSame([[1], [3], [null]], $matrix1); //* @phpstan-ignore-line
+    }
+
+    /**
+     * These 2 tests are contrived. They prove that method
+     * works as desired, but Excel will actually return
+     * a CALC error, a result I don't know how to duplicate.
+     */
+    public static function testExtendFirstColumn(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setTitle('Products');
+        $calculationEngine = Calculation::getInstance($spreadsheet);
+        $calculationEngine->setInstanceArrayReturnType(
+            Calculation::RETURN_ARRAY_AS_ARRAY
+        );
+
+        $sheet->getCell('D5')->setValue(5);
+        $sheet->getCell('E5')->setValue(20);
+        $sheet->fromArray(
+            [
+                [5, 20, 'Apples'],
+                [10, 20, 'Bananas'],
+                [5, 20, 'Cherries'],
+                [5, 40, 'Grapes'],
+                [25, 50, 'Peaches'],
+                [30, 60, 'Pears'],
+                [35, 70, 'Papayas'],
+                [40, 80, 'Mangos'],
+                [null, 20, 'Unknown'],
+            ],
+            null,
+            'K1',
+            true
+        );
+        $kRows = $sheet->getHighestDataRow('K');
+        self::assertSame(8, $kRows);
+        $lRows = $sheet->getHighestDataRow('L');
+        self::assertSame(9, $lRows);
+        $mRows = $sheet->getHighestDataRow('M');
+        self::assertSame(9, $mRows);
+        $sheet->getCell('A1')
+            ->setValue(
+                "=FILTER(Products!M1:M$mRows,"
+                    . "(Products!K1:K$kRows=D5)"
+                    . "*(Products!L1:L$lRows=E5))"
+            );
+
+        $result = $sheet->getCell('A1')->getCalculatedValue();
+        self::assertSame([['Apples'], ['Cherries']], $result);
+        $spreadsheet->disconnectWorksheets();
+    }
+
+    public static function testExtendSecondColumn(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setTitle('Products');
+        $calculationEngine = Calculation::getInstance($spreadsheet);
+        $calculationEngine->setInstanceArrayReturnType(
+            Calculation::RETURN_ARRAY_AS_ARRAY
+        );
+
+        $sheet->getCell('D5')->setValue(5);
+        $sheet->getCell('E5')->setValue(20);
+        $sheet->fromArray(
+            [
+                [5, 20, 'Apples'],
+                [10, 20, 'Bananas'],
+                [5, 20, 'Cherries'],
+                [5, 40, 'Grapes'],
+                [25, 50, 'Peaches'],
+                [30, 60, 'Pears'],
+                [35, 70, 'Papayas'],
+                [40, 80, 'Mangos'],
+                [null, 20, 'Unknown'],
+            ],
+            null,
+            'K1',
+            true
+        );
+        $kRows = $sheet->getHighestDataRow('K');
+        self::assertSame(8, $kRows);
+        //$lRows = $sheet->getHighestDataRow('L');
+        //self::assertSame(9, $lRows);
+        $lRows = 2;
+        $mRows = $sheet->getHighestDataRow('M');
+        self::assertSame(9, $mRows);
+        $sheet->getCell('A1')
+            ->setValue(
+                "=FILTER(Products!M1:M$mRows,"
+                    . "(Products!K1:K$kRows=D5)"
+                    . "*(Products!L1:L$lRows=E5))"
+            );
+
+        $result = $sheet->getCell('A1')->getCalculatedValue();
+        self::assertSame([['Apples']], $result);
+        $spreadsheet->disconnectWorksheets();
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -852,15 +852,15 @@ private static function resizeMatricesExtend(array &$matrix1, array &$matrix2, i`
`852`	`852`	`if ($matrix2Columns < $matrix1Columns) {`
`853`	`853`	`for ($i = 0; $i < $matrix2Rows; ++$i) {`
`854`	`854`	`/** @var mixed[][] $matrix2 */`
`855`		`- $x = $matrix2[$i][$matrix2Columns - 1];`
	`855`	`+ $x = ($matrix2Columns === 1) ? $matrix2[$i][0] : null;`
`856`	`856`	`for ($j = $matrix2Columns; $j < $matrix1Columns; ++$j) {`
`857`	`857`	`$matrix2[$i][$j] = $x;`
`858`	`858`	`}`
`859`	`859`	`}`
`860`	`860`	`}`
`861`	`861`	`if ($matrix2Rows < $matrix1Rows) {`
`862`		`- $x = $matrix2[$matrix2Rows - 1];`
`863`		`- for ($i = 0; $i < $matrix1Rows; ++$i) {`
	`862`	`+ $x = ($matrix2Rows === 1) ? $matrix2[0] : array_fill(0, $matrix2Columns, null);`
	`863`	`+ for ($i = $matrix2Rows; $i < $matrix1Rows; ++$i) {`
`864`	`864`	`$matrix2[$i] = $x;`
`865`	`865`	`}`
`866`	`866`	`}`
`@@ -870,15 +870,15 @@ private static function resizeMatricesExtend(array &$matrix1, array &$matrix2, i`
`870`	`870`	`if ($matrix1Columns < $matrix2Columns) {`
`871`	`871`	`for ($i = 0; $i < $matrix1Rows; ++$i) {`
`872`	`872`	`/** @var mixed[][] $matrix1 */`
`873`		`- $x = $matrix1[$i][$matrix1Columns - 1];`
	`873`	`+ $x = ($matrix1Columns === 1) ? $matrix1[$i][0] : null;`
`874`	`874`	`for ($j = $matrix1Columns; $j < $matrix2Columns; ++$j) {`
`875`	`875`	`$matrix1[$i][$j] = $x;`
`876`	`876`	`}`
`877`	`877`	`}`
`878`	`878`	`}`
`879`	`879`	`if ($matrix1Rows < $matrix2Rows) {`
`880`		`- $x = $matrix1[$matrix1Rows - 1];`
`881`		`- for ($i = 0; $i < $matrix2Rows; ++$i) {`
	`880`	`+ $x = ($matrix1Rows === 1) ? $matrix1[0] : array_fill(0, $matrix1Columns, null);`
	`881`	`+ for ($i = $matrix1Rows; $i < $matrix2Rows; ++$i) {`
`882`	`882`	`$matrix1[$i] = $x;`
`883`	`883`	`}`
`884`	`884`	`}`
`@@ -2375,15 +2375,15 @@ private function executeNumericBinaryOperation(mixed $operand1, mixed $operand2,`
`2375`	`2375`	`for ($row = 0; $row < $rows; ++$row) {`
`2376`	`2376`	`for ($column = 0; $column < $columns; ++$column) {`
`2377`	`2377`	`/** @var mixed[][] $operand1 */`
`2378`		`- if ($operand1[$row][$column] === null) {`
	`2378`	`+ if (($operand1[$row][$column] ?? null) === null) {`
`2379`	`2379`	`$operand1[$row][$column] = 0;`
`2380`	`2380`	`} elseif (!self::isNumericOrBool($operand1[$row][$column])) {`
`2381`	`2381`	`$operand1[$row][$column] = self::makeError($operand1[$row][$column]);`
`2382`	`2382`
`2383`	`2383`	`continue;`
`2384`	`2384`	`}`
`2385`	`2385`	`/** @var mixed[][] $operand2 */`
`2386`		`- if ($operand2[$row][$column] === null) {`
	`2386`	`+ if (($operand2[$row][$column] ?? null) === null) {`
`2387`	`2387`	`$operand2[$row][$column] = 0;`
`2388`	`2388`	`} elseif (!self::isNumericOrBool($operand2[$row][$column])) {`
`2389`	`2389`	`$operand1[$row][$column] = self::makeError($operand2[$row][$column]);`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private static function filterByRow(array $lookupArray, array $matchArray): arra`
`62`	`62`
`63`	`63`	`return array_filter(`
`64`	`64`	`array_values($lookupArray),`
`65`		`- fn ($index): bool => (bool) $matchArray[$index],`
	`65`	`+ fn ($index): bool => (bool) ($matchArray[$index] ?? null),`
`66`	`66`	`ARRAY_FILTER_USE_KEY`
`67`	`67`	`);`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -691,10 +691,10 @@ public function getAllSheets(): array`
`691`	`691`	`*/`
`692`	`692`	`public function getSheetByName(string $worksheetName): ?Worksheet`
`693`	`693`	`{`
`694`		`- $worksheetCount = count($this->workSheetCollection);`
`695`		`- for ($i = 0; $i < $worksheetCount; ++$i) {`
`696`		`- if (strcasecmp($this->workSheetCollection[$i]->getTitle(), trim($worksheetName, "'")) === 0) {`
`697`		`- return $this->workSheetCollection[$i];`
	`694`	`+ $trimWorksheetName = trim($worksheetName, "'");`
	`695`	`+ foreach ($this->workSheetCollection as $worksheet) {`
	`696`	`+ if (strcasecmp($worksheet->getTitle(), $trimWorksheetName) === 0) {`
	`697`	`+ return $worksheet;`
`698`	`698`	`}`
`699`	`699`	`}`
`700`	`700`