From 00247fa38b9480ea2b5f8b9fa6cdfbd119011cf2 Mon Sep 17 00:00:00 2001 From: Simon Podlipsky Date: Tue, 24 Mar 2026 14:25:00 +0100 Subject: [PATCH] chore: bump phpunit to ^11.0 Update phpunit.xml.dist for PHPUnit 11 schema (replace with , remove deprecated attributes). Make data provider methods static as required by PHPUnit 11. --- composer.json | 2 +- phpunit.xml.dist | 14 +++++--------- tests/IPTest.php | 14 +++++++------- tests/NetworkTest.php | 20 ++++++++++---------- tests/RangeTest.php | 10 +++++----- 5 files changed, 28 insertions(+), 32 deletions(-) diff --git a/composer.json b/composer.json index 56b5739..d32f746 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "ext-bcmath": "*" }, "require-dev": { - "phpunit/phpunit": "^9.6" + "phpunit/phpunit": "^11.0" }, "autoload": { "psr-4": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index bee2777..0e71b4c 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,26 +1,22 @@ + displayDetailsOnTestsThatTriggerDeprecations="true" + displayDetailsOnTestsThatTriggerWarnings="true"> - + src - - - - - + diff --git a/tests/IPTest.php b/tests/IPTest.php index 90dda7e..1b82abe 100644 --- a/tests/IPTest.php +++ b/tests/IPTest.php @@ -173,7 +173,7 @@ public function testReversePointer($ip, $expected): void $this->assertEquals($expected, $reversePointer); } - public function getTestConstructorExceptionData(): array + public static function getTestConstructorExceptionData(): array { return [ ['256.0.0.1'], @@ -187,7 +187,7 @@ public function getTestConstructorExceptionData(): array ]; } - public function getToStringData(): array + public static function getToStringData(): array { return [ ['127.0.0.1', '127.0.0.1'], @@ -197,7 +197,7 @@ public function getToStringData(): array ]; } - public function getTestParseData(): array + public static function getTestParseData(): array { return [ [2130706433, '127.0.0.1'], //long @@ -209,7 +209,7 @@ public function getTestParseData(): array ]; } - public function getParseBinData(): array + public static function getParseBinData(): array { return [ [ @@ -220,7 +220,7 @@ public function getParseBinData(): array ]; } - public function getTestNextData(): array + public static function getTestNextData(): array { return [ ['192.168.0.1', 1, '192.168.0.2'], @@ -232,7 +232,7 @@ public function getTestNextData(): array ]; } - public function getTestPrevData(): array + public static function getTestPrevData(): array { return [ ['192.168.1.1', 1, '192.168.1.0'], @@ -244,7 +244,7 @@ public function getTestPrevData(): array ]; } - public function getReversePointerData(): array + public static function getReversePointerData(): array { return [ ['192.0.2.5', '5.2.0.192.in-addr.arpa'], diff --git a/tests/NetworkTest.php b/tests/NetworkTest.php index fdc8656..0fbb936 100644 --- a/tests/NetworkTest.php +++ b/tests/NetworkTest.php @@ -163,7 +163,7 @@ public function testCount($data, $expected): void $this->assertCount($expected, Network::parse($data)); } - public function getTestParseData(): array + public static function getTestParseData(): array { return [ ['192.168.0.54/24', '192.168.0.0/24'], @@ -173,7 +173,7 @@ public function getTestParseData(): array ]; } - public function getPrefixData(): array + public static function getPrefixData(): array { return [ ['24', IP::IP_V4, IP::parse('255.255.255.0')], @@ -183,7 +183,7 @@ public function getPrefixData(): array ]; } - public function getInvalidPrefixData(): array + public static function getInvalidPrefixData(): array { return [ ['-1', IP::IP_V4], @@ -193,7 +193,7 @@ public function getInvalidPrefixData(): array ]; } - public function getHostsData(): array + public static function getHostsData(): array { return [ [ @@ -210,7 +210,7 @@ public function getHostsData(): array ]; } - public function getExcludeData(): array + public static function getExcludeData(): array { return [ [ @@ -226,7 +226,7 @@ public function getExcludeData(): array ]; } - public function getExcludeExceptionData(): array + public static function getExcludeExceptionData(): array { return [ ['192.0.2.0/28', '192.0.3.0/24'], @@ -234,7 +234,7 @@ public function getExcludeExceptionData(): array ]; } - public function getMoveToData(): array + public static function getMoveToData(): array { return [ [ @@ -265,7 +265,7 @@ public function getMoveToData(): array ]; } - public function getMoveToExceptionData(): array + public static function getMoveToExceptionData(): array { return [ ['192.168.0.0/22', '22'], @@ -275,7 +275,7 @@ public function getMoveToExceptionData(): array ]; } - public function getTestIterationData(): array + public static function getTestIterationData(): array { return [ [ @@ -307,7 +307,7 @@ public function getTestIterationData(): array ]; } - public function getTestCountData(): array + public static function getTestCountData(): array { return [ ['127.0.0.0/31', 2], diff --git a/tests/RangeTest.php b/tests/RangeTest.php index 1ff7d33..5dd1d53 100644 --- a/tests/RangeTest.php +++ b/tests/RangeTest.php @@ -60,7 +60,7 @@ public function testCount($data, $expected): void $this->assertEquals($expected, count(Range::parse($data))); } - public function getTestParseData(): array + public static function getTestParseData(): array { return [ ['127.0.0.1-127.255.255.255', ['127.0.0.1', '127.255.255.255']], @@ -70,7 +70,7 @@ public function getTestParseData(): array ]; } - public function getTestNetworksData(): array + public static function getTestNetworksData(): array { return [ ['192.168.1.*', ['192.168.1.0/24']], @@ -95,7 +95,7 @@ public function getTestNetworksData(): array ]; } - public function getTestContainsData(): array + public static function getTestContainsData(): array { return [ ['192.168.*.*', '192.168.245.15', true], @@ -112,7 +112,7 @@ public function getTestContainsData(): array ]; } - public function getTestIterationData(): array + public static function getTestIterationData(): array { return [ [ @@ -144,7 +144,7 @@ public function getTestIterationData(): array ]; } - public function getTestCountData(): array + public static function getTestCountData(): array { return [ ['127.0.0.0/31', 2],