Completed
Push — master ( 0f5448...bd313d )
by Lars
01:56
created
src/voku/db/DB.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -370,9 +370,9 @@  discard block
 block discarded – undo
370 370
         }
371 371
 
372 372
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
373
-          $_value = '(' . implode(',', $_value) . ')';
373
+          $_value = '('.implode(',', $_value).')';
374 374
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
375
-          $_value = '(' . implode(' AND ', $_value) . ')';
375
+          $_value = '('.implode(' AND ', $_value).')';
376 376
         }
377 377
 
378 378
       } else {
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
           $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue
418 418
         }
419 419
 
420
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
420
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
421 421
         $tmpCounter++;
422 422
       }
423 423
 
@@ -548,14 +548,14 @@  discard block
 block discarded – undo
548 548
           $this->socket
549 549
       );
550 550
     } catch (\Exception $e) {
551
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
551
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
552 552
       $this->_debug->displayError($error, false);
553 553
       throw new DBConnectException($error, 100, $e);
554 554
     }
555 555
     \mysqli_report(MYSQLI_REPORT_OFF);
556 556
 
557 557
     if (!$this->connected) {
558
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error();
558
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error();
559 559
       $this->_debug->displayError($error, false);
560 560
       /** @noinspection ThrowRawExceptionInspection */
561 561
       throw new DBConnectException($error, 101);
@@ -597,10 +597,10 @@  discard block
 block discarded – undo
597 597
     }
598 598
 
599 599
     if ($databaseName) {
600
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
600
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
601 601
     }
602 602
 
603
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
603
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
604 604
 
605 605
     return $this->query($sql);
606 606
   }
@@ -794,7 +794,7 @@  discard block
 block discarded – undo
794 794
 
795 795
     if ($useCache === true) {
796 796
       $cache = new Cache(null, null, false, $useCache);
797
-      $cacheKey = 'sql-' . md5($query);
797
+      $cacheKey = 'sql-'.md5($query);
798 798
 
799 799
       if (
800 800
           $cache->getCacheIsReady() === true
@@ -895,7 +895,7 @@  discard block
 block discarded – undo
895 895
     static $firstInstance = null;
896 896
 
897 897
     if (
898
-        $hostname . $username . $password . $database . $port . $charset == ''
898
+        $hostname.$username.$password.$database.$port.$charset == ''
899 899
         &&
900 900
         null !== $firstInstance
901 901
     ) {
@@ -903,7 +903,7 @@  discard block
 block discarded – undo
903 903
     }
904 904
 
905 905
     $connection = md5(
906
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . (int)$session_to_db
906
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.(int)$session_to_db
907 907
     );
908 908
 
909 909
     if (!isset($instance[$connection])) {
@@ -990,10 +990,10 @@  discard block
 block discarded – undo
990 990
     $SET = $this->_parseArrayPair($data);
991 991
 
992 992
     if ($databaseName) {
993
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
993
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
994 994
     }
995 995
 
996
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
996
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
997 997
 
998 998
     return $this->query($sql);
999 999
   }
@@ -1087,10 +1087,10 @@  discard block
 block discarded – undo
1087 1087
 
1088 1088
       if ($this->_debug->checkForDev() === true) {
1089 1089
         echo "Info: maybe you have to increase your 'max_allowed_packet = 30M' in the config: 'my.conf' \n<br />";
1090
-        echo 'Error:' . $errorMsg;
1090
+        echo 'Error:'.$errorMsg;
1091 1091
       }
1092 1092
 
1093
-      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg . ":\n<br />" . $sql);
1093
+      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg.":\n<br />".$sql);
1094 1094
     }
1095 1095
 
1096 1096
     // return the result only if there was a "SELECT"-query
@@ -1287,11 +1287,11 @@  discard block
 block discarded – undo
1287 1287
 
1288 1288
       // exit if we have more then 3 "DB server has gone away"-errors
1289 1289
       if ($RECONNECT_COUNTER > 3) {
1290
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
1290
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
1291 1291
         throw new DBGoneAwayException($errorMsg);
1292 1292
       }
1293 1293
 
1294
-      $this->_debug->mailToAdmin('DB-Error', $errorMsg . ":\n<br />" . $sql);
1294
+      $this->_debug->mailToAdmin('DB-Error', $errorMsg.":\n<br />".$sql);
1295 1295
 
1296 1296
       // reconnect
1297 1297
       $RECONNECT_COUNTER++;
@@ -1301,10 +1301,10 @@  discard block
 block discarded – undo
1301 1301
       return $this->query($sql, $sqlParams);
1302 1302
     }
1303 1303
 
1304
-    $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
1304
+    $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql);
1305 1305
 
1306 1306
     // this query returned an error, we must display it (only for dev) !!!
1307
-    $this->_debug->displayError($errorMsg . ' | ' . $sql);
1307
+    $this->_debug->displayError($errorMsg.' | '.$sql);
1308 1308
 
1309 1309
     return false;
1310 1310
   }
@@ -1327,7 +1327,7 @@  discard block
 block discarded – undo
1327 1327
         )
1328 1328
     );
1329 1329
 
1330
-    return '`' . $str . '`';
1330
+    return '`'.$str.'`';
1331 1331
   }
1332 1332
 
1333 1333
   /**
@@ -1398,10 +1398,10 @@  discard block
 block discarded – undo
1398 1398
     $values = implode(',', $data);
1399 1399
 
1400 1400
     if ($databaseName) {
1401
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1401
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1402 1402
     }
1403 1403
 
1404
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1404
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1405 1405
 
1406 1406
     return $this->query($sql);
1407 1407
   }
@@ -1486,7 +1486,7 @@  discard block
 block discarded – undo
1486 1486
     $var = $this->escape($var, false, false, null);
1487 1487
 
1488 1488
     if (is_string($var)) {
1489
-      $var = "'" . trim($var, "'") . "'";
1489
+      $var = "'".trim($var, "'")."'";
1490 1490
     }
1491 1491
 
1492 1492
     return $var;
@@ -1523,10 +1523,10 @@  discard block
 block discarded – undo
1523 1523
     }
1524 1524
 
1525 1525
     if ($databaseName) {
1526
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1526
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1527 1527
     }
1528 1528
 
1529
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1529
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1530 1530
 
1531 1531
     return $this->query($sql);
1532 1532
   }
@@ -1553,10 +1553,10 @@  discard block
 block discarded – undo
1553 1553
     $return = mysqli_set_charset($this->link, $charset);
1554 1554
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1555 1555
     /** @noinspection UsageOfSilenceOperatorInspection */
1556
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
1556
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
1557 1557
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1558 1558
     /** @noinspection UsageOfSilenceOperatorInspection */
1559
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
1559
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
1560 1560
 
1561 1561
     return $return;
1562 1562
   }
@@ -1702,10 +1702,10 @@  discard block
 block discarded – undo
1702 1702
     }
1703 1703
 
1704 1704
     if ($databaseName) {
1705
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1705
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1706 1706
     }
1707 1707
 
1708
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
1708
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
1709 1709
 
1710 1710
     return $this->query($sql);
1711 1711
   }
Please login to merge, or discard this patch.