Completed
Push — master ( e0d76f...7b97ec )
by Lars
01:54
created
src/voku/db/DB.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -434,9 +434,9 @@  discard block
 block discarded – undo
434 434
         }
435 435
 
436 436
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
437
-          $_value = '(' . implode(',', $_value) . ')';
437
+          $_value = '('.implode(',', $_value).')';
438 438
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
439
-          $_value = '(' . implode(' AND ', $_value) . ')';
439
+          $_value = '('.implode(' AND ', $_value).')';
440 440
         }
441 441
 
442 442
       } else {
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
           $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue
482 482
         }
483 483
 
484
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
484
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
485 485
         $tmpCounter++;
486 486
       }
487 487
 
@@ -675,7 +675,7 @@  discard block
 block discarded – undo
675 675
       );
676 676
 
677 677
     } catch (\Exception $e) {
678
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
678
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
679 679
       $this->_debug->displayError($error, false);
680 680
       throw new DBConnectException($error, 100, $e);
681 681
     }
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
 
684 684
     $errno = mysqli_connect_errno();
685 685
     if (!$this->connected || $errno) {
686
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
686
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
687 687
       $this->_debug->displayError($error, false);
688 688
       throw new DBConnectException($error, 101);
689 689
     }
@@ -724,10 +724,10 @@  discard block
 block discarded – undo
724 724
     }
725 725
 
726 726
     if ($databaseName) {
727
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
727
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
728 728
     }
729 729
 
730
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
730
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
731 731
 
732 732
     return $this->query($sql);
733 733
   }
@@ -792,12 +792,12 @@  discard block
 block discarded – undo
792 792
     $parseKey = md5(uniqid((string)mt_rand(), true));
793 793
 
794 794
     foreach ($params as $name => $value) {
795
-      $parseKeyInner = $name . '-' . $parseKey;
796
-      $sql = str_replace(':' . $name, $parseKeyInner, $sql);
795
+      $parseKeyInner = $name.'-'.$parseKey;
796
+      $sql = str_replace(':'.$name, $parseKeyInner, $sql);
797 797
     }
798 798
 
799 799
     foreach ($params as $name => $value) {
800
-      $parseKeyInner = $name . '-' . $parseKey;
800
+      $parseKeyInner = $name.'-'.$parseKey;
801 801
       $sqlBefore = $sql;
802 802
 
803 803
       while (strpos($sql, $parseKeyInner) !== false) {
@@ -974,7 +974,7 @@  discard block
 block discarded – undo
974 974
 
975 975
     if ($useCache === true) {
976 976
       $cache = new Cache(null, null, false, $useCache);
977
-      $cacheKey = 'sql-' . md5($query);
977
+      $cacheKey = 'sql-'.md5($query);
978 978
 
979 979
       if (
980 980
           $cache->getCacheIsReady() === true
@@ -1082,7 +1082,7 @@  discard block
 block discarded – undo
1082 1082
     static $firstInstance = null;
1083 1083
 
1084 1084
     if (
1085
-        $hostname . $username . $password . $database . $port . $charset == ''
1085
+        $hostname.$username.$password.$database.$port.$charset == ''
1086 1086
         &&
1087 1087
         null !== $firstInstance
1088 1088
     ) {
@@ -1092,7 +1092,7 @@  discard block
 block discarded – undo
1092 1092
     $extra_config_string = '';
1093 1093
     if (is_array($extra_config) === true) {
1094 1094
       foreach ($extra_config as $extra_config_key => $extra_config_value) {
1095
-        $extra_config_string .= $extra_config_key . (string)$extra_config_value;
1095
+        $extra_config_string .= $extra_config_key.(string)$extra_config_value;
1096 1096
       }
1097 1097
     } else {
1098 1098
       // only for backward compatibility
@@ -1100,7 +1100,7 @@  discard block
 block discarded – undo
1100 1100
     }
1101 1101
 
1102 1102
     $connection = md5(
1103
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1103
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1104 1104
     );
1105 1105
 
1106 1106
     if (!isset($instance[$connection])) {
@@ -1187,10 +1187,10 @@  discard block
 block discarded – undo
1187 1187
     $SET = $this->_parseArrayPair($data);
1188 1188
 
1189 1189
     if ($databaseName) {
1190
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1190
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1191 1191
     }
1192 1192
 
1193
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
1193
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
1194 1194
 
1195 1195
     return $this->query($sql);
1196 1196
   }
@@ -1500,11 +1500,11 @@  discard block
 block discarded – undo
1500 1500
 
1501 1501
       // exit if we have more then 3 "DB server has gone away"-errors
1502 1502
       if ($RECONNECT_COUNTER > 3) {
1503
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
1503
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
1504 1504
         throw new DBGoneAwayException($errorMessage);
1505 1505
       }
1506 1506
 
1507
-      $this->_debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1507
+      $this->_debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1508 1508
 
1509 1509
       // reconnect
1510 1510
       $RECONNECT_COUNTER++;
@@ -1518,10 +1518,10 @@  discard block
 block discarded – undo
1518 1518
       return false;
1519 1519
     }
1520 1520
 
1521
-    $this->_debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1521
+    $this->_debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1522 1522
 
1523 1523
     // this query returned an error, we must display it (only for dev) !!!
1524
-    $this->_debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql);
1524
+    $this->_debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql);
1525 1525
 
1526 1526
     return false;
1527 1527
   }
@@ -1544,7 +1544,7 @@  discard block
 block discarded – undo
1544 1544
         )
