matracine / ip-tools

src/Iterators/RangeIterator.php

Braces +1 added lines, -2 removed lines

@@ -92,8 +92,7 @@
         try
         {
             $this->range[$this->index];       
-        }
-        catch(\Exception $e)
+        } catch(\Exception $e)
         {
             return false;
         }

src/Iterators/SubnetIterator.php

Braces +1 added lines, -2 removed lines

@@ -93,8 +93,7 @@
         try
         {
             $this->subnet[$this->index];       
-        }
-        catch(\Exception $e)
+        } catch(\Exception $e)
         {
             return false;
         }

src/IPv4/Address.php

Indentation +5 added lines, -5 removed lines

@@ -36,10 +36,10 @@ 
      * @see https://en.wikipedia.org/wiki/Classful_network 
      */ 
     const CLASS_A = "A",
-          CLASS_B = "B",
-          CLASS_C = "C",
-          CLASS_D = "D",
-          CLASS_E = "E";
+            CLASS_B = "B",
+            CLASS_C = "C",
+            CLASS_D = "D",
+            CLASS_E = "E";
 
     /**
      * IPv4 addresses are stored as a 32 bits integer
@@ -404,7 +404,7 @@ 
      * @param self $address
      * @return bool
      */
-     public function match(Address $address)
+        public function match(Address $address)
     {
         return $this->int() == $address->int();
     }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
      * @return self
      */
 
