iriven / GeoIP2Country

src/bin/GeoipNetwork.php

Spacing +9 added lines, -9 removed lines

@@ -7,13 +7,13 @@ 
     /**
      * @var string $ipAddress
     **/
-    private $ipAddress=null;
+    private $ipAddress = null;
     /**
      * Class constructor.
      *
      * @param string $ipAddress
      */
-    public function __construct(string $ipAddress=null)
+    public function __construct(string $ipAddress = null)
     {
         $ipAddress || $ipAddress = $this->getIPAddress();
         $this->validateAddress($ipAddress);
@@ -26,8 +26,8 @@ 
     public function getIPAddress()
     {
         $ipAddress = null;
-        $serverIPKeys =['HTTP_X_COMING_FROM', 'HTTP_FORWARDED', 'HTTP_FORWARDED_FOR', 'HTTP_X_CLUSTER_CLIENT_IP',
-                        'HTTP_X_FORWARDED', 'HTTP_VIA', 'HTTP_CLIENT_IP','HTTP_X_FORWARDED_FOR','REMOTE_ADDR'];
+        $serverIPKeys = ['HTTP_X_COMING_FROM', 'HTTP_FORWARDED', 'HTTP_FORWARDED_FOR', 'HTTP_X_CLUSTER_CLIENT_IP',
+                        'HTTP_X_FORWARDED', 'HTTP_VIA', 'HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'REMOTE_ADDR'];
         foreach ($serverIPKeys as $IPKey):
             if (array_key_exists($IPKey, $_SERVER)) {
                 if (!strlen($_SERVER[$IPKey])) { continue; }
@@ -39,7 +39,7 @@ 
         {
             $ipAddress = substr($ipAddress, 0, ($commaPos - 1));
         }
-        return $ipAddress?:'0.0.0.0';
+        return $ipAddress ?: '0.0.0.0';
     }
     /**
      * If IPV6, Returns the IP in it's fullest format.
@@ -77,9 +77,9 @@ 
     {
         $ipAddress = $this->expandAddress($ipAddress);
         if (strpos($ipAddress, ':') !== false):
-            $bin = inet_pton($ipAddress) ;
-            $ints = unpack('J2', $bin) ;
-            return $ints[1] ;
+            $bin = inet_pton($ipAddress);
+            $ints = unpack('J2', $bin);
+            return $ints[1];
         endif;
         return ip2long($ipAddress);
     }
@@ -113,7 +113,7 @@ 
         try
         {
             $ipAddress = $this->expandAddress($ipAddress);
-            if (strpos($ipAddress, ':') !== false) {return 6;}
+            if (strpos($ipAddress, ':') !== false) {return 6; }
             return 4;
         } catch (\Throwable $th) {
             trigger_error($th->getMessage(), E_USER_ERROR);