Completed
Push — master ( 61de7c...d19f01 )
by Lars
38:27 queued 23:24
created
src/voku/db/Debug.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
         } else {
114 114
 
115 115
             // for testing with dev-address
116
-            $noDev = isset($_GET['noDev']) ? (int) $_GET['noDev'] : 0;
116
+            $noDev = isset($_GET['noDev']) ? (int)$_GET['noDev'] : 0;
117 117
             $remoteIpAddress = $_SERVER['REMOTE_ADDR'] ?? false;
118 118
 
119 119
             if (
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
     {
164 164
         $fileInfo = $this->getFileAndLineFromSql();
165 165
 
166
-        $log = '[' . \date('Y-m-d H:i:s') . ']: SQL-Error: ' . $error . ' | Trace: ' . $fileInfo['path'] . '<br>';
166
+        $log = '['.\date('Y-m-d H:i:s').']: SQL-Error: '.$error.' | Trace: '.$fileInfo['path'].'<br>';
167 167
 
168 168
         $this->logger(['error', $log]);
169 169
 
@@ -179,17 +179,17 @@  discard block
 block discarded – undo
179 179
 
180 180
             if (\PHP_SAPI === 'cli') {
181 181
                 echo "\n";
182
-                echo 'Error: ' . $error . "\n";
183
-                echo 'Trace: ' . $fileInfo['path'] . "\n";
182
+                echo 'Error: '.$error."\n";
183
+                echo 'Trace: '.$fileInfo['path']."\n";
184 184
                 echo "\n";
185 185
             } else {
186 186
                 echo '
187
-                <div class="OBJ-mysql-box" style="border: ' . $box_border . '; background: ' . $box_bg . '; padding: 10px; margin: 10px;">
187
+                <div class="OBJ-mysql-box" style="border: ' . $box_border.'; background: '.$box_bg.'; padding: 10px; margin: 10px;">
188 188
                   <b style="font-size: 14px;">MYSQL Error:</b>
189 189
                   <code style="display: block;">
190
-                    Error:' . $error . '
190
+                    Error:' . $error.'
191 191
                     <br><br>
192
-                    Trace: ' . $fileInfo['path'] . '
192
+                    Trace: ' . $fileInfo['path'].'
193 193
                   </code>
194 194
                 </div>
195 195
                 ';
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
                 continue;
245 245
             }
246 246
 
247
-            $path .= ($referrer[$key]['class'] ?? $referrer[$key]['file'] ?? '') . '::' . ($referrer[$key]['function'] ?? '') . ':' . ($referrer[$key - 1]['line'] ?? '') . ' <- ';
247
+            $path .= ($referrer[$key]['class'] ?? $referrer[$key]['file'] ?? '').'::'.($referrer[$key]['function'] ?? '').':'.($referrer[$key - 1]['line'] ?? '').' <- ';
248 248
         }
249 249
 
250 250
         $return['path'] = $path;
@@ -324,11 +324,11 @@  discard block
 block discarded – undo
324 324
                 /** @noinspection PhpUsageOfSilenceOperatorInspection */
325 325
                 $traceStringExtra = @\mysqli_info($tmpLink);
326 326
                 if ($traceStringExtra) {
327
-                    $traceStringExtra = ' | info => ' . $traceStringExtra;
327
+                    $traceStringExtra = ' | info => '.$traceStringExtra;
328 328
                 }
329 329
             }
330 330
 
331
-            $traceStringExtra = ' | results => ' . \print_r($results, true) . $traceStringExtra;
331
+            $traceStringExtra = ' | results => '.\print_r($results, true).$traceStringExtra;
332 332
         }
333 333
 
334 334
         static $SLOW_QUERY_WARNING = null;
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
             $queryStatus = ' ERROR (REPEAT) ';
357 357
         }
358 358
 
359
-        $queryLog = '[' . \date('Y-m-d H:i:s') . ']: ' . $queryStatus . ' Duration: SQL::::DURATION-START' . \round($duration, 5) . 'SQL::::DURATION-END | Repeat: ' . $QUERY_LOG_FILE_INFO[$cacheKey] . ' | Host: ' . $this->_db->getConfig()['hostname'] . ' | Trace: ' . $fileInfo['path'] . ' | SQL: SQL::::QUERY-START ' . \str_replace("\n", '', $sql) . ' SQL::::QUERY-END' . $traceStringExtra . "\n";
359
+        $queryLog = '['.\date('Y-m-d H:i:s').']: '.$queryStatus.' Duration: SQL::::DURATION-START'.\round($duration, 5).'SQL::::DURATION-END | Repeat: '.$QUERY_LOG_FILE_INFO[$cacheKey].' | Host: '.$this->_db->getConfig()['hostname'].' | Trace: '.$fileInfo['path'].' | SQL: SQL::::QUERY-START '.\str_replace("\n", '', $sql).' SQL::::QUERY-END'.$traceStringExtra."\n";
360 360
 
361 361
         return $this->logger([$logLevel, $queryLog, 'sql']);
362 362
     }
@@ -429,11 +429,11 @@  discard block
 block discarded – undo
429 429
             mailToAdmin($subject, $htmlBody, $priority);
