1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
From: =?utf-8?q?David_Pr=C3=A9vot?= <david@tilapin.org>
Date: Mon, 4 Mar 2024 10:32:50 +0100
Subject: Compatibility with recent PHPUnit (12)
---
components/Components/DomainTest.php | 2 +-
components/Components/HierarchicalPathTest.php | 1 -
interfaces/IPv4/ConverterTest.php | 10 ++++++++--
uri/BaseUriTest.php | 3 ++-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/components/Components/DomainTest.php b/components/Components/DomainTest.php
index 5dab01a..aa1efac 100644
--- a/components/Components/DomainTest.php
+++ b/components/Components/DomainTest.php
@@ -207,7 +207,7 @@ final class DomainTest extends TestCase
}
#[DataProvider('countableProvider')]
- public function testCountable(string $host, int $nblabels): void
+ public function testCountable(string $host, int $nblabels, array $more): void
{
self::assertCount($nblabels, Domain::new($host));
}
diff --git a/components/Components/HierarchicalPathTest.php b/components/Components/HierarchicalPathTest.php
index 92814e5..1b98b3f 100644
--- a/components/Components/HierarchicalPathTest.php
+++ b/components/Components/HierarchicalPathTest.php
@@ -738,7 +738,6 @@ final class HierarchicalPathTest extends TestCase
[
'',
'',
- '',
],
[
'"bad"',
diff --git a/interfaces/IPv4/ConverterTest.php b/interfaces/IPv4/ConverterTest.php
index db5db20..dc0ac49 100644
--- a/interfaces/IPv4/ConverterTest.php
+++ b/interfaces/IPv4/ConverterTest.php
@@ -21,8 +21,14 @@ use PHPUnit\Framework\TestCase;
final class ConverterTest extends TestCase
{
#[DataProvider('providerHost')]
- public function testParseWithAutoDetectCalculator(?string $input, ?string $expected): void
- {
+ public function testParseWithAutoDetectCalculator(
+ string $input,
+ string $expected,
+ string $octal,
+ string $hexadecimal,
+ string $sixToFour,
+ string $ipv4Mapped,
+ ): void {
if (PHP_INT_SIZE != 4) {
self::assertEquals($expected, Converter::fromEnvironment()->toDecimal($input) ?? $input);
}
diff --git a/uri/BaseUriTest.php b/uri/BaseUriTest.php
index 2df8c63..be619f4 100644
--- a/uri/BaseUriTest.php
+++ b/uri/BaseUriTest.php
@@ -156,7 +156,8 @@ final class BaseUriTest extends TestCase
public function testRelativizeAndResolve(
string $baseUri,
string $uri,
- string $expectedRelativize
+ string $expectedRelativize,
+ string $expectedUri,
): void {
self::assertSame(
$expectedRelativize,
|
