@@ -249,7 +249,7 @@ |
||
| 249 | 249 | * @param string $username |
| 250 | 250 | * @param string $password |
| 251 | 251 | * @param string $database |
| 252 | - * @param int|string $port <p>default is (int)3306</p> |
|
| 252 | + * @param integer $port <p>default is (int)3306</p> |
|
| 253 | 253 | * @param string $charset <p>default is 'utf8' or 'utf8mb4' (if supported)</p> |
| 254 | 254 | * @param bool|string $exit_on_error <p>Throw a 'Exception' when a query failed, otherwise it will return 'false'. |
| 255 | 255 | * Use a empty string "" or false to disable it.</p> |
@@ -438,9 +438,9 @@ discard block |
||
| 438 | 438 | } |
| 439 | 439 | |
| 440 | 440 | if ($_connector === 'NOT IN' || $_connector === 'IN') { |
| 441 | - $_value = '(' . implode(',', $_value) . ')'; |
|
| 441 | + $_value = '('.implode(',', $_value).')'; |
|
| 442 | 442 | } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') { |
| 443 | - $_value = '(' . implode(' AND ', $_value) . ')'; |
|
| 443 | + $_value = '('.implode(' AND ', $_value).')'; |
|
| 444 | 444 | } |
| 445 | 445 | |
| 446 | 446 | } else { |
@@ -485,7 +485,7 @@ discard block |
||
| 485 | 485 | $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue |
| 486 | 486 | } |
| 487 | 487 | |
| 488 | - $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n"; |
|
| 488 | + $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n"; |
|
| 489 | 489 | $tmpCounter++; |
| 490 | 490 | } |
| 491 | 491 | |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | ); |
| 680 | 680 | |
| 681 | 681 | } catch (\Exception $e) { |
| 682 | - $error = 'Error connecting to mysql server: ' . $e->getMessage(); |
|
| 682 | + $error = 'Error connecting to mysql server: '.$e->getMessage(); |
|
| 683 | 683 | $this->_debug->displayError($error, true); |
| 684 | 684 | throw new DBConnectException($error, 100, $e); |
| 685 | 685 | } |
@@ -687,7 +687,7 @@ discard block |
||
| 687 | 687 | |
| 688 | 688 | $errno = mysqli_connect_errno(); |
| 689 | 689 | if (!$this->connected || $errno) { |
| 690 | - $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')'; |
|
| 690 | + $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')'; |
|
| 691 | 691 | $this->_debug->displayError($error, true); |
| 692 | 692 | throw new DBConnectException($error, 101); |
| 693 | 693 | } |
@@ -728,10 +728,10 @@ discard block |
||
| 728 | 728 | } |
| 729 | 729 | |
| 730 | 730 | if ($databaseName) { |
| 731 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 731 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 732 | 732 | } |
| 733 | 733 | |
| 734 | - $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);"; |
|
| 734 | + $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);"; |
|
| 735 | 735 | |
| 736 | 736 | return $this->query($sql); |
| 737 | 737 | } |
@@ -796,12 +796,12 @@ discard block |
||
| 796 | 796 | $parseKey = md5(uniqid((string)mt_rand(), true)); |
| 797 | 797 | |
| 798 | 798 | foreach ($params as $name => $value) { |
| 799 | - $parseKeyInner = $name . '-' . $parseKey; |
|
| 800 | - $sql = str_replace(':' . $name, $parseKeyInner, $sql); |
|
| 799 | + $parseKeyInner = $name.'-'.$parseKey; |
|
| 800 | + $sql = str_replace(':'.$name, $parseKeyInner, $sql); |
|
| 801 | 801 | } |
| 802 | 802 | |
| 803 | 803 | foreach ($params as $name => $value) { |
| 804 | - $parseKeyInner = $name . '-' . $parseKey; |
|
| 804 | + $parseKeyInner = $name.'-'.$parseKey; |
|
| 805 | 805 | $sqlBefore = $sql; |
| 806 | 806 | |
| 807 | 807 | while (strpos($sql, $parseKeyInner) !== false) { |
@@ -978,7 +978,7 @@ discard block |
||
| 978 | 978 | |
| 979 | 979 | if ($useCache === true) { |
| 980 | 980 | $cache = new Cache(null, null, false, $useCache); |
| 981 | - $cacheKey = 'sql-' . md5($query); |
|
| 981 | + $cacheKey = 'sql-'.md5($query); |
|
| 982 | 982 | |
| 983 | 983 | if ( |
| 984 | 984 | $cache->getCacheIsReady() === true |
@@ -1088,7 +1088,7 @@ discard block |
||
| 1088 | 1088 | static $firstInstance = null; |
| 1089 | 1089 | |
| 1090 | 1090 | if ( |
| 1091 | - $hostname . $username . $password . $database . $port . $charset == '' |
|
| 1091 | + $hostname.$username.$password.$database.$port.$charset == '' |
|
| 1092 | 1092 | && |
| 1093 | 1093 | null !== $firstInstance |
| 1094 | 1094 | ) { |
@@ -1098,7 +1098,7 @@ discard block |
||
| 1098 | 1098 | $extra_config_string = ''; |
| 1099 | 1099 | if (is_array($extra_config) === true) { |
| 1100 | 1100 | foreach ($extra_config as $extra_config_key => $extra_config_value) { |
| 1101 | - $extra_config_string .= $extra_config_key . (string)$extra_config_value; |
|
| 1101 | + $extra_config_string .= $extra_config_key.(string)$extra_config_value; |
|
| 1102 | 1102 | } |
| 1103 | 1103 | } else { |
| 1104 | 1104 | // only for backward compatibility |
@@ -1106,7 +1106,7 @@ discard block |
||
| 1106 | 1106 | } |
| 1107 | 1107 | |
| 1108 | 1108 | $connection = md5( |
| 1109 | - $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string |
|
| 1109 | + $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string |
|
| 1110 | 1110 | ); |
| 1111 | 1111 | |
| 1112 | 1112 | if (!isset($instance[$connection])) { |
@@ -1193,10 +1193,10 @@ discard block |
||
| 1193 | 1193 | $SET = $this->_parseArrayPair($data); |
| 1194 | 1194 | |
| 1195 | 1195 | if ($databaseName) { |
| 1196 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 1196 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 1197 | 1197 | } |
| 1198 | 1198 | |
| 1199 | - $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;"; |
|
| 1199 | + $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;"; |
|
| 1200 | 1200 | |
| 1201 | 1201 | return $this->query($sql); |
| 1202 | 1202 | } |
@@ -1506,11 +1506,11 @@ discard block |
||
| 1506 | 1506 | |
| 1507 | 1507 | // exit if we have more then 3 "DB server has gone away"-errors |
| 1508 | 1508 | if ($RECONNECT_COUNTER > 3) { |
| 1509 | - $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5); |
|
| 1509 | + $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5); |
|
| 1510 | 1510 | throw new DBGoneAwayException($errorMessage); |
| 1511 | 1511 | } |
| 1512 | 1512 | |
| 1513 | - $this->_debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql); |
|
| 1513 | + $this->_debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql); |
|
| 1514 | 1514 | |
| 1515 | 1515 | // reconnect |
| 1516 | 1516 | $RECONNECT_COUNTER++; |
@@ -1524,7 +1524,7 @@ discard block |
||
| 1524 | 1524 | return false; |
| 1525 | 1525 | } |
| 1526 | 1526 | |
| 1527 | - $this->_debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql); |
|
| 1527 | + $this->_debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql); |
|
| 1528 | 1528 | |
| 1529 | 1529 | $force_exception_after_error = null; // auto |
| 1530 | 1530 | if ($this->_in_transaction === true) { |
@@ -1532,7 +1532,7 @@ discard block |
||
| 1532 | 1532 | } |
| 1533 | 1533 | // this query returned an error, we must display it (only for dev) !!! |
| 1534 | 1534 | |
| 1535 | - $this->_debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error); |
|
| 1535 | + $this->_debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error); |
|
| 1536 | 1536 | |
| 1537 | 1537 | return false; |
| 1538 | 1538 | } |
@@ -1555,7 +1555,7 @@ discard block |
||
| 1555 | 1555 | ) |
| 1556 | 1556 | ); |
| 1557 | 1557 | |
| 1558 | - return '`' . $str . '`'; |
|
| 1558 | + return '`'.$str.'`'; |
|
| 1559 | 1559 | } |
| 1560 | 1560 | |
| 1561 | 1561 | /** |
@@ -1626,10 +1626,10 @@ discard block |
||
| 1626 | 1626 | $values = implode(',', $data); |
| 1627 | 1627 | |
| 1628 | 1628 | if ($databaseName) { |
| 1629 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 1629 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 1630 | 1630 | } |
| 1631 | 1631 | |
| 1632 | - $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);"; |
|
| 1632 | + $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);"; |
|
| 1633 | 1633 | |
| 1634 | 1634 | return $this->query($sql); |
| 1635 | 1635 | } |
@@ -1717,7 +1717,7 @@ discard block |
||
| 1717 | 1717 | $var = $this->escape($var, false, false, null); |
| 1718 | 1718 | |
| 1719 | 1719 | if (is_string($var)) { |
| 1720 | - $var = "'" . trim($var, "'") . "'"; |
|
| 1720 | + $var = "'".trim($var, "'")."'"; |
|
| 1721 | 1721 | } |
| 1722 | 1722 | |
| 1723 | 1723 | return $var; |
@@ -1754,10 +1754,10 @@ discard block |
||
| 1754 | 1754 | } |
| 1755 | 1755 | |
| 1756 | 1756 | if ($databaseName) { |
| 1757 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 1757 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 1758 | 1758 | } |
| 1759 | 1759 | |
| 1760 | - $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);"; |
|
| 1760 | + $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);"; |
|
| 1761 | 1761 | |
| 1762 | 1762 | return $this->query($sql); |
| 1763 | 1763 | } |
@@ -1800,10 +1800,10 @@ discard block |
||
| 1800 | 1800 | $return = mysqli_set_charset($this->link, $charset); |
| 1801 | 1801 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
| 1802 | 1802 | /** @noinspection UsageOfSilenceOperatorInspection */ |
| 1803 | - @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset); |
|
| 1803 | + @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset); |
|
| 1804 | 1804 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
| 1805 | 1805 | /** @noinspection UsageOfSilenceOperatorInspection */ |
| 1806 | - @\mysqli_query($this->link, "SET NAMES '" . $charset . "'"); |
|
| 1806 | + @\mysqli_query($this->link, "SET NAMES '".$charset."'"); |
|
| 1807 | 1807 | |
| 1808 | 1808 | return $return; |
| 1809 | 1809 | } |
@@ -1931,7 +1931,7 @@ discard block |
||
| 1931 | 1931 | $result = call_user_func($callback, $this); |
| 1932 | 1932 | if ($result === false) { |
| 1933 | 1933 | /** @noinspection ThrowRawExceptionInspection */ |
| 1934 | - throw new \Exception('call_user_func [' . $callback . '] === false'); |
|
| 1934 | + throw new \Exception('call_user_func ['.$callback.'] === false'); |
|
| 1935 | 1935 | } |
| 1936 | 1936 | |
| 1937 | 1937 | return $this->commit(); |
@@ -1984,10 +1984,10 @@ discard block |
||
| 1984 | 1984 | } |
| 1985 | 1985 | |
| 1986 | 1986 | if ($databaseName) { |
| 1987 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 1987 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 1988 | 1988 | } |
| 1989 | 1989 | |
| 1990 | - $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);"; |
|
| 1990 | + $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);"; |
|
| 1991 | 1991 | |
| 1992 | 1992 | return $this->query($sql); |
| 1993 | 1993 | } |