From b9d27198c5e4973d07e66fd156b00c2e5abbd870 Mon Sep 17 00:00:00 2001 From: samuelwilliams Date: Mon, 7 Oct 2019 22:14:11 +1100 Subject: [PATCH 1/2] Add PHP-CS-Fixer as dev dependency. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f178d8a..285663f 100755 --- a/composer.json +++ b/composer.json @@ -10,7 +10,8 @@ "ext-gmp": "*" }, "require-dev": { - "phpunit/phpunit": ">=6.5 <8.1" + "phpunit/phpunit": ">=6.5 <8.1", + "friendsofphp/php-cs-fixer": "~2.15" }, "autoload": { "psr-4": { From b6d9629bb90624e7eb75c25995f7d39fe67b7d9c Mon Sep 17 00:00:00 2001 From: samuelwilliams Date: Mon, 7 Oct 2019 22:14:36 +1100 Subject: [PATCH 2/2] Run PHP-CS-Fixer. --- src/IPBlock.php | 1 + src/IPv4Block.php | 75 +++++++++++++++++++++++------------------------ 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/IPBlock.php b/src/IPBlock.php index fed9373..27b7ba1 100644 --- a/src/IPBlock.php +++ b/src/IPBlock.php @@ -318,6 +318,7 @@ public function getGivenIpWithNetmask(): string * @param mixed $prefix * * @throws \InvalidArgumentException + * * @return int */ protected function checkPrefix($prefix) diff --git a/src/IPv4Block.php b/src/IPv4Block.php index 382d2d6..9b8c594 100644 --- a/src/IPv4Block.php +++ b/src/IPv4Block.php @@ -21,51 +21,50 @@ class IPv4Block extends IPBlock { protected static $ip_class = IPv4::class; - const netmask2prefix = array( - "0.0.0.0" => 0, - "128.0.0.0" => 1, - "192.0.0.0" => 2, - "224.0.0.0" => 3, - "240.0.0.0" => 4, - "248.0.0.0" => 5, - "252.0.0.0" => 6, - "254.0.0.0" => 7, - "255.0.0.0" => 8, - "255.128.0.0" => 9, - "255.192.0.0" => 10, - "255.224.0.0" => 11, - "255.240.0.0" => 12, - "255.248.0.0" => 13, - "255.252.0.0" => 14, - "255.254.0.0" => 15, - "255.255.0.0" => 16, - "255.255.128.0" => 17, - "255.255.192.0" => 18, - "255.255.224.0" => 19, - "255.255.240.0" => 20, - "255.255.248.0" => 21, - "255.255.252.0" => 22, - "255.255.254.0" => 23, - "255.255.255.0" => 24, - "255.255.255.128" => 25, - "255.255.255.192" => 26, - "255.255.255.224" => 27, - "255.255.255.240" => 28, - "255.255.255.248" => 29, - "255.255.255.252" => 30, - "255.255.255.254" => 31, - "255.255.255.255" => 32 - ); + const netmask2prefix = [ + '0.0.0.0' => 0, + '128.0.0.0' => 1, + '192.0.0.0' => 2, + '224.0.0.0' => 3, + '240.0.0.0' => 4, + '248.0.0.0' => 5, + '252.0.0.0' => 6, + '254.0.0.0' => 7, + '255.0.0.0' => 8, + '255.128.0.0' => 9, + '255.192.0.0' => 10, + '255.224.0.0' => 11, + '255.240.0.0' => 12, + '255.248.0.0' => 13, + '255.252.0.0' => 14, + '255.254.0.0' => 15, + '255.255.0.0' => 16, + '255.255.128.0' => 17, + '255.255.192.0' => 18, + '255.255.224.0' => 19, + '255.255.240.0' => 20, + '255.255.248.0' => 21, + '255.255.252.0' => 22, + '255.255.254.0' => 23, + '255.255.255.0' => 24, + '255.255.255.128' => 25, + '255.255.255.192' => 26, + '255.255.255.224' => 27, + '255.255.255.240' => 28, + '255.255.255.248' => 29, + '255.255.255.252' => 30, + '255.255.255.254' => 31, + '255.255.255.255' => 32, + ]; /** * @internal - * Check if the prefix is valid, - * rewrites IPv4 old-style netmask to CIDR prefix number, - * and returns the prefix. + * Check if the prefix is valid, rewrites IPv4 old-style netmask to CIDR prefix number, and returns the prefix * * @param mixed $prefix * * @throws \InvalidArgumentException + * * @return int */ protected function checkPrefix($prefix)