Skip to content

Commit a40c708

Browse files
author
MarkBaker
committed
Merge from 2.0 development, and rebase phpstan baseline
1 parent a8fc5bc commit a40c708

File tree

2 files changed

+1
-51
lines changed

2 files changed

+1
-51
lines changed

phpstan-baseline.neon

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,56 +1080,6 @@ parameters:
10801080
count: 1
10811081
path: src/PhpSpreadsheet/Chart/DataSeriesValues.php
10821082

1083-
-
1084-
message: "#^Parameter \\#1 \\$angle of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:setShadowAngle\\(\\) expects int, int\\|null given\\.$#"
1085-
count: 1
1086-
path: src/PhpSpreadsheet/Chart/GridLines.php
1087-
1088-
-
1089-
message: "#^Parameter \\#1 \\$color of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:setGlowColor\\(\\) expects string, string\\|null given\\.$#"
1090-
count: 1
1091-
path: src/PhpSpreadsheet/Chart/GridLines.php
1092-
1093-
-
1094-
message: "#^Parameter \\#1 \\$distance of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:setShadowDistance\\(\\) expects float, float\\|null given\\.$#"
1095-
count: 1
1096-
path: src/PhpSpreadsheet/Chart/GridLines.php
1097-
1098-
-
1099-
message: "#^Parameter \\#2 \\$alpha of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:setGlowColor\\(\\) expects int, int\\|null given\\.$#"
1100-
count: 1
1101-
path: src/PhpSpreadsheet/Chart/GridLines.php
1102-
1103-
-
1104-
message: "#^Parameter \\#3 \\$colorType of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:setGlowColor\\(\\) expects string, string\\|null given\\.$#"
1105-
count: 1
1106-
path: src/PhpSpreadsheet/Chart/GridLines.php
1107-
1108-
-
1109-
message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:\\$glowProperties has no type specified\\.$#"
1110-
count: 1
1111-
path: src/PhpSpreadsheet/Chart/GridLines.php
1112-
1113-
-
1114-
message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:\\$lineProperties has no type specified\\.$#"
1115-
count: 1
1116-
path: src/PhpSpreadsheet/Chart/GridLines.php
1117-
1118-
-
1119-
message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:\\$objectState has no type specified\\.$#"
1120-
count: 1
1121-
path: src/PhpSpreadsheet/Chart/GridLines.php
1122-
1123-
-
1124-
message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:\\$shadowProperties has no type specified\\.$#"
1125-
count: 1
1126-
path: src/PhpSpreadsheet/Chart/GridLines.php
1127-
1128-
-
1129-
message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:\\$softEdges has no type specified\\.$#"
1130-
count: 1
1131-
path: src/PhpSpreadsheet/Chart/GridLines.php
1132-
11331083
-
11341084
message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Legend\\:\\:\\$layout \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Layout\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Layout\\|null\\.$#"
11351085
count: 1

tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
44

55
use Exception;
6-
use PhpOffice\PhpSpreadsheet\NamedRange;
76
use PhpOffice\PhpSpreadsheet\Cell\DataType;
7+
use PhpOffice\PhpSpreadsheet\NamedRange;
88
use PhpOffice\PhpSpreadsheet\Spreadsheet;
99
use PhpOffice\PhpSpreadsheet\Worksheet\CellIterator;
1010
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;

0 commit comments

Comments
 (0)