iriven / GeoIP2Country

src/bin/GeoipNetwork.php

Indentation +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 
     /**
      * @var string $ipAddress
-    **/
+     **/
     private $ipAddress=null;
 
     public function __construct($ipAddress=null)

Spacing +17 added lines, -17 removed lines

@@ -10,9 +10,9 @@ 
     /**
      * @var string $ipAddress
     **/
-    private $ipAddress=null;
+    private $ipAddress = null;
 
-    public function __construct($ipAddress=null)
+    public function __construct($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';
     }
 
     /**
@@ -79,9 +79,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);
     }
@@ -90,7 +90,7 @@ 
      * @param $ipAddress
      * @return mixed|string
      */
-    public function ip2long (string $ipAddress)
+    public function ip2long(string $ipAddress)
     {
         $ipAddress || $ipAddress = $this->getIPAddress();
         $decimal = null;
@@ -105,7 +105,7 @@ 
                     $network = inet_pton($ipAddress);
                     $parts   = unpack('C*', $network);
                     foreach ($parts as &$byte):
-                        $decimal.= str_pad(decbin($byte), 8, '0', STR_PAD_LEFT);
+                        $decimal .= str_pad(decbin($byte), 8, '0', STR_PAD_LEFT);
                     endforeach;
                     $decimal = ltrim($decimal, '0');
                     break;
@@ -130,7 +130,7 @@ 
     {
         $ipAddress = null;
         if (preg_match('/[.:]/', $decimal))
-        {return strtoupper($decimal);}
+        {return strtoupper($decimal); }
         switch ($decimal):
             case (strlen($decimal) <= 32):
                 $ipAddress .= long2ip($decimal);
@@ -141,14 +141,14 @@ 
                 { $decimal = '0'.$decimal; }
                 for ($bits = 0; $bits <= 7; $bits++)
                 {
-                    $binPart = substr($decimal,($bits*16),16);
+                    $binPart = substr($decimal, ($bits*16), 16);
                     $ipAddress .= dechex(bindec($binPart)).':';
                 }
-                $ipAddress = inet_ntop(inet_pton(substr($ipAddress,0,-1)));
+                $ipAddress = inet_ntop(inet_pton(substr($ipAddress, 0, -1)));
                 break;
         endswitch;
             $ipAddress = strtoupper($ipAddress);
-        return $compress? $ipAddress : $this->expandAddress($ipAddress);
+        return $compress ? $ipAddress : $this->expandAddress($ipAddress);
     }
 
     /**
@@ -178,9 +178,9 @@ 
     {
         try
         {
-            if(!preg_match('/[.:]/', $ipAddress)) {$ipAddress = $this->long2ip($ipAddress, false);}
+            if (!preg_match('/[.:]/', $ipAddress)) {$ipAddress = $this->long2ip($ipAddress, false); }
             $this->validateAddress($ipAddress);
-            $delimiter = (strpos($ipAddress,':')===false)? '.' : ':';
+            $delimiter = (strpos($ipAddress, ':') === false) ? '.' : ':';
             return current(explode($delimiter, $ipAddress));
         } catch (\Throwable $th) {
             trigger_error($th->getMessage(), E_USER_ERROR);
@@ -200,7 +200,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);

Braces +3 added lines, -1 removed lines

@@ -57,9 +57,11 @@
         try
         {
             $this->validateAddress($ipAddress);
-            if (strpos($ipAddress, ':') !== false) // IPv6 address
+            if (strpos($ipAddress, ':') !== false) {
+                // IPv6 address
             {
                 $hex = unpack('H*hex', inet_pton($ipAddress));
+            }
                 $ipAddress = substr(preg_replace('/([A-f0-9]{4})/', "$1:", $hex['hex']), 0, -1);
                 $ipAddress = strtoupper($ipAddress);
             }

src/bin/GeoipDatabase.php

Indentation +3 added lines, -3 removed lines

@@ -17,9 +17,9 @@
     private $oPDOInstance;
     /**
      * PDO transaction Counter
-    *
-    * @var integer
-    */
+     *
+     * @var integer
+     */
     private $transactionCounter = 0;
     /**
      * Class Constructor

Spacing +19 added lines, -19 removed lines

@@ -3,7 +3,7 @@ 
 namespace geolocation\bin;
 
 use \PDO;
-use \SplFileInfo ;
+use \SplFileInfo;
 use \Throwable;
 
 class GeoipDatabase
@@ -86,7 +86,7 @@ 
      */
     private function genDsn(string $database = null)
     {
-        $database || $database='Geoip.db.sqlite';
+        $database || $database = 'Geoip.db.sqlite';
         try {
             $destination = rtrim(dirname(__DIR__), self::DS);
             if (!is_writeable($destination))
@@ -94,15 +94,15 @@ 
                 throw new Throwable(sprintf('The required destination path is not writable: `%s`', $destination));
             }
             $info = new SplFileInfo($database);
-            $dbName= $info->getFilename();
-            $dbSuffix='.sqlite';
-            if (substr_compare(strtolower($dbName), $dbSuffix, -strlen($dbSuffix)) !== 0) { $dbName .= $dbSuffix ; }
+            $dbName = $info->getFilename();
+            $dbSuffix = '.sqlite';
+            if (substr_compare(strtolower($dbName), $dbSuffix, -strlen($dbSuffix)) !== 0) { $dbName .= $dbSuffix; }
         } catch (Throwable $th) {
             trigger_error($th->getMessage(), E_USER_ERROR);
         }
         $destination .= self::DS.'data';
         if (!is_dir($destination)) { mkdir($destination, '0755', true); }
-        return 'sqlite:'.realpath($destination).self::DS.$dbName ;
+        return 'sqlite:'.realpath($destination).self::DS.$dbName;
     }
 
     /**
@@ -163,16 +163,16 @@ 
             $sCommand .= 'FROM `ipv%dRange` ';
             $sCommand .= 'WHERE `start` <= :start ';
             $sCommand .= 'ORDER BY start DESC LIMIT 1';
-            $statement = $this->oPDOInstance->prepare(sprintf($sCommand, $ipVersion)) ;
-            $statement->execute([':start' => $start ]) ;
-            $row = $statement->fetch(PDO::FETCH_OBJ) ;
+            $statement = $this->oPDOInstance->prepare(sprintf($sCommand, $ipVersion));
+            $statement->execute([':start' => $start]);
+            $row = $statement->fetch(PDO::FETCH_OBJ);
             if (is_bool($row) && $row === false)
             {
                 $row = new \stdClass();
-                $row->end = 0 ;
+                $row->end = 0;
             }
-            if ($row->end < $start || !$row->country) { $row->country = 'ZZ' ; }
-            return $row->country ;
+            if ($row->end < $start || !$row->country) { $row->country = 'ZZ'; }
+            return $row->country;
         } catch (\PDOException $th) {
             trigger_error($th->getMessage(), E_USER_ERROR);
         }
@@ -184,7 +184,7 @@ 
      * @param array $tablesList
      * @return $this
      */
