Skip to content

Commit b2d885f

Browse files
authored
Merge branch 'master' into stan2lv901
2 parents 9fc52cd + 6ec2cc9 commit b2d885f

File tree

24 files changed

+2969
-2811
lines changed

24 files changed

+2969
-2811
lines changed

CHANGELOG.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,17 @@ and this project adheres to [Semantic Versioning](https://semver.org).
99

1010
### Added
1111

12-
- Nothing yet.
12+
- Add ability to add custom functions to Calculation. [PR #4390](https://github.com/PHPOffice/PhpSpreadsheet/pull/4390)
13+
- Add FormulaRange to IgnoredErrors. [PR #4393](https://github.com/PHPOffice/PhpSpreadsheet/pull/4393)
1314

1415
### Removed
1516

1617
- Nothing yet.
1718

1819
### Changed
1920

20-
- Start migration to Phpstan 2. [PR #4396](https://github.com/PHPOffice/PhpSpreadsheet/pull/4396)
21+
- Phpstan Version 2. [PR #4384](https://github.com/PHPOffice/PhpSpreadsheet/pull/4384)
22+
- Start migration to Phpstan level 9. [PR #4396](https://github.com/PHPOffice/PhpSpreadsheet/pull/4396)
2123

2224
### Moved
2325

@@ -29,14 +31,14 @@ and this project adheres to [Semantic Versioning](https://semver.org).
2931

3032
### Fixed
3133

32-
- Nothing yet.
34+
- 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)
3335

3436
## 2025-03-02 - 4.1.0
3537

3638
### Added
3739

3840
- Support Justify Last Line. [Issue #4374](https://github.com/PHPOffice/PhpSpreadsheet/issues/4374) [PR #4373](https://github.com/PHPOffice/PhpSpreadsheet/pull/4373)
39-
- Allow Spreadsheet clone. [PR #437-](https://github.com/PHPOffice/PhpSpreadsheet/pull/4370)
41+
- Allow Spreadsheet clone. [PR #4370](https://github.com/PHPOffice/PhpSpreadsheet/pull/4370)
4042

4143
### Changed
4244

docs/topics/reading-files.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ for a working example of this code.
851851
### listWorksheetInfo
852852

853853
The `listWorksheetInfo()` method returns a nested array, with each entry
854-
listing the name and dimensions for a worksheet:
854+
listing the name, dimensions and state for a worksheet:
855855

856856
```php
857857
$reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($inputFileType);
@@ -865,7 +865,8 @@ foreach ($worksheetData as $worksheet) {
865865
echo 'Rows: ', $worksheet['totalRows'],
866866
' Columns: ', $worksheet['totalColumns'], '<br />';
867867
echo 'Cell Range: A1:',
868-
$worksheet['lastColumnLetter'], $worksheet['totalRows'];
868+
$worksheet['lastColumnLetter'], $worksheet['totalRows'], '<br />';
869+
echo 'Sheet state: ', $worksheet['sheetState'];
869870
echo '</li>';
870871
}
871872
echo '</ol>';

0 commit comments

Comments
 (0)