Completed
Push — master ( 423a40...855ee8 )
by Lars
03:36
created
src/voku/db/DB.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -460,9 +460,9 @@  discard block
 block discarded – undo
460 460
         }
461 461
 
462 462
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
463
-          $_value = '(' . \implode(',', $_value) . ')';
463
+          $_value = '('.\implode(',', $_value).')';
464 464
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
465
-          $_value = '(' . \implode(' AND ', $_value) . ')';
465
+          $_value = '('.\implode(' AND ', $_value).')';
466 466
         }
467 467
 
468 468
       } else {
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
           $valueInner = "''";
510 510
         }
511 511
 
512
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
512
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
513 513
         $tmpCounter++;
514 514
       }
515 515
 
@@ -710,7 +710,7 @@  discard block
 block discarded – undo
710 710
       );
711 711
 
712 712
     } catch (\Exception $e) {
713
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
713
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
714 714
       $this->_debug->displayError($error, true);
715 715
       throw new DBConnectException($error, 100, $e);
716 716
     }
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
718 718
 
719 719
     $errno = \mysqli_connect_errno();
720 720
     if (!$this->connected || $errno) {
721
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
721
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
722 722
       $this->_debug->displayError($error, true);
723 723
       throw new DBConnectException($error, 101);
724 724
     }
@@ -759,10 +759,10 @@  discard block
 block discarded – undo
759 759
     }
760 760
 
761 761
     if ($databaseName) {
762
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
762
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
763 763
     }
764 764
 
765
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE)";
765
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE)";
766 766
 
767 767
     return $this->query($sql);
768 768
   }
@@ -830,7 +830,7 @@  discard block
 block discarded – undo
830 830
 
831 831
       // add ":" if needed
832 832
       if (\strpos($name, ':') !== 0) {
833
-        $nameTmp = ':' . $name;
833
+        $nameTmp = ':'.$name;
834 834
       } else {
835 835
         $nameTmp = $name;
836 836
       }
@@ -1010,7 +1010,7 @@  discard block
 block discarded – undo
1010 1010
 
1011 1011
     if ($useCache === true) {
1012 1012
       $cache = new Cache(null, null, false, $useCache);
1013
-      $cacheKey = 'sql-' . \md5($query);
1013
+      $cacheKey = 'sql-'.\md5($query);
1014 1014
 
1015 1015
       if (
1016 1016
           $cache->getCacheIsReady() === true
@@ -1133,7 +1133,7 @@  discard block
 block discarded – undo
1133 1133
     static $firstInstance = null;
1134 1134
 
1135 1135
     if (
1136
-        $hostname . $username . $password . $database . $port . $charset == '3306utf8'
1136
+        $hostname.$username.$password.$database.$port.$charset == '3306utf8'
1137 1137
         &&
1138 1138
         null !== $firstInstance
1139 1139
     ) {
@@ -1147,7 +1147,7 @@  discard block
 block discarded – undo
1147 1147
     $extra_config_string = '';
1148 1148
     if (\is_array($extra_config) === true) {
1149 1149
       foreach ($extra_config as $extra_config_key => $extra_config_value) {
1150
-        $extra_config_string .= $extra_config_key . (string)$extra_config_value;
1150
+        $extra_config_string .= $extra_config_key.(string)$extra_config_value;
1151 1151
       }
1152 1152
     } else {
1153 1153
       // only for backward compatibility
@@ -1155,7 +1155,7 @@  discard block
 block discarded – undo
1155 1155
     }
1156 1156
 
1157 1157
     $connection = \md5(
1158
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1158
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1159 1159
     );
1160 1160
 
1161 1161
     if (!isset($instance[$connection])) {
@@ -1246,10 +1246,10 @@  discard block
 block discarded – undo
1246 1246
     $SET = $this->_parseArrayPair($data);
1247 1247
 
1248 1248
     if ($databaseName) {
1249
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
1249
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
1250 1250
     }
1251 1251
 
1252
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET";
1252
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET";
1253 1253
 
1254 1254
     return $this->query($sql);
1255 1255
   }
@@ -1560,11 +1560,11 @@  discard block
 block discarded – undo
1560 1560
 
1561 1561
       // exit if we have more then 3 "DB server has gone away"-errors
1562 1562
       if ($RECONNECT_COUNTER > 3) {
1563
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
1563
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
1564 1564
         throw new DBGoneAwayException($errorMessage);
1565 1565
       }
1566 1566
 
1567
-      $this->_debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1567
+      $this->_debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1568 1568
 
1569 1569
       // reconnect
1570 1570
       $RECONNECT_COUNTER++;
@@ -1578,7 +1578,7 @@  discard block
 block discarded – undo
1578 1578
       return false;
1579 1579
     }
1580 1580
 
1581
-    $this->_debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1581
+    $this->_debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1582 1582
 
1583 1583
     $force_exception_after_error = null; // auto
1584 1584
     if ($this->_in_transaction === true) {
@@ -1586,7 +1586,7 @@  discard block
 block discarded – undo
1586 1586
     }
1587 1587
     // this query returned an error, we must display it (only for dev) !!!
1588 1588
 
1589
-    $this->_debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error);
1589
+    $this->_debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error);
1590 1590
 
