Skip to content

Commit d368cfb

Browse files
simPodsimPod
committed
chore: bump phpunit to ^11.0
Update phpunit.xml.dist for PHPUnit 11 schema (replace <coverage> with <source>, remove deprecated attributes). Make data provider methods static as required by PHPUnit 11.
1 parent 41f8d37 commit d368cfb

5 files changed

Lines changed: 28 additions & 32 deletions

File tree

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"ext-bcmath": "*"
1515
},
1616
"require-dev": {
17-
"phpunit/phpunit": "^9.6"
17+
"phpunit/phpunit": "^11.0"
1818
},
1919
"autoload": {
2020
"psr-4": {

‎phpunit.xml.dist‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.0/phpunit.xsd"
44
colors="true"
55
executionOrder="depends,defects"
66
backupGlobals="false"
77
beStrictAboutOutputDuringTests="true"
8-
beStrictAboutTodoAnnotatedTests="true"
9-
verbose="true">
8+
displayDetailsOnTestsThatTriggerDeprecations="true"
9+
displayDetailsOnTestsThatTriggerWarnings="true">
1010

1111
<php>
1212
<ini name="error_reporting" value="-1"/>
1313
</php>
1414

15-
<coverage processUncoveredFiles="true">
15+
<source>
1616
<include>
1717
<directory suffix=".php">src</directory>
1818
</include>
19-
<report>
20-
<html outputDirectory="tests/var/coverage-report" lowUpperBound="35" highLowerBound="70"/>
21-
<text outputFile="php://stdout" showOnlySummary="true"/>
22-
</report>
23-
</coverage>
19+
</source>
2420

2521
<testsuites>
2622
<testsuite name="default">

‎tests/IPTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public function testReversePointer($ip, $expected): void
173173
$this->assertEquals($expected, $reversePointer);
174174
}
175175

176-
public function getTestConstructorExceptionData(): array
176+
public static function getTestConstructorExceptionData(): array
177177
{
178178
return [
179179
['256.0.0.1'],
@@ -187,7 +187,7 @@ public function getTestConstructorExceptionData(): array
187187
];
188188
}
189189

190-
public function getToStringData(): array
190+
public static function getToStringData(): array
191191
{
192192
return [
193193
['127.0.0.1', '127.0.0.1'],
@@ -197,7 +197,7 @@ public function getToStringData(): array
197197
];
198198
}
199199

200-
public function getTestParseData(): array
200+
public static function getTestParseData(): array
201201
{
202202
return [
203203
[2130706433, '127.0.0.1'], //long
@@ -209,7 +209,7 @@ public function getTestParseData(): array
209209
];
210210
}
211211

212-
public function getParseBinData(): array
212+
public static function getParseBinData(): array
213213
{
214214
return [
215215
[
@@ -220,7 +220,7 @@ public function getParseBinData(): array
220220
];
221221
}
222222

223-
public function getTestNextData(): array
223+
public static function getTestNextData(): array
224224
{
225225
return [
226226
['192.168.0.1', 1, '192.168.0.2'],
@@ -232,7 +232,7 @@ public function getTestNextData(): array
232232
];
233233
}
234234

235-
public function getTestPrevData(): array
235+
public static function getTestPrevData(): array
236236
{
237237
return [
238238
['192.168.1.1', 1, '192.168.1.0'],
@@ -244,7 +244,7 @@ public function getTestPrevData(): array
244244
];
245245
}
246246

247-
public function getReversePointerData(): array
247+
public static function getReversePointerData(): array
248248
{
249249
return [
250250
['192.0.2.5', '5.2.0.192.in-addr.arpa'],

‎tests/NetworkTest.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public function testCount($data, $expected): void
163163
$this->assertCount($expected, Network::parse($data));
164164
}
165165

166-
public function getTestParseData(): array
166+
public static function getTestParseData(): array
167167
{
168168
return [
169169
['192.168.0.54/24', '192.168.0.0/24'],
@@ -173,7 +173,7 @@ public function getTestParseData(): array
173173
];
174174
}
175175

176-
public function getPrefixData(): array
176+
public static function getPrefixData(): array
177177
{
178178
return [
179179
['24', IP::IP_V4, IP::parse('255.255.255.0')],
@@ -183,7 +183,7 @@ public function getPrefixData(): array
183183
];
184184
}
185185

186-
public function getInvalidPrefixData(): array
186+
public static function getInvalidPrefixData(): array
187187
{
188188
return [
189189
['-1', IP::IP_V4],
@@ -193,7 +193,7 @@ public function getInvalidPrefixData(): array
193193
];
194194
}
195195

196-
public function getHostsData(): array
196+
public static function getHostsData(): array
197197
{
198198
return [
199199
[
@@ -210,7 +210,7 @@ public function getHostsData(): array
210210
];
211211
}
212212

213-
public function getExcludeData(): array
213+
public static function getExcludeData(): array
214214
{
215215
return [
216216
[
@@ -226,15 +226,15 @@ public function getExcludeData(): array
226226
];
227227
}
228228

229-
public function getExcludeExceptionData(): array
229+
public static function getExcludeExceptionData(): array
230230
{
231231
return [
232232
['192.0.2.0/28', '192.0.3.0/24'],
233233
['192.0.2.2/32', '192.0.2.3/32'],
234234
];
235235
}
236236

237-
public function getMoveToData(): array
237+
public static function getMoveToData(): array
238238
{
239239
return [
240240
[
@@ -265,7 +265,7 @@ public function getMoveToData(): array
265265
];
266266
}
267267

268-
public function getMoveToExceptionData(): array
268+
public static function getMoveToExceptionData(): array
269269
{
270270
return [
271271
['192.168.0.0/22', '22'],
@@ -275,7 +275,7 @@ public function getMoveToExceptionData(): array
275275
];
276276
}
277277

278-
public function getTestIterationData(): array
278+
public static function getTestIterationData(): array
279279
{
280280
return [
281281
[
@@ -307,7 +307,7 @@ public function getTestIterationData(): array
307307
];
308308
}
309309

310-
public function getTestCountData(): array
310+
public static function getTestCountData(): array
311311
{
312312
return [
313313
['127.0.0.0/31', 2],

‎tests/RangeTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function testCount($data, $expected): void
6060
$this->assertEquals($expected, count(Range::parse($data)));
6161
}
6262

63-
public function getTestParseData(): array
63+
public static function getTestParseData(): array
6464
{
6565
return [
6666
['127.0.0.1-127.255.255.255', ['127.0.0.1', '127.255.255.255']],
@@ -70,7 +70,7 @@ public function getTestParseData(): array
7070
];
7171
}
7272

73-
public function getTestNetworksData(): array
73+
public static function getTestNetworksData(): array
7474
{
7575
return [
7676
['192.168.1.*', ['192.168.1.0/24']],
@@ -95,7 +95,7 @@ public function getTestNetworksData(): array
9595
];
9696
}
9797

98-
public function getTestContainsData(): array
98+
public static function getTestContainsData(): array
9999
{
100100
return [
101101
['192.168.*.*', '192.168.245.15', true],
@@ -112,7 +112,7 @@ public function getTestContainsData(): array
112112
];
113113
}
114114

115-
public function getTestIterationData(): array
115+
public static function getTestIterationData(): array
116116
{
117117
return [
118118
[
@@ -144,7 +144,7 @@ public function getTestIterationData(): array
144144
];
145145
}
146146

147-
public function getTestCountData(): array
147+
public static function getTestCountData(): array
148148
{
149149
return [
150150
['127.0.0.0/31', 2],

0 commit comments

Comments
 (0)