430 430
         } else {
431 431
             if ($priority === 3) {
432
-                $this->logger(['debug', $subject . ' | ' . $htmlBody]);
432
+                $this->logger(['debug', $subject.' | '.$htmlBody]);
433 433
             } elseif ($priority > 3) {
434
-                $this->logger(['error', $subject . ' | ' . $htmlBody]);
434
+                $this->logger(['error', $subject.' | '.$htmlBody]);
435 435
             } else {
436
-                $this->logger(['info', $subject . ' | ' . $htmlBody]);
436
+                $this->logger(['info', $subject.' | '.$htmlBody]);
437 437
             }
438 438
         }
439 439
     }
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
      */
446 446
     public function setEchoOnError($echo_on_error)
447 447
     {
448
-        $this->echo_on_error = (bool) $echo_on_error;
448
+        $this->echo_on_error = (bool)$echo_on_error;
449 449
     }
450 450
 
451 451
     /**
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
455 455
      */
456 456
     public function setExitOnError($exit_on_error)
457 457
     {
458
-        $this->exit_on_error = (bool) $exit_on_error;
458
+        $this->exit_on_error = (bool)$exit_on_error;
459 459
     }
460 460
 
461 461
     /**
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
      */
466 466
     public function setLoggerClassName($logger_class_name)
467 467
     {
468
-        $this->logger_class_name = (string) $logger_class_name;
468
+        $this->logger_class_name = (string)$logger_class_name;
469 469
     }
470 470
 
471 471
     /**
@@ -475,6 +475,6 @@  discard block
 block discarded – undo
475 475
      */
476 476
     public function setLoggerLevel($logger_level)
477 477
     {
478
-        $this->logger_level = (string) $logger_level;
478
+        $this->logger_level = (string)$logger_level;
479 479
     }
480 480
 }
Please login to merge, or discard this patch.
src/voku/db/Helper.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
         $configOrig = $dbConnection->getConfig();
