Merge branch 'master' into hyperlinkstyle

Author: oleibman

CHANGELOG.md

@@ -34,8 +34,9 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Print Area and Row Break. [Issue #1275](https://github.com/PHPOffice/PhpSpreadsheet/issues/1275) [PR #4450](https://github.com/PHPOffice/PhpSpreadsheet/pull/4450)
 - Copy Styles after insertNewColumnBefore. [Issue #1425](https://github.com/PHPOffice/PhpSpreadsheet/issues/1425) [PR #4468](https://github.com/PHPOffice/PhpSpreadsheet/pull/4468)
 - Xls Writer Treat Hyperlink Starting with # as Internal. [Issue #56](https://github.com/PHPOffice/PhpSpreadsheet/issues/56) [PR #4453](https://github.com/PHPOffice/PhpSpreadsheet/pull/4453)
-- ODS Handling of Ceiling and Floor. [Issue #407](https://github.com/PHPOffice/PhpSpreadsheet/issues/407) [PR #4466](https://github.com/PHPOffice/PhpSpreadsheet/pull/4466)
 - Hyperlink Styles. [Issue #1632](https://github.com/PHPOffice/PhpSpreadsheet/issues/1632) [PR #4478](https://github.com/PHPOffice/PhpSpreadsheet/pull/4478)
+- ODS Handling of Ceiling and Floor. [Issue #477](https://github.com/PHPOffice/PhpSpreadsheet/issues/407) [PR #4466](https://github.com/PHPOffice/PhpSpreadsheet/pull/4466)
+- Xlsx Reader Do Not Process Printer Settings for Dataonly. [Issue #4477](https://github.com/PHPOffice/PhpSpreadsheet/issues/4477) [PR #4480](https://github.com/PHPOffice/PhpSpreadsheet/pull/4480)
 
 ## 2025-04-16 - 4.2.0
 

bin/generate-document.php

@@ -11,9 +11,20 @@
 
 file_put_contents(
     __DIR__ . '/../docs/references/function-list-by-category.md',
-    DocumentGenerator::generateFunctionListByCategory($phpSpreadsheetFunctions)
+    DocumentGenerator::generateFunctionListByCategory(
+        $phpSpreadsheetFunctions
+    )
 );
 file_put_contents(
     __DIR__ . '/../docs/references/function-list-by-name.md',
-    DocumentGenerator::generateFunctionListByName($phpSpreadsheetFunctions)
+    DocumentGenerator::generateFunctionListByName(
+        $phpSpreadsheetFunctions
+    )
+);
+file_put_contents(
+    __DIR__ . '/../docs/references/function-list-by-name-compact.md',
+    DocumentGenerator::generateFunctionListByName(
+        $phpSpreadsheetFunctions,
+        true
+    )
 );

docs/references/function-list-by-name-compact.md

@@ -1,5 +1,8 @@
 # Function list by name
 
+A more compact list can be found [here](./function-list-by-name-compact.md)
+
+
 ## A
 
 Excel Function           | Category                       | PhpSpreadsheet Function

docs/references/function-list-by-name.md

@@ -91,16 +91,30 @@ private static function getPhpSpreadsheetFunctionText(mixed $functionCall): stri
     /**
      * @param array<string, array{category: string, functionCall: string|string[], argumentCount: string, passCellReference?: bool, passByReference?: bool[], custom?: bool}> $phpSpreadsheetFunctions
      */
-    public static function generateFunctionListByName(array $phpSpreadsheetFunctions): string
+    public static function generateFunctionListByName(array $phpSpreadsheetFunctions, bool $compact = false): string
     {
         $categoryConstants = array_flip(self::getCategories());
-        $result = "# Function list by name\n";
+        if ($compact) {
+            $result = "# Function list by name compact\n";
+            $result .= "\n";
+            $result .= 'Category should be prefixed by `CATEGORY_` to match the values in \PhpOffice\PhpSpreadsheet\Calculation\Category';
+            $result .= "\n\n";
+            $result .= 'Function should be prefixed by `PhpOffice\PhpSpreadsheet\Calculation\`';
+            $result .= "\n\n";
+            $result .= 'A less compact list can be found [here](./function-list-by-name.md)';
+            $result .= "\n\n";
+        } else {
+            $result = "# Function list by name\n";
+            $result .= "\n";
+            $result .= 'A more compact list can be found [here](./function-list-by-name-compact.md)';
+            $result .= "\n\n";
+        }
         $lastAlphabet = null;
+        $lengths = $compact ? [25, 22, 37] : [25, 31, 37];
         foreach ($phpSpreadsheetFunctions as $excelFunction => $functionInfo) {
             if (in_array($excelFunction, self::EXCLUDED_FUNCTIONS, true)) {
                 continue;
             }
-            $lengths = [25, 31, 37];
             if ($lastAlphabet !== $excelFunction[0]) {
                 $lastAlphabet = $excelFunction[0];
                 $result .= "\n";
@@ -111,6 +125,14 @@ public static function generateFunctionListByName(array $phpSpreadsheetFunctions
             }
             $category = $categoryConstants[$functionInfo['category']];
             $phpFunction = self::getPhpSpreadsheetFunctionText($functionInfo['functionCall']);
+            if ($compact) {
+                $category = str_replace('CATEGORY_', '', $category);
+                $phpFunction = str_replace(
+                    '\PhpOffice\PhpSpreadsheet\Calculation\\',
+                    '',
+                    $phpFunction
+                );
+            }
             $result .= self::tableRow($lengths, [$excelFunction, $category, $phpFunction]) . "\n";
         }
 

infra/DocumentGenerator.php

@@ -16,28 +16,18 @@ class FormattedNumber
     // preg_quoted string for major currency symbols, with a %s for locale currency
     private const CURRENCY_CONVERSION_LIST = '\$€£¥%s';
 
-    private const STRING_CONVERSION_LIST = [
-        [self::class, 'convertToNumberIfNumeric'],
-        [self::class, 'convertToNumberIfFraction'],
-        [self::class, 'convertToNumberIfPercent'],
-        [self::class, 'convertToNumberIfCurrency'],
-    ];
-
     /**
      * Identify whether a string contains a formatted numeric value,
      * and convert it to a numeric if it is.
      *
-     * @param string $operand string value to test
+     * @param float|string $operand string value to test
      */
-    public static function convertToNumberIfFormatted(string &$operand): bool
+    public static function convertToNumberIfFormatted(float|string &$operand): bool
     {
-        foreach (self::STRING_CONVERSION_LIST as $conversionMethod) {
-            if ($conversionMethod($operand) === true) {
-                return true;
-            }
-        }
-
-        return false;
+        return self::convertToNumberIfNumeric($operand)
+            || self::convertToNumberIfFraction($operand)
+            || self::convertToNumberIfPercent($operand)
+            || self::convertToNumberIfCurrency($operand);
     }
 
     /**
@@ -68,9 +58,9 @@ public static function convertToNumberIfNumeric(float|string &$operand): bool
      *
      * @param string $operand string value to test
      */
-    public static function convertToNumberIfFraction(string &$operand): bool
+    public static function convertToNumberIfFraction(float|string &$operand): bool
     {
-        if (preg_match(self::STRING_REGEXP_FRACTION, $operand, $match)) {
+        if (is_string($operand) && preg_match(self::STRING_REGEXP_FRACTION, $operand, $match)) {
             $sign = ($match[1] === '-') ? '-' : '+';
             $wholePart = ($match[3] === '') ? '' : ($sign . $match[3]);
             $fractionFormula = '=' . $wholePart . $sign . $match[4];

src/PhpSpreadsheet/Calculation/Engine/FormattedNumber.php

@@ -47,13 +47,15 @@ final class StructuredReference implements Operand, Stringable
 
     private ?int $totalsRow;
 
+    /** @var mixed[] */
     private array $columns;
 
     public function __construct(string $structuredReference)
     {
         $this->value = $structuredReference;
     }
 
+    /** @param string[] $matches */
     public static function fromParser(string $formula, int $index, array $matches): self
     {
         $val = $matches[0];
@@ -171,6 +173,11 @@ private function getTableByName(Cell $cell): Table
         return $table;
     }
 
+    /**
+     * @param array<array<int|string>> $tableRange
+     *
+     * @return mixed[]
+     */
     private function getColumns(Cell $cell, array $tableRange): array
     {
         $worksheet = $cell->getWorksheet();
@@ -179,6 +186,7 @@ private function getColumns(Cell $cell, array $tableRange): array
         $columns = [];
         $lastColumn = ++$tableRange[1][0];
         for ($column = $tableRange[0][0]; $column !== $lastColumn; ++$column) {
+            /** @var string $column */
             $columns[$column] = $worksheet
                 ->getCell($column . ($this->headersRow ?? ($this->firstDataRow - 1)))
                 ->getCalculatedValue();
@@ -196,7 +204,7 @@ private function getRowReference(Cell $cell): string
         $reference = str_replace('[' . self::ITEM_SPECIFIER_THIS_ROW . '],', '', $reference);
 
         foreach ($this->columns as $columnId => $columnName) {
-            $columnName = str_replace("\u{a0}", ' ', $columnName);
+            $columnName = str_replace("\u{a0}", ' ', $columnName); //* @phpstan-ignore-line
             $reference = $this->adjustRowReference($columnName, $reference, $cell, $columnId);
         }
 
@@ -330,7 +338,7 @@ private function getColumnsForColumnReference(string $reference, int $startRow,
     {
         $columnsSelected = false;
         foreach ($this->columns as $columnId => $columnName) {
-            $columnName = str_replace("\u{a0}", ' ', $columnName ?? '');
+            $columnName = str_replace("\u{a0}", ' ', $columnName ?? ''); //* @phpstan-ignore-line
             $cellFrom = "{$columnId}{$startRow}";
             $cellTo = "{$columnId}{$endRow}";
             $cellReference = ($cellFrom === $cellTo) ? $cellFrom : "{$cellFrom}:{$cellTo}";

src/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php

@@ -130,7 +130,10 @@ public static function NOT(mixed $logical = false): array|bool|string
         return !$logical;
     }
 
-    /** @param mixed[] $args */
+    /**
+     * @param mixed[] $args
+     * @param callable(int, int): bool $func
+     */
     private static function countTrueValues(array $args, callable $func): bool|string
     {
         $trueValueCount = 0;

src/PhpSpreadsheet/Calculation/Logical/Operations.php

@@ -45,7 +45,7 @@ class Address
      * @param mixed $sheetName Optional Name of worksheet to use
      *                      Or can be an array of values
      *
-     * @return array|string If an array of values is passed as the $testValue argument, then the returned result will also be
+     * @return mixed[]|string If an array of values is passed as the $testValue argument, then the returned result will also be
      *            an array with the same dimensions
      */
     public static function cell(mixed $row, mixed $column, mixed $relativity = 1, mixed $referenceStyle = true, mixed $sheetName = ''): array|string

src/PhpSpreadsheet/Calculation/LookupRef/Address.php

@@ -80,6 +80,11 @@ public static function chooseRows(mixed $input, mixed ...$args): array|string
         return $outputArray;
     }
 
+    /**
+     * @param mixed[] $array
+     *
+     * @return mixed[]|string
+     */
     private static function dropRows(array $array, mixed $offset): array|string
     {
         if ($offset === null) {
@@ -134,6 +139,11 @@ public static function drop(mixed $input, mixed $rows = null, mixed $columns = n
         return self::transpose($outputArray3);
     }
 
+    /**
+     * @param mixed[] $array
+     *
+     * @return mixed[]|string
+     */
     private static function takeRows(array $array, mixed $offset): array|string
     {
         if ($offset === null) {