Completed
Push — master ( 41a0d7...545092 )
by Lars
02:11
created
src/voku/db/DB.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -283,12 +283,12 @@  discard block
 block discarded – undo
283 283
           $this->socket
284 284
       );
285 285
     } catch (\Exception $e) {
286
-      $this->_debug->displayError('Error connecting to mysql server: ' . $e->getMessage(), true);
286
+      $this->_debug->displayError('Error connecting to mysql server: '.$e->getMessage(), true);
287 287
     }
288 288
     \mysqli_report(MYSQLI_REPORT_OFF);
289 289
 
290 290
     if (!$this->connected) {
291
-      $this->_debug->displayError('Error connecting to mysql server: ' . \mysqli_connect_error(), true);
291
+      $this->_debug->displayError('Error connecting to mysql server: '.\mysqli_connect_error(), true);
292 292
     } else {
293 293
       $this->set_charset($this->charset);
294 294
     }
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
     static $firstInstance = null;
384 384
 
385 385
     if (
386
-        $hostname . $username . $password . $database . $port . $charset == ''
386
+        $hostname.$username.$password.$database.$port.$charset == ''
387 387
         &&
388 388
         null !== $firstInstance
389 389
     ) {
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
     }
392 392
 
393 393
     $connection = md5(
394
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . (int)$session_to_db
394
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.(int)$session_to_db
395 395
     );
396 396
 
397 397
     if (!isset($instance[$connection])) {
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
     $var = $this->escape($var, false, false, null);
602 602
 
603 603
     if (is_string($var)) {
604
-      $var = "'" . trim($var, "'") . "'";
604
+      $var = "'".trim($var, "'")."'";
605 605
     }
606 606
 
607 607
     return $var;
@@ -787,11 +787,11 @@  discard block
 block discarded – undo
787 787
 
788 788
       // exit if we have more then 3 "DB server has gone away"-errors
789 789
       if ($RECONNECT_COUNTER > 3) {
790
-        $this->_debug->mailToAdmin('SQL-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
790
+        $this->_debug->mailToAdmin('SQL-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
791 791
         throw new \Exception($errorMsg);
792 792
       }
793 793
 
794
-      $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
794
+      $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql);
795 795
 
796 796
       // reconnect
797 797
       $RECONNECT_COUNTER++;
@@ -801,10 +801,10 @@  discard block
 block discarded – undo
801 801
       return $this->query($sql, $sqlParams);
802 802
     }
803 803
 
804
-    $this->_debug->mailToAdmin('SQL-Warning', $errorMsg . ":\n<br />" . $sql);
804
+    $this->_debug->mailToAdmin('SQL-Warning', $errorMsg.":\n<br />".$sql);
805 805
 
806 806
     // this query returned an error, we must display it (only for dev) !!!
807
-    $this->_debug->displayError($errorMsg . ' | ' . $sql);
807
+    $this->_debug->displayError($errorMsg.' | '.$sql);
808 808
 
809 809
     return false;
810 810
   }
@@ -874,7 +874,7 @@  discard block
 block discarded – undo
874 874
 
875 875
     if ($useCache === true) {
876 876
       $cache = new Cache(null, null, false, $useCache);
877
-      $cacheKey = 'sql-' . md5($query);
877
+      $cacheKey = 'sql-'.md5($query);
878 878
 
879 879
       if (
880 880
           $cache->getCacheIsReady() === true
@@ -991,10 +991,10 @@  discard block
 block discarded – undo
991 991
     $return = mysqli_set_charset($this->link, $charset);
992 992
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
993 993
     /** @noinspection UsageOfSilenceOperatorInspection */
994
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
994
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
995 995
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
996 996
     /** @noinspection UsageOfSilenceOperatorInspection */
997
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
997
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
998 998
 
999 999
     return $return;
1000 1000
   }
@@ -1081,10 +1081,10 @@  discard block
 block discarded – undo
1081 1081
 
1082 1082
       if ($this->_debug->checkForDev() === true) {
1083 1083
         echo "Info: maybe you have to increase your 'max_allowed_packet = 30M' in the config: 'my.conf' \n<br />";
1084
-        echo 'Error:' . $errorMsg;
1084
+        echo 'Error:'.$errorMsg;
1085 1085
       }
1086 1086
 
1087
-      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg . ":\n<br />" . $sql);
1087
+      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg.":\n<br />".$sql);
1088 1088
     }
