Completed
Push — master ( a44fa5...1623f0 )
by Lars
02:05
created
src/voku/db/ActiveRecordExpressions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,6 +21,6 @@
 block discarded – undo
21 21
    */
22 22
   public function __toString()
23 23
   {
24
-    return $this->source . ' ' . $this->operator . ' ' . $this->target;
24
+    return $this->source.' '.$this->operator.' '.$this->target;
25 25
   }
26 26
 }
Please login to merge, or discard this patch.
src/voku/db/Helper.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     $optimized = 0;
32 32
     if (!empty($tables)) {
33 33
       foreach ($tables as $table) {
34
-        $optimize = 'OPTIMIZE TABLE ' . $dbConnection->quote_string($table);
34
+        $optimize = 'OPTIMIZE TABLE '.$dbConnection->quote_string($table);
35 35
         $result = $dbConnection->query($optimize);
36 36
         if ($result) {
37 37
           $optimized++;
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     $optimized = 0;
60 60
     if (!empty($tables)) {
61 61
       foreach ($tables as $table) {
62
-        $optimize = 'REPAIR TABLE ' . $dbConnection->quote_string($table);
62
+        $optimize = 'REPAIR TABLE '.$dbConnection->quote_string($table);
63 63
         $result = $dbConnection->query($optimize);
64 64
         if ($result) {
65 65
           $optimized++;
@@ -176,23 +176,23 @@  discard block
 block discarded – undo
176 176
 
177 177
     $whereSQL = $dbConnection->_parseArrayPair($whereArray, 'AND');
178 178
     if ($whereSQL) {
179
-      $whereSQL = 'AND ' . $whereSQL;
179
+      $whereSQL = 'AND '.$whereSQL;
180 180
     }
181 181
 
182 182
     if ($databaseName) {
183
-      $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.';
183
+      $databaseName = $dbConnection->quote_string(trim($databaseName)).'.';
184 184
     }
185 185
 
186 186
     // get the row
187
-    $query = 'SELECT ' . $dbConnection->quote_string($searchFieldName) . ', ' . $dbConnection->quote_string($idFieldName) . ' 
188
-      FROM ' . $databaseName . $dbConnection->quote_string($table) . '
187
+    $query = 'SELECT '.$dbConnection->quote_string($searchFieldName).', '.$dbConnection->quote_string($idFieldName).' 
188
+      FROM ' . $databaseName.$dbConnection->quote_string($table).'
189 189
       WHERE 1 = 1
190
-      ' . $whereSQL . '
190
+      ' . $whereSQL.'
191 191
     ';
192 192
 
193 193
     if ($useCache === true) {
194 194
       $cache = new Cache(null, null, false, $useCache);
195
-      $cacheKey = 'sql-phonetic-search-' . \md5($query);
195
+      $cacheKey = 'sql-phonetic-search-'.\md5($query);
196 196
 
197 197
       if (
198 198
           $cache->getCacheIsReady() === true
@@ -322,10 +322,10 @@  discard block
 block discarded – undo
322 322
     }
323 323
 
324 324
     if ($databaseName) {
325
-      $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.';
325
+      $databaseName = $dbConnection->quote_string(trim($databaseName)).'.';
326 326
     }
327 327
 
328
-    $sql = 'SHOW COLUMNS FROM ' . $databaseName . $dbConnection->escape($table);
328
+    $sql = 'SHOW COLUMNS FROM '.$databaseName.$dbConnection->escape($table);
329 329
     $result = $dbConnection->query($sql);
330 330
 
331 331
     if ($result && $result->num_rows > 0) {
@@ -371,17 +371,17 @@  discard block
 block discarded – undo
371 371
 
372 372
     $whereSQL = $dbConnection->_parseArrayPair($whereArray, 'AND');
373 373
     if ($whereSQL) {
374
-      $whereSQL = 'AND ' . $whereSQL;
374
+      $whereSQL = 'AND '.$whereSQL;
375 375
     }
376 376
 
377 377
     if ($databaseName) {
378
-      $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.';
378
+      $databaseName = $dbConnection->quote_string(trim($databaseName)).'.';
379 379
     }
380 380
 
381 381
     // get the row
382
-    $query = 'SELECT * FROM ' . $databaseName . $dbConnection->quote_string($table) . '
382
+    $query = 'SELECT * FROM '.$databaseName.$dbConnection->quote_string($table).'
383 383
       WHERE 1 = 1
384
-      ' . $whereSQL . '
384
+      ' . $whereSQL.'
385 385
     ';
386 386
     $result = $dbConnection->query($query);
387 387
 
@@ -401,11 +401,11 @@  discard block
 block discarded – undo
401 401
 
402 402
           if (!\in_array($fieldName, $ignoreArray, true)) {
403 403
             if (\array_key_exists($fieldName, $updateArray)) {
404
-              $insert_keys .= ',' . $fieldName;
404
+              $insert_keys .= ','.$fieldName;
405 405
               $insert_values .= ',?';
406 406
               $bindings[] = $updateArray[$fieldName]; // INFO: do not escape non selected data
407 407
             } else {
408
-              $insert_keys .= ',' . $fieldName;
408
+              $insert_keys .= ','.$fieldName;
409 409
               $insert_values .= ',?';
410 410
               $bindings[] = $value; // INFO: do not escape non selected data
411 411
             }
@@ -416,10 +416,10 @@  discard block
 block discarded – undo
416 416
         $insert_values = ltrim($insert_values, ',');
417 417
 
418 418
         // insert the "copied" row
419
-        $new_query = 'INSERT INTO ' . $databaseName . $dbConnection->quote_string($table) . ' 
420
-          (' . $insert_keys . ')
419
+        $new_query = 'INSERT INTO '.$databaseName.$dbConnection->quote_string($table).' 
420
+          (' . $insert_keys.')
421 421
           VALUES 
422
-          (' . $insert_values . ')
422
+          (' . $insert_values.')
423 423
         ';
424 424
 
425 425
         return $dbConnection->query($new_query, $bindings);
Please login to merge, or discard this patch.
src/voku/db/Result.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
         &&
108 108
         !$result instanceof \Doctrine\DBAL\Statement
109 109
     ) {
110
-      throw new \InvalidArgumentException('$result must be ' . \mysqli_result::class . ' or ' . \Doctrine\DBAL\Statement::class . ' !');
110
+      throw new \InvalidArgumentException('$result must be '.\mysqli_result::class.' or '.\Doctrine\DBAL\Statement::class.' !');
111 111
     }
112 112
 
113 113
     $this->_result = $result;
@@ -812,7 +812,7 @@  discard block
 block discarded – undo
812 812
   {
813 813
     if ($as_array) {
814 814
       return \array_map(
815
-          function ($object) {
815
+          function($object) {
816 816
             return (array)$object;
817 817
           },
818 818
           $this->fetch_fields()
@@ -986,7 +986,7 @@  discard block
 block discarded – undo
986 986
     }
987 987
 
988 988
     return \array_map(
989
-        function ($values) use ($keys) {
989
+        function($values) use ($keys) {
990 990
           return \array_combine($keys, $values);
991 991
         }, $rows
992 992
     );
@@ -1102,7 +1102,7 @@  discard block
 block discarded – undo
1102 1102
           $fieldTmp->{$metadataTmpKey} = $metadataTmpValue;
1103 1103
         }
1104 1104
 
1105
-        $typeNativeTmp = 'MYSQL_TYPE_' . $metadataTmp['native_type'];
1105
+        $typeNativeTmp = 'MYSQL_TYPE_'.$metadataTmp['native_type'];
1106 1106
         $typeTmp = $THIS_CLASS_TMP->getConstant($typeNativeTmp);
1107 1107
         if ($typeTmp) {
1108 1108
           $fieldTmp->type = $typeTmp;
Please login to merge, or discard this patch.
src/voku/db/Prepare.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
     foreach ($this->_boundParams as $param) {
84 84
       $arguments[0] .= $param['type'];
85
-      $arguments[] =& $param['value'];
85
+      $arguments[] = & $param['value'];
86 86
     }
87 87
 
88 88
     return $arguments;
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
     $value = $this->_db->escape($value);
106 106
 
107 107
     if ($type === 's') {
108
-      $valueForSqlWithBoundParameters = "'" . $value . "'";
108
+      $valueForSqlWithBoundParameters = "'".$value."'";
109 109
     } elseif ($type === 'i') {
110 110
       $valueForSqlWithBoundParameters = (int)$value;
111 111
     } elseif ($type === 'd') {
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
     // debug_backtrace returns arguments by reference, see comments at http://php.net/manual/de/function.func-get-args.php
149 149
     $trace = \debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 1);
150 150
 
151
-    $args =& $trace[0]['args'];
151
+    $args = & $trace[0]['args'];
152 152
     $typesArray = \str_split($types);
153 153
 
154 154
     $args_count = \count($args) - 1;
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 
163 163
     $arg = 1;
164 164
     foreach ($typesArray as $typeInner) {
165
-      $val =& $args[$arg];
165
+      $val = & $args[$arg];
166 166
       $this->_boundParams[] = [
167 167
           'type'  => $typeInner,
168 168
           'value' => &$val,
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
     $bool = parent::prepare($query);
299 299
 
300 300
     if ($bool === false) {
301
-      $this->_debug->displayError('Can not prepare query: ' . $query . ' | ' . $this->error, false);
301
+      $this->_debug->displayError('Can not prepare query: '.$query.' | '.$this->error, false);
302 302
     }
303 303
 
304 304
     return $bool;
@@ -386,11 +386,11 @@  discard block
 block discarded – undo
386 386
 
387 387
       // exit if we have more then 3 "DB server has gone away"-errors
388 388
       if ($RECONNECT_COUNTER > 3) {
389
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
389
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
390 390
         throw new DBGoneAwayException($errorMsg);
391 391
       }
392 392
 
393
-      $this->_debug->mailToAdmin('DB-Error', $errorMsg . ":\n<br />" . $sql);
393
+      $this->_debug->mailToAdmin('DB-Error', $errorMsg.":\n<br />".$sql);
394 394
 
395 395
       // reconnect
396 396
       $RECONNECT_COUNTER++;
@@ -400,10 +400,10 @@  discard block
 block discarded – undo
400 400
       return $this->execute();
401 401
     }
402 402
 
403
-    $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
403
+    $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql);
404 404
 
405 405
     // this query returned an error, we must display it (only for dev) !!!
406
-    $this->_debug->displayError($errorMsg . ' | ' . $sql);
406
+    $this->_debug->displayError($errorMsg.' | '.$sql);
407 407
 
408 408
     return false;
409 409
   }
Please login to merge, or discard this patch.
src/voku/db/ActiveRecord.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
         null === $active_record->{$sql_string_part}
416 416
     ) {
417 417
 
418
-      $sql_string_part = \strtoupper($sql_string_part) . ' ' . $active_record->table . '.*';
418
+      $sql_string_part = \strtoupper($sql_string_part).' '.$active_record->table.'.*';
419 419
 
420 420
     } elseif (
421 421
         (
@@ -427,15 +427,15 @@  discard block
 block discarded – undo
427 427
         null === $active_record->{$sql_string_part}
428 428
     ) {
429 429
 
430
-      $sql_string_part = \strtoupper($sql_string_part) . ' ' . $active_record->table;
430
+      $sql_string_part = \strtoupper($sql_string_part).' '.$active_record->table;
431 431
 
432 432
     } elseif ('delete' === $sql_string_part) {
433 433
 
434
-      $sql_string_part = \strtoupper($sql_string_part) . ' ';
434
+      $sql_string_part = \strtoupper($sql_string_part).' ';
435 435
 
436 436
     } else {
437 437
 
438
-      $sql_string_part = (null !== $active_record->{$sql_string_part}) ? $active_record->{$sql_string_part} . ' ' : '';
438
+      $sql_string_part = (null !== $active_record->{$sql_string_part}) ? $active_record->{$sql_string_part}.' ' : '';
439 439
 
440 440
     }
441 441
   }
@@ -451,10 +451,10 @@  discard block
 block discarded – undo
451 451
   {
452 452
     if (\is_array($value)) {
453 453
       foreach ($value as $key => $val) {
454
-        $this->params[$value[$key] = self::PREFIX . ++self::$count] = $val;
454
+        $this->params[$value[$key] = self::PREFIX.++self::$count] = $val;
455 455
       }
456 456
     } elseif (\is_string($value)) {
457
-      $this->params[$ph = self::PREFIX . ++self::$count] = $value;
457
+      $this->params[$ph = self::PREFIX.++self::$count] = $value;
458 458
       $value = $ph;
459 459
     }
460 460
 
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
     $value = $this->_filterParam($value);
476 476
     $expression = new ActiveRecordExpressions(
477 477
         [
478
-            'source'   => ('where' === strtolower($name) ? $this->table . '.' : '') . $field,
478
+            'source'   => ('where' === strtolower($name) ? $this->table.'.' : '').$field,
479 479
             'operator' => $operator,
480 480
             'target'   => \is_array($value)
481 481
                 ? new ActiveRecordExpressionsWrap(
@@ -939,7 +939,7 @@  discard block
 block discarded – undo
939 939
     $value = $this->_filterParam($this->dirty);
940 940
     $this->insert = new ActiveRecordExpressions(
941 941
         [
942
-            'operator' => 'INSERT INTO ' . $this->table,
942
+            'operator' => 'INSERT INTO '.$this->table,
943 943
             'target'   => new ActiveRecordExpressionsWrap(['target' => \array_keys($this->dirty)]),
944 944
         ]
945 945
     );
@@ -985,7 +985,7 @@  discard block
 block discarded – undo
985 985
     $this->join = new ActiveRecordExpressions(
986 986
         [
987 987
             'source'   => $this->join ?: '',
988
-            'operator' => $type . ' JOIN',
988
+            'operator' => $type.' JOIN',
989 989
             'target'   => new ActiveRecordExpressions(
990 990
                 [
991 991
                     'source'   => $table,
Please login to merge, or discard this patch.
src/voku/db/DB.php 1 patch
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -433,19 +433,19 @@  discard block
 block discarded – undo
433 433
         }
434 434
 
435 435
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
436
-          $_value = '(' . \implode(',', $_value) . ')';
436
+          $_value = '('.\implode(',', $_value).')';
437 437
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
438
-          $_value = '(' . \implode(' AND ', $_value) . ')';
438
+          $_value = '('.\implode(' AND ', $_value).')';
439 439
         } elseif ($firstKey && $firstValue) {
440 440
 
441 441
           if (\strpos($firstKey, ' +') !== false) {
442 442
             $firstKey = \str_replace(' +', '', $firstKey);
443
-            $_value = $firstKey . ' + ' . $firstValue;
443
+            $_value = $firstKey.' + '.$firstValue;
444 444
           }
445 445
 
446 446
           if (\strpos($firstKey, ' -') !== false) {
447 447
             $firstKey = \str_replace(' -', '', $firstKey);
448
-            $_value = $firstKey . ' - ' . $firstValue;
448
+            $_value = $firstKey.' - '.$firstValue;
449 449
           }
450 450
         }
451 451
 
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
           $valueInner = "''";
494 494
         }
495 495
 
496
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
496
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
497 497
         $tmpCounter++;
498 498
       }
499 499
 
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
 
581 581
       // add ":" if needed
582 582
       if (\strpos($name, ':') !== 0) {
583
-        $nameTmp = ':' . $name;
583
+        $nameTmp = ':'.$name;
584 584
       } else {
585 585
         $nameTmp = $name;
586 586
       }
@@ -773,7 +773,7 @@  discard block
 block discarded – undo
773 773
         $this->connected = $this->doctrine_connection->isConnected();
774 774
 
775 775
         if (!$this->connected) {
776
-          $error = 'Error connecting to mysql server: ' . $this->doctrine_connection->errorInfo();
776
+          $error = 'Error connecting to mysql server: '.$this->doctrine_connection->errorInfo();
777 777
           $this->debug->displayError($error, false);
778 778
           throw new DBConnectException($error, 101);
779 779
         }
@@ -790,7 +790,7 @@  discard block
 block discarded – undo
790 790
         $this->connected = $this->doctrine_connection->isConnected();
791 791
 
792 792
         if (!$this->connected) {
793
-          $error = 'Error connecting to mysql server: ' . $this->doctrine_connection->errorInfo();
793
+          $error = 'Error connecting to mysql server: '.$this->doctrine_connection->errorInfo();
794 794
           $this->debug->displayError($error, false);
795 795
           throw new DBConnectException($error, 101);
796 796
         }
@@ -853,7 +853,7 @@  discard block
 block discarded – undo
853 853
       );
854 854
 
855 855
     } catch (\Exception $e) {
856
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
856
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
857 857
       $this->debug->displayError($error, false);
858 858
       throw new DBConnectException($error, 100, $e);
859 859
     }
@@ -861,7 +861,7 @@  discard block
 block discarded – undo
861 861
 
862 862
     $errno = \mysqli_connect_errno();
863 863
     if (!$this->connected || $errno) {
864
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
864
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
865 865
       $this->debug->displayError($error, false);
866 866
       throw new DBConnectException($error, 101);
867 867
     }
@@ -902,10 +902,10 @@  discard block
 block discarded – undo
902 902
     }
903 903
 
904 904
     if ($databaseName) {
905
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
905
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
906 906
     }
907 907
 
908
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE)";
908
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE)";
909 909
 
910 910
     return $this->query($sql);
911 911
   }
@@ -1108,7 +1108,7 @@  discard block
 block discarded – undo
1108 1108
 
1109 1109
     if ($useCache === true) {
1110 1110
       $cache = new Cache(null, null, false, $useCache);
1111
-      $cacheKey = 'sql-' . \md5($query);
1111
+      $cacheKey = 'sql-'.\md5($query);
1112 1112
 
1113 1113
       if (
1114 1114
           $cache->getCacheIsReady() === true
@@ -1283,7 +1283,7 @@  discard block
 block discarded – undo
1283 1283
     }
1284 1284
 
1285 1285
     if (
1286
-        '' . $hostname . $username . $password . $database . $port . $charset == '' . $port . $charset
1286
+        ''.$hostname.$username.$password.$database.$port.$charset == ''.$port.$charset
1287 1287
         &&
1288 1288
         null !== $firstInstance
1289 1289
     ) {
@@ -1301,11 +1301,11 @@  discard block
 block discarded – undo
1301 1301
       } else {
1302 1302
         $extra_config_value_tmp = (string)$extra_config_value;
1303 1303
       }
1304
-      $extra_config_string .= $extra_config_key . $extra_config_value_tmp;
1304
+      $extra_config_string .= $extra_config_key.$extra_config_value_tmp;
1305 1305
     }
1306 1306
 
1307 1307
     $connection = \md5(
1308
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1308
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1309 1309
     );
1310 1310
 
1311 1311
     if (!isset($instance[$connection])) {
@@ -1445,10 +1445,10 @@  discard block
 block discarded – undo
1445 1445
     $SET = $this->_parseArrayPair($data);
1446 1446
 
1447 1447
     if ($databaseName) {
1448
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
1448
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
1449 1449
     }
1450 1450
 
1451
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET";
1451
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET";
1452 1452
 
1453 1453
     return $this->query($sql);
1454 1454
   }
@@ -1980,11 +1980,11 @@  discard block
 block discarded – undo
1980 1980
 
1981 1981
       // exit if we have more then 3 "DB server has gone away"-errors
1982 1982
       if ($RECONNECT_COUNTER > 3) {
1983
-        $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
1983
+        $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
1984 1984
         throw new DBGoneAwayException($errorMessage);
1985 1985
       }
1986 1986
 
1987
-      $this->debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1987
+      $this->debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1988 1988
 
1989 1989
       // reconnect
1990 1990
       $RECONNECT_COUNTER++;
@@ -1998,7 +1998,7 @@  discard block
 block discarded – undo
1998 1998
       return false;
1999 1999
     }
2000 2000
 
2001
-    $this->debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
2001
+    $this->debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
2002 2002
 
2003 2003
     $force_exception_after_error = null; // auto
2004 2004
     if ($this->in_transaction === true) {
@@ -2006,7 +2006,7 @@  discard block
 block discarded – undo
2006 2006
     }
2007 2007
     // this query returned an error, we must display it (only for dev) !!!
2008 2008
 
2009
-    $this->debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error);
2009
+    $this->debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error);
2010 2010
 
2011 2011
     return false;
2012 2012
   }
@@ -2029,7 +2029,7 @@  discard block
 block discarded – undo
2029 2029
         )
2030 2030
     );
2031 2031
 
2032
-    return '`' . $str . '`';
2032
+    return '`'.$str.'`';
2033 2033
   }
2034 2034
 
2035 2035
   /**
@@ -2099,10 +2099,10 @@  discard block
 block discarded – undo
2099 2099
     $values = \implode(',', $data);
2100 2100
 
2101 2101
     if ($databaseName) {
2102
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2102
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
2103 2103
     }
2104 2104
 
2105
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values)";
2105
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values)";
2106 2106
 
2107 2107
     return $this->query($sql);
2108 2108
   }
@@ -2246,7 +2246,7 @@  discard block
 block discarded – undo
2246 2246
     $var = $this->escape($var, false, false, null);
2247 2247
 
2248 2248
     if (\is_string($var)) {
2249
-      $var = "'" . \trim($var, "'") . "'";
2249
+      $var = "'".\trim($var, "'")."'";
2250 2250
     }
2251 2251
 
2252 2252
     return $var;
@@ -2283,10 +2283,10 @@  discard block
 block discarded – undo
2283 2283
     }
2284 2284
 
2285 2285
     if ($databaseName) {
2286
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2286
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
2287 2287
     }
2288 2288
 
2289
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE)";
2289
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE)";
2290 2290
 
2291 2291
     return $this->query($sql);
2292 2292
   }
@@ -2388,16 +2388,16 @@  discard block
 block discarded – undo
2388 2388
       $return = mysqli_set_charset($this->mysqli_link, $charset);
2389 2389
 
2390 2390
       /** @noinspection PhpUsageOfSilenceOperatorInspection */
2391
-      @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET ' . $charset);
2391
+      @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET '.$charset);
2392 2392
       /** @noinspection PhpUsageOfSilenceOperatorInspection */
2393
-      @\mysqli_query($this->mysqli_link, "SET NAMES '" . $charset . "'");
2393
+      @\mysqli_query($this->mysqli_link, "SET NAMES '".$charset."'");
2394 2394
 
2395 2395
     } elseif ($this->isDoctrinePDOConnection() === true) {
2396 2396
 
2397 2397
       $doctrineWrappedConnection = $this->getDoctrinePDOConnection();
2398 2398
 
2399
-      $doctrineWrappedConnection->exec('SET CHARACTER SET ' . $charset);
2400
-      $doctrineWrappedConnection->exec("SET NAMES '" . $charset . "'");
2399
+      $doctrineWrappedConnection->exec('SET CHARACTER SET '.$charset);
2400
+      $doctrineWrappedConnection->exec("SET NAMES '".$charset."'");
2401 2401
 
2402 2402
       $return = true;
2403 2403
 
@@ -2542,7 +2542,7 @@  discard block
 block discarded – undo
2542 2542
    */
2543 2543
   public function table_exists(string $table): bool
2544 2544
   {
2545
-    $check = $this->query('SELECT 1 FROM ' . $this->quote_string($table));
2545
+    $check = $this->query('SELECT 1 FROM '.$this->quote_string($table));
2546 2546
 
2547 2547
     return $check !== false
2548 2548
            &&
@@ -2573,7 +2573,7 @@  discard block
 block discarded – undo
2573 2573
       $result = $callback($this);
2574 2574
       if ($result === false) {
2575 2575
         /** @noinspection ThrowRawExceptionInspection */
2576
-        throw new \Exception('call_user_func [' . $callback . '] === false');
2576
+        throw new \Exception('call_user_func ['.$callback.'] === false');
2577 2577
       }
2578 2578
 
2579 2579
       return $this->commit();
@@ -2632,10 +2632,10 @@  discard block
 block discarded – undo
2632 2632
     }
2633 2633
 
2634 2634
     if ($databaseName) {
2635
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2635
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
2636 2636
     }
2637 2637
 
2638
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE)";
2638
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE)";
2639 2639
 