1545 1545
     );
1546 1546
 
1547
-    return '`' . $str . '`';
1547
+    return '`'.$str.'`';
1548 1548
   }
1549 1549
 
1550 1550
   /**
@@ -1615,10 +1615,10 @@  discard block
 block discarded – undo
1615 1615
     $values = implode(',', $data);
1616 1616
 
1617 1617
     if ($databaseName) {
1618
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1618
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1619 1619
     }
1620 1620
 
1621
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1621
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1622 1622
 
1623 1623
     return $this->query($sql);
1624 1624
   }
@@ -1706,7 +1706,7 @@  discard block
 block discarded – undo
1706 1706
     $var = $this->escape($var, false, false, null);
1707 1707
 
1708 1708
     if (is_string($var)) {
1709
-      $var = "'" . trim($var, "'") . "'";
1709
+      $var = "'".trim($var, "'")."'";
1710 1710
     }
1711 1711
 
1712 1712
     return $var;
@@ -1743,10 +1743,10 @@  discard block
 block discarded – undo
1743 1743
     }
1744 1744
 
1745 1745
     if ($databaseName) {
1746
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1746
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1747 1747
     }
1748 1748
 
1749
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1749
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1750 1750
 
1751 1751
     return $this->query($sql);
1752 1752
   }
@@ -1789,10 +1789,10 @@  discard block
 block discarded – undo
1789 1789
     $return = mysqli_set_charset($this->link, $charset);
1790 1790
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1791 1791
     /** @noinspection UsageOfSilenceOperatorInspection */
1792
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
1792
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
1793 1793
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1794 1794
     /** @noinspection UsageOfSilenceOperatorInspection */
1795
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
1795
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
1796 1796
 
1797 1797
     return $return;
1798 1798
   }
@@ -1920,7 +1920,7 @@  discard block
 block discarded – undo
1920 1920
 
1921 1921
       if ($result === false) {
1922 1922
         /** @noinspection ThrowRawExceptionInspection */
1923
-        throw new \Exception('call_user_func [' . $callback . '] === false');
1923
+        throw new \Exception('call_user_func ['.$callback.'] === false');
1924 1924
       }
1925 1925
 
1926 1926
       return $this->commit();
@@ -1973,10 +1973,10 @@  discard block
 block discarded – undo
1973 1973
     }
1974 1974
 
1975 1975
     if ($databaseName) {
1976
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1976
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1977 1977
     }
1978 1978
 
1979
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
1979
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
1980 1980
 
1981 1981
     return $this->query($sql);
1982 1982
   }
Please login to merge, or discard this patch.