1089 1089
 
1090 1090
     // return the result only if there was a "SELECT"-query
@@ -1123,7 +1123,7 @@  discard block
 block discarded – undo
1123 1123
     }
1124 1124
 
1125 1125
     if (\mysqli_connect_errno()) {
1126
-      $this->_debug->displayError('Error connecting to mysql server: ' . \mysqli_connect_error(), true);
1126
+      $this->_debug->displayError('Error connecting to mysql server: '.\mysqli_connect_error(), true);
1127 1127
 
1128 1128
       return false;
1129 1129
     }
@@ -1234,10 +1234,10 @@  discard block
 block discarded – undo
1234 1234
     $SET = $this->_parseArrayPair($data);
1235 1235
 
1236 1236
     if ($databaseName) {
1237
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1237
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1238 1238
     }
1239 1239
 
1240
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
1240
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
1241 1241
 
1242 1242
     return $this->query($sql);
1243 1243
   }
@@ -1338,9 +1338,9 @@  discard block
 block discarded – undo
1338 1338
         }
1339 1339
 
1340 1340
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
1341
-          $_value = '(' . implode(',', $_value) . ')';
1341
+          $_value = '('.implode(',', $_value).')';
1342 1342
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
1343
-          $_value = '(' . implode(' AND ', $_value) . ')';
1343
+          $_value = '('.implode(' AND ', $_value).')';
1344 1344
         }
1345 1345
 
1346 1346
       } else {
@@ -1385,7 +1385,7 @@  discard block
 block discarded – undo
1385 1385
           $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue
1386 1386
         }
1387 1387
 
1388
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
1388
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
1389 1389
         $tmpCounter++;
1390 1390
       }
1391 1391
 
@@ -1417,7 +1417,7 @@  discard block
 block discarded – undo
1417 1417
         )
1418 1418
     );
1419 1419
 
1420
-    return '`' . $str . '`';
1420
+    return '`'.$str.'`';
1421 1421
   }
1422 1422
 
1423 1423
   /**
@@ -1473,10 +1473,10 @@  discard block
 block discarded – undo
1473 1473
     $values = implode(',', $data);
1474 1474
 
1475 1475
     if ($databaseName) {
1476
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1476
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1477 1477
     }
1478 1478
 
1479
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1479
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1480 1480
 
1481 1481
     return $this->query($sql);
1482 1482
   }
@@ -1519,10 +1519,10 @@  discard block
 block discarded – undo
1519 1519
     }
1520 1520
 
1521 1521
     if ($databaseName) {
1522
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1522
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1523 1523
     }
1524 1524
 
1525
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
1525
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
1526 1526
 
1527 1527
     return $this->query($sql);
1528 1528
   }
@@ -1556,10 +1556,10 @@  discard block
 block discarded – undo
1556 1556
     }
1557 1557
 
1558 1558
     if ($databaseName) {
1559
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1559
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1560 1560
     }
1561 1561
 
1562
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1562
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1563 1563
 
1564 1564
     return $this->query($sql);
1565 1565
   }
@@ -1593,10 +1593,10 @@  discard block
 block discarded – undo
1593 1593
     }
1594 1594
 
1595 1595
     if ($databaseName) {
1596
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1596
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1597 1597
     }
1598 1598
 
1599
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1599
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1600 1600
 
1601 1601
     return $this->query($sql);
1602 1602
   }
Please login to merge, or discard this patch.