iriven / GeoIP2Country

src/bin/GeoipDatabase.php

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 void
      */
-    public function flush(array $tablesList=[])
+    public function flush(array $tablesList = [])
     {
         !empty($tablesList) || $tablesList = $this->showTables();
         is_array($tablesList) || $tablesList = [$tablesList];
@@ -198,7 +198,7 @@ 
                 $this->oPDOInstance->query('VACUUM');
             endif;
         } catch (\PDOException $th) {
-            trigger_error('Statement failed: ' . $th->getMessage(), E_USER_ERROR);
+            trigger_error('Statement failed: '.$th->getMessage(), E_USER_ERROR);
         }
     }
 
@@ -215,17 +215,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);
         }
     }
     /**
@@ -235,7 +235,7 @@ 
      */
     public function beginTransaction()
     {
-        if (!$this->transactionCounter++) {return $this->oPDOInstance->beginTransaction();}
+        if (!$this->transactionCounter++) {return $this->oPDOInstance->beginTransaction(); }
         return $this->transactionCounter >= 0;
     }
 
@@ -246,7 +246,7 @@ 
      */
     public function commit()
     {
-        if (!--$this->transactionCounter) {return $this->oPDOInstance->commit();}
+        if (!--$this->transactionCounter) {return $this->oPDOInstance->commit(); }
         return $this->transactionCounter >= 0;
     }