2640 2640
     return $this->query($sql);
2641 2641
   }
Please login to merge, or discard this patch.
src/voku/db/Debug.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -139,9 +139,9 @@  discard block
 block discarded – undo
139 139
     $this->logger(
140 140
         [
141 141
             'error',
142
-            '<strong>' . \date(
142
+            '<strong>'.\date(
143 143
                 'd. m. Y G:i:s'
144
-            ) . ' (' . $fileInfo['file'] . ' line: ' . $fileInfo['line'] . ') (sql-error):</strong> ' . $error . '<br>',
144
+            ).' ('.$fileInfo['file'].' line: '.$fileInfo['line'].') (sql-error):</strong> '.$error.'<br>',
145 145
         ]
146 146
     );
147 147
 
@@ -157,16 +157,16 @@  discard block
 block discarded – undo
157 157
 
158 158
       if (\PHP_SAPI === 'cli') {
159 159
         echo "\n";
160
-        echo 'file:line -> ' . $fileInfo['file'] . ':' . $fileInfo['line'] . "\n";
161
-        echo 'error: ' . \str_replace(["\r\n", "\n", "\r"], '', $error);
160
+        echo 'file:line -> '.$fileInfo['file'].':'.$fileInfo['line']."\n";
161
+        echo 'error: '.\str_replace(["\r\n", "\n", "\r"], '', $error);
162 162
         echo "\n";
163 163
       } else {
164 164
         echo '
165
-        <div class="OBJ-mysql-box" style="border: ' . $box_border . '; background: ' . $box_bg . '; padding: 10px; margin: 10px;">
165
+        <div class="OBJ-mysql-box" style="border: ' . $box_border.'; background: '.$box_bg.'; padding: 10px; margin: 10px;">
166 166
           <b style="font-size: 14px;">MYSQL Error:</b>
167 167
           <code style="display: block;">
168
-            file:line -> ' . $fileInfo['file'] . ':' . $fileInfo['line'] . '
169
-            ' . $error . '
168
+            file:line -> ' . $fileInfo['file'].':'.$fileInfo['line'].'
169
+            ' . $error.'
170 170
           </code>
171 171
         </div>
172 172
         ';
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
       /** @noinspection PhpUsageOfSilenceOperatorInspection */
309 309
       $infoExtra = @\mysqli_info($tmpLink);
310 310
       if ($infoExtra) {
311
-        $infoExtra = ' | info => ' . $infoExtra;
311
+        $infoExtra = ' | info => '.$infoExtra;
312 312
       }
313 313
     }
