Completed
Push — master ( 4e98a1...a4a40b )
by Lars
05:38 queued 10s
created
src/voku/db/DB.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -418,9 +418,9 @@  discard block
 block discarded – undo
418 418
         }
419 419
 
420 420
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
421
-          $_value = '(' . \implode(',', $_value) . ')';
421
+          $_value = '('.\implode(',', $_value).')';
422 422
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
423
-          $_value = '(' . \implode(' AND ', $_value) . ')';
423
+          $_value = '('.\implode(' AND ', $_value).')';
424 424
         }
425 425
 
426 426
       } else {
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
           $valueInner = "''";
468 468
         }
469 469
 
470
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
470
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
471 471
         $tmpCounter++;
472 472
       }
473 473
 
@@ -554,7 +554,7 @@  discard block
 block discarded – undo
554 554
 
555 555
       // add ":" if needed
556 556
       if (\strpos($name, ':') !== 0) {
557
-        $nameTmp = ':' . $name;
557
+        $nameTmp = ':'.$name;
558 558
       } else {
559 559
         $nameTmp = $name;
560 560
       }
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
         $this->connected = $this->_doctrine_connection->isConnected();
707 707
 
708 708
         if (!$this->connected) {
709
-          $error = 'Error connecting to mysql server: ' . $this->_doctrine_connection->errorInfo();
709
+          $error = 'Error connecting to mysql server: '.$this->_doctrine_connection->errorInfo();
710 710
           $this->_debug->displayError($error, false);
711 711
           throw new DBConnectException($error, 101);
712 712
         }
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
       );
770 770
 
771 771
     } catch (\Exception $e) {
772
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
772
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
773 773
       $this->_debug->displayError($error, false);
774 774
       throw new DBConnectException($error, 100, $e);
775 775
     }
@@ -777,7 +777,7 @@  discard block
 block discarded – undo
777 777
 
778 778
     $errno = \mysqli_connect_errno();
779 779
     if (!$this->connected || $errno) {
780
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
780
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
781 781
       $this->_debug->displayError($error, false);
782 782
       throw new DBConnectException($error, 101);
783 783
     }
@@ -818,10 +818,10 @@  discard block
 block discarded – undo
818 818
     }
819 819
 
820 820
     if ($databaseName) {
821
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
821
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
822 822
     }
823 823
 
824
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE)";
824
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE)";
825 825
 
826 826
     return $this->query($sql);
827 827
   }
@@ -1004,7 +1004,7 @@  discard block
 block discarded – undo
1004 1004
 
1005 1005
     if ($useCache === true) {
1006 1006
       $cache = new Cache(null, null, false, $useCache);
1007
-      $cacheKey = 'sql-' . \md5($query);
1007
+      $cacheKey = 'sql-'.\md5($query);
1008 1008
 
1009 1009
       if (
1010 1010
           $cache->getCacheIsReady() === true
@@ -1141,7 +1141,7 @@  discard block
 block discarded – undo
1141 1141
     }
1142 1142
 
1143 1143
     if (
1144
-        $hostname . $username . $password . $database . $port . $charset == '3306utf8'
1144
+        $hostname.$username.$password.$database.$port.$charset == '3306utf8'
1145 1145
         &&
1146 1146
         null !== $firstInstance
1147 1147
     ) {
@@ -1159,11 +1159,11 @@  discard block
 block discarded – undo
1159 1159
       } else {
1160 1160
         $extra_config_value_tmp = (string)$extra_config_value;
1161 1161
       }
1162
-      $extra_config_string .= $extra_config_key . $extra_config_value_tmp;
1162
+      $extra_config_string .= $extra_config_key.$extra_config_value_tmp;
1163 1163
     }
1164 1164
 
1165 1165
     $connection = \md5(
1166
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1166
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1167 1167
     );
1168 1168
 
1169 1169
     if (!isset($instance[$connection])) {
@@ -1254,10 +1254,10 @@  discard block
 block discarded – undo
1254 1254
     $SET = $this->_parseArrayPair($data);
1255 1255
 
1256 1256
     if ($databaseName) {
1257
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
1257
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
1258 1258
     }
1259 1259
 
1260
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET";
1260
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET";
1261 1261
 
1262 1262
     return $this->query($sql);
1263 1263
   }
@@ -1656,11 +1656,11 @@  discard block
 block discarded – undo
1656 1656
 
