Merge branch 'master' into issue1425

Author: oleibman

CHANGELOG.md

@@ -30,9 +30,11 @@ 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)
 - 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)
 
 ## 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,2 @@
 parameters:
-	ignoreErrors: []
+	ignoreErrors:

phpstan.neon.dist

@@ -29,4 +29,5 @@ parameters:
         - '~^Parameter \#2 .* of static method PHPUnit\\Framework\\Assert\:\:assert\w+\(\) expects .*, .* given\.$~'
         #- '~Method .*rovider.* return type has no value type specified in iterable type array\.$~'
         #- '~Method .*rovider.* should return array but returns mixed\.$~'
+        #- '~.* has parameter \$expectedResult with no value type specified in iterable type array\.$~'
         - identifier: missingType.iterableValue

src/PhpSpreadsheet/Calculation/Calculation.php

@@ -42,6 +42,7 @@ public static function evaluate(array $database, array|null|int|string $field, a
             return ExcelError::NAN();
         }
 
+        /** @var array<null|float|int|string> */
         $row = array_pop($columnData);
 
         return array_pop($row);

src/PhpSpreadsheet/Calculation/Database/DGet.php

@@ -53,8 +53,7 @@ protected static function fieldExtract(array $database, mixed $field): ?int
 
         /** @var callable */
         $callable = 'strtoupper';
-        /** @var non-empty-array $database */
-        $fieldNames = array_map($callable, array_shift($database));
+        $fieldNames = array_map($callable, array_shift($database)); //* @phpstan-ignore-line
         if (is_numeric($field)) {
             $field = (int) $field - 1;
             if ($field < 0 || $field >= count($fieldNames)) {
@@ -88,21 +87,24 @@ protected static function fieldExtract(array $database, mixed $field): ?int
      */
     protected static function filter(array $database, array $criteria): array
     {
-        /** @var array */
+        /** @var mixed[] */
         $fieldNames = array_shift($database);
-        /** @var array */
         $criteriaNames = array_shift($criteria);
 
         //    Convert the criteria into a set of AND/OR conditions with [:placeholders]
+        /** @var string[] $criteriaNames */
         $query = self::buildQuery($criteriaNames, $criteria);
 
         //    Loop through each row of the database
+        /** @var mixed[][] $criteriaNames */
         return self::executeQuery($database, $query, $criteriaNames, $fieldNames);
     }
 
     /**
      * @param mixed[] $database The range of cells that makes up the list or database
      * @param mixed[][] $criteria
+     *
+     * @return mixed[]
      */
     protected static function getFilteredColumn(array $database, ?int $field, array $criteria): array
     {
@@ -112,7 +114,7 @@ protected static function getFilteredColumn(array $database, ?int $field, array
 
         //    extract an array of values for the requested column
         $columnData = [];
-        /** @var array $row */
+        /** @var mixed[] $row */
         foreach ($database as $rowKey => $row) {
             $keys = array_keys($row);
             $key = $keys[$field] ?? null;

src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php

@@ -28,7 +28,7 @@ class Date
      * A Month name or abbreviation (English only at this point) such as 'January' or 'Jan' will still be accepted,
      *     as will a day value with a suffix (e.g. '21st' rather than simply 21); again only English language.
      *
-     * @param array|float|int|string $year The value of the year argument can include one to four digits.
+     * @param array<mixed>|float|int|string $year The value of the year argument can include one to four digits.
      *                                Excel interprets the year argument according to the configured
      *                                date system: 1900 or 1904.
      *                                If year is between 0 (zero) and 1899 (inclusive), Excel adds that
@@ -39,7 +39,7 @@ class Date
      *                                2008.
      *                                If year is less than 0 or is 10000 or greater, Excel returns the
      *                                #NUM! error value.
-     * @param array|float|int|string $month A positive or negative integer representing the month of the year
+     * @param array<mixed>|float|int|string $month A positive or negative integer representing the month of the year
      *                                from 1 to 12 (January to December).
      *                                If month is greater than 12, month adds that number of months to
      *                                the first month in the year specified. For example, DATE(2008,14,2)
@@ -48,7 +48,7 @@ class Date
      *                                number of months, plus 1, from the first month in the year
      *                                specified. For example, DATE(2008,-3,2) returns the serial number
      *                                representing September 2, 2007.
-     * @param array|float|int|string $day A positive or negative integer representing the day of the month
+     * @param array<mixed>|float|int|string $day A positive or negative integer representing the day of the month
      *                                from 1 to 31.
      *                                If day is greater than the number of days in the month specified,
      *                                day adds that number of days to the first day in the month. For
@@ -59,7 +59,7 @@ class Date
      *                                example, DATE(2008,1,-15) returns the serial number representing
      *                                December 16, 2007.
      *
-     * @return array|DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     * @return array<mixed>|DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      *         If an array of numbers is passed as the argument, then the returned result will also be an array
      *            with the same dimensions

src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php

@@ -24,7 +24,7 @@ class DateParts
      *                                    PHP DateTime object, or a standard date string
      *                         Or can be an array of date values
      *
-     * @return array|int|string Day of the month
+     * @return array<mixed>|int|string Day of the month
      *         If an array of numbers is passed as the argument, then the returned result will also be an array
      *            with the same dimensions
      */
@@ -65,7 +65,7 @@ public static function day(mixed $dateValue): array|int|string
      *                                    PHP DateTime object, or a standard date string
      *                         Or can be an array of date values
      *
-     * @return array|int|string Month of the year
+     * @return array<mixed>|int|string Month of the year
      *         If an array of numbers is passed as the argument, then the returned result will also be an array
      *            with the same dimensions
      */
@@ -104,7 +104,7 @@ public static function month(mixed $dateValue): array|string|int
      *                                    PHP DateTime object, or a standard date string
      *                         Or can be an array of date values
      *
-     * @return array|int|string Year
+     * @return array<mixed>|int|string Year
      *         If an array of numbers is passed as the argument, then the returned result will also be an array
      *            with the same dimensions
      */