Completed
Push — master ( 21c5ce...19caf3 )
by Lars
01:37
created
src/voku/db/exceptions/DBGoneAwayException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace voku\db\exceptions;
6 6
 
Please login to merge, or discard this patch.
src/voku/db/exceptions/ActiveRecordException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace voku\db\exceptions;
6 6
 
Please login to merge, or discard this patch.
src/voku/db/DB.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace voku\db;
6 6
 
@@ -436,9 +436,9 @@  discard block
 block discarded – undo
436 436
         }
437 437
 
438 438
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
439
-          $_value = '(' . implode(',', $_value) . ')';
439
+          $_value = '('.implode(',', $_value).')';
440 440
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
441
-          $_value = '(' . implode(' AND ', $_value) . ')';
441
+          $_value = '('.implode(' AND ', $_value).')';
442 442
         }
443 443
 
444 444
       } else {
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
           $valueInner = "''";
488 488
         }
489 489
 
490
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
490
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
491 491
         $tmpCounter++;
492 492
       }
493 493
 
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
690 690
       );
691 691
 
692 692
     } catch (\Exception $e) {
693
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
693
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
694 694
       $this->_debug->displayError($error, true);
695 695
       throw new DBConnectException($error, 100, $e);
696 696
     }
@@ -698,7 +698,7 @@  discard block
 block discarded – undo
698 698
 
699 699
     $errno = mysqli_connect_errno();
700 700
     if (!$this->connected || $errno) {
701
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
701
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
702 702
       $this->_debug->displayError($error, true);
703 703
       throw new DBConnectException($error, 101);
704 704
     }
@@ -739,10 +739,10 @@  discard block
 block discarded – undo
739 739
     }
740 740
 
741 741
     if ($databaseName) {
742
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
742
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
743 743
     }
744 744
 
745
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
745
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
746 746
 
747 747
     return $this->query($sql);
748 748
   }
@@ -812,8 +812,8 @@  discard block
 block discarded – undo
812 812
         $nameTmp = substr($name, 1);
813 813
       }
814 814
 
815
-      $parseKeyInner = $nameTmp . '-' . $parseKey;
816
-      $sql = str_replace(':' . $nameTmp, $parseKeyInner, $sql);
815
+      $parseKeyInner = $nameTmp.'-'.$parseKey;
816
+      $sql = str_replace(':'.$nameTmp, $parseKeyInner, $sql);
817 817
     }
818 818
 
819 819
     foreach ($params as $name => $value) {
@@ -822,7 +822,7 @@  discard block
 block discarded – undo
822 822
         $nameTmp = substr($name, 1);
823 823
       }
824 824
 
825
-      $parseKeyInner = $nameTmp . '-' . $parseKey;
825
+      $parseKeyInner = $nameTmp.'-'.$parseKey;
826 826
       $sqlBefore = $sql;
827 827
       $secureParamValue = $this->secure($params[$name]);
828 828
 
@@ -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
@@ -1120,7 +1120,7 @@  discard block
 block discarded – undo
1120 1120
     static $firstInstance = null;
1121 1121
 
1122 1122
     if (
1123
-        $hostname . $username . $password . $database . $port . $charset == '3306utf8'
1123
+        $hostname.$username.$password.$database.$port.$charset == '3306utf8'
1124 1124
         &&
1125 1125
         null !== $firstInstance
1126 1126
     ) {
@@ -1130,7 +1130,7 @@  discard block
 block discarded – undo
1130 1130
     $extra_config_string = '';
1131 1131
     if (\is_array($extra_config) === true) {
1132 1132
       foreach ($extra_config as $extra_config_key => $extra_config_value) {
1133
-        $extra_config_string .= $extra_config_key . (string)$extra_config_value;
1133
+        $extra_config_string .= $extra_config_key.(string)$extra_config_value;
1134 1134
       }
1135 1135
     } else {
1136 1136
       // only for backward compatibility
@@ -1138,7 +1138,7 @@  discard block
 block discarded – undo
1138 1138
     }
1139 1139
 
1140 1140
     $connection = md5(
1141
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string
1141
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
1142 1142
     );
1143 1143
 
1144 1144
     if (!isset($instance[$connection])) {
@@ -1225,10 +1225,10 @@  discard block
 block discarded – undo
1225 1225
     $SET = $this->_parseArrayPair($data);
1226 1226
 
1227 1227
     if ($databaseName) {
1228
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1228
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1229 1229
     }
1230 1230
 
1231
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
1231
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
1232 1232
 
1233 1233
     return $this->query($sql);
1234 1234
   }
@@ -1541,11 +1541,11 @@  discard block
 block discarded – undo
1541 1541
 
1542 1542
       // exit if we have more then 3 "DB server has gone away"-errors
1543 1543
       if ($RECONNECT_COUNTER > 3) {
1544
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
1544
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
1545 1545
         throw new DBGoneAwayException($errorMessage);
1546 1546
       }
1547 1547
 
1548
-      $this->_debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1548
+      $this->_debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1549 1549
 
1550 1550
       // reconnect
1551 1551
       $RECONNECT_COUNTER++;
@@ -1559,7 +1559,7 @@  discard block
 block discarded – undo
1559 1559
       return false;
1560 1560
     }