314 314
 
@@ -316,14 +316,14 @@  discard block
 block discarded – undo
316 316
     // logging
317 317
     //
318 318
 
319
-    $info = 'time => ' . \round($duration, 5) . ' | results => ' . (int)$results . $infoExtra . ' | SQL => ' . UTF8::htmlentities($sql);
319
+    $info = 'time => '.\round($duration, 5).' | results => '.(int)$results.$infoExtra.' | SQL => '.UTF8::htmlentities($sql);
320 320
 
321 321
     $fileInfo = $this->getFileAndLineFromSql();
322 322
 
323 323
     return $this->logger(
324 324
         [
325 325
             $logLevel,
326
-            '<strong>' . \date('d. m. Y G:i:s') . ' (' . $fileInfo['file'] . ' line: ' . $fileInfo['line'] . '):</strong> ' . $info . '<br>',
326
+            '<strong>'.\date('d. m. Y G:i:s').' ('.$fileInfo['file'].' line: '.$fileInfo['line'].'):</strong> '.$info.'<br>',
327 327
             'sql',
328 328
         ]
329 329
     );
@@ -389,21 +389,21 @@  discard block
 block discarded – undo
389 389
         $this->logger(
390 390
             [
391 391
                 'debug',
392
-                $subject . ' | ' . $htmlBody,
392
+                $subject.' | '.$htmlBody,
393 393
             ]
394 394
         );
395 395
       } elseif ($priority > 3) {
396 396
         $this->logger(
397 397
             [
398 398
                 'error',
399
-                $subject . ' | ' . $htmlBody,
399
+                $subject.' | '.$htmlBody,
400 400
             ]
401 401
         );
402 402
       } elseif ($priority < 3) {
403 403
         $this->logger(
404 404
             [
405 405
                 'info',
406
-                $subject . ' | ' . $htmlBody,
406
+                $subject.' | '.$htmlBody,
407 407
             ]
408 408
         );
409 409
       }
Please login to merge, or discard this patch.