1657 1657
       // exit if we have more then 3 "DB server has gone away"-errors
1658 1658
       if ($RECONNECT_COUNTER > 3) {
1659
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
1659
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
1660 1660
         throw new DBGoneAwayException($errorMessage);
1661 1661
       }
1662 1662
 
1663
-      $this->_debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1663
+      $this->_debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1664 1664
 
1665 1665
       // reconnect
1666 1666
       $RECONNECT_COUNTER++;
@@ -1674,7 +1674,7 @@  discard block
 block discarded – undo
1674 1674
       return false;
1675 1675
     }
1676 1676
 
1677
-    $this->_debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1677
+    $this->_debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1678 1678
 
1679 1679
     $force_exception_after_error = null; // auto
1680 1680
     if ($this->_in_transaction === true) {
@@ -1682,7 +1682,7 @@  discard block
 block discarded – undo
1682 1682
     }
1683 1683
     // this query returned an error, we must display it (only for dev) !!!
1684 1684
 
1685
-    $this->_debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error);
1685
+    $this->_debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error);
1686 1686
 
1687 1687
     return false;
1688 1688
   }
@@ -1705,7 +1705,7 @@  discard block
 block discarded – undo
1705 1705
         )
1706 1706
     );
1707 1707
 
1708
-    return '`' . $str . '`';
1708
+    return '`'.$str.'`';
1709 1709
   }
1710 1710
 
1711 1711
   /**
@@ -1775,10 +1775,10 @@  discard block
 block discarded – undo
1775 1775
     $values = \implode(',', $data);
1776 1776
 
1777 1777
     if ($databaseName) {
1778
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
1778
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
1779 1779
     }
1780 1780
 
1781
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values)";
1781
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values)";
1782 1782
 
1783 1783
     return $this->query($sql);
1784 1784
   }
@@ -1910,7 +1910,7 @@  discard block
 block discarded – undo
1910 1910
     $var = $this->escape($var, false, false, null);
1911 1911
 
1912 1912
     if (\is_string($var)) {
1913
-      $var = "'" . \trim($var, "'") . "'";
1913
+      $var = "'".\trim($var, "'")."'";
1914 1914
     }
1915 1915
 
1916 1916
     return $var;
@@ -1947,10 +1947,10 @@  discard block
 block discarded – undo
1947 1947
     }
1948 1948
 
1949 1949
     if ($databaseName) {
1950
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
1950
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
1951 1951
     }
1952 1952
 
1953
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE)";
1953
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE)";
1954 1954
 
1955 1955
     return $this->query($sql);
1956 1956
   }
@@ -2037,9 +2037,9 @@  discard block
 block discarded – undo
2037 2037
 
2038 2038
     $return = mysqli_set_charset($this->link, $charset);
2039 2039
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
2040
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
2040
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
2041 2041
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
2042
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
2042
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
2043 2043
 
2044 2044
     return $return;
2045 2045
   }
@@ -2168,7 +2168,7 @@  discard block
 block discarded – undo
2168 2168
    */
2169 2169
   public function table_exists(string $table): bool
2170 2170
   {
2171
-    $check = $this->query('SELECT 1 FROM ' . $this->quote_string($table));
2171
+    $check = $this->query('SELECT 1 FROM '.$this->quote_string($table));
2172 2172
 
2173 2173
     return $check !== false
2174 2174
            &&
@@ -2199,7 +2199,7 @@  discard block
 block discarded – undo
2199 2199
       $result = $callback($this);
2200 2200
       if ($result === false) {
2201 2201
         /** @noinspection ThrowRawExceptionInspection */
2202
-        throw new \Exception('call_user_func [' . $callback . '] === false');
2202
+        throw new \Exception('call_user_func ['.$callback.'] === false');
2203 2203
       }
2204 2204
 
2205 2205
       return $this->commit();
@@ -2252,10 +2252,10 @@  discard block
 block discarded – undo
2252 2252
     }
2253 2253
 
2254 2254
     if ($databaseName) {
2255
-      $databaseName = $this->quote_string(\trim($databaseName)) . '.';
2255
+      $databaseName = $this->quote_string(\trim($databaseName)).'.';
2256 2256
     }
2257 2257
 
2258
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE)";
2258
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE)";
2259 2259
 
2260 2260
     return $this->query($sql);
2261 2261
   }
Please login to merge, or discard this patch.