Completed
Push — master ( 059279...e0d76f )
by Lars
19:42 queued 17:36
created
src/voku/db/DB.php 1 patch
Spacing   +28 added lines, -28 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
 
@@ -669,7 +669,7 @@  discard block
 block discarded – undo
669 669
       );
670 670
 
671 671
     } catch (\Exception $e) {
672
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
672
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
673 673
       $this->_debug->displayError($error, false);
674 674
       throw new DBConnectException($error, 100, $e);
675 675
     }
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
677 677
 
678 678
     $errno = mysqli_connect_errno();
679 679
     if (!$this->connected || $errno) {
680
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
680
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
681 681
       $this->_debug->displayError($error, false);
682 682
       throw new DBConnectException($error, 101);
683 683
     }
@@ -718,10 +718,10 @@  discard block
 block discarded – undo
718 718
     }
719 719
 
720 720
     if ($databaseName) {
721
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
721
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
722 722
     }
723 723
 
724
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
724
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
725 725
 
726 726
     return $this->query($sql);
727 727
   }
@@ -784,7 +784,7 @@  discard block
 block discarded – undo
784 784
     $replace = array();
785 785
 
786 786
     foreach ($bindings as $name => $value) {
787
-      $search[] = '/:' . preg_quote($name, '/') . '\b/';
787
+      $search[] = '/:'.preg_quote($name, '/').'\b/';
788 788
       $replace[] = $this->secure($value);
789 789
     }
790 790
 
@@ -953,7 +953,7 @@  discard block
 block discarded – undo
953 953
 
954 954
     if ($useCache === true) {
955 955
       $cache = new Cache(null, null, false, $useCache);
956
-      $cacheKey = 'sql-' . md5($query);
956
+      $cacheKey = 'sql-'.md5($query);
957 957
 
958 958
       if (
959 959
           $cache->getCacheIsReady() === true
@@ -1061,7 +1061,7 @@  discard block
 block discarded – undo
1061 1061
     static $firstInstance = null;
1062 1062
 
1063 1063
     if (
1064
-        $hostname . $username . $password . $database . $port . $charset == ''
1064
+        $hostname.$username.$password.$database.$port.$charset == ''
1065 1065
         &&
1066 1066
         null !== $firstInstance
1067 1067
     ) {
@@ -1071,7 +1071,7 @@  discard block
 block discarded – undo
1071 1071
     $extra_config_string = '';
1072 1072
     if (is_array($extra_config) === true) {
1073 1073
       foreach ($extra_config as $extra_config_key => $extra_config_value) {
1074
-        $extra_config_string .= $extra_config_key . (string)$extra_config_value;
1074
+        $extra_config_string .= $extra_config_key.(string)$extra_config_value;
1075 1075
       }
1076 1076
     } else {
1077 1077
       // only for backward compatibility
@@ -1079,7 +1079,7 @@  discard block
 block discarded – undo
1079 1079
     }
1080 1080
 
1081 1081
     $connection = md5(
1082
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1082
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1083 1083
     );
1084 1084
 
1085 1085
     if (!isset($instance[$connection])) {
@@ -1166,10 +1166,10 @@  discard block
 block discarded – undo
1166 1166
     $SET = $this->_parseArrayPair($data);
1167 1167
 
1168 1168
     if ($databaseName) {
1169
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1169
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1170 1170
     }
1171 1171
 
1172
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
1172
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
1173 1173
 
1174 1174
     return $this->query($sql);
1175 1175
   }
@@ -1478,11 +1478,11 @@  discard block
 block discarded – undo
1478 1478
 
1479 1479
       // exit if we have more then 3 "DB server has gone away"-errors
1480 1480
       if ($RECONNECT_COUNTER > 3) {
1481
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
1481
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
1482 1482
         throw new DBGoneAwayException($errorMessage);
1483 1483
       }
1484 1484
 
1485
-      $this->_debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1485
+      $this->_debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1486 1486
 
1487 1487
       // reconnect
1488 1488
       $RECONNECT_COUNTER++;
@@ -1496,10 +1496,10 @@  discard block
 block discarded – undo
1496 1496
       return false;
1497 1497
     }
1498 1498
 
1499
-    $this->_debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1499
+    $this->_debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1500 1500
 
1501 1501
     // this query returned an error, we must display it (only for dev) !!!
1502
-    $this->_debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql);
1502
+    $this->_debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql);
1503 1503
 
1504 1504
     return false;
1505 1505
   }
@@ -1522,7 +1522,7 @@  discard block
 block discarded – undo
1522 1522
         )
1523 1523
     );
1524 1524
 
1525
-    return '`' . $str . '`';
1525
+    return '`'.$str.'`';
1526 1526
   }
1527 1527
 
1528 1528
   /**
@@ -1593,10 +1593,10 @@  discard block
 block discarded – undo
1593 1593
     $values = implode(',', $data);
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 = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1599
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1600 1600
 
1601 1601
     return $this->query($sql);
1602 1602
   }
@@ -1684,7 +1684,7 @@  discard block
 block discarded – undo
1684 1684
     $var = $this->escape($var, false, false, null);
1685 1685
 
1686 1686
     if (is_string($var)) {
1687
-      $var = "'" . trim($var, "'") . "'";
1687
+      $var = "'".trim($var, "'")."'";
1688 1688
     }
1689 1689
 
1690 1690
     return $var;
@@ -1721,10 +1721,10 @@  discard block
 block discarded – undo
1721 1721
     }
1722 1722
 
1723 1723
     if ($databaseName) {
1724
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1724
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1725 1725
     }
1726 1726
 
1727
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1727
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1728 1728
 
1729 1729
     return $this->query($sql);
1730 1730
   }
@@ -1767,10 +1767,10 @@  discard block
 block discarded – undo
1767 1767
     $return = mysqli_set_charset($this->link, $charset);
1768 1768
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1769 1769
     /** @noinspection UsageOfSilenceOperatorInspection */
1770
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
1770
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
1771 1771
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1772 1772
     /** @noinspection UsageOfSilenceOperatorInspection */
1773
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
1773
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
1774 1774
 
1775 1775
     return $return;
1776 1776
   }
@@ -1937,10 +1937,10 @@  discard block
 block discarded – undo
1937 1937
     }
1938 1938
 
1939 1939
     if ($databaseName) {
1940
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1940
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1941 1941
     }
1942 1942
 
1943
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
1943
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
1944 1944
 
1945 1945
     return $this->query($sql);
1946 1946
   }
Please login to merge, or discard this patch.