Merge branch 'master' into wakeup

Author: oleibman

CHANGELOG.md

@@ -30,8 +30,12 @@ and this project adheres to [Semantic Versioning](https://semver.org). Thia is a
 
 ### Fixed
 
+- Performance improvement when working with large amounts of cells. [Issue #4607](https://github.com/PHPOffice/PhpSpreadsheet/issues/4607) [PR #4609](https://github.com/PHPOffice/PhpSpreadsheet/pull/4609)
+- Minor improvements to Calculation coverage. [PR #4624](https://github.com/PHPOffice/PhpSpreadsheet/pull/4624)
+- Conditional formatting in extLst. [Issue #4629](https://github.com/PHPOffice/PhpSpreadsheet/issues/4629) [PR #4633](https://github.com/PHPOffice/PhpSpreadsheet/pull/4633)
 - Php8.5 deprecates use of null as array index. [PR #4634](https://github.com/PHPOffice/PhpSpreadsheet/pull/4634)
 - For Php8.5, replace one of our two uses of `__wakeup` with `__unserialize`, and eliminate the other. [PR #4639](https://github.com/PHPOffice/PhpSpreadsheet/pull/4639)
+- Use prefix _xlfn for BASE function. [Issue #4638](https://github.com/PHPOffice/PhpSpreadsheet/issues/4638) [PR #4641](https://github.com/PHPOffice/PhpSpreadsheet/pull/4641)
 
 ## 2025-09-03 - 5.1.0
 

composer.lock

@@ -327,7 +327,7 @@ protected function mapErrorCodeRows(): void
             foreach ($cells as $cell) {
                 if ($cell->getValue() != '') {
                     $this->log($cell->getRow() . ' -> ' . $cell->getValueString());
-                    $this->errorCodeMap[$cell->getValue()] = $cell->getRow();
+                    $this->errorCodeMap[$cell->getValueString()] = $cell->getRow();
                 }
             }
         }
@@ -345,7 +345,7 @@ protected function mapFunctionNameRows(): void
                 if ($this->isFunctionCategoryEntry($cell)) {
                     if (!empty($cell->getValue())) {
                         $this->log('CATEGORY: ' . $cell->getValueString());
-                        $this->functionNameMap[$cell->getValue()] = $cell->getRow();
+                        $this->functionNameMap[$cell->getValueString()] = $cell->getRow();
                     }
 
                     continue;
@@ -356,7 +356,7 @@ protected function mapFunctionNameRows(): void
                         $this->functionNameMap[($cell->getValue() ? 'TRUE' : 'FALSE')] = $cell->getRow();
                     } else {
                         $this->log($cell->getRow() . ' -> ' . $cell->getValueString());
-                        $this->functionNameMap[$cell->getValue()] = $cell->getRow();
+                        $this->functionNameMap[$cell->getValueString()] = $cell->getRow();
                     }
                 }
             }

infra/LocaleGenerator.php

@@ -104,7 +104,7 @@
         $helper->log('Unrecognized currency symbol');
     } else {
         try {
-            $negative = $negatives[$_POST['negative']] ?? CurrencyNegative::minus;
+            $negative = $negatives[$_POST['negative']] ?? CurrencyNegative::minus; //* @phpstan-ignore-line
             $wizard = new Wizard\Currency($_POST['currency'], (int) $_POST['decimals'], isset($_POST['thousands']), (bool) $_POST['position']);
             $wizard->setNegative($negative);
             $mask = $wizard->format();
@@ -118,7 +118,7 @@
                 . ', Wizard\Currency::' . (((bool) $_POST['position']) ? 'LEADING_SYMBOL' : 'TRAILING_SYMBOL')
                 . ');'
             );
-            $helper->log('$wizard->setNegative(' . $negativesString[$_POST['negative']] . ');');
+            $helper->log('$wizard->setNegative(' . $negativesString[$_POST['negative']] . ');'); //* @phpstan-ignore-line
             $helper->log('$mask = $wizard->format();');
             $helper->log('<br />echo (string) $mask;');
             $helper->log('<hr /><b>Mask:</b><br />');

samples/Wizards/NumberFormat/Currency.php

@@ -888,7 +888,7 @@ private static function resizeMatricesExtend(array &$matrix1, array &$matrix2, i
                 }
             }
             if ($matrix1Rows < $matrix2Rows) {
-                $x = ($matrix1Rows === 1) ? $matrix1[0] : array_fill(0, $matrix1Columns, null);
+                $x = ($matrix1Rows === 1) ? $matrix1[0] : array_fill(0, $matrix2Columns, null);
                 for ($i = $matrix1Rows; $i < $matrix2Rows; ++$i) {
                     $matrix1[$i] = $x;
                 }
@@ -1699,7 +1699,7 @@ private function processTokenStack(false|array $tokens, ?string $cellID = null,
                         return $this->raiseFormulaError($e->getMessage(), $e->getCode(), $e);
                     }
                 }
-            } elseif (!is_numeric($token) && !is_object($token) && isset($token, self::BINARY_OPERATORS[$token])) {
+            } elseif (!is_numeric($token) && !is_object($token) && isset($token, self::BINARY_OPERATORS[$token])) { //* @phpstan-ignore-line
                 // if the token is a binary operator, pop the top two values off the stack, do the operation, and push the result back on the stack
                 //    We must have two operands, error if we don't
                 $operand2Data = $stack->pop();
@@ -2879,6 +2879,7 @@ private static function swapOperands(Stack $stack, string $opCharacter): bool
         if ($stack->count() > 0) {
             $o2 = $stack->last();
             if ($o2) {
+                /** @var array{value: string} $o2 */
                 if (isset(self::CALCULATION_OPERATORS[$o2['value']])) {
                     $retVal = (self::OPERATOR_PRECEDENCE[$opCharacter] ?? 0) <= self::OPERATOR_PRECEDENCE[$o2['value']];
                 }

src/PhpSpreadsheet/Calculation/Calculation.php

@@ -63,6 +63,11 @@ protected static function loadLocales(): void
             $filename = substr($filename, strlen($localeFileDirectory));
             if ($filename != 'en') {
                 self::$validLocaleLanguages[] = $filename;
+                $subdirs = glob("$localeFileDirectory$filename/*", GLOB_ONLYDIR) ?: [];
+                foreach ($subdirs as $subdir) {
+                    $subdirx = basename($subdir);
+                    self::$validLocaleLanguages[] = "{$filename}_{$subdirx}";
+                }
             }
         }
     }

src/PhpSpreadsheet/Calculation/CalculationLocale.php

@@ -102,7 +102,7 @@ private static function evaluateVectorMatrixPair(callable $method, array $matrix
     }
 
     /**
-     * @param mixed[] $matrixIndexes
+     * @param array<int|string> $matrixIndexes
      *
      * @return mixed[]
      */

src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentProcessor.php

@@ -21,8 +21,10 @@ public function count(): int
 
     /**
      * Push a new entry onto the stack.
+     *
+     * @param int|string $value The value to test
      */
-    public function push(mixed $value): void
+    public function push($value): void
     {
         $this->stack[$value] = $value;
     }
@@ -38,9 +40,9 @@ public function pop(): mixed
     /**
      * Test to see if a specified entry exists on the stack.
      *
-     * @param mixed $value The value to test
+     * @param int|string $value The value to test
      */
-    public function onStack(mixed $value): bool
+    public function onStack($value): bool
     {
         return isset($this->stack[$value]);
     }

src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php

@@ -135,14 +135,14 @@ public static function index(mixed $matrix, mixed $rowNum = 0, mixed $columnNum
             return self::extractRowValue($matrix, $rowKeys, $rowNum);
         }
 
-        $columnNum = $columnKeys[--$columnNum];
+        $columnNum = $columnKeys[--$columnNum]; //* @phpstan-ignore-line
         if ($rowNum === 0) {
             return array_map(
                 fn ($value): array => [$value],
                 array_column($matrix, $columnNum)
             );
         }
-        $rowNum = $rowKeys[--$rowNum];
+        $rowNum = $rowKeys[--$rowNum]; //* @phpstan-ignore-line
         /** @var mixed[][] $matrix */
 
         return $matrix[$rowNum][$columnNum];
@@ -159,7 +159,7 @@ private static function extractRowValue(array $matrix, array $rowKeys, int $rowN
         }
 
         $rowNum = $rowKeys[--$rowNum];
-        $row = $matrix[$rowNum];
+        $row = $matrix[$rowNum]; //* @phpstan-ignore-line
         if (is_array($row)) {
             return [$rowNum => $row];
         }

src/PhpSpreadsheet/Calculation/LookupRef/Matrix.php

@@ -335,6 +335,7 @@ private static function sortLookupArrayFromVector(array $sortArray, array $sortV
         // Building a new array in the correct (sorted) order works; but may be memory heavy for larger arrays
         $sortedArray = [];
         foreach ($sortVector as $index) {
+            /** @var int|string $index */
             $sortedArray[] = $sortArray[$index];
         }