Skip to content

Commit acfd752

Browse files
author
MarkBaker
committed
Merge branch 'master' into CalculationEngine-Array-Formulae-Initial-Work
# Conflicts: # phpstan-baseline.neon # src/PhpSpreadsheet/Calculation/Calculation.php
2 parents d613de1 + 9776efc commit acfd752

33 files changed

+385
-316
lines changed

‎CHANGELOG.md

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

1010
### Added
1111

12-
- Nothing
12+
- Add point size option for scatter charts
1313

1414
### Changed
1515

16-
- Nothing
16+
- Memory and speed improvements, particularly for the Cell Collection, and the Writers.
1717

1818
### Deprecated
1919

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"dompdf/dompdf": "^1.0",
8383
"friendsofphp/php-cs-fixer": "^3.2",
8484
"jpgraph/jpgraph": "^4.0",
85-
"mpdf/mpdf": "8.0.17",
85+
"mpdf/mpdf": "8.1.1",
8686
"phpcompatibility/php-compatibility": "^9.3",
8787
"phpstan/phpstan": "^1.1",
8888
"phpstan/phpstan-phpunit": "^1.0",

‎composer.lock

Lines changed: 82 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎phpstan-baseline.neon

Lines changed: 1 addition & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,6 @@ parameters:
2020
count: 6
2121
path: src/PhpSpreadsheet/Calculation/Calculation.php
2222

23-
-
24-
message: "#^Cannot call method getColumn\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
25-
count: 2
26-
path: src/PhpSpreadsheet/Calculation/Calculation.php
27-
28-
-
29-
message: "#^Cannot call method getCoordinate\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
30-
count: 2
31-
path: src/PhpSpreadsheet/Calculation/Calculation.php
32-
3323
-
3424
message: "#^Cannot call method getHighestColumn\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
3525
count: 1
@@ -40,21 +30,6 @@ parameters:
4030
count: 1
4131
path: src/PhpSpreadsheet/Calculation/Calculation.php
4232

43-
-
44-
message: "#^Cannot call method getRow\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
45-
count: 2
46-
path: src/PhpSpreadsheet/Calculation/Calculation.php
47-
48-
-
49-
message: "#^Cannot call method getTitle\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
50-
count: 1
51-
path: src/PhpSpreadsheet/Calculation/Calculation.php
52-
53-
-
54-
message: "#^Cannot call method has\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells\\|null\\.$#"
55-
count: 1
56-
path: src/PhpSpreadsheet/Calculation/Calculation.php
57-
5833
-
5934
message: "#^Cannot use array destructuring on array\\<string\\>\\|string\\.$#"
6035
count: 6
@@ -95,11 +70,6 @@ parameters:
9570
count: 1
9671
path: src/PhpSpreadsheet/Calculation/Calculation.php
9772

98-
-
99-
message: "#^Parameter \\#1 \\$parent of method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\:\\:attach\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells, PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells\\|null given\\.$#"
100-
count: 1
101-
path: src/PhpSpreadsheet/Calculation/Calculation.php
102-
10373
-
10474
message: "#^Parameter \\#1 \\$str of function preg_quote expects string, int\\|string given\\.$#"
10575
count: 1
@@ -780,26 +750,6 @@ parameters:
780750
count: 4
781751
path: src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php
782752

783-
-
784-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\VLookup\\:\\:vlookupSort\\(\\) has no return type specified\\.$#"
785-
count: 1
786-
path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
787-
788-
-
789-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\VLookup\\:\\:vlookupSort\\(\\) has parameter \\$a with no type specified\\.$#"
790-
count: 1
791-
path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
792-
793-
-
794-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\VLookup\\:\\:vlookupSort\\(\\) has parameter \\$b with no type specified\\.$#"
795-
count: 1
796-
path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
797-
798-
-
799-
message: "#^Parameter \\#2 \\$callback of function uasort expects callable\\(T, T\\)\\: int, array\\{'self', 'vlookupSort'\\} given\\.$#"
800-
count: 1
801-
path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
802-
803753
-
804754
message: "#^Binary operation \"/\" between array\\|float\\|int\\|string and array\\|float\\|int\\|string results in an error\\.$#"
805755
count: 2
@@ -2360,36 +2310,6 @@ parameters:
23602310
count: 1
23612311
path: src/PhpSpreadsheet/Reader/Xls/ErrorCode.php
23622312

2363-
-
2364-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:f\\(\\) has no return type specified\\.$#"
2365-
count: 1
2366-
path: src/PhpSpreadsheet/Reader/Xls/MD5.php
2367-
2368-
-
2369-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:g\\(\\) has no return type specified\\.$#"
2370-
count: 1
2371-
path: src/PhpSpreadsheet/Reader/Xls/MD5.php
2372-
2373-
-
2374-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:h\\(\\) has no return type specified\\.$#"
2375-
count: 1
2376-
path: src/PhpSpreadsheet/Reader/Xls/MD5.php
2377-
2378-
-
2379-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:i\\(\\) has no return type specified\\.$#"
2380-
count: 1
2381-
path: src/PhpSpreadsheet/Reader/Xls/MD5.php
2382-
2383-
-
2384-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:rotate\\(\\) has no return type specified\\.$#"
2385-
count: 1
2386-
path: src/PhpSpreadsheet/Reader/Xls/MD5.php
2387-
2388-
-
2389-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:step\\(\\) has parameter \\$func with no type specified\\.$#"
2390-
count: 1
2391-
path: src/PhpSpreadsheet/Reader/Xls/MD5.php
2392-
23932313
-
23942314
message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\RC4\\:\\:\\$i has no type specified\\.$#"
23952315
count: 1
@@ -4260,16 +4180,6 @@ parameters:
42604180
count: 1
42614181
path: src/PhpSpreadsheet/Worksheet/Worksheet.php
42624182

4263-
-
4264-
message: "#^Parameter \\#1 \\$row of method PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells\\:\\:removeRow\\(\\) expects string, int given\\.$#"
4265-
count: 1
4266-
path: src/PhpSpreadsheet/Worksheet/Worksheet.php
4267-
4268-
-
4269-
message: "#^Parameter \\#1 \\$row of method PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells\\:\\:removeRow\\(\\) expects string, int\\<1, max\\> given\\.$#"
4270-
count: 1
4271-
path: src/PhpSpreadsheet/Worksheet/Worksheet.php
4272-
42734183
-
42744184
message: "#^Parameter \\#2 \\$format of static method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\:\\:toFormattedString\\(\\) expects string, string\\|null given\\.$#"
42754185
count: 2
@@ -5052,7 +4962,7 @@ parameters:
50524962

50534963
-
50544964
message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
5055-
count: 45
4965+
count: 44
50564966
path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
50574967

50584968
-
@@ -5355,11 +5265,6 @@ parameters:
53555265
count: 1
53565266
path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
53575267

5358-
-
5359-
message: "#^Offset int\\<1, max\\> on array\\<string, non\\-empty\\-array\\<int, string\\>\\> in isset\\(\\) does not exist\\.$#"
5360-
count: 2
5361-
path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
5362-
53635268
-
53645269
message: "#^Parameter \\#2 \\$content of method XMLWriter\\:\\:writeElement\\(\\) expects string\\|null, int\\|string given\\.$#"
53655270
count: 1

0 commit comments

Comments
 (0)