23 23
         \array_walk_recursive(
24 24
             $configOrig,
25
-            static function ($k, $v) use (&$configTmp) {
25
+            static function($k, $v) use (&$configTmp) {
26 26
                 $configTmp[] = $v;
27 27
                 $configTmp[] = $k;
28 28
             }
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
         $optimized = 0;
49 49
         if (!empty($tables)) {
50 50
             foreach ($tables as $table) {
51
-                $optimize = 'OPTIMIZE TABLE ' . $dbConnection->quote_string($table);
51
+                $optimize = 'OPTIMIZE TABLE '.$dbConnection->quote_string($table);
52 52
                 $result = $dbConnection->query($optimize);
53 53
                 if ($result) {
54 54
                     $optimized++;
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
         $optimized = 0;
77 77
         if (!empty($tables)) {
78 78
             foreach ($tables as $table) {
79
-                $optimize = 'REPAIR TABLE ' . $dbConnection->quote_string($table);
79
+                $optimize = 'REPAIR TABLE '.$dbConnection->quote_string($table);
80 80
                 $result = $dbConnection->query($optimize);
81 81
                 if ($result) {
82 82
                     $optimized++;
@@ -210,23 +210,23 @@  discard block
 block discarded – undo
210 210
 
211 211
         $whereSQL = $dbConnection->_parseArrayPair($whereArray, 'AND');
212 212
         if ($whereSQL) {
213
-            $whereSQL = 'AND ' . $whereSQL;
213
+            $whereSQL = 'AND '.$whereSQL;
214 214
         }
215 215
 
216 216
         if ($databaseName) {
217
-            $databaseName = $dbConnection->quote_string(\trim($databaseName)) . '.';
217
+            $databaseName = $dbConnection->quote_string(\trim($databaseName)).'.';
218 218
         }
219 219
 
220 220
         // get the row
221
-        $query = 'SELECT ' . $dbConnection->quote_string($searchFieldName) . ', ' . $dbConnection->quote_string($idFieldName) . ' 
222
-          FROM ' . $databaseName . $dbConnection->quote_string($table) . '
221
+        $query = 'SELECT '.$dbConnection->quote_string($searchFieldName).', '.$dbConnection->quote_string($idFieldName).' 
222
+          FROM ' . $databaseName.$dbConnection->quote_string($table).'
223 223
           WHERE 1 = 1
224
-          ' . $whereSQL . '
224
+          ' . $whereSQL.'
225 225
         ';
226 226
 
227 227
         if ($useCache) {
228 228
             $cache = new \voku\cache\Cache(null, null, false, $useCache);
229
-            $cacheKey = 'sql-phonetic-search-' . \md5($query);
229
+            $cacheKey = 'sql-phonetic-search-'.\md5($query);
230 230
 
231 231
             if (
232 232
                 $cache->getCacheIsReady()
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
         }
311 311
 
312 312
         /** @noinspection PhpParamsInspection - false-positiv | https://github.com/voku/simple-mysqli/issues/50 */
313
-        return $MYSQL_CLIENT_VERSION_CACHE[$cacheKey] = (string) \mysqli_get_client_version();
313
+        return $MYSQL_CLIENT_VERSION_CACHE[$cacheKey] = (string)\mysqli_get_client_version();
314 314
     }
315 315
 
316 316
     /**
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
         if ($doctrineConnection) {
339 339
             $doctrineWrappedConnection = $doctrineConnection->getWrappedConnection();
340 340
             if ($doctrineWrappedConnection instanceof \Doctrine\DBAL\Driver\PDOConnection) {
341
-                return $MYSQL_SERVER_VERSION_CACHE[$cacheKey] = (string) $doctrineWrappedConnection->getServerVersion();
341
+                return $MYSQL_SERVER_VERSION_CACHE[$cacheKey] = (string)$doctrineWrappedConnection->getServerVersion();
342 342
             }
343 343
         }
344 344
 
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
             return '';
348 348
         }
349 349
 
350
-        return $MYSQL_SERVER_VERSION_CACHE[$cacheKey] = (string) \mysqli_get_server_version($mysqli_link);
350
+        return $MYSQL_SERVER_VERSION_CACHE[$cacheKey] = (string)\mysqli_get_server_version($mysqli_link);
351 351
     }
352 352
 
353 353
     /**
@@ -388,13 +388,13 @@  discard block
 block discarded – undo
388 388
         }
389 389
 
390 390
         if ($databaseName) {
391
-            $databaseName = $dbConnection->quote_string(\trim($databaseName)) . '.';
391
+            $databaseName = $dbConnection->quote_string(\trim($databaseName)).'.';
392 392
         }
393 393
 
394 394
         /** @var string $table */
395 395
         $table = $dbConnection->escape($table);
396 396
 
397
-        $sql = 'SHOW COLUMNS FROM ' . $databaseName . $table;
397
+        $sql = 'SHOW COLUMNS FROM '.$databaseName.$table;
398 398
         $result = $dbConnection->query($sql);
399 399
 
400 400
         if ($result instanceof Result && $result->num_rows > 0) {
@@ -446,17 +446,17 @@  discard block
 block discarded – undo
446 446
 
447 447
         $whereSQL = $dbConnection->_parseArrayPair($whereArray, 'AND');
448 448
         if ($whereSQL) {
449
-            $whereSQL = 'AND ' . $whereSQL;
449
+            $whereSQL = 'AND '.$whereSQL;
450 450
         }
451 451
 
452 452
         if ($databaseName) {
453
-            $databaseName = $dbConnection->quote_string(\trim($databaseName)) . '.';
453
+            $databaseName = $dbConnection->quote_string(\trim($databaseName)).'.';
454 454
         }
455 455
 
456 456
         // get the row
457
-        $query = 'SELECT * FROM ' . $databaseName . $dbConnection->quote_string($table) . '
457
+        $query = 'SELECT * FROM '.$databaseName.$dbConnection->quote_string($table).'
458 458
           WHERE 1 = 1
459
-          ' . $whereSQL . '
459
+          ' . $whereSQL.'
460 460
         ';
461 461
         $result = $dbConnection->query($query);
462 462
 
@@ -475,11 +475,11 @@  discard block
 block discarded – undo
475 475
                 foreach ($tmpArray as $fieldName => $value) {
476 476
                     if (!\in_array($fieldName, $ignoreArray, true)) {
477 477
                         if (\array_key_exists($fieldName, $updateArray)) {
478
-                            $insert_keys .= ',' . $fieldName;
478
+                            $insert_keys .= ','.$fieldName;
479 479
                             $insert_values .= ',?';
480 480
                             $bindings[] = $updateArray[$fieldName]; // INFO: do not escape non selected data
481 481
                         } else {
482
-                            $insert_keys .= ',' . $fieldName;
482
+                            $insert_keys .= ','.$fieldName;
483 483
                             $insert_values .= ',?';
484 484
                             $bindings[] = $value; // INFO: do not escape non selected data
485 485
                         }
@@ -490,10 +490,10 @@  discard block
 block discarded – undo
490 490
                 $insert_values = \ltrim($insert_values, ',');
491 491
 
492 492
                 // insert the "copied" row
493
-                $new_query = 'INSERT INTO ' . $databaseName . $dbConnection->quote_string($table) . ' 
494
-                  (' . $insert_keys . ')
493
+                $new_query = 'INSERT INTO '.$databaseName.$dbConnection->quote_string($table).' 
494
+                  (' . $insert_keys.')
495 495
                   VALUES 
496
-                  (' . $insert_values . ')
496
+                  (' . $insert_values.')
497 497
                 ';
498 498
 
499 499
                 $return = $dbConnection->query($new_query, $bindings);
Please login to merge, or discard this patch.
src/voku/db/Result.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -144,14 +144,14 @@  discard block
 block discarded – undo
144 144
             &&
145 145
             !$result instanceof \Doctrine\DBAL\Driver\Statement
146 146
         ) {
147
-            throw new \InvalidArgumentException('$result must be ' . \mysqli_result::class . ' or ' . \Doctrine\DBAL\Driver\Statement::class . ' !');
147
+            throw new \InvalidArgumentException('$result must be '.\mysqli_result::class.' or '.\Doctrine\DBAL\Driver\Statement::class.' !');
148 148
         }
149 149
 
150 150
         $this->_result = $result;
151 151
 
152 152
         if ($this->_result instanceof \Doctrine\DBAL\Driver\Statement) {
153 153
             if (\method_exists($this->_result, 'getWrappedStatement')) {
154
-                throw new \InvalidArgumentException('$result (' . \Doctrine\DBAL\Driver\Statement::class . ') must implement "getWrappedStatement()"!');
154
+                throw new \InvalidArgumentException('$result ('.\Doctrine\DBAL\Driver\Statement::class.') must implement "getWrappedStatement()"!');
155 155
             }
156 156
 
157 157
             $doctrineDriver = $this->_result->getWrappedStatement();
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 
171 171
             $this->num_rows = $this->_result->rowCount();
172 172
         } else {
173
-            $this->num_rows = (int) $this->_result->num_rows;
173
+            $this->num_rows = (int)$this->_result->num_rows;
174 174
         }
175 175
 
176 176
         $this->current_row = 0;
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
      */
212 212
     public function __toString()
213 213
     {
214
-        return (string) $this->num_rows;
214
+        return (string)$this->num_rows;
215 215
     }
216 216
 
217 217
     /**
@@ -527,7 +527,7 @@  discard block
 block discarded – undo
527 527
         }
528 528
 
529 529
         return \Arrayy\Arrayy::createFromGeneratorFunction(
530
-            function () {
530
+            function() {
531 531
                 $this->reset();
532 532
 
533 533
                 /** @noinspection PhpAssignmentInConditionInspection */
@@ -877,8 +877,8 @@  discard block
 block discarded – undo
877 877
 
878 878
         if ($as_array) {
879 879
             $fields = \array_map(
880
-                static function ($object) {
881
-                    return (array) $object;
880
+                static function($object) {
881
+                    return (array)$object;
882 882
                 },
883 883
                 $fields
884 884
             );
@@ -1062,7 +1062,7 @@  discard block
 block discarded – undo
1062 1062
         }
1063 1063
 
1064 1064
         return \array_map(
1065
-            static function ($values) use ($keys) {
1065
+            static function($values) use ($keys) {
1066 1066
                 return \array_combine($keys, $values);
1067 1067
             },
1068 1068
             $rows
@@ -1216,7 +1216,7 @@  discard block
 block discarded – undo
1216 1216
                     $fieldTmp->{$metadataTmpKey} = $metadataTmpValue;
1217 1217
                 }
1218 1218
 
1219
-                $typeNativeTmp = 'MYSQL_TYPE_' . ($metadataTmp['native_type'] ?? '');
1219
+                $typeNativeTmp = 'MYSQL_TYPE_'.($metadataTmp['native_type'] ?? '');
1220 1220
                 $typeTmp = $THIS_CLASS_TMP->getConstant($typeNativeTmp);
1221 1221
                 if ($typeTmp) {
1222 1222
                     $fieldTmp->type = $typeTmp;
@@ -1578,11 +1578,11 @@  discard block
 block discarded – undo
1578 1578
             if (\abs($offset) > $this->num_rows) {
1579 1579
                 $offset = 0;
1580 1580
             } else {
1581
-                $offset = $this->num_rows - (int) \abs($offset);
1581
+                $offset = $this->num_rows - (int)\abs($offset);
1582 1582
             }
1583 1583
         }
1584 1584
 
1585
-        $length = $length !== null ? (int) $length : $this->num_rows;
1585
+        $length = $length !== null ? (int)$length : $this->num_rows;
1586 1586
         $n = 0;
1587 1587
         for ($i = $offset; $i < $this->num_rows && $n < $length; $i++) {
1588 1588
             if ($preserve_keys) {
Please login to merge, or discard this patch.
src/voku/db/Prepare.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -109,11 +109,11 @@  discard block
 block discarded – undo
109 109
         $value = $this->_db->escape($value);
110 110
 
111 111
         if ($type === 's') {
112
-            $valueForSqlWithBoundParameters = "'" . $value . "'";
112
+            $valueForSqlWithBoundParameters = "'".$value."'";
113 113
         } elseif ($type === 'i') {
114
-            $valueForSqlWithBoundParameters = (int) $value;
114
+            $valueForSqlWithBoundParameters = (int)$value;
115 115
         } elseif ($type === 'd') {
116
-            $valueForSqlWithBoundParameters = (float) $value;
116
+            $valueForSqlWithBoundParameters = (float)$value;
117 117
         } else {
118 118
             $valueForSqlWithBoundParameters = $value;
119 119
         }
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 
210 210
             // "INSERT" || "REPLACE"
211 211
             if (\preg_match('/^\s*"?(INSERT|REPLACE)\s+/i', $this->_sql)) {
212
-                $insert_id = (int) $this->insert_id;
212
+                $insert_id = (int)$this->insert_id;
213 213
                 $this->_debug->logQuery($this->_sql_with_bound_parameters, $query_duration, $insert_id);
214 214
 
215 215
                 return $insert_id;
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 
218 218
             // "UPDATE" || "DELETE"
219 219
             if (\preg_match('/^\s*"?(UPDATE|DELETE)\s+/i', $this->_sql)) {
220
-                $affected_rows = (int) $this->affected_rows;
220
+                $affected_rows = (int)$this->affected_rows;
221 221
                 $this->_debug->logQuery($this->_sql_with_bound_parameters, $query_duration, $affected_rows);
222 222
 
223 223
                 return $affected_rows;
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
                     return $this->queryErrorHandling($this->error, $this->_sql_with_bound_parameters);
235 235
                 }
236 236
 
237
-                $num_rows = (int) $select_result->num_rows;
237
+                $num_rows = (int)$select_result->num_rows;
238 238
                 $this->_debug->logQuery($this->_sql_with_bound_parameters, $query_duration, $num_rows);
239 239
 
240 240
                 return new Result($this->_sql_with_bound_parameters, $select_result);
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
     public function prepare($query): bool
294 294
     {
295 295
         if (!\is_string($query)) {
296
-            throw new \InvalidArgumentException('$query was no string: ' . \gettype($query));
296
+            throw new \InvalidArgumentException('$query was no string: '.\gettype($query));
297 297
         }
298 298
 
299 299
         $this->_sql = $query;
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
         $bool = parent::prepare($query);
313 313
 
314 314
         if ($bool === false) {
315
-            $this->_debug->displayError('Can not prepare query: ' . $query . ' | ' . $this->error, true);
315
+            $this->_debug->displayError('Can not prepare query: '.$query.' | '.$this->error, true);
316 316
         }
317 317
 
318 318
         return $bool;
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
                 // we need to replace the question mark "?" here
374 374
                 $values[1] = \str_replace('?', '###simple_mysqli__prepare_question_mark###', (string)$values[1]);
375 375
                 // build the query (only for debugging)
376
-                $testQuery = (string) \preg_replace("/\?/", (string)$values[1], $testQuery, 1);
376
+                $testQuery = (string)\preg_replace("/\?/", (string)$values[1], $testQuery, 1);
377 377
             }
378 378
             $testQuery = \str_replace('###simple_mysqli__prepare_question_mark###', '?', $testQuery);
379 379
         }
@@ -404,12 +404,12 @@  discard block
 block discarded – undo
404 404
 
405 405
             // exit if we have more then 3 "DB server has gone away"-errors
406 406
             if ($RECONNECT_COUNTER > 3) {
407
-                $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
407
+                $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
408 408
 
409 409
                 throw new DBGoneAwayException($errorMsg);
410 410
             }
411 411
 
412
-            $this->_debug->mailToAdmin('DB-Error', $errorMsg . ":\n<br />" . $sql);
412
+            $this->_debug->mailToAdmin('DB-Error', $errorMsg.":\n<br />".$sql);
413 413
 
414 414
             // reconnect
415 415
             $RECONNECT_COUNTER++;
@@ -419,10 +419,10 @@  discard block
 block discarded – undo
419 419
             return $this->execute();
420 420
         }
421 421
 
422
-        $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
422
+        $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql);
423 423
 
424 424
         // this query returned an error, we must display it (only for dev) !!!
425
-        $this->_debug->displayError($errorMsg . ' | ' . $sql);
425
+        $this->_debug->displayError($errorMsg.' | '.$sql);
426 426
 
427 427
         return false;
428 428
     }
Please login to merge, or discard this patch.
src/voku/db/DB.php 1 patch
Spacing   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -317,10 +317,10 @@  discard block
 block discarded – undo
317 317
         }
318 318
 
319 319
         if ($port) {
320
-            $this->port = (int) $port;
320
+            $this->port = (int)$port;
321 321
         } else {
322 322
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
323
-            $this->port = (int) @\ini_get('mysqli.default_port');
323
+            $this->port = (int)@\ini_get('mysqli.default_port');
324 324
         }
325 325
 
326 326
         // fallback
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
         foreach ($arrayPair as $_key => $_value) {
375 375
             $_connector = '=';
376 376
             $_glueHelper = '';
377
-            $_key_upper = \strtoupper((string) $_key);
377
+            $_key_upper = \strtoupper((string)$_key);
378 378
 
379 379
             if (\strpos($_key_upper, ' NOT') !== false) {
380 380
                 $_connector = 'NOT';
@@ -457,30 +457,30 @@  discard block
 block discarded – undo
457 457
                 }
458 458
 
459 459
                 if ($_connector === 'NOT IN' || $_connector === 'IN') {
460
-                    $_value = '(' . \implode(',', $_value) . ')';
460
+                    $_value = '('.\implode(',', $_value).')';
461 461
                 } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
462 462
                     $_value = \implode(' AND ', $_value);
463 463
                 } elseif ($firstKey && $firstValue) {
464
-                    if (\strpos((string) $firstKey, ' +') !== false) {
465
-                        $firstKey = \str_replace(' +', '', (string) $firstKey);
466
-                        $_value = $firstKey . ' + ' . $firstValue;
464
+                    if (\strpos((string)$firstKey, ' +') !== false) {
465
+                        $firstKey = \str_replace(' +', '', (string)$firstKey);
466
+                        $_value = $firstKey.' + '.$firstValue;
467 467
                     }
468 468
 
469
-                    if (\strpos((string) $firstKey, ' -') !== false) {
470
-                        $firstKey = \str_replace(' -', '', (string) $firstKey);
471
-                        $_value = $firstKey . ' - ' . $firstValue;
469
+                    if (\strpos((string)$firstKey, ' -') !== false) {
470
+                        $firstKey = \str_replace(' -', '', (string)$firstKey);
471
+                        $_value = $firstKey.' - '.$firstValue;
472 472
                     }
473 473
                 }
474 474
             } else {
475 475
                 $_value = $this->secure($_value);
476 476
             }
477 477
 
478
-            $_key = UTF8::str_replace_last($_glueHelper, '', (string) $_key);
478
+            $_key = UTF8::str_replace_last($_glueHelper, '', (string)$_key);
479 479
             $_key = UTF8::str_replace_last($_connector, '', $_key);
480 480
 
481 481
             $quoteString = $this->quote_string(\trim($_key));
482 482
 
483
-            $_value = (array) $_value;
483
+            $_value = (array)$_value;
484 484
 
485 485
             if (!$_glueHelper) {
486 486
                 $_glueHelper = $glue;
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
                     $valueInner = "''";
505 505
                 }
506 506
 
507
-                $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
507
+                $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
508 508
                 $tmpCounter++;
509 509
             }
510 510
 
@@ -556,8 +556,8 @@  discard block
 block discarded – undo
556 556
 
557 557
             unset($params[$key]);
558 558
 
559
-            $sql = \substr_replace($sql, (string) $replacement, $offset, 1);
560
-            $offset = \strpos($sql, '?', $offset + \strlen((string) $replacement));
559
+            $sql = \substr_replace($sql, (string)$replacement, $offset, 1);
560
+            $offset = \strpos($sql, '?', $offset + \strlen((string)$replacement));
561 561
         }
562 562
 
563 563
         return ['sql' => $sql, 'params' => $params];
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
 
595 595
             // add ":" if needed
596 596
             if (\strpos($name, ':') !== 0) {
597
-                $nameTmp = ':' . $name;
597
+                $nameTmp = ':'.$name;
598 598
             } else {
599 599
                 $nameTmp = $name;
600 600
             }
@@ -602,7 +602,7 @@  discard block
 block discarded – undo
602 602
             if ($offset === null) {
603 603
                 $offset = \strpos($sql, $nameTmp);
604 604
             } else {
605
-                $offset = \strpos($sql, $nameTmp, $offset + \strlen((string) $replacement));
605
+                $offset = \strpos($sql, $nameTmp, $offset + \strlen((string)$replacement));
606 606
             }
607 607
 
608 608
             if ($offset === false) {
@@ -614,7 +614,7 @@  discard block
 block discarded – undo
614 614
 
615 615
             unset($params[$name]);
616 616
 
617
-            $sql = \substr_replace($sql, (string) $replacement, $offset, \strlen($nameTmp));
617
+            $sql = \substr_replace($sql, (string)$replacement, $offset, \strlen($nameTmp));
618 618
         }
619 619
 
620 620
         return ['sql' => $sql, 'params' => $params];
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
             return \mysqli_affected_rows($this->mysqli_link);
636 636
         }
637 637
 
638
-        return (int) $this->affected_rows;
638
+        return (int)$this->affected_rows;
639 639
     }
640 640
 
641 641
     /**
@@ -852,10 +852,10 @@  discard block
 block discarded – undo
852 852
                 $this->database,
853 853
                 $this->port,
854 854
                 $this->socket,
855
-                (int) $flags
855
+                (int)$flags
856 856
             );
857 857
         } catch (\Exception $e) {
858
-            $error = 'Error connecting to mysql server: ' . $e->getMessage();
858
+            $error = 'Error connecting to mysql server: '.$e->getMessage();
859 859
             $this->debug->displayError($error, false);
860 860
 
861 861
             throw new DBConnectException($error, 100, $e);
@@ -864,7 +864,7 @@  discard block
 block discarded – undo
864 864
 
865 865
         $errno = \mysqli_connect_errno();
866 866
         if (!$this->connected || $errno) {
867
-            $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
867
+            $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
868 868
             $this->debug->displayError($error, false);
869 869
 
870 870
             throw new DBConnectException($error, 101);
@@ -887,7 +887,7 @@  discard block
 block discarded – undo
887 887
         }
888 888
 
889 889
         if (!$this->connected) {
890
-            $error = 'Error connecting to mysql server: ' . \print_r($this->doctrine_connection ? $this->doctrine_connection->errorInfo() : [], false);
890
+            $error = 'Error connecting to mysql server: '.\print_r($this->doctrine_connection ? $this->doctrine_connection->errorInfo() : [], false);
891 891
             $this->debug->displayError($error, false);
892 892
 
893 893
             throw new DBConnectException($error, 101);
@@ -934,10 +934,10 @@  discard block
 block discarded – undo
934 934
         }
935 935
 
936 936
         if ($databaseName) {
937
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
937
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
938 938
         }
939 939
 
940
-        $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . ' WHERE (' . $WHERE . ')';
940
+        $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table).' WHERE ('.$WHERE.')';
941 941
 
942 942
         $return = $this->query($sql);
943 943
 
@@ -1042,7 +1042,7 @@  discard block
 block discarded – undo
1042 1042
                 $var = $var->format('Y-m-d H:i:s');
1043 1043
                 $type = 'string';
1044 1044
             } elseif (\method_exists($var, '__toString')) {
1045
-                $var = (string) $var;
1045
+                $var = (string)$var;
1046 1046
                 $type = 'string';
1047 1047
             }
1048 1048
         }
@@ -1053,7 +1053,7 @@  discard block
 block discarded – undo
1053 1053
                 /** @var bool $var */
1054 1054
                 $var = $var;
1055 1055
 
1056
-                $var = (int) $var;
1056
+                $var = (int)$var;
1057 1057
 
1058 1058
                 break;
1059 1059
 
@@ -1098,7 +1098,7 @@  discard block
 block discarded – undo
1098 1098
                     }
1099 1099
                 } else {
1100 1100
                     $varCleaned = [];
1101
-                    foreach ((array) $var as $key => $value) {
1101
+                    foreach ((array)$var as $key => $value) {
1102 1102
                         /** @var string $key */
1103 1103
                         $key = $this->escape($key, $stripe_non_utf8, $html_entity_decode);
1104 1104
                         /** @var string $value */
@@ -1168,7 +1168,7 @@  discard block
 block discarded – undo
1168 1168
 
1169 1169
         if ($useCache) {
1170 1170
             $cache = new \voku\cache\Cache(null, null, false, $useCache);
1171
-            $cacheKey = 'sql-' . \md5($query);
1171
+            $cacheKey = 'sql-'.\md5($query);
1172 1172
 
1173 1173
             if (
1174 1174
                 $cache->getCacheIsReady()
@@ -1344,7 +1344,7 @@  discard block
 block discarded – undo
1344 1344
         }
1345 1345
 
1346 1346
         if (
1347
-            '' . $hostname . $username . $password . $database . $port . $charset === '' . $port . $charset
1347
+            ''.$hostname.$username.$password.$database.$port.$charset === ''.$port.$charset
1348 1348
             &&
1349 1349
             $firstInstance instanceof self
1350 1350
         ) {
@@ -1360,13 +1360,13 @@  discard block
 block discarded – undo
1360 1360
             if (\is_object($extra_config_value)) {
1361 1361
                 $extra_config_value_tmp = \spl_object_hash($extra_config_value);
1362 1362
             } else {
1363
-                $extra_config_value_tmp = (string) $extra_config_value;
1363
+                $extra_config_value_tmp = (string)$extra_config_value;
1364 1364
             }
1365
-            $extra_config_string .= $extra_config_key . $extra_config_value_tmp;
1365
+            $extra_config_string .= $extra_config_key.$extra_config_value_tmp;
1366 1366
         }
1367 1367
 
1368 1368
         $connection = \md5(
1369
-            $hostname . $username . $password . $database . $port . $charset . (int) $exit_on_error . (int) $echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1369
+            $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1370 1370
         );
1371 1371
 
1372 1372
         if (!isset($instance[$connection])) {
@@ -1509,10 +1509,10 @@  discard block
 block discarded – undo
1509 1509
         $SET = $this->_parseArrayPair($data);
1510 1510
 
1511 1511
         if ($databaseName) {
1512
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
1512
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
1513 1513
         }
1514 1514
 
1515
-        $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . ' SET ' . $SET;
1515
+        $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table).' SET '.$SET;
1516 1516
 
1517 1517
         $return = $this->query($sql);
1518 1518
         if ($return === false) {
@@ -1686,7 +1686,7 @@  discard block
 block discarded – undo
1686 1686
                         $errorCode = 1;
1687 1687
                     }
1688 1688
 
1689
-                    return $this->queryErrorHandling($queryException->getMessage(), (int) $errorCode, $sql, false, true);
1689
+                    return $this->queryErrorHandling($queryException->getMessage(), (int)$errorCode, $sql, false, true);
1690 1690
                 }
1691 1691
             }
1692 1692
         } elseif ($this->mysqli_link) {
@@ -2032,7 +2032,7 @@  discard block
 block discarded – undo
2032 2032
                 $errorCode = 1;
2033 2033
             }
2034 2034
 
2035
-            return $this->queryErrorHandling($queryException->getMessage(), (int) $errorCode, $sql, $params);
2035
+            return $this->queryErrorHandling($queryException->getMessage(), (int)$errorCode, $sql, $params);
2036 2036
         }
2037 2037
 
2038 2038
         if ($this->mysqli_link) {
@@ -2121,12 +2121,12 @@  discard block
 block discarded – undo
2121 2121
 
2122 2122
             // exit if we have more then 3 "DB server has gone away"-errors
2123 2123
             if ($RECONNECT_COUNTER > 3) {
2124
-                $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
2124
+                $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
2125 2125
 
2126 2126
                 throw new DBGoneAwayException($errorMessage);
2127 2127
             }
2128 2128
 
2129
-            $this->debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
2129
+            $this->debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
2130 2130
 
2131 2131
             // reconnect
2132 2132
             $RECONNECT_COUNTER++;
@@ -2140,7 +2140,7 @@  discard block
 block discarded – undo
2140 2140
             return false;
2141 2141
         }
2142 2142
 
2143
-        $this->debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
2143
+        $this->debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
2144 2144
 
2145 2145
         if (
2146 2146
             $force_exception_after_error === null
@@ -2151,7 +2151,7 @@  discard block
 block discarded – undo
2151 2151
         }
2152 2152
 
2153 2153
         // this query returned an error, we must display it (only for dev) !!!
2154
-        $this->debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error);
2154
+        $this->debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error);
2155 2155
 
2156 2156
         return false;
2157 2157
     }
@@ -2172,12 +2172,12 @@  discard block
 block discarded – undo
2172 2172
             '`',
2173 2173
             '``',
2174 2174
             \trim(
2175
-                (string) $str,
2175
+                (string)$str,
2176 2176
                 '`'
2177 2177
             )
2178 2178
         );
2179 2179
 
2180
-        return '`' . $str . '`';
2180
+        return '`'.$str.'`';
2181 2181
     }
