Completed
Push — master ( cbc17a...5fbc20 )
by Lars
14:12
created
src/voku/db/DB.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -437,9 +437,9 @@  discard block
 block discarded – undo
437 437
         }
438 438
 
439 439
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
440
-          $_value = '(' . implode(',', $_value) . ')';
440
+          $_value = '('.implode(',', $_value).')';
441 441
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
442
-          $_value = '(' . implode(' AND ', $_value) . ')';
442
+          $_value = '('.implode(' AND ', $_value).')';
443 443
         }
444 444
 
445 445
       } else {
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
488 488
           $valueInner = "''";
489 489
         }
490 490
 
491
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
491
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
492 492
         $tmpCounter++;
493 493
       }
494 494
 
@@ -682,7 +682,7 @@  discard block
 block discarded – undo
682 682
       );
683 683
 
684 684
     } catch (\Exception $e) {
685
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
685
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
686 686
       $this->_debug->displayError($error, true);
687 687
       throw new DBConnectException($error, 100, $e);
688 688
     }
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
690 690
 
691 691
     $errno = mysqli_connect_errno();
692 692
     if (!$this->connected || $errno) {
693
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
693
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
694 694
       $this->_debug->displayError($error, true);
695 695
       throw new DBConnectException($error, 101);
696 696
     }
@@ -731,10 +731,10 @@  discard block
 block discarded – undo
731 731
     }
732 732
 
733 733
     if ($databaseName) {
734
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
734
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
735 735
     }
736 736
 
737
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
737
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
738 738
 
739 739
     return $this->query($sql);
740 740
   }
@@ -804,8 +804,8 @@  discard block
 block discarded – undo
804 804
         $nameTmp = substr($name, 1);
805 805
       }
806 806
 
807
-      $parseKeyInner = $nameTmp . '-' . $parseKey;
808
-      $sql = str_replace(':' . $nameTmp, $parseKeyInner, $sql);
807
+      $parseKeyInner = $nameTmp.'-'.$parseKey;
808
+      $sql = str_replace(':'.$nameTmp, $parseKeyInner, $sql);
809 809
     }
810 810
 
811 811
     foreach ($params as $name => $value) {
@@ -814,7 +814,7 @@  discard block
 block discarded – undo
814 814
         $nameTmp = substr($name, 1);
815 815
       }
816 816
 
817
-      $parseKeyInner = $nameTmp . '-' . $parseKey;
817
+      $parseKeyInner = $nameTmp.'-'.$parseKey;
818 818
       $sqlBefore = $sql;
819 819
       $secureParamValue = $this->secure($params[$name]);
820 820
 
@@ -1002,7 +1002,7 @@  discard block
 block discarded – undo
1002 1002
 
1003 1003
     if ($useCache === true) {
1004 1004
       $cache = new Cache(null, null, false, $useCache);
1005
-      $cacheKey = 'sql-' . md5($query);
1005
+      $cacheKey = 'sql-'.md5($query);
1006 1006
 
1007 1007
       if (
1008 1008
           $cache->getCacheIsReady() === true
@@ -1112,7 +1112,7 @@  discard block
 block discarded – undo
1112 1112
     static $firstInstance = null;
1113 1113
 
1114 1114
     if (
1115
-        $hostname . $username . $password . $database . $port . $charset == ''
1115
+        $hostname.$username.$password.$database.$port.$charset == ''
1116 1116
         &&
1117 1117
         null !== $firstInstance
1118 1118
     ) {
@@ -1122,7 +1122,7 @@  discard block
 block discarded – undo
1122 1122
     $extra_config_string = '';
1123 1123
     if (is_array($extra_config) === true) {
1124 1124
       foreach ($extra_config as $extra_config_key => $extra_config_value) {
1125
-        $extra_config_string .= $extra_config_key . (string)$extra_config_value;
1125
+        $extra_config_string .= $extra_config_key.(string)$extra_config_value;
1126 1126
       }
1127 1127
     } else {
1128 1128
       // only for backward compatibility
@@ -1130,7 +1130,7 @@  discard block
 block discarded – undo
1130 1130
     }
1131 1131
 
1132 1132
     $connection = md5(
1133
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1133
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1134 1134
     );
1135 1135
 
1136 1136
     if (!isset($instance[$connection])) {
@@ -1217,10 +1217,10 @@  discard block
 block discarded – undo
1217 1217
     $SET = $this->_parseArrayPair($data);
1218 1218
 
1219 1219
     if ($databaseName) {
1220
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1220
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1221 1221
     }
1222 1222
 
1223
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
1223
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
1224 1224
 
1225 1225
     return $this->query($sql);
1226 1226
   }
@@ -1534,11 +1534,11 @@  discard block
 block discarded – undo
1534 1534
 
1535 1535
       // exit if we have more then 3 "DB server has gone away"-errors
1536 1536
       if ($RECONNECT_COUNTER > 3) {
1537
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
1537
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
1538 1538
         throw new DBGoneAwayException($errorMessage);
1539 1539
       }
1540 1540
 
1541
-      $this->_debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1541
+      $this->_debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1542 1542
 
1543 1543
       // reconnect
1544 1544
       $RECONNECT_COUNTER++;
@@ -1552,7 +1552,7 @@  discard block
 block discarded – undo
1552 1552
       return false;
1553 1553
     }
1554 1554
 
1555
-    $this->_debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1555
+    $this->_debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1556 1556
 
1557 1557
     $force_exception_after_error = null; // auto
1558 1558
     if ($this->_in_transaction === true) {
@@ -1560,7 +1560,7 @@  discard block
 block discarded – undo
1560 1560
     }
1561 1561
     // this query returned an error, we must display it (only for dev) !!!
1562 1562
 
1563
-    $this->_debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error);
1563
+    $this->_debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error);
1564 1564
 