1561 1561
 
1562
-    $this->_debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
1562
+    $this->_debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
1563 1563
 
1564 1564
     $force_exception_after_error = null; // auto
1565 1565
     if ($this->_in_transaction === true) {
@@ -1567,7 +1567,7 @@  discard block
 block discarded – undo
1567 1567
     }
1568 1568
     // this query returned an error, we must display it (only for dev) !!!
1569 1569
 
1570
-    $this->_debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error);
1570
+    $this->_debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error);
1571 1571
 
1572 1572
     return false;
1573 1573
   }
@@ -1590,7 +1590,7 @@  discard block
 block discarded – undo
1590 1590
         )
1591 1591
     );
1592 1592
 
1593
-    return '`' . $str . '`';
1593
+    return '`'.$str.'`';
1594 1594
   }
1595 1595
 
1596 1596
   /**
@@ -1661,10 +1661,10 @@  discard block
 block discarded – undo
1661 1661
     $values = implode(',', $data);
1662 1662
 
1663 1663
     if ($databaseName) {
1664
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1664
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1665 1665
     }
1666 1666
 
1667
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1667
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1668 1668
 
1669 1669
     return $this->query($sql);
1670 1670
   }
@@ -1762,7 +1762,7 @@  discard block
 block discarded – undo
1762 1762
     $var = $this->escape($var, false, false, null);
1763 1763
 
1764 1764
     if (\is_string($var)) {
1765
-      $var = "'" . trim($var, "'") . "'";
1765
+      $var = "'".trim($var, "'")."'";
1766 1766
     }
1767 1767
 
1768 1768
     return $var;
@@ -1799,10 +1799,10 @@  discard block
 block discarded – undo
1799 1799
     }
1800 1800
 
1801 1801
     if ($databaseName) {
1802
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1802
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1803 1803
     }
1804 1804
 
1805
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1805
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1806 1806
 
1807 1807
     return $this->query($sql);
1808 1808
   }
@@ -1844,9 +1844,9 @@  discard block
 block discarded – undo
1844 1844
 
1845 1845
     $return = mysqli_set_charset($this->link, $charset);
1846 1846
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1847
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
1847
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
1848 1848
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
1849
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
1849
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
1850 1850
 
1851 1851
     return $return;
1852 1852
   }
@@ -1980,7 +1980,7 @@  discard block
 block discarded – undo
1980 1980
       $result = call_user_func($callback, $this);
1981 1981
       if ($result === false) {
1982 1982
         /** @noinspection ThrowRawExceptionInspection */
1983
-        throw new \Exception('call_user_func [' . $callback . '] === false');
1983
+        throw new \Exception('call_user_func ['.$callback.'] === false');
1984 1984
       }
1985 1985
 
1986 1986
       return $this->commit();
@@ -2033,10 +2033,10 @@  discard block
 block discarded – undo
2033 2033
     }
2034 2034
 
2035 2035
     if ($databaseName) {
2036
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
2036
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
2037 2037
     }
2038 2038
 
2039
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
2039
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
2040 2040
 
2041 2041
     return $this->query($sql);
2042 2042
   }
@@ -2050,7 +2050,7 @@  discard block
 block discarded – undo
2050 2050
    */
2051 2051
   public function table_exists(string $table): bool
2052 2052
   {
2053
-    $check = $this->query('SELECT 1 FROM ' . $this->quote_string($table));
2053
+    $check = $this->query('SELECT 1 FROM '.$this->quote_string($table));
2054 2054
 
2055 2055
     return $check !== false
2056 2056
            &&
Please login to merge, or discard this patch.