matracine / ip-tools

src/Iterators/RangeIterator.php

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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/Subnet.php

Indentation -2 removed lines

@@ -23,7 +23,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 implements IP, \Countable, \ArrayAccess, \IteratorAggregate
@@ -37,7 +36,6 @@ 
      * Netmask of the subnet
      *
      * Stored as a 32 bits integer
-
      * /24 => 255.255.255.0 => 0xffffff00
      *
      * @var int nemask

Spacing +6 added lines, -6 removed lines

@@ -57,7 +57,7 @@ 
         // Ensure CIDR is valid, use Address::fromCidr to have validation logic in only one place 
         $netmask = Address::fromCidr($cidr)->int();
         $address = $network->int();
-        if( ($address & $netmask) != $address)
+        if (($address & $netmask)!=$address)
         {
             throw new RangeException(sprintf("Invalid network adress %s, this address is not usable with the CIDR %d", (string)$network, $cidr));
         }
@@ -152,7 +152,7 @@ 
     public function getBroadcastAddress()
     {
         $netmask_inverted = (0xffffffff & ~$this->netmask);
-        $intBroadcast =  ($this->network->int() | $netmask_inverted);
+        $intBroadcast = ($this->network->int() | $netmask_inverted);
         return Address::fromInteger($intBroadcast);
     }
 
@@ -164,7 +164,7 @@ 
      */
     public function contains(Address $ip)
     {
-        return (($this->network->int() & $this->netmask) == ($ip->int() & $this->netmask));
+        return (($this->network->int() & $this->netmask)==($ip->int() & $this->netmask));
     }
 
     /**
@@ -187,7 +187,7 @@ 
      */
     public function count()
     {
-        return (~$this->netmask & 0xffffffff)+1; 
+        return (~$this->netmask & 0xffffffff) + 1; 
     }
 
     /**
@@ -213,7 +213,7 @@ 
     public function shift(int $offset)
     {
         // On décale l'adresse de réseau en fonction de la taille du subnet
-        $newNetwork = Address::fromInteger($this->getNetworkAddress()->int() + ($offset*count($this)));
+        $newNetwork = Address::fromInteger($this->getNetworkAddress()->int() + ($offset * count($this)));
 
         // On évite de manipuler directement les propriétés network d'un nouvek objet 
         // pour profiter de la validation en cas de dépassement des bornes.
@@ -322,7 +322,7 @@ 
      * @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 Subnet", self::class));
     }

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();
     }

Braces +17 added lines, -11 removed lines

@@ -113,7 +113,7 @@ 
         foreach($address as $digit)
         {
             if (is_string($digit) )
-            {        
+            {
                 $digit = trim($digit);
                 if (strlen($digit)==0)
                 {
@@ -271,23 +271,28 @@ 
     {
         $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;
         }
 
@@ -324,8 +329,7 @@ 
         try
         {
             $this->asCidr();
-        }
-        catch(DomainException $e)
+        } catch(DomainException $e)
         {
             return false;
         }
@@ -353,8 +357,10 @@ 
             Subnet::fromCidr(Address::fromString("172.16.0.0"), 12),
             Subnet::fromCidr(Address::fromString("192.168.0.0"), 16),
         );
-        foreach($subnets as $subnet) {
-            if($subnet->contains($this)) {
+        foreach($subnets as $subnet)
+        {
+            if($subnet->contains($this))
+            {
                 return true;
             }
         }
@@ -405,7 +411,7 @@ 
      * @return bool
      */
      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 +22 added lines, -22 removed lines

@@ -66,7 +66,7 @@ 
             
         } 
 
-        $this->address =  $address;
+        $this->address = $address;
     }
 
     /**
@@ -103,22 +103,22 @@ 
 
     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)));
         }
 
         $buffer = 0;
-        foreach($address as $digit)
+        foreach ($address as $digit)
         {
-            if (is_string($digit) )
+            if (is_string($digit))
             {        
                 $digit = trim($digit);
                 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));
@@ -131,12 +131,12 @@ 
                 $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)));
             }
 
-            if($digit<0 || $digit>0xff)
+            if ($digit<0 || $digit>0xff)
             {
                 throw new OutOfBoundsException(sprintf("Cannot convert %d to Ipv4 addresss digit", $digit));
 
@@ -174,7 +174,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));
         }
@@ -233,10 +233,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->address )
+            if ($n==$this->address)
             {
                 return $cidr;
             }
@@ -269,23 +269,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;
         }
 
@@ -323,7 +323,7 @@ 
         {
             $this->asCidr();
         }
-        catch(DomainException $e)
+        catch (DomainException $e)
         {
             return false;
         }
@@ -351,8 +351,8 @@ 
             Subnet::fromCidr(Address::fromString("172.16.0.0"), 12),
             Subnet::fromCidr(Address::fromString("192.168.0.0"), 16),
         );
-        foreach($subnets as $subnet) {
-            if($subnet->contains($this)) {
+        foreach ($subnets as $subnet) {
+            if ($subnet->contains($this)) {
                 return true;
             }
         }
@@ -383,7 +383,7 @@ 
      */
     public function isPrivate()
     {
-        return ($this->isRFC1918()  || $this->isRFC6598());
+        return ($this->isRFC1918() || $this->isRFC6598());
     }
 
     /**
@@ -393,7 +393,7 @@ 
      */
     public function isMulticast()
     {
-        return $this->getClass() === self::CLASS_D;
+        return $this->getClass()===self::CLASS_D;
     }
 
     /**
@@ -404,7 +404,7 @@ 
      */
      public function match(Address $address)
     {
-        return $this->int() == $address->int();
+        return $this->int()==$address->int();
     }
 
     /**
@@ -418,7 +418,7 @@ 
      */
     public function shift(int $offset)
     {
-        return self::fromInteger($this->address+$offset);
+        return self::fromInteger($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 +4 added lines, -4 removed lines

@@ -50,7 +50,7 @@ 
      */
     public function __construct(Address $ip1, Address $ip2)
     {
-        if ($ip1->int() < $ip2->int())
+        if ($ip1->int()<$ip2->int())
         {
             $this->lowerBound = clone($ip1);
             $this->upperBound = clone($ip2);
@@ -98,7 +98,7 @@ 
     {
         $ipVal = $ip->int();
 
-        return ($ipVal>=$this->lowerBound->int()) && ($ipVal<=$this->upperBound->int() );
+        return ($ipVal>=$this->lowerBound->int()) && ($ipVal<=$this->upperBound->int());
     }
 
 
@@ -112,7 +112,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()));
     }
 
     /**
@@ -196,7 +196,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 +2 added lines, -2 removed lines

@@ -149,7 +149,7 @@ 
     public function offsetExists($offset)
     {
          if (is_string($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)));
@@ -157,7 +157,7 @@ 
             $offset = (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))