Merge branch 'master' into issue4451

Author: oleibman

CHANGELOG.md

@@ -30,8 +30,10 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Fixed
 
 - Micro-optimization for excelToDateTimeObject. [Issue #4438](https://github.com/PHPOffice/PhpSpreadsheet/issues/4438) [PR #4442](https://github.com/PHPOffice/PhpSpreadsheet/pull/4442)
+- Removing Columns/Rows Containing Merged Cells. [Issue #282](https://github.com/PHPOffice/PhpSpreadsheet/issues/282) [PR #4465](https://github.com/PHPOffice/PhpSpreadsheet/pull/4465)
 - Print Area and Row Break. [Issue #1275](https://github.com/PHPOffice/PhpSpreadsheet/issues/1275) [PR #4450](https://github.com/PHPOffice/PhpSpreadsheet/pull/4450)
 - 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)
 
 ## 2025-04-16 - 4.2.0
 

docs/index.md

@@ -51,7 +51,7 @@ Use [composer](https://getcomposer.org) to install PhpSpreadsheet into your proj
 composer require phpoffice/phpspreadsheet
 ```
 
-Or also download the documentation and samples if you plan to use them:
+Or also download the documentation and samples if you plan to use them (note that `git` must be in your path for this to work):
 
 ```sh
 composer require phpoffice/phpspreadsheet --prefer-source

infra/DocumentGenerator.php

@@ -9,6 +9,13 @@
 
 class DocumentGenerator
 {
+    private const EXCLUDED_FUNCTIONS = [
+        'CEILING.ODS',
+        'CEILING.XCL',
+        'FLOOR.ODS',
+        'FLOOR.XCL',
+    ];
+
     /**
      * @param array<string, array{category: string, functionCall: string|string[], argumentCount: string, passCellReference?: bool, passByReference?: bool[], custom?: bool}> $phpSpreadsheetFunctions
      */
@@ -23,6 +30,9 @@ public static function generateFunctionListByCategory($phpSpreadsheetFunctions):
             $result .= self::tableRow($lengths, ['Excel Function', 'PhpSpreadsheet Function']) . "\n";
             $result .= self::tableRow($lengths, null) . "\n";
             foreach ($phpSpreadsheetFunctions as $excelFunction => $functionInfo) {
+                if (in_array($excelFunction, self::EXCLUDED_FUNCTIONS, true)) {
+                    continue;
+                }
                 if ($category === $functionInfo['category']) {
                     $phpFunction = self::getPhpSpreadsheetFunctionText($functionInfo['functionCall']);
                     $result .= self::tableRow($lengths, [$excelFunction, $phpFunction]) . "\n";
@@ -87,6 +97,9 @@ public static function generateFunctionListByName(array $phpSpreadsheetFunctions
         $result = "# Function list by name\n";
         $lastAlphabet = null;
         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];

phpstan-baseline.neon

@@ -1,2 +1,61 @@
 parameters:
-	ignoreErrors: []
+	ignoreErrors:
+		-
+			message: '#^Method PhpOffice\\PhpSpreadsheet\\Calculation\\MathTrig\\Sum\:\:sumErroringStrings\(\) should return array\|float\|int\|string but returns mixed\.$#'
+			identifier: return.type
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/MathTrig/Sum.php
+
+		-
+			message: '#^Method PhpOffice\\PhpSpreadsheet\\Calculation\\MathTrig\\Sum\:\:sumIgnoringStrings\(\) should return float\|int\|string but returns mixed\.$#'
+			identifier: return.type
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/MathTrig/Sum.php
+
+		-
+			message: '#^Binary operation "\*" between mixed and mixed results in an error\.$#'
+			identifier: binaryOp.invalid
+			count: 4
+			path: src/PhpSpreadsheet/Calculation/MathTrig/SumSquares.php
+
+		-
+			message: '#^Binary operation "\-" between mixed and mixed results in an error\.$#'
+			identifier: binaryOp.invalid
+			count: 2
+			path: src/PhpSpreadsheet/Calculation/MathTrig/SumSquares.php
+
+		-
+			message: '#^Method PhpOffice\\PhpSpreadsheet\\Calculation\\Statistical\\Maximum\:\:max\(\) should return float\|int\|string but returns mixed\.$#'
+			identifier: return.type
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Statistical/Maximum.php
+
+		-
+			message: '#^Method PhpOffice\\PhpSpreadsheet\\Calculation\\Statistical\\Maximum\:\:maxA\(\) should return float\|int\|string but returns mixed\.$#'
+			identifier: return.type
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Statistical/Maximum.php
+
+		-
+			message: '#^Method PhpOffice\\PhpSpreadsheet\\Calculation\\Statistical\\Minimum\:\:min\(\) should return float\|int\|string but returns mixed\.$#'
+			identifier: return.type
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Statistical/Minimum.php
+
+		-
+			message: '#^Method PhpOffice\\PhpSpreadsheet\\Calculation\\Statistical\\Minimum\:\:minA\(\) should return float\|int\|string but returns mixed\.$#'
+			identifier: return.type
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Statistical/Minimum.php
+
+		-
+			message: '#^Parameter \#1 \$str of function preg_quote expects string, mixed given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/TextData/Extract.php
+
+		-
+			message: '#^Parameter \#1 \$str of function preg_quote expects string, mixed given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/TextData/Text.php