Skip to content

Commit 53a984b

Browse files
oleibmanoleibman
authored
Merge branch 'master' into feature/justifyLastLine
2 parents f366749 + 8c86caa commit 53a984b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+775
-529
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
1010
### Added
1111

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

1415
### Removed
1516

@@ -32,6 +33,8 @@ and this project adheres to [Semantic Versioning](https://semver.org).
3233
### Fixed
3334

3435
- Refactor Helper/Html. [PR #4359](https://github.com/PHPOffice/PhpSpreadsheet/pull/4359)
36+
- Ignore ignoredErrors when not applicable. [Issue #4375](https://github.com/PHPOffice/PhpSpreadsheet/issues/4375) [PR #4377](https://github.com/PHPOffice/PhpSpreadsheet/pull/4377)
37+
- Better handling of defined names on sheets whose titles include apostrophes. [Issue #4356](https://github.com/PHPOffice/PhpSpreadsheet/issues/4356) [Issue #4362](https://github.com/PHPOffice/PhpSpreadsheet/issues/4362) [Issue #4376](https://github.com/PHPOffice/PhpSpreadsheet/issues/4376) [PR #4360](https://github.com/PHPOffice/PhpSpreadsheet/pull/4360)
3538

3639
## 2025-02-08 - 4.0.0
3740

‎phpstan-baseline.neon‎

Lines changed: 0 additions & 235 deletions
Original file line numberDiff line numberDiff line change
@@ -1,160 +1,5 @@
11
parameters:
22
ignoreErrors:
3-
-
4-
message: "#^Call to function is_array\\(\\) with array will always evaluate to true\\.$#"
5-
count: 2
6-
path: src/PhpSpreadsheet/Calculation/Calculation.php
7-
8-
-
9-
message: "#^Call to function is_string\\(\\) with string will always evaluate to true\\.$#"
10-
count: 1
11-
path: src/PhpSpreadsheet/Calculation/Calculation.php
12-
13-
-
14-
message: "#^Offset 'reference' might not exist on array\\|null\\.$#"
15-
count: 1
16-
path: src/PhpSpreadsheet/Calculation/Calculation.php
17-
18-
-
19-
message: "#^Offset 'type' might not exist on array\\|null\\.$#"
20-
count: 2
21-
path: src/PhpSpreadsheet/Calculation/Calculation.php
22-
23-
-
24-
message: "#^Offset 'value' might not exist on array\\|null\\.$#"
25-
count: 7
26-
path: src/PhpSpreadsheet/Calculation/Calculation.php
27-
28-
-
29-
message: "#^PHPDoc tag @var with type int is not subtype of native type int\\<48, 57\\>\\|int\\<256, 1048576\\>\\|numeric\\-string\\.$#"
30-
count: 1
31-
path: src/PhpSpreadsheet/Calculation/Calculation.php
32-
33-
-
34-
message: "#^Parameter \\#1 \\.\\.\\.\\$arg1 of function max expects non\\-empty\\-array, list\\<\\(int\\|string\\)\\> given\\.$#"
35-
count: 1
36-
path: src/PhpSpreadsheet/Calculation/Calculation.php
37-
38-
-
39-
message: "#^Parameter \\#1 \\.\\.\\.\\$arg1 of function max expects non\\-empty\\-array, list\\<int\\> given\\.$#"
40-
count: 2
41-
path: src/PhpSpreadsheet/Calculation/Calculation.php
42-
43-
-
44-
message: "#^Parameter \\#1 \\.\\.\\.\\$arg1 of function max expects non\\-empty\\-array, list\\<string\\> given\\.$#"
45-
count: 1
46-
path: src/PhpSpreadsheet/Calculation/Calculation.php
47-
48-
-
49-
message: "#^Parameter \\#1 \\.\\.\\.\\$arg1 of function min expects non\\-empty\\-array, list\\<\\(int\\|string\\)\\> given\\.$#"
50-
count: 1
51-
path: src/PhpSpreadsheet/Calculation/Calculation.php
52-
53-
-
54-
message: "#^Parameter \\#1 \\.\\.\\.\\$arg1 of function min expects non\\-empty\\-array, list\\<int\\> given\\.$#"
55-
count: 2
56-
path: src/PhpSpreadsheet/Calculation/Calculation.php
57-
58-
-
59-
message: "#^Parameter \\#1 \\.\\.\\.\\$arg1 of function min expects non\\-empty\\-array, list\\<string\\> given\\.$#"
60-
count: 1
61-
path: src/PhpSpreadsheet/Calculation/Calculation.php
62-
63-
-
64-
message: "#^Offset 0 on non\\-empty\\-list\\<string\\> on left side of \\?\\? always exists and is not nullable\\.$#"
65-
count: 1
66-
path: src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
67-
68-
-
69-
message: "#^Parameter &\\$year by\\-ref type of method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\DateTimeExcel\\\\Date\\:\\:adjustYearMonth\\(\\) expects int, float given\\.$#"
70-
count: 2
71-
path: src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php
72-
73-
-
74-
message: "#^Strict comparison using \\!\\=\\= between DateInterval and false will always evaluate to true\\.$#"
75-
count: 1
76-
path: src/PhpSpreadsheet/Calculation/DateTimeExcel/Days.php
77-
78-
-
79-
message: "#^Parameter &\\$testVal3 by\\-ref type of method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\DateTimeExcel\\\\Helpers\\:\\:adjustYear\\(\\) expects string, float\\|int given\\.$#"
80-
count: 1
81-
path: src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php
82-
83-
-
84-
message: "#^Parameter &\\$hour by\\-ref type of method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\DateTimeExcel\\\\Time\\:\\:adjustMinute\\(\\) expects int, float given\\.$#"
85-
count: 2
86-
path: src/PhpSpreadsheet/Calculation/DateTimeExcel/Time.php
87-
88-
-
89-
message: "#^Parameter &\\$minute by\\-ref type of method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\DateTimeExcel\\\\Time\\:\\:adjustSecond\\(\\) expects int, float given\\.$#"
90-
count: 2
91-
path: src/PhpSpreadsheet/Calculation/DateTimeExcel/Time.php
92-
93-
-
94-
message: "#^Parameter &\\$operand by\\-ref type of method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engine\\\\FormattedNumber\\:\\:convertToNumberIfCurrency\\(\\) expects string, float given\\.$#"
95-
count: 1
96-
path: src/PhpSpreadsheet/Calculation/Engine/FormattedNumber.php
97-
98-
-
99-
message: "#^Parameter &\\$operand by\\-ref type of method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engine\\\\FormattedNumber\\:\\:convertToNumberIfNumeric\\(\\) expects string, float given\\.$#"
100-
count: 1
101-
path: src/PhpSpreadsheet/Calculation/Engine/FormattedNumber.php
102-
103-
-
104-
message: "#^Parameter &\\$operand by\\-ref type of method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engine\\\\FormattedNumber\\:\\:convertToNumberIfPercent\\(\\) expects string, float given\\.$#"
105-
count: 1
106-
path: src/PhpSpreadsheet/Calculation/Engine/FormattedNumber.php
107-
108-
-
109-
message: "#^Strict comparison using \\!\\=\\= between float and null will always evaluate to true\\.$#"
110-
count: 1
111-
path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic.php
112-
113-
-
114-
message: "#^Parameter \\#1 \\.\\.\\.\\$arg1 of function max expects non\\-empty\\-array, array given\\.$#"
115-
count: 1
116-
path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
117-
118-
-
119-
message: "#^Parameter \\#1 \\.\\.\\.\\$arg1 of function min expects non\\-empty\\-array, array given\\.$#"
120-
count: 1
121-
path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
122-
123-
-
124-
message: "#^Call to function is_array\\(\\) with array will always evaluate to true\\.$#"
125-
count: 1
126-
path: src/PhpSpreadsheet/Calculation/Information/Value.php
127-
128-
-
129-
message: "#^Parameter \\#1 \\$array \\(list\\<mixed\\>\\) of array_values is already a list, call has no effect\\.$#"
130-
count: 1
131-
path: src/PhpSpreadsheet/Calculation/LookupRef/Filter.php
132-
133-
-
134-
message: "#^Offset float does not exist on non\\-empty\\-list\\<mixed\\>\\.$#"
135-
count: 1
136-
path: src/PhpSpreadsheet/Calculation/Statistical/Averages.php
137-
138-
-
139-
message: "#^Call to function is_numeric\\(\\) with float\\|int\\|numeric\\-string will always evaluate to true\\.$#"
140-
count: 1
141-
path: src/PhpSpreadsheet/Calculation/Statistical/Deviations.php
142-
143-
-
144-
message: "#^Call to function is_float\\(\\) with float will always evaluate to true\\.$#"
145-
count: 2
146-
path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
147-
148-
-
149-
message: "#^Offset float does not exist on non\\-empty\\-list\\<mixed\\>\\.$#"
150-
count: 4
151-
path: src/PhpSpreadsheet/Calculation/Statistical/Percentiles.php
152-
153-
-
154-
message: "#^PHPDoc tag @var with type array is not subtype of native type list\\<mixed\\>\\|false\\.$#"
155-
count: 2
156-
path: src/PhpSpreadsheet/Calculation/TextData/Text.php
157-
1583
-
1594
message: "#^Call to function is_string\\(\\) with numeric\\-string\\|non\\-empty\\-string will always evaluate to true\\.$#"
1605
count: 1
@@ -424,83 +269,3 @@ parameters:
424269
message: "#^Strict comparison using \\!\\=\\= between string and null will always evaluate to true\\.$#"
425270
count: 1
426271
path: src/PhpSpreadsheet/Worksheet/Worksheet.php
427-
428-
-
429-
message: "#^Binary operation \"\\.\\=\" between array\\|string and non\\-falsy\\-string results in an error\\.$#"
430-
count: 1
431-
path: src/PhpSpreadsheet/Writer/Html.php
432-
433-
-
434-
message: "#^Instanceof between PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart and PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart will always evaluate to true\\.$#"
435-
count: 1
436-
path: src/PhpSpreadsheet/Writer/Html.php
437-
438-
-
439-
message: "#^Strict comparison using \\!\\=\\= between PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter and null will always evaluate to true\\.$#"
440-
count: 1
441-
path: src/PhpSpreadsheet/Writer/Ods/AutoFilters.php
442-
443-
-
444-
message: "#^Strict comparison using \\!\\=\\= between int and null will always evaluate to true\\.$#"
445-
count: 1
446-
path: src/PhpSpreadsheet/Writer/Ods/Content.php
447-
448-
-
449-
message: "#^Parameter \\#1 \\$image of callable passed to call_user_func\\(\\) expects GdImage, GdImage\\|null given\\.$#"
450-
count: 1
451-
path: src/PhpSpreadsheet/Writer/Xls.php
452-
453-
-
454-
message: "#^Static property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\BIFFwriter\\:\\:\\$byteOrder \\(int\\|null\\) is never assigned null so it can be removed from the property type\\.$#"
455-
count: 1
456-
path: src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php
457-
458-
-
459-
message: "#^Call to function is_string\\(\\) with string will always evaluate to true\\.$#"
460-
count: 3
461-
path: src/PhpSpreadsheet/Writer/Xls/CellDataValidation.php
462-
463-
-
464-
message: "#^PHPDoc tag @var with type float\\|int\\|string is not subtype of native type mixed\\.$#"
465-
count: 1
466-
path: src/PhpSpreadsheet/Writer/Xls/ConditionalHelper.php
467-
468-
-
469-
message: "#^Call to function is_string\\(\\) with string will always evaluate to true\\.$#"
470-
count: 1
471-
path: src/PhpSpreadsheet/Writer/Xls/Style/CellBorder.php
472-
473-
-
474-
message: "#^PHPDoc tag @var with type callable is not subtype of native type string\\.$#"
475-
count: 1
476-
path: src/PhpSpreadsheet/Writer/Xlsx.php
477-
478-
-
479-
message: "#^PHPDoc tag @var with type string is not subtype of native type non\\-empty\\-array\\|non\\-falsy\\-string\\.$#"
480-
count: 1
481-
path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
482-
483-
-
484-
message: "#^Parameter &\\$plotGroupingType by\\-ref type of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Chart\\:\\:writePlotGroup\\(\\) expects string, string\\|null given\\.$#"
485-
count: 1
486-
path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
487-
488-
-
489-
message: "#^Strict comparison using \\!\\=\\= between array\\|PhpOffice\\\\PhpSpreadsheet\\\\RichText\\\\RichText\\|string and null will always evaluate to true\\.$#"
490-
count: 3
491-
path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
492-
493-
-
494-
message: "#^Call to function is_array\\(\\) with array\\<string\\> will always evaluate to true\\.$#"
495-
count: 1
496-
path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
497-
498-
-
499-
message: "#^Strict comparison using \\!\\=\\= between PhpOffice\\\\PhpSpreadsheet\\\\RichText\\\\RichText and null will always evaluate to true\\.$#"
500-
count: 1
501-
path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
502-
503-
-
504-
message: "#^Strict comparison using \\!\\=\\= between PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormatValueObject and null will always evaluate to true\\.$#"
505-
count: 2
506-
path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php

0 commit comments

Comments
 (0)