Skip to content

Commit f918847

Browse files
author
MarkBaker
committed
Merge branch 'master' into 2.0-Development
# Conflicts: # phpstan-baseline.neon
2 parents 02abb41 + 9776efc commit f918847

33 files changed

+385
-317
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: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:dataTestReference\\(\\) has no return type specified\\.$#"
6035
count: 1
@@ -120,11 +95,6 @@ parameters:
12095
count: 1
12196
path: src/PhpSpreadsheet/Calculation/Calculation.php
12297

123-
-
124-
message: "#^Parameter \\#1 \\$parent of method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\:\\:attach\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells, PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells\\|null given\\.$#"
125-
count: 1
126-
path: src/PhpSpreadsheet/Calculation/Calculation.php
127-
12898
-
12999
message: "#^Parameter \\#1 \\$str of function preg_quote expects string, int\\|string given\\.$#"
130100
count: 1
@@ -700,26 +670,6 @@ parameters:
700670
count: 3
701671
path: src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php
702672

703-
-
704-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\VLookup\\:\\:vlookupSort\\(\\) has no return type specified\\.$#"
705-
count: 1
706-
path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
707-
708-
-
709-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\VLookup\\:\\:vlookupSort\\(\\) has parameter \\$a with no type specified\\.$#"
710-
count: 1
711-
path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
712-
713-
-
714-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\VLookup\\:\\:vlookupSort\\(\\) has parameter \\$b with no type specified\\.$#"
715-
count: 1
716-
path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
717-
718-
-
719-
message: "#^Parameter \\#2 \\$callback of function uasort expects callable\\(T, T\\)\\: int, array\\{'self', 'vlookupSort'\\} given\\.$#"
720-
count: 1
721-
path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
722-
723673
-
724674
message: "#^Binary operation \"/\" between array\\|float\\|int\\|string and array\\|float\\|int\\|string results in an error\\.$#"
725675
count: 2
@@ -2265,36 +2215,6 @@ parameters:
22652215
count: 1
22662216
path: src/PhpSpreadsheet/Reader/Xls/ErrorCode.php
22672217

2268-
-
2269-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:f\\(\\) has no return type specified\\.$#"
2270-
count: 1
2271-
path: src/PhpSpreadsheet/Reader/Xls/MD5.php
2272-
2273-
-
2274-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:g\\(\\) has no return type specified\\.$#"
2275-
count: 1
2276-
path: src/PhpSpreadsheet/Reader/Xls/MD5.php
2277-
2278-
-
2279-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:h\\(\\) has no return type specified\\.$#"
2280-
count: 1
2281-
path: src/PhpSpreadsheet/Reader/Xls/MD5.php
2282-
2283-
-
2284-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:i\\(\\) has no return type specified\\.$#"
2285-
count: 1
2286-
path: src/PhpSpreadsheet/Reader/Xls/MD5.php
2287-
2288-
-
2289-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:rotate\\(\\) has no return type specified\\.$#"
2290-
count: 1
2291-
path: src/PhpSpreadsheet/Reader/Xls/MD5.php
2292-
2293-
-
2294-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:step\\(\\) has parameter \\$func with no type specified\\.$#"
2295-
count: 1
2296-
path: src/PhpSpreadsheet/Reader/Xls/MD5.php
2297-
22982218
-
22992219
message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\RC4\\:\\:\\$i has no type specified\\.$#"
23002220
count: 1
@@ -4155,16 +4075,6 @@ parameters:
41554075
count: 1
41564076
path: src/PhpSpreadsheet/Worksheet/Worksheet.php
41574077

4158-
-
4159-
message: "#^Parameter \\#1 \\$row of method PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells\\:\\:removeRow\\(\\) expects string, int given\\.$#"
4160-
count: 1
4161-
path: src/PhpSpreadsheet/Worksheet/Worksheet.php
4162-
4163-
-
4164-
message: "#^Parameter \\#1 \\$row of method PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells\\:\\:removeRow\\(\\) expects string, int\\<1, max\\> given\\.$#"
4165-
count: 1
4166-
path: src/PhpSpreadsheet/Worksheet/Worksheet.php
4167-
41684078
-
41694079
message: "#^Parameter \\#2 \\$format of static method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\:\\:toFormattedString\\(\\) expects string, string\\|null given\\.$#"
41704080
count: 2
@@ -4942,7 +4852,7 @@ parameters:
49424852

49434853
-
49444854
message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
4945-
count: 45
4855+
count: 44
49464856
path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
49474857

49484858
-
@@ -5235,11 +5145,6 @@ parameters:
52355145
count: 1
52365146
path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
52375147

5238-
-
5239-
message: "#^Offset int\\<1, max\\> on array\\<string, non\\-empty\\-array\\<int, string\\>\\> in isset\\(\\) does not exist\\.$#"
5240-
count: 2
5241-
path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
5242-
52435148
-
52445149
message: "#^Parameter \\#2 \\$content of method XMLWriter\\:\\:writeElement\\(\\) expects string\\|null, int\\|string given\\.$#"
52455150
count: 1

0 commit comments

Comments
 (0)