@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | */ |
78 | 78 | private function genDsn(string $database = null) |
79 | 79 | { |
80 | - $database || $database='Geoip.db.sqlite'; |
|
80 | + $database || $database = 'Geoip.db.sqlite'; |
|
81 | 81 | try { |
82 | 82 | $destination = rtrim(dirname(__DIR__), self::DS); |
83 | 83 | if (!is_writeable($destination)) { |
@@ -85,15 +85,15 @@ discard block |
||
85 | 85 | throw new \Throwable($msg); |
86 | 86 | } |
87 | 87 | $info = new \SplFileInfo($database); |
88 | - $dbName= $info->getFilename(); |
|
89 | - $dbSuffix='.sqlite'; |
|
90 | - if (substr_compare(strtolower($dbName), $dbSuffix, -strlen($dbSuffix)) !== 0) { $dbName .= $dbSuffix ; } |
|
88 | + $dbName = $info->getFilename(); |
|
89 | + $dbSuffix = '.sqlite'; |
|
90 | + if (substr_compare(strtolower($dbName), $dbSuffix, -strlen($dbSuffix)) !== 0) { $dbName .= $dbSuffix; } |
|
91 | 91 | } catch (\Throwable $th) { |
92 | 92 | trigger_error($th->getMessage(), E_USER_ERROR); |
93 | 93 | } |
94 | 94 | $destination .= self::DS.'data'; |
95 | 95 | if (!is_dir($destination)) { mkdir($destination, '0755', true); } |
96 | - return 'sqlite:'.realpath($destination).self::DS.$dbName ; |
|
96 | + return 'sqlite:'.realpath($destination).self::DS.$dbName; |
|
97 | 97 | } |
98 | 98 | /** |
99 | 99 | * Get the table list in the database |
@@ -151,16 +151,16 @@ discard block |
||
151 | 151 | $sCommand .= 'FROM `ipv%dRange` '; |
152 | 152 | $sCommand .= 'WHERE `start` <= :start '; |
153 | 153 | $sCommand .= 'ORDER BY start DESC LIMIT 1'; |
154 | - $statement = $this->oPDOInstance->prepare(sprintf($sCommand, $ipVersion)) ; |
|
155 | - $statement->execute([':start' => $start ]) ; |
|
156 | - $row = $statement->fetch(\PDO::FETCH_OBJ) ; |
|
154 | + $statement = $this->oPDOInstance->prepare(sprintf($sCommand, $ipVersion)); |
|
155 | + $statement->execute([':start' => $start]); |
|
156 | + $row = $statement->fetch(\PDO::FETCH_OBJ); |
|
157 | 157 | if (is_bool($row) && $row === false) |
158 | 158 | { |
159 | 159 | $row = new \stdClass(); |
160 | - $row->end = 0 ; |
|
160 | + $row->end = 0; |
|
161 | 161 | } |
162 | - if ($row->end < $start || !$row->country) { $row->country = 'ZZ' ; } |
|
163 | - return $row->country ; |
|
162 | + if ($row->end < $start || !$row->country) { $row->country = 'ZZ'; } |
|
163 | + return $row->country; |
|
164 | 164 | } catch (\PDOException $th) { |
165 | 165 | trigger_error($th->getMessage(), E_USER_ERROR); |
166 | 166 | } |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | * @param array $tablesList |
172 | 172 | * @return void |
173 | 173 | */ |
174 | - public function flush(array $tablesList=[]) |
|
174 | + public function flush(array $tablesList = []) |
|
175 | 175 | { |
176 | 176 | !empty($tablesList) || $tablesList = $this->showTables(); |
177 | 177 | is_array($tablesList) || $tablesList = [$tablesList]; |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | $this->oPDOInstance->query('VACUUM'); |
186 | 186 | endif; |
187 | 187 | } catch (\PDOException $th) { |
188 | - trigger_error('Statement failed: ' . $th->getMessage(), E_USER_ERROR); |
|
188 | + trigger_error('Statement failed: '.$th->getMessage(), E_USER_ERROR); |
|
189 | 189 | } |
190 | 190 | } |
191 | 191 | /** |
@@ -201,16 +201,16 @@ discard block |
||
201 | 201 | { |
202 | 202 | try |
203 | 203 | { |
204 | - $sQuery ='INSERT INTO `ipv%dRange` (`start`, `end`, `country`) values (:start, :end, :country)'; |
|
204 | + $sQuery = 'INSERT INTO `ipv%dRange` (`start`, `end`, `country`) values (:start, :end, :country)'; |
|
205 | 205 | $command = sprintf($sQuery, $ipVersion); |
206 | 206 | $statement = $this->oPDOInstance->prepare($command); |
207 | 207 | $statement->execute([ |
208 | 208 | ':start' => $start, |
209 | 209 | ':end' => $end, |
210 | 210 | ':country' => $country |
211 | - ]) ; |
|
211 | + ]); |
|
212 | 212 | } catch (\PDOException $th) { |
213 | - trigger_error('Statement failed: ' . $th->getMessage(), E_USER_ERROR); |
|
213 | + trigger_error('Statement failed: '.$th->getMessage(), E_USER_ERROR); |
|
214 | 214 | } |
215 | 215 | } |
216 | 216 | /** |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | */ |
221 | 221 | public function beginTransaction() |
222 | 222 | { |
223 | - if (!$this->transactionCounter++) {return $this->oPDOInstance->beginTransaction();} |
|
223 | + if (!$this->transactionCounter++) {return $this->oPDOInstance->beginTransaction(); } |
|
224 | 224 | return $this->transactionCounter >= 0; |
225 | 225 | } |
226 | 226 | /** |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | */ |
231 | 231 | public function commit() |
232 | 232 | { |
233 | - if (!--$this->transactionCounter) {return $this->oPDOInstance->commit();} |
|
233 | + if (!--$this->transactionCounter) {return $this->oPDOInstance->commit(); } |
|
234 | 234 | return $this->transactionCounter >= 0; |
235 | 235 | } |
236 | 236 | /** |