Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"ext-bcmath": "*"
},
"require-dev": {
"phpunit/phpunit": "^9.6"
"phpunit/phpunit": "^11.0"
},
"autoload": {
"psr-4": {
Expand Down
14 changes: 5 additions & 9 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.0/phpunit.xsd"
colors="true"
executionOrder="depends,defects"
backupGlobals="false"
beStrictAboutOutputDuringTests="true"
beStrictAboutTodoAnnotatedTests="true"
verbose="true">
displayDetailsOnTestsThatTriggerDeprecations="true"
displayDetailsOnTestsThatTriggerWarnings="true">

<php>
<ini name="error_reporting" value="-1"/>
</php>

<coverage processUncoveredFiles="true">
<source>
<include>
<directory suffix=".php">src</directory>
</include>
<report>
<html outputDirectory="tests/var/coverage-report" lowUpperBound="35" highLowerBound="70"/>
<text outputFile="php://stdout" showOnlySummary="true"/>
</report>
</coverage>
</source>

<testsuites>
<testsuite name="default">
Expand Down
14 changes: 7 additions & 7 deletions tests/IPTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand All @@ -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'],
Expand All @@ -197,7 +197,7 @@ public function getToStringData(): array
];
}

public function getTestParseData(): array
public static function getTestParseData(): array
{
return [
[2130706433, '127.0.0.1'], //long
Expand All @@ -209,7 +209,7 @@ public function getTestParseData(): array
];
}

public function getParseBinData(): array
public static function getParseBinData(): array
{
return [
[
Expand All @@ -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'],
Expand All @@ -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'],
Expand All @@ -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'],
Expand Down
20 changes: 10 additions & 10 deletions tests/NetworkTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand All @@ -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')],
Expand All @@ -183,7 +183,7 @@ public function getPrefixData(): array
];
}

public function getInvalidPrefixData(): array
public static function getInvalidPrefixData(): array
{
return [
['-1', IP::IP_V4],
Expand All @@ -193,7 +193,7 @@ public function getInvalidPrefixData(): array
];
}

public function getHostsData(): array
public static function getHostsData(): array
{
return [
[
Expand All @@ -210,7 +210,7 @@ public function getHostsData(): array
];
}

public function getExcludeData(): array
public static function getExcludeData(): array
{
return [
[
Expand All @@ -226,15 +226,15 @@ public function getExcludeData(): array
];
}

public function getExcludeExceptionData(): array
public static function getExcludeExceptionData(): array
{
return [
['192.0.2.0/28', '192.0.3.0/24'],
['192.0.2.2/32', '192.0.2.3/32'],
];
}

public function getMoveToData(): array
public static function getMoveToData(): array
{
return [
[
Expand Down Expand Up @@ -265,7 +265,7 @@ public function getMoveToData(): array
];
}

public function getMoveToExceptionData(): array
public static function getMoveToExceptionData(): array
{
return [
['192.168.0.0/22', '22'],
Expand All @@ -275,7 +275,7 @@ public function getMoveToExceptionData(): array
];
}

public function getTestIterationData(): array
public static function getTestIterationData(): array
{
return [
[
Expand Down Expand Up @@ -307,7 +307,7 @@ public function getTestIterationData(): array
];
}

public function getTestCountData(): array
public static function getTestCountData(): array
{
return [
['127.0.0.0/31', 2],
Expand Down
10 changes: 5 additions & 5 deletions tests/RangeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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']],
Expand All @@ -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']],
Expand All @@ -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],
Expand All @@ -112,7 +112,7 @@ public function getTestContainsData(): array
];
}

public function getTestIterationData(): array
public static function getTestIterationData(): array
{
return [
[
Expand Down Expand Up @@ -144,7 +144,7 @@ public function getTestIterationData(): array
];
}

public function getTestCountData(): array
public static function getTestCountData(): array
{
return [
['127.0.0.0/31', 2],
Expand Down
Loading