-    public function flush(array $tablesList=[])
+    public function flush(array $tablesList = [])
     {
         $tablesList || $tablesList = $this->showTables();
         is_array($tablesList) || $tablesList = [$tablesList];
@@ -199,7 +199,7 @@ 
             endif;
             return $this;
         } catch (\PDOException $th) {
-            trigger_error('Statement failed: ' . $th->getMessage(), E_USER_ERROR);
+            trigger_error('Statement failed: '.$th->getMessage(), E_USER_ERROR);
         }
     }
 
@@ -216,17 +216,17 @@ 
     {
         try
         {
-            $sQuery ='INSERT INTO `ipv%dRange` (`start`, `end`, `country`) values (:start, :end, :country)';
+            $sQuery = 'INSERT INTO `ipv%dRange` (`start`, `end`, `country`) values (:start, :end, :country)';
             $command = sprintf($sQuery, $ipVersion);
             $statement = $this->oPDOInstance->prepare($command);
             $statement->execute([
                 ':start'   => $start,
                 ':end'     => $end,
                 ':country' => $country
-            ]) ;
+            ]);
             return $this->oPDOInstance->lastInsertId();
         } catch (\PDOException $th) {
-            trigger_error('Statement failed: ' . $th->getMessage(), E_USER_ERROR);
+            trigger_error('Statement failed: '.$th->getMessage(), E_USER_ERROR);
         }
     }
     /**
@@ -236,7 +236,7 @@ 
      */
     public function beginTransaction()
     {
-        if (!$this->transactionCounter++) {return $this->oPDOInstance->beginTransaction();}
+        if (!$this->transactionCounter++) {return $this->oPDOInstance->beginTransaction(); }
         return $this->transactionCounter >= 0;
     }
 
@@ -247,7 +247,7 @@ 
      */
     public function commit()
     {
-        if (!--$this->transactionCounter) {return $this->oPDOInstance->commit();}
+        if (!--$this->transactionCounter) {return $this->oPDOInstance->commit(); }
         return $this->transactionCounter >= 0;
     }
 

src/GeoIP2Country.php

Indentation +2 added lines, -2 removed lines

@@ -11,14 +11,14 @@
      * PDO SQLite3 database instance
      *
      * @var GeoipDatabase
-    **/
+     **/
     private $oDBInstance=null;
 
     /**
      * Network tools class instance
      *
      * @var GeoipNetwork
-    **/
+     **/
     private $oNetwork=null;
 
     /**

Spacing +5 added lines, -5 removed lines

@@ -12,14 +12,14 @@ 
      *
      * @var GeoipDatabase
     **/
-    private $oDBInstance=null;
+    private $oDBInstance = null;
 
     /**
      * Network tools class instance
      *
      * @var GeoipNetwork
     **/
-    private $oNetwork=null;
+    private $oNetwork = null;
 
     /**
      * Class Constructor
@@ -39,7 +39,7 @@ 
      * @param string|null $ipAddress
      * @return string
      */
-    public function resolve(string $ipAddress= null): string
+    public function resolve(string $ipAddress = null): string
     {
         $ipAddress || $ipAddress = $this->oNetwork->getIPAddress();
         $ipVersion = $this->oNetwork->ipVersion($ipAddress);
@@ -51,11 +51,11 @@ 
      * @param mixed|null $ipAddress
      * @return bool
      */
-    public function isReservedAddress($ipAddress=null): bool
+    public function isReservedAddress($ipAddress = null): bool
     {
         $ipAddress || $ipAddress = $this->oNetwork->getIPAddress();
         $countryCode = $this->resolve($ipAddress);
-        return !$countryCode || strcasecmp($countryCode, 'ZZ') == 0 ;
+        return !$countryCode || strcasecmp($countryCode, 'ZZ') == 0;
     }