Skip to content

Dev dependency: PHP CS Fixer #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
samuelwilliams wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Dev dependency: PHP CS Fixer #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9d2719
Add PHP-CS-Fixer as dev dependency.
samuelwilliams Oct 7, 2019
b6d9629
Run PHP-CS-Fixer.
samuelwilliams Oct 7, 2019
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
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
1 change: 1 addition & 0 deletions src/IPBlock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ public function getGivenIpWithNetmask(): string
* @param mixed $prefix
*
* @throws \InvalidArgumentException
*
* @return int
*/
protected function checkPrefix($prefix)
Expand Down
75 changes: 37 additions & 38 deletions src/IPv4Block.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down