-    public static function fromArray(Array $address)
+    public static function fromArray(array $address)
     {
         if( count($address) != 4)
         {

Spacing +17 added lines, -17 removed lines

@@ -63,12 +63,12 @@ 
      */
     public function __construct(int $address)
     {
-        if ($address<0 || $address>0xffffffff)
+        if($address<0 || $address>0xffffffff)
         {
             throw new OutOfBoundsException(sprintf("Cannot convert 0x%x to an IPv4 address", $address));            
         } 
 
-        $this->address =  $address;
+        $this->address = $address;
     }
 
     /**
@@ -105,7 +105,7 @@ 
 
     public static function fromArray(Array $address)
     {
-        if( count($address) != 4)
+        if(count($address)!=4)
         {
             throw new InvalidArgumentException(sprintf("Array must contain 4 digits, %d found", count($address)));
         }
@@ -113,19 +113,19 @@ 
         $buffer = 0;
         foreach($address as $digit)
         {
-            if (is_string($digit) )
+            if(is_string($digit))
             {        
                 $digit = trim($digit);
-                if (strlen($digit)==0)
+                if(strlen($digit)==0)
                 {
                     throw new InvalidArgumentException(sprintf("The array must contains only integers or strings with integer content , string found with empty value"));
                 }
-                if ( $digit[0] == '-' && ctype_digit(ltrim($digit, '-')) )
+                if($digit[0]=='-' && ctype_digit(ltrim($digit, '-')))
                 {
                     // string type : "-123"
                     throw new OutOfBoundsException(sprintf("Cannot convert %d to Ipv4 addresss digit", $digit));
                 }
-                if (!ctype_digit($digit))
+                if(!ctype_digit($digit))
                 {
                     throw new InvalidArgumentException(sprintf("The array must contains only integers or strings with integer content , string found with bad value %s", $digit));
                 }
@@ -133,7 +133,7 @@ 
                 $digit = (int)$digit;
             }
             
-            if (!is_integer($digit) )
+            if(!is_integer($digit))
             {
                 throw new InvalidArgumentException(sprintf("The array must contains only integers or strings with integer content , %s found", gettype($digit)));
             }
@@ -245,7 +245,7 @@ 
      */
      public function match(Address $address)
     {
-        return $this->int() == $address->int();
+        return $this->int()==$address->int();
     }
 
     /**
@@ -257,23 +257,23 @@ 
     {
         $higherOctet = $this->address >> 24;
 
-        if (($higherOctet & 0x80) == 0) {
+        if(($higherOctet & 0x80)==0) {
             return self::CLASS_A;
         }
 
-        if (($higherOctet & 0xC0) == 0x80) {
+        if(($higherOctet & 0xC0)==0x80) {
             return self::CLASS_B;
         }
 
-        if (($higherOctet & 0xE0) == 0xC0) {
+        if(($higherOctet & 0xE0)==0xC0) {
             return self::CLASS_C;
         }
 
-        if (($higherOctet & 0xF0) == 0xE0) {
+        if(($higherOctet & 0xF0)==0xE0) {
             return self::CLASS_D;
         }
 
-        if (($higherOctet & 0xF0) == 0xF0) {
+        if(($higherOctet & 0xF0)==0xF0) {
             return self::CLASS_E;
         }
 
@@ -290,7 +290,7 @@ 
      */
     public function isMulticast()
     {
-        return $this->getClass() === self::CLASS_D;
+        return $this->getClass()===self::CLASS_D;
     }
 
     /**
@@ -381,7 +381,7 @@ 
      */
     public function isPrivate()
     {
-        return ($this->isRFC1918()  || $this->isRFC6598());
+        return ($this->isRFC1918() || $this->isRFC6598());
     }
 
     /**
@@ -395,7 +395,7 @@ 
      */
     public function shift(int $offset)
     {
-        return new static($this->address+$offset);
+        return new static($this->address + $offset);
     }
 
     /**

src/IPv4/Range.php

Indentation +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
      */
     public function offsetExists($offset)
     {
-         if (is_string($offset))
+            if (is_string($offset))
         {
             if (!preg_match('/^-?[0-9]+$/', $offset))
             {
@@ -156,7 +156,7 @@ 
             }           
             $offset = (int)$offset;
         }
-       if (!is_int($offset))
+        if (!is_int($offset))
         {
             throw new InvalidArgumentException(sprintf('Invalid key type (%s), only integers or strings representing integers can be used to acces address in a Range', gettype($offset)));
         }

Spacing +14 added lines, -14 removed lines

@@ -62,7 +62,7 @@ 
     {
         $lower = $lowerBound->int();
         $upper = $upperBound->int();
-        if ($lower > $upper)
+        if($lower>$upper)
         {
             $temp = $lower;
             $lower = $upper;
@@ -82,17 +82,17 @@ 
      */
     public static function fromCount(Address $baseAddress, int $count)
     {
-        if ($count == 0)
+        if($count==0)
         {
             throw new InvalidArgumentException("Cannot assign a range of 0 addresses");
         }
-        if ($count<0)
+        if($count<0)
         {
-            $delta = $count+1;
+            $delta = $count + 1;
         }
         else
         {
-            $delta = $count-1;
+            $delta = $count - 1;
         }
         $upperBound = $baseAddress->shift($delta);
         return new static($baseAddress, $upperBound);
@@ -120,7 +120,7 @@ 
      */
     public function getUpperBound()
     {
-        return new Address($this->getLowerBound()->int()+$this->count-1);
+        return new Address($this->getLowerBound()->int() + $this->count - 1);
     }
 
     /**
@@ -149,7 +149,7 @@ 
      */
     public function match(Range $range)
     {
-        return ( ($this->getLowerBound()->int()==$range->getLowerBound()->int()) && ($this->getUpperBound()->int()==$range->getUpperBound()->int()));
+        return (($this->getLowerBound()->int()==$range->getLowerBound()->int()) && ($this->getUpperBound()->int()==$range->getUpperBound()->int()));
     }
 
     /**
@@ -173,7 +173,7 @@ 
      */  
     public function shift(int $offset)
     {
-        return static::fromCount($this->getLowerBound()->shift($offset*count($this)), count($this));
+        return static::fromCount($this->getLowerBound()->shift($offset * count($this)), count($this));
     }
 
     /**
@@ -217,19 +217,19 @@ 
      */
     public function offsetExists($offset)
     {
-         if (is_string($offset))
+         if(is_string($offset))
         {
-            if (!preg_match('/^-?[0-9]+$/', $offset))
+            if(!preg_match('/^-?[0-9]+$/', $offset))
             {
                 throw new InvalidArgumentException(sprintf('Invalid key type (%s), only integers or strings representing integers can be used to acces address in a Range', gettype($offset)));
             }           
             $offset = (int)$offset;
         }
-       if (!is_int($offset))
+       if(!is_int($offset))
         {
             throw new InvalidArgumentException(sprintf('Invalid key type (%s), only integers or strings representing integers can be used to acces address in a Range', gettype($offset)));
         }
-        if ($offset<0 || $offset>=count($this))
+        if($offset<0 || $offset>=count($this))
         {
             return false;
         }
@@ -248,7 +248,7 @@ 
      */
     public function offsetGet($offset)
     {
-        if (!$this->offsetExists($offset))
+        if(!$this->offsetExists($offset))
         {
             throw new OutOfBoundsException();
         }
@@ -265,7 +265,7 @@ 
      * @param Address $value
      * @throws BadMethodCallException always
      */ 
-    public function offsetSet($offset,  $value)
+    public function offsetSet($offset, $value)
     {
         throw new BadMethodCallException(sprintf("class %s is immutable, cannot modify an address value in a Range", self::class));
     }

Braces +1 added lines, -2 removed lines

@@ -89,8 +89,7 @@
         if ($count<0)
         {
             $delta = $count+1;
-        }
-        else
+        } else
         {
             $delta = $count-1;
         }

src/IPv4/Netmask.php

Spacing +8 added lines, -8 removed lines

@@ -38,22 +38,22 @@ 
     public function __construct(int $netmask)
     {
         parent::__construct($netmask);
-        if (0==$netmask)
+        if(0==$netmask)
         {
             return;
         }
         // Netamsk validation
         $mask = 0xffffffff;
         do {
-            if ($mask == $netmask)
+            if($mask==$netmask)
             {
                 // valid netmask
                 return;
             }
             $mask = ($mask << 1) & 0xffffffff;   
-        } while ($mask>0);
+        } while($mask>0);
 
-        if ($netmask!=0)
+        if($netmask!=0)
         {
             throw new DomainException(sprintf("Cannot convert 0x%x (%s) to netmask", $netmask, (string)$this));
         }
@@ -74,7 +74,7 @@ 
      */
     public static function fromCidr(int $cidr)
     {
-        if ($cidr<0 || $cidr>32 )
+        if($cidr<0 || $cidr>32)
         {
             throw new OutOfBoundsException(sprintf("Invalid CIDR value %d", $cidr));
         }
@@ -104,10 +104,10 @@ 
     public function asCidr()
     {
         // Pas très élégant.... 
-        for ($cidr=32 ; $cidr>=0 ; $cidr--)
+        for($cidr = 32; $cidr>=0; $cidr--)
         {
             $n = (0xffffffff << (32 - $cidr)) & 0xffffffff;
-            if( $n == $this->int() )
+            if($n==$this->int())
             {
                 return $cidr;
             }
@@ -121,7 +121,7 @@ 
      */ 
     public function count()
     {
-        return (~($this->int()) & 0xffffffff)+1;
+        return (~($this->int()) & 0xffffffff) + 1;
     }
 
     public function shift(int $offset)

test.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@
 <?php
 $a = 0xffffffff;
-printf ("%d\n",$a);
+printf("%d\n", $a);
 
-$a = -(0xffffffff)-1;
-printf ("%d\n",$a);
+$a = -(0xffffffff) - 1;
+printf("%d\n", $a);

src/IPv4/Subnet.php

Indentation +9 added lines, -10 removed lines

@@ -24,7 +24,6 @@ 
  *  * Countable : number of addresses
  *  * ArrayAccess : Address can be acceesed by offset (ex : $range[10])
  *  * IteratorAggregate :   range can be itrated (foreach)
-
  * @package IPTools
  */
 class Subnet extends Range
@@ -34,13 +33,13 @@ 
      */
     protected $netmask;
 
-     /**
-     * Creates an IP Subnet from a an IP network addresses and a netamsk
-     *
-     * @param Address $baseAddress the first address of the range
-     * @param int $count the number  other bound
-     * @param bool $strict if true $network
-     */
+        /**
+         * Creates an IP Subnet from a an IP network addresses and a netamsk
+         *
+         * @param Address $baseAddress the first address of the range
+         * @param int $count the number  other bound
+         * @param bool $strict if true $network
+         */
     public function __construct(Address $network, Address $netmask, bool $strict=true)
     {
         $finalNetmask = clone($netmask);
@@ -61,7 +60,7 @@ 
         $this->netmask = $finalNetmask;
     }
 
-   /**
+    /**
      * Construct an IPv4 Subnet from a CIDR notation (#.#.#.#/#)
      *
      * @param Address $network the network base address  of the subnet
@@ -168,7 +167,7 @@ 
         return static::fromCidr(
             $this->getNetworkAddress()->shift($offset*count($this)),
             $this->getNetmaskAddress()->asCidr()
-         );
+            );
     }
 
     /*

Spacing +8 added lines, -8 removed lines

@@ -41,23 +41,23 @@ 
      * @param int $count the number  other bound
      * @param bool $strict if true $network
      */
-    public function __construct(Address $network, Address $netmask, bool $strict=true)
+    public function __construct(Address $network, Address $netmask, bool $strict = true)
     {
         $finalNetmask = clone($netmask);
-        if (!($netmask instanceof Netmask))
+        if(!($netmask instanceof Netmask))
         {
             $finalNetmask = Netmask::fromAddress($netmask);  
         }
         
         // Verify parameters validity
-        if( (($network->int() & $finalNetmask->int()) != $network->int()) && $strict)
+        if((($network->int() & $finalNetmask->int())!=$network->int()) && $strict)
         {
             throw new RangeException(sprintf("Invalid network adress %s, this address is not usable with the netmask %s", (string)$network, (string)$finalNetmask));
         }
 
         $finalNetwork = new Address($network->int() & $finalNetmask->int());
 
-        parent::__construct($finalNetwork, $finalNetwork->shift(count($finalNetmask)-1));
+        parent::__construct($finalNetwork, $finalNetwork->shift(count($finalNetmask) - 1));
         $this->netmask = $finalNetmask;
     }
 
@@ -71,7 +71,7 @@ 
      * @throws RangeException when network address and netmask does not form a valid subnet 
      * @return Subnet
      */
-    public static function fromCidr(Address $network, int $cidr, bool $strict=true)
+    public static function fromCidr(Address $network, int $cidr, bool $strict = true)
     {
         // Ensure CIDR is valid, use Address::fromCidr to have validation logic in only one place 
         $netmask = Netmask::fromCidr($cidr);
@@ -108,10 +108,10 @@ 
      * @throws InvaidArgumentException when provided sting cannot be converted to a valid subnet
      * @return Subnet
      */
-    public static function fromString(string $subnet, bool $strict=true)
+    public static function fromString(string $subnet, bool $strict = true)
     {
         @list($address, $netmask, $trash) = explode('/', $subnet);
-        if (!is_null($trash) || is_null($netmask))
+        if(!is_null($trash) || is_null($netmask))
         {
             throw new InvalidArgumentException(sprintf("%s cannot be converted to subnet. Valid formats are : x.x.x.x/cidr or x.x.x.x/y.y.y.y", $subnet));
         }
@@ -166,7 +166,7 @@ 
     public function shift(int $offset)
     {
         return static::fromCidr(
-            $this->getNetworkAddress()->shift($offset*count($this)),
+            $this->getNetworkAddress()->shift($offset * count($this)),
             $this->getNetmaskAddress()->asCidr()
          );
     }

src/IPv4/IPv4.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  */
 namespace mracine\IPTools\IPv4;
 
-use mracine\IPTools\IPVersion;;
+use mracine\IPTools\IPVersion; ;
 
 trait IPv4
 {