2182 2182
 
2183 2183
     /**
@@ -2246,10 +2246,10 @@  discard block
 block discarded – undo
2246 2246
         $values = \implode(',', $data);
2247 2247
 
2248 2248
         if ($databaseName) {
2249
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2249
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
2250 2250
         }
2251 2251
 
2252
-        $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . ' (' . $columns . ') VALUES (' . $values . ')';
2252
+        $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table).' ('.$columns.') VALUES ('.$values.')';
2253 2253
 
2254 2254
         $return = $this->query($sql);
2255 2255
         \assert(\is_int($return) || $return === false);
@@ -2348,7 +2348,7 @@  discard block
 block discarded – undo
2348 2348
                 }
2349 2349
             } else {
2350 2350
                 $varCleaned = [];
2351
-                foreach ((array) $var as $key => $value) {
2351
+                foreach ((array)$var as $key => $value) {
2352 2352
                     /** @var string $key */
2353 2353
                     $key = $this->escape($key, false, false, $convert_array);
2354 2354
                     /** @var float|int|string $value */
@@ -2396,7 +2396,7 @@  discard block
 block discarded – undo
2396 2396
         $var = $this->escape($var, false, false, null);
2397 2397
 
2398 2398
         if (\is_string($var)) {
2399
-            $var = "'" . \trim($var, "'") . "'";
2399
+            $var = "'".\trim($var, "'")."'";
2400 2400
         }