1565 1565
     return false;
1566 1566
   }
@@ -1583,7 +1583,7 @@  discard block
 block discarded – undo
1583 1583
         )
1584 1584
     );
1585 1585
 
1586
-    return '`' . $str . '`';
1586
+    return '`'.$str.'`';
1587 1587
   }
1588 1588
 
1589 1589
   /**
@@ -1654,10 +1654,10 @@  discard block
 block discarded – undo
1654 1654
     $values = implode(',', $data);
1655 1655
 
1656 1656
     if ($databaseName) {
1657
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1657
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1658 1658
     }
1659 1659
 
1660
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1660
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1661 1661
 
1662 1662
     return $this->query($sql);
1663 1663
   }
@@ -1755,7 +1755,7 @@  discard block
 block discarded – undo
1755 1755
     $var = $this->escape($var, false, false, null);
1756 1756
 
1757 1757
     if (is_string($var)) {
1758
-      $var = "'" . trim($var, "'") . "'";
1758
+      $var = "'".trim($var, "'")."'";
1759 1759
     }
1760 1760
 
1761 1761
     return $var;
@@ -1792,10 +1792,10 @@  discard block
 block discarded – undo
1792 1792
     }
1793 1793
 
1794 1794
     if ($databaseName) {
1795
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1795
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1796 1796
     }
1797 1797
 
1798
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1798
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1799 1799
 
1800 1800
     return $this->query($sql);
1801 1801
   }
@@ -1838,10 +1838,10 @@  discard block
 block discarded – undo
1838 1838
     $return = mysqli_set_charset($this->link, $charset);
1839 1839
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1840 1840
     /** @noinspection UsageOfSilenceOperatorInspection */
1841
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
1841
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
1842 1842
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1843 1843
     /** @noinspection UsageOfSilenceOperatorInspection */
1844
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
1844
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
1845 1845
 
1846 1846
     return $return;
1847 1847
   }
@@ -1975,7 +1975,7 @@  discard block
 block discarded – undo
1975 1975
       $result = call_user_func($callback, $this);
1976 1976
       if ($result === false) {
1977 1977
         /** @noinspection ThrowRawExceptionInspection */
1978
-        throw new \Exception('call_user_func [' . $callback . '] === false');
1978
+        throw new \Exception('call_user_func ['.$callback.'] === false');
1979 1979
       }
1980 1980
 
1981 1981
       return $this->commit();
@@ -2028,10 +2028,10 @@  discard block
 block discarded – undo
2028 2028
     }
2029 2029
 
2030 2030
     if ($databaseName) {
2031
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
2031
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
2032 2032
     }
2033 2033
 
2034
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
2034
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
2035 2035
 
2036 2036
     return $this->query($sql);
2037 2037
   }
@@ -2045,7 +2045,7 @@  discard block
 block discarded – undo
2045 2045
    */
2046 2046
   public function table_exists($table)
2047 2047
   {
2048
-    $check = $this->query('SELECT 1 FROM ' . $this->quote_string($table));
2048
+    $check = $this->query('SELECT 1 FROM '.$this->quote_string($table));
2049 2049
     if (
2050 2050
         $check !== false
2051 2051
         &&
Please login to merge, or discard this patch.