Skip to content

Commit b4c25a6

Browse files
Merge pull request #18709 from MoonE/refactor-generate-wkt
Refactor generateWkt of gis classes
2 parents dd9df66 + 33897db commit b4c25a6

17 files changed

+222
-309
lines changed

phpstan-baseline.neon

Lines changed: 28 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -10772,7 +10772,7 @@ parameters:
1077210772

1077310773
-
1077410774
message: "#^Cannot access offset 'gis_type' on mixed\\.$#"
10775-
count: 3
10775+
count: 2
1077610776
path: src/Gis/GisGeometryCollection.php
1077710777

1077810778
-
@@ -10782,32 +10782,22 @@ parameters:
1078210782

1078310783
-
1078410784
message: "#^Cannot access offset 'LINESTRING' on mixed\\.$#"
10785-
count: 7
10785+
count: 1
1078610786
path: src/Gis/GisLineString.php
1078710787

1078810788
-
1078910789
message: "#^Cannot access offset 'data_length' on mixed\\.$#"
1079010790
count: 1
1079110791
path: src/Gis/GisLineString.php
1079210792

10793-
-
10794-
message: "#^Cannot access offset 'x' on mixed\\.$#"
10795-
count: 3
10796-
path: src/Gis/GisLineString.php
10797-
10798-
-
10799-
message: "#^Cannot access offset 'y' on mixed\\.$#"
10800-
count: 3
10801-
path: src/Gis/GisLineString.php
10802-
1080310793
-
1080410794
message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#"
10805-
count: 6
10795+
count: 1
1080610796
path: src/Gis/GisLineString.php
1080710797

1080810798
-
10809-
message: "#^Cannot cast mixed to string\\.$#"
10810-
count: 2
10799+
message: "#^Parameter \\#1 \\$point of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getWktCoord\\(\\) expects array\\{x\\: float\\|int\\|string, y\\: float\\|int\\|string\\}\\|null, mixed given\\.$#"
10800+
count: 1
1081110801
path: src/Gis/GisLineString.php
1081210802

1081310803
-
@@ -10842,17 +10832,17 @@ parameters:
1084210832

1084310833
-
1084410834
message: "#^Cannot access offset 'x' on mixed\\.$#"
10845-
count: 4
10835+
count: 1
1084610836
path: src/Gis/GisMultiLineString.php
1084710837

1084810838
-
1084910839
message: "#^Cannot access offset 'y' on mixed\\.$#"
10850-
count: 4
10840+
count: 1
1085110841
path: src/Gis/GisMultiLineString.php
1085210842

1085310843
-
1085410844
message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#"
10855-
count: 14
10845+
count: 4
1085610846
path: src/Gis/GisMultiLineString.php
1085710847

1085810848
-
@@ -10861,8 +10851,8 @@ parameters:
1086110851
path: src/Gis/GisMultiLineString.php
1086210852

1086310853
-
10864-
message: "#^Cannot cast mixed to string\\.$#"
10865-
count: 2
10854+
message: "#^Parameter \\#1 \\$point of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getWktCoord\\(\\) expects array\\{x\\: float\\|int\\|string, y\\: float\\|int\\|string\\}\\|null, mixed given\\.$#"
10855+
count: 1
1086610856
path: src/Gis/GisMultiLineString.php
1086710857

1086810858
-
@@ -10877,7 +10867,7 @@ parameters:
1087710867

1087810868
-
1087910869
message: "#^Cannot access offset 'MULTIPOINT' on mixed\\.$#"
10880-
count: 7
10870+
count: 1
1088110871
path: src/Gis/GisMultiPoint.php
1088210872

1088310873
-
@@ -10887,22 +10877,22 @@ parameters:
1088710877

1088810878
-
1088910879
message: "#^Cannot access offset 'x' on mixed\\.$#"
10890-
count: 4
10880+
count: 1
1089110881
path: src/Gis/GisMultiPoint.php
1089210882

1089310883
-
1089410884
message: "#^Cannot access offset 'y' on mixed\\.$#"
10895-
count: 4
10885+
count: 1
1089610886
path: src/Gis/GisMultiPoint.php
1089710887

1089810888
-
1089910889
message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#"
10900-
count: 8
10890+
count: 3
1090110891
path: src/Gis/GisMultiPoint.php
1090210892

1090310893
-
10904-
message: "#^Cannot cast mixed to string\\.$#"
10905-
count: 2
10894+
message: "#^Parameter \\#1 \\$point of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getWktCoord\\(\\) expects array\\{x\\: float\\|int\\|string, y\\: float\\|int\\|string\\}\\|null, mixed given\\.$#"
10895+
count: 1
1090610896
path: src/Gis/GisMultiPoint.php
1090710897

1090810898
-
@@ -10957,12 +10947,12 @@ parameters:
1095710947

1095810948
-
1095910949
message: "#^Cannot access offset 'x' on mixed\\.$#"
10960-
count: 5
10950+
count: 2
1096110951
path: src/Gis/GisMultiPolygon.php
1096210952

1096310953
-
1096410954
message: "#^Cannot access offset 'y' on mixed\\.$#"
10965-
count: 5
10955+
count: 2
1096610956
path: src/Gis/GisMultiPolygon.php
1096710957

1096810958
-
@@ -10972,7 +10962,7 @@ parameters:
1097210962

1097310963
-
1097410964
message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#"
10975-
count: 21
10965+
count: 6
1097610966
path: src/Gis/GisMultiPolygon.php
1097710967

1097810968
-
@@ -10991,8 +10981,8 @@ parameters:
1099110981
path: src/Gis/GisMultiPolygon.php
1099210982

1099310983
-
10994-
message: "#^Cannot cast mixed to string\\.$#"
10995-
count: 2
10984+
message: "#^Parameter \\#1 \\$point of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getWktCoord\\(\\) expects array\\{x\\: float\\|int\\|string, y\\: float\\|int\\|string\\}\\|null, mixed given\\.$#"
10985+
count: 1
1099610986
path: src/Gis/GisMultiPolygon.php
1099710987

1099810988
-
@@ -11017,22 +11007,12 @@ parameters:
1101711007

1101811008
-
1101911009
message: "#^Cannot access offset 'POINT' on mixed\\.$#"
11020-
count: 6
11021-
path: src/Gis/GisPoint.php
11022-
11023-
-
11024-
message: "#^Cannot access offset 'x' on mixed\\.$#"
11025-
count: 3
11026-
path: src/Gis/GisPoint.php
11027-
11028-
-
11029-
message: "#^Cannot access offset 'y' on mixed\\.$#"
11030-
count: 3
11010+
count: 1
1103111011
path: src/Gis/GisPoint.php
1103211012

1103311013
-
11034-
message: "#^Cannot cast mixed to string\\.$#"
11035-
count: 2
11014+
message: "#^Parameter \\#1 \\$point of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getWktCoord\\(\\) expects array\\{x\\: float\\|int\\|string, y\\: float\\|int\\|string\\}\\|null, mixed given\\.$#"
11015+
count: 1
1103611016
path: src/Gis/GisPoint.php
1103711017

1103811018
-
@@ -11047,27 +11027,17 @@ parameters:
1104711027

1104811028
-
1104911029
message: "#^Cannot access offset 'POLYGON' on mixed\\.$#"
11050-
count: 8
11030+
count: 1
1105111031
path: src/Gis/GisPolygon.php
1105211032

1105311033
-
1105411034
message: "#^Cannot access offset 'data_length' on mixed\\.$#"
1105511035
count: 2
1105611036
path: src/Gis/GisPolygon.php
1105711037

11058-
-
11059-
message: "#^Cannot access offset 'x' on mixed\\.$#"
11060-
count: 3
11061-
path: src/Gis/GisPolygon.php
11062-
11063-
-
11064-
message: "#^Cannot access offset 'y' on mixed\\.$#"
11065-
count: 3
11066-
path: src/Gis/GisPolygon.php
11067-
1106811038
-
1106911039
message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#"
11070-
count: 13
11040+
count: 3
1107111041
path: src/Gis/GisPolygon.php
1107211042

1107311043
-
@@ -11076,8 +11046,8 @@ parameters:
1107611046
path: src/Gis/GisPolygon.php
1107711047

1107811048
-
11079-
message: "#^Cannot cast mixed to string\\.$#"
11080-
count: 2
11049+
message: "#^Parameter \\#1 \\$point of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getWktCoord\\(\\) expects array\\{x\\: float\\|int\\|string, y\\: float\\|int\\|string\\}\\|null, mixed given\\.$#"
11050+
count: 1
1108111051
path: src/Gis/GisPolygon.php
1108211052

1108311053
-

0 commit comments

Comments
 (0)