2401 2401
 
2402 2402
         return $var;
@@ -2438,10 +2438,10 @@  discard block
 block discarded – undo
2438 2438
         }
2439 2439
 
2440 2440
         if ($databaseName) {
2441
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2441
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
2442 2442
         }
2443 2443
 
2444
-        $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . ' WHERE (' . $WHERE . ')';
2444
+        $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table).' WHERE ('.$WHERE.')';
2445 2445
 
2446 2446
         $return = $this->query($sql);
2447 2447
         \assert($return instanceof Result || $return === false);
@@ -2494,7 +2494,7 @@  discard block
 block discarded – undo
2494 2494
     public function setConfigExtra(array $extra_config)
2495 2495
     {
2496 2496
         if (isset($extra_config['session_to_db'])) {
2497
-            $this->session_to_db = (bool) $extra_config['session_to_db'];
2497
+            $this->session_to_db = (bool)$extra_config['session_to_db'];
2498 2498
         }
2499 2499
 
2500 2500
         if (isset($extra_config['doctrine'])) {
@@ -2557,9 +2557,9 @@  discard block
 block discarded – undo
2557 2557
             $return = \mysqli_set_charset($this->mysqli_link, $charset);
2558 2558
 
2559 2559
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2560
-            @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET ' . $charset);
2560
+            @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET '.$charset);
2561 2561
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2562
-            @\mysqli_query($this->mysqli_link, "SET NAMES '" . $charset . "'");
2562
+            @\mysqli_query($this->mysqli_link, "SET NAMES '".$charset."'");
2563 2563
         } elseif ($this->doctrine_connection && $this->isDoctrinePDOConnection()) {
2564 2564
             $doctrineWrappedConnection = $this->getDoctrinePDOConnection();
2565 2565
             if (!$doctrineWrappedConnection instanceof \Doctrine\DBAL\Connection) {
@@ -2567,9 +2567,9 @@  discard block
 block discarded – undo
2567 2567
             }
2568 2568
 
2569 2569
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2570
-            @$doctrineWrappedConnection->exec('SET CHARACTER SET ' . $charset);
2570
+            @$doctrineWrappedConnection->exec('SET CHARACTER SET '.$charset);
2571 2571
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
2572
-            @$doctrineWrappedConnection->exec("SET NAMES '" . $charset . "'");
2572
+            @$doctrineWrappedConnection->exec("SET NAMES '".$charset."'");
2573 2573
 
2574 2574
             $return = true;
2575 2575
         } else {
@@ -2710,7 +2710,7 @@  discard block
 block discarded – undo
2710 2710
      */
2711 2711
     public function table_exists(string $table): bool
2712 2712
     {
2713
-        $check = $this->query('SELECT 1 FROM ' . $this->quote_string($table));
2713
+        $check = $this->query('SELECT 1 FROM '.$this->quote_string($table));
2714 2714
 
2715 2715
         return $check !== false
2716 2716
                &&
@@ -2741,7 +2741,7 @@  discard block
 block discarded – undo
2741 2741
             $result = $callback($this);
2742 2742
             if ($result === false) {
2743 2743
                 /** @noinspection ThrowRawExceptionInspection */
2744
-                throw new \Exception('call_user_func [' . \print_r($callback, true) . '] === false');
2744
+                throw new \Exception('call_user_func ['.\print_r($callback, true).'] === false');
2745 2745
             }
2746 2746
 
2747 2747
             return $this->commit();
@@ -2804,10 +2804,10 @@  discard block
 block discarded – undo
2804 2804
         }
2805 2805
 
2806 2806
         if ($databaseName) {
2807
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2807
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
2808 2808
         }
2809 2809
 
2810
-        $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . ' SET ' . $SET . ' WHERE (' . $WHERE . ')';
2810
+        $sql = 'UPDATE '.$databaseName.$this->quote_string($table).' SET '.$SET.' WHERE ('.$WHERE.')';
2811 2811
 
2812 2812
         $return = $this->query($sql);
2813 2813
         \assert(\is_int($return) || $return === false);
Please login to merge, or discard this patch.