1591 1591
     return false;
1592 1592
   }
@@ -1609,7 +1609,7 @@  discard block
 block discarded – undo
1609 1609
         )
1610 1610
     );
1611 1611
 
1612
-    return '`' . $str . '`';
1612
+    return '`'.$str.'`';
1613 1613
   }
1614 1614
 
1615 1615
   /**
@@ -1680,10 +1680,10 @@  discard block
 block discarded – undo
1680 1680
     $values = \implode(',', $data);
1681 1681
 
1682 1682
     if ($databaseName) {
1683
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
1683
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
1684 1684
     }
1685 1685
 
1686
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values)";
1686
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values)";
1687 1687
 
1688 1688
     return $this->query($sql);
1689 1689
   }
@@ -1779,7 +1779,7 @@  discard block
 block discarded – undo
1779 1779
     $var = $this->escape($var, false, false, null);
1780 1780
 
1781 1781
     if (\is_string($var)) {
1782
-      $var = "'" . \trim($var, "'") . "'";
1782
+      $var = "'".\trim($var, "'")."'";
1783 1783
     }
1784 1784
 
1785 1785
     return $var;
@@ -1816,10 +1816,10 @@  discard block
 block discarded – undo
1816 1816
     }
1817 1817
 
1818 1818
     if ($databaseName) {
1819
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
1819
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
1820 1820
     }
1821 1821
 
1822
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE)";
1822
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE)";
1823 1823
 
1824 1824
     return $this->query($sql);
1825 1825
   }
@@ -1861,9 +1861,9 @@  discard block
 block discarded – undo
1861 1861
 
1862 1862
     $return = mysqli_set_charset($this->link, $charset);
1863 1863
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1864
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
1864
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
1865 1865
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1866
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
1866
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
1867 1867
 
1868 1868
     return $return;
1869 1869
   }
@@ -1997,7 +1997,7 @@  discard block
 block discarded – undo
1997 1997
       $result = $callback($this);
1998 1998
       if ($result === false) {
1999 1999
         /** @noinspection ThrowRawExceptionInspection */
2000
-        throw new \Exception('call_user_func [' . $callback . '] === false');
2000
+        throw new \Exception('call_user_func ['.$callback.'] === false');
2001 2001
       }
2002 2002
 
2003 2003
       return $this->commit();
@@ -2050,10 +2050,10 @@  discard block
 block discarded – undo
2050 2050
     }
2051 2051
 
2052 2052
     if ($databaseName) {
2053
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2053
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
2054 2054
     }
2055 2055
 
2056
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE)";
2056
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE)";
2057 2057
 
2058 2058
     return $this->query($sql);
2059 2059
   }
@@ -2067,7 +2067,7 @@  discard block
 block discarded – undo
2067 2067
    */
2068 2068
   public function table_exists(string $table): bool
2069 2069
   {
2070
-    $check = $this->query('SELECT 1 FROM ' . $this->quote_string($table));
2070
+    $check = $this->query('SELECT 1 FROM '.$this->quote_string($table));
2071 2071
 
2072 2072
     return $check !== false
2073 2073
            &&
Please login to merge, or discard this patch.