matracine / ip-tools

src/IPv4/Subnet.php

Spacing +10 added lines, -10 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);
@@ -105,10 +105,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));
         }
@@ -128,9 +128,9 @@ 
      * @param string $separator The separator used between network an CIDR, defaults to /
      * @return string
      */
-    public function asDotQuadAndCidr(string $separator='/')
+    public function asDotQuadAndCidr(string $separator = '/')
     {
-        return (string)$this->getNetworkAddress() . $separator . (string)$this->getNetmaskAddress()->asCidr();
+        return (string)$this->getNetworkAddress().$separator.(string)$this->getNetmaskAddress()->asCidr();
     }
 
     /**
@@ -176,7 +176,7 @@ 
     public function shift(int $offset)
     {
         return static::fromCidr(
-            $this->getNetworkAddress()->shift($offset*count($this)),
+            $this->getNetworkAddress()->shift($offset * count($this)),
             $this->getNetmaskAddress()->asCidr()
          );
     }