Skip to content

Commit a694a6d

Browse files
committed
Tests: remove some PHP < 7.2 specific code
1 parent 5dab205 commit a694a6d

File tree

2 files changed

+18
-36
lines changed

2 files changed

+18
-36
lines changed

src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function getErrorList()
3232
{
3333
$errors = [];
3434

35-
if (PHP_VERSION_ID >= 70200 && PHP_VERSION_ID < 80000) {
35+
if (PHP_VERSION_ID < 80000) {
3636
$errors[3] = 1;
3737
}
3838

src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php

Lines changed: 17 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public function getErrorList()
3737
13 => 2,
3838
14 => 1,
3939
15 => 1,
40+
17 => 3,
4041
28 => 1,
4142
43 => 1,
4243
76 => 1,
@@ -49,19 +50,22 @@ public function getErrorList()
4950
124 => 2,
5051
125 => 1,
5152
126 => 1,
53+
128 => 1,
5254
137 => 4,
5355
138 => 4,
5456
139 => 4,
55-
143 => 2,
57+
143 => 3,
5658
155 => 1,
5759
159 => 1,
60+
161 => 2,
5861
166 => 1,
5962
173 => 1,
6063
183 => 1,
6164
190 => 2,
6265
193 => 2,
6366
196 => 1,
6467
199 => 2,
68+
201 => 1,
6569
210 => 1,
6670
211 => 1,
6771
222 => 1,
@@ -71,7 +75,7 @@ public function getErrorList()
7175
226 => 1,
7276
227 => 1,
7377
230 => 2,
74-
232 => 2,
78+
232 => 7,
7579
246 => 1,
7680
248 => 4,
7781
261 => 1,
@@ -89,14 +93,18 @@ public function getErrorList()
8993
312 => 1,
9094
358 => 1,
9195
359 => 2,
96+
363 => 3,
9297
372 => 1,
9398
373 => 1,
99+
377 => 1,
94100
387 => 1,
95101
407 => 1,
96102
441 => 1,
97103
500 => 1,
98104
526 => 1,
99105
548 => 1,
106+
575 => 2,
107+
627 => 2,
100108
641 => 1,
101109
669 => 1,
102110
688 => 1,
@@ -116,6 +124,7 @@ public function getErrorList()
116124
890 => 1,
117125
978 => 1,
118126
997 => 1,
127+
1002 => 1,
119128
1004 => 2,
120129
1006 => 1,
121130
1029 => 1,
@@ -124,58 +133,31 @@ public function getErrorList()
124133
1069 => 1,
125134
1070 => 1,
126135
1071 => 1,
136+
1075 => 6,
127137
1080 => 2,
128138
1083 => 1,
129139
1084 => 1,
130140
1085 => 1,
141+
1089 => 3,
131142
1093 => 4,
132143
1100 => 1,
133144
1101 => 1,
134145
1102 => 1,
135146
1103 => 1,
147+
1107 => 8,
136148
1123 => 1,
137149
1124 => 1,
138150
1125 => 1,
151+
1129 => 3,
139152
1138 => 1,
140153
1139 => 1,
141154
1144 => 1,
142155
1145 => 1,
143156
1151 => 1,
157+
1154 => 1,
158+
1160 => 1,
144159
];
145160

146-
// Scalar type hints only work from PHP 7 onwards.
147-
if (PHP_VERSION_ID >= 70000) {
148-
$errors[17] = 3;
149-
$errors[128] = 1;
150-
$errors[143] = 3;
151-
$errors[161] = 2;
152-
$errors[201] = 1;
153-
$errors[232] = 7;
154-
$errors[363] = 3;
155-
$errors[377] = 1;
156-
$errors[575] = 2;
157-
$errors[627] = 1;
158-
$errors[1002] = 1;
159-
$errors[1075] = 6;
160-
$errors[1089] = 3;
161-
$errors[1107] = 8;
162-
$errors[1129] = 3;
163-
$errors[1154] = 1;
164-
$errors[1160] = 1;
165-
} else {
166-
$errors[729] = 4;
167-
$errors[740] = 2;
168-
$errors[752] = 2;
169-
$errors[982] = 1;
170-
}//end if
171-
172-
// Object type hints only work from PHP 7.2 onwards.
173-
if (PHP_VERSION_ID >= 70200) {
174-
$errors[627] = 2;
175-
} else {
176-
$errors[992] = 2;
177-
}
178-
179161
// Mixed type hints only work from PHP 8.0 onwards.
180162
if (PHP_VERSION_ID >= 80000) {
181163
$errors[265] = 1;

0 commit comments

Comments
 (0)