Merge branch 'master' into issue4435

Author: oleibman

CHANGELOG.md

@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Add ability to add custom functions to Calculation. [PR #4390](https://github.com/PHPOffice/PhpSpreadsheet/pull/4390)
 - Add FormulaRange to IgnoredErrors. [PR #4393](https://github.com/PHPOffice/PhpSpreadsheet/pull/4393)
+- TextGrid improvements. [PR #4418](https://github.com/PHPOffice/PhpSpreadsheet/pull/4418)
+- Permit read to class which extends Spreadsheet. [Discussion #4402](https://github.com/PHPOffice/PhpSpreadsheet/discussions/4402) [PR #4404](https://github.com/PHPOffice/PhpSpreadsheet/pull/4404)
+- Conditional and table formatting support for html writer [PR #4412](https://github.com/PHPOffice/PhpSpreadsheet/pull/4412)
 
 ### Removed
 
@@ -22,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Start migration to Phpstan level 9. [PR #4396](https://github.com/PHPOffice/PhpSpreadsheet/pull/4396)
 - Calculation locale logic moved to separate class. [PR #4398](https://github.com/PHPOffice/PhpSpreadsheet/pull/4398)
 - TREND_POLYNOMIAL_* and TREND_BEST_FIT do not work, and are changed to throw Exceptions if attempted. (TREND_BEST_FIT_NO_POLY works.) An attempt to use an unknown trend type will now also throw an exception. [Issue #4400](https://github.com/PHPOffice/PhpSpreadsheet/issues/4400) [PR #4339](https://github.com/PHPOffice/PhpSpreadsheet/pull/4339)
+- Month parameter of DATE function will now return VALUE if an ordinal string (e.g. '3rd') is used, but will accept bool or null. [PR #4420](https://github.com/PHPOffice/PhpSpreadsheet/pull/4420)
 
 ### Moved
 
@@ -33,9 +37,14 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
+- Ignore fractional part of Drawing Shadow Alpha. [Issue #4415](https://github.com/PHPOffice/PhpSpreadsheet/issues/4415) [PR #4417](https://github.com/PHPOffice/PhpSpreadsheet/pull/4417)
 - BIN2DEC, OCT2DEC, and HEX2DEC return numbers rather than strings. [Issue #4383](https://github.com/PHPOffice/PhpSpreadsheet/issues/4383) [PR #4389](https://github.com/PHPOffice/PhpSpreadsheet/pull/4389)
 - Fix TREND_BEST_FIT_NO_POLY. [Issue #4400](https://github.com/PHPOffice/PhpSpreadsheet/issues/4400) [PR #4339](https://github.com/PHPOffice/PhpSpreadsheet/pull/4339)
 - Ods Reader No DataType for Null Value. [Issue #4435](https://github.com/PHPOffice/PhpSpreadsheet/issues/4435) [PR #4436](https://github.com/PHPOffice/PhpSpreadsheet/pull/4436)
+- Column widths not preserved when using read filter. [Issue #4416](https://github.com/PHPOffice/PhpSpreadsheet/issues/4416) [PR #4423](https://github.com/PHPOffice/PhpSpreadsheet/pull/4423)
+- Fix typo in Style exportArray quotePrefix. [Issue #4422](https://github.com/PHPOffice/PhpSpreadsheet/issues/4422) [PR #4424](https://github.com/PHPOffice/PhpSpreadsheet/pull/4424)
+- Tweak Spreadsheet clone. [PR #4419](https://github.com/PHPOffice/PhpSpreadsheet/pull/4419)
+- Better handling of Chart DisplayBlanksAs. [Issue #4411](https://github.com/PHPOffice/PhpSpreadsheet/issues/4411) [PR #4414](https://github.com/PHPOffice/PhpSpreadsheet/pull/4414)
 
 ## 2025-03-02 - 4.1.0
 

composer.lock

@@ -143,20 +143,28 @@ Currently, the following Conditional Types are supported for the following Reade
 
 MS Excel | Conditional Type | Readers | Writers
 ---|---|---|---
-| Cell Value | Conditional::CONDITION_CELLIS | Xlsx | Xlsx, Xls
-Specific Text | Conditional::CONDITION_CONTAINSTEXT | Xlsx | Xlsx
- | Conditional::CONDITION_NOTCONTAINSTEXT | Xlsx | Xlsx
- | Conditional::CONDITION_BEGINSWITH | Xlsx | Xlsx
- | Conditional::CONDITION_ENDSWITH | Xlsx | Xlsx
-Dates Occurring | Conditional::CONDITION_TIMEPERIOD | Xlsx | Xlsx
-Blanks | Conditional::CONDITION_CONTAINSBLANKS | Xlsx | Xlsx
-No Blanks | Conditional::CONDITION_NOTCONTAINSBLANKS | Xlsx | Xlsx
-Errors | Conditional::CONDITION_CONTAINSERRORS | Xlsx | Xlsx
-No Errors | Conditional::CONDITION_NOTCONTAINSERRORS | Xlsx | Xlsx
-Duplicates/Unique | Conditional::CONDITION_DUPLICATES | Xlsx | Xlsx
- | Conditional::CONDITION_UNIQUE | Xlsx | Xlsx
-Use a formula | Conditional::CONDITION_EXPRESSION | Xlsx | Xlsx, Xls
-Data Bars | Conditional::CONDITION_DATABAR | Xlsx | Xlsx
+| Cell Value | Conditional::CONDITION_CELLIS | Xlsx | Xlsx, Xls, Html
+Specific Text | Conditional::CONDITION_CONTAINSTEXT | Xlsx | Xlsx, Html
+ | Conditional::CONDITION_NOTCONTAINSTEXT | Xlsx | Xlsx, Html
+ | Conditional::CONDITION_BEGINSWITH | Xlsx | Xlsx, Html
+ | Conditional::CONDITION_ENDSWITH | Xlsx | Xlsx, Html
+Dates Occurring | Conditional::CONDITION_TIMEPERIOD | Xlsx | Xlsx, Html
+Blanks | Conditional::CONDITION_CONTAINSBLANKS | Xlsx | Xlsx, Html
+No Blanks | Conditional::CONDITION_NOTCONTAINSBLANKS | Xlsx | Xlsx, Html
+Errors | Conditional::CONDITION_CONTAINSERRORS | Xlsx | Xlsx, Html
+No Errors | Conditional::CONDITION_NOTCONTAINSERRORS | Xlsx | Xlsx, Html
+Duplicates/Unique | Conditional::CONDITION_DUPLICATES | Xlsx | Xlsx, Html
+ | Conditional::CONDITION_UNIQUE | Xlsx | Xlsx, Html
+Use a formula | Conditional::CONDITION_EXPRESSION | Xlsx | Xlsx, Xls, Html
+Data Bars | Conditional::CONDITION_DATABAR | Xlsx | Xlsx, Html
+Colour Scales | Conditional::COLORSCALE | Xlsx | Html
+
+To enable conditional formatting for Html writer, use:
+
+```php
+        $writer = new HtmlWriter($spreadsheet);
+        $writer->setConditionalFormatting(true);
+```
 
 The following Conditional Types are currently not supported by any Readers or Writers:
 
@@ -165,7 +173,6 @@ MS Excel | Conditional Type
 Above/Below Average | ?
 Top/Bottom Items | ?
 Top/Bottom %age | ?
-Colour Scales |?
 Icon Sets | ?
 
 Unsupported types will by ignored by the Readers, and cannot be created through PHPSpreadsheet.

docs/topics/conditional-formatting.md

@@ -1169,6 +1169,44 @@ One benefit of flags is that you can pass several flags in a single method call.
 Two or more flags can be passed together using PHP's `|` operator.
 
 ```php
-$reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReaderForFile("myExampleFile.xlsx");
-$reader->load("spreadsheetWithCharts.xlsx", $reader::READ_DATA_ONLY | $reader::IGNORE_EMPTY_CELLS);
-```
+$reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReaderForFile('myExampleFile.xlsx');
+$reader->load(
+    'spreadsheetWithCharts.xlsx',
+    $reader::READ_DATA_ONLY | $reader::IGNORE_EMPTY_CELLS
+);
+```
+
+## Writing Data as a Plaintext Grid
+
+Although not really a spreadsheet format, it can be useful to write data in grid format to a plaintext file.
+Code like the following can be used:
+```php
+        $array = $sheet->toArray(null, true, true, true);
+        $textGrid = new \PhpOffice\PhpSpreadsheet\Shared\TextGrid(
+            $array,
+            true, // true for cli, false for html
+            // Starting with release 4.2,
+            // the output format can be tweaked by uncommenting
+            // any of the following 3 optional parameters.
+            // rowDividers: true,
+            // rowHeaders: false,
+            // columnHeaders: false,
+        );
+        $result = $textGrid->render();
+```
+You can then echo `$result` to a terminal, or write it to a file with `file_put_contents`. The result will resemble:
+```
+    +-----+------------------+---+----------+
+    | A   | B                | C | D        |
++---+-----+------------------+---+----------+
+| 1 | 6   | 1900-01-06 00:00 |   | 0.572917 |
+| 2 | 6   | TRUE             |   | 1<>2     |
+| 3 | xyz | xyz              |   |          |
++---+-----+------------------+---+----------+
+```
+Please note that this may produce sub-optimal results for situations such as:
+
+- use of accents as combining characters rather than using pre-composed characters (may be handled by extending the class to override the `getString` or `strlen` methods)
+- Fullwidth characters
+- right-to-left characters (better display in a browser than a terminal on a non-RTL system)
+- multi-line strings