@@ -442,11 +442,11 @@ discard block |
||
| 442 | 442 | } |
| 443 | 443 | |
| 444 | 444 | if ($_connector === 'NOT IN' || $_connector === 'IN') { |
| 445 | - $_value = '(' . \implode(',', $_value) . ')'; |
|
| 445 | + $_value = '('.\implode(',', $_value).')'; |
|
| 446 | 446 | } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') { |
| 447 | - $_value = '(' . \implode(' AND ', $_value) . ')'; |
|
| 447 | + $_value = '('.\implode(' AND ', $_value).')'; |
|
| 448 | 448 | } elseif ($_connector === '+' || $_connector === '-') { |
| 449 | - $_value = $firstKey . ' ' . $_connector . ' ' . $firstValue; |
|
| 449 | + $_value = $firstKey.' '.$_connector.' '.$firstValue; |
|
| 450 | 450 | $_connector_dummy = $_connector; |
| 451 | 451 | $_connector = '='; |
| 452 | 452 | } |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | $valueInner = "''"; |
| 497 | 497 | } |
| 498 | 498 | |
| 499 | - $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n"; |
|
| 499 | + $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n"; |
|
| 500 | 500 | $tmpCounter++; |
| 501 | 501 | } |
| 502 | 502 | |
@@ -583,7 +583,7 @@ discard block |
||
| 583 | 583 | |
| 584 | 584 | // add ":" if needed |
| 585 | 585 | if (\strpos($name, ':') !== 0) { |
| 586 | - $nameTmp = ':' . $name; |
|
| 586 | + $nameTmp = ':'.$name; |
|
| 587 | 587 | } else { |
| 588 | 588 | $nameTmp = $name; |
| 589 | 589 | } |
@@ -776,7 +776,7 @@ discard block |
||
| 776 | 776 | $this->connected = $this->doctrine_connection->isConnected(); |
| 777 | 777 | |
| 778 | 778 | if (!$this->connected) { |
| 779 | - $error = 'Error connecting to mysql server: ' . $this->doctrine_connection->errorInfo(); |
|
| 779 | + $error = 'Error connecting to mysql server: '.$this->doctrine_connection->errorInfo(); |
|
| 780 | 780 | $this->debug->displayError($error, false); |
| 781 | 781 | throw new DBConnectException($error, 101); |
| 782 | 782 | } |
@@ -793,7 +793,7 @@ discard block |
||
| 793 | 793 | $this->connected = $this->doctrine_connection->isConnected(); |
| 794 | 794 | |
| 795 | 795 | if (!$this->connected) { |
| 796 | - $error = 'Error connecting to mysql server: ' . $this->doctrine_connection->errorInfo(); |
|
| 796 | + $error = 'Error connecting to mysql server: '.$this->doctrine_connection->errorInfo(); |
|
| 797 | 797 | $this->debug->displayError($error, false); |
| 798 | 798 | throw new DBConnectException($error, 101); |
| 799 | 799 | } |
@@ -856,7 +856,7 @@ discard block |
||
| 856 | 856 | ); |
| 857 | 857 | |
| 858 | 858 | } catch (\Exception $e) { |
| 859 | - $error = 'Error connecting to mysql server: ' . $e->getMessage(); |
|
| 859 | + $error = 'Error connecting to mysql server: '.$e->getMessage(); |
|
| 860 | 860 | $this->debug->displayError($error, false); |
| 861 | 861 | throw new DBConnectException($error, 100, $e); |
| 862 | 862 | } |
@@ -864,7 +864,7 @@ discard block |
||
| 864 | 864 | |
| 865 | 865 | $errno = \mysqli_connect_errno(); |
| 866 | 866 | if (!$this->connected || $errno) { |
| 867 | - $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')'; |
|
| 867 | + $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')'; |
|
| 868 | 868 | $this->debug->displayError($error, false); |
| 869 | 869 | throw new DBConnectException($error, 101); |
| 870 | 870 | } |
@@ -905,10 +905,10 @@ discard block |
||
| 905 | 905 | } |
| 906 | 906 | |
| 907 | 907 | if ($databaseName) { |
| 908 | - $databaseName = $this->quote_string(\trim($databaseName)) . '.'; |
|
| 908 | + $databaseName = $this->quote_string(\trim($databaseName)).'.'; |
|
| 909 | 909 | } |
| 910 | 910 | |
| 911 | - $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE)"; |
|
| 911 | + $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE)"; |
|
| 912 | 912 | |
| 913 | 913 | return $this->query($sql); |
| 914 | 914 | } |
@@ -1111,7 +1111,7 @@ discard block |
||
| 1111 | 1111 | |
| 1112 | 1112 | if ($useCache === true) { |
| 1113 | 1113 | $cache = new Cache(null, null, false, $useCache); |
| 1114 | - $cacheKey = 'sql-' . \md5($query); |
|
| 1114 | + $cacheKey = 'sql-'.\md5($query); |
|
| 1115 | 1115 | |
| 1116 | 1116 | if ( |
| 1117 | 1117 | $cache->getCacheIsReady() === true |
@@ -1286,7 +1286,7 @@ discard block |
||
| 1286 | 1286 | } |
| 1287 | 1287 | |
| 1288 | 1288 | if ( |
| 1289 | - '' . $hostname . $username . $password . $database . $port . $charset == '' . $port . $charset |
|
| 1289 | + ''.$hostname.$username.$password.$database.$port.$charset == ''.$port.$charset |
|
| 1290 | 1290 | && |
| 1291 | 1291 | null !== $firstInstance |
| 1292 | 1292 | ) { |
@@ -1304,11 +1304,11 @@ discard block |
||
| 1304 | 1304 | } else { |
| 1305 | 1305 | $extra_config_value_tmp = (string)$extra_config_value; |
| 1306 | 1306 | } |
| 1307 | - $extra_config_string .= $extra_config_key . $extra_config_value_tmp; |
|
| 1307 | + $extra_config_string .= $extra_config_key.$extra_config_value_tmp; |
|
| 1308 | 1308 | } |
| 1309 | 1309 | |
| 1310 | 1310 | $connection = \md5( |
| 1311 | - $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string |
|
| 1311 | + $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string |
|
| 1312 | 1312 | ); |
| 1313 | 1313 | |
| 1314 | 1314 | if (!isset($instance[$connection])) { |
@@ -1448,10 +1448,10 @@ discard block |
||
| 1448 | 1448 | $SET = $this->_parseArrayPair($data); |
| 1449 | 1449 | |
| 1450 | 1450 | if ($databaseName) { |
| 1451 | - $databaseName = $this->quote_string(\trim($databaseName)) . '.'; |
|
| 1451 | + $databaseName = $this->quote_string(\trim($databaseName)).'.'; |
|
| 1452 | 1452 | } |
| 1453 | 1453 | |
| 1454 | - $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET"; |
|
| 1454 | + $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET"; |
|
| 1455 | 1455 | |
| 1456 | 1456 | return $this->query($sql); |
| 1457 | 1457 | } |
@@ -1983,11 +1983,11 @@ discard block |
||
| 1983 | 1983 | |
| 1984 | 1984 | // exit if we have more then 3 "DB server has gone away"-errors |
| 1985 | 1985 | if ($RECONNECT_COUNTER > 3) { |
| 1986 | - $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5); |
|
| 1986 | + $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5); |
|
| 1987 | 1987 | throw new DBGoneAwayException($errorMessage); |
| 1988 | 1988 | } |
| 1989 | 1989 | |
| 1990 | - $this->debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql); |
|
| 1990 | + $this->debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql); |
|
| 1991 | 1991 | |
| 1992 | 1992 | // reconnect |
| 1993 | 1993 | $RECONNECT_COUNTER++; |
@@ -2001,7 +2001,7 @@ discard block |
||
| 2001 | 2001 | return false; |
| 2002 | 2002 | } |
| 2003 | 2003 | |
| 2004 | - $this->debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql); |
|
| 2004 | + $this->debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql); |
|
| 2005 | 2005 | |
| 2006 | 2006 | $force_exception_after_error = null; // auto |
| 2007 | 2007 | if ($this->in_transaction === true) { |
@@ -2009,7 +2009,7 @@ discard block |
||
| 2009 | 2009 | } |
| 2010 | 2010 | // this query returned an error, we must display it (only for dev) !!! |
| 2011 | 2011 | |
| 2012 | - $this->debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error); |
|
| 2012 | + $this->debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error); |
|
| 2013 | 2013 | |
| 2014 | 2014 | return false; |
| 2015 | 2015 | } |
@@ -2032,7 +2032,7 @@ discard block |
||
| 2032 | 2032 | ) |
| 2033 | 2033 | ); |
| 2034 | 2034 | |
| 2035 | - return '`' . $str . '`'; |
|
| 2035 | + return '`'.$str.'`'; |
|
| 2036 | 2036 | } |
| 2037 | 2037 | |
| 2038 | 2038 | /** |
@@ -2102,10 +2102,10 @@ discard block |
||
| 2102 | 2102 | $values = \implode(',', $data); |
| 2103 | 2103 | |
| 2104 | 2104 | if ($databaseName) { |
| 2105 | - $databaseName = $this->quote_string(\trim($databaseName)) . '.'; |
|
| 2105 | + $databaseName = $this->quote_string(\trim($databaseName)).'.'; |
|
| 2106 | 2106 | } |
| 2107 | 2107 | |
| 2108 | - $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values)"; |
|
| 2108 | + $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values)"; |
|
| 2109 | 2109 | |
| 2110 | 2110 | return $this->query($sql); |
| 2111 | 2111 | } |
@@ -2249,7 +2249,7 @@ discard block |
||
| 2249 | 2249 | $var = $this->escape($var, false, false, null); |
| 2250 | 2250 | |
| 2251 | 2251 | if (\is_string($var)) { |
| 2252 | - $var = "'" . \trim($var, "'") . "'"; |
|
| 2252 | + $var = "'".\trim($var, "'")."'"; |
|
| 2253 | 2253 | } |
| 2254 | 2254 | |
| 2255 | 2255 | return $var; |
@@ -2286,10 +2286,10 @@ discard block |
||
| 2286 | 2286 | } |
| 2287 | 2287 | |
| 2288 | 2288 | if ($databaseName) { |
| 2289 | - $databaseName = $this->quote_string(\trim($databaseName)) . '.'; |
|
| 2289 | + $databaseName = $this->quote_string(\trim($databaseName)).'.'; |
|
| 2290 | 2290 | } |
| 2291 | 2291 | |
| 2292 | - $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE)"; |
|
| 2292 | + $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE)"; |
|
| 2293 | 2293 | |
| 2294 | 2294 | return $this->query($sql); |
| 2295 | 2295 | } |
@@ -2391,16 +2391,16 @@ discard block |
||
| 2391 | 2391 | $return = mysqli_set_charset($this->mysqli_link, $charset); |
| 2392 | 2392 | |
| 2393 | 2393 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
| 2394 | - @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET ' . $charset); |
|
| 2394 | + @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET '.$charset); |
|
| 2395 | 2395 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
| 2396 | - @\mysqli_query($this->mysqli_link, "SET NAMES '" . $charset . "'"); |
|
| 2396 | + @\mysqli_query($this->mysqli_link, "SET NAMES '".$charset."'"); |
|
| 2397 | 2397 | |
| 2398 | 2398 | } elseif ($this->isDoctrinePDOConnection() === true) { |
| 2399 | 2399 | |
| 2400 | 2400 | $doctrineWrappedConnection = $this->getDoctrinePDOConnection(); |
| 2401 | 2401 | |
| 2402 | - $doctrineWrappedConnection->exec('SET CHARACTER SET ' . $charset); |
|
| 2403 | - $doctrineWrappedConnection->exec("SET NAMES '" . $charset . "'"); |
|
| 2402 | + $doctrineWrappedConnection->exec('SET CHARACTER SET '.$charset); |
|
| 2403 | + $doctrineWrappedConnection->exec("SET NAMES '".$charset."'"); |
|
| 2404 | 2404 | |
| 2405 | 2405 | $return = true; |
| 2406 | 2406 | |
@@ -2545,7 +2545,7 @@ discard block |
||
| 2545 | 2545 | */ |
| 2546 | 2546 | public function table_exists(string $table): bool |
| 2547 | 2547 | { |
| 2548 | - $check = $this->query('SELECT 1 FROM ' . $this->quote_string($table)); |
|
| 2548 | + $check = $this->query('SELECT 1 FROM '.$this->quote_string($table)); |
|
| 2549 | 2549 | |
| 2550 | 2550 | return $check !== false |
| 2551 | 2551 | && |
@@ -2576,7 +2576,7 @@ discard block |
||
| 2576 | 2576 | $result = $callback($this); |
| 2577 | 2577 | if ($result === false) { |
| 2578 | 2578 | /** @noinspection ThrowRawExceptionInspection */ |
| 2579 | - throw new \Exception('call_user_func [' . $callback . '] === false'); |
|
| 2579 | + throw new \Exception('call_user_func ['.$callback.'] === false'); |
|
| 2580 | 2580 | } |
| 2581 | 2581 | |
| 2582 | 2582 | return $this->commit(); |
@@ -2635,10 +2635,10 @@ discard block |
||
| 2635 | 2635 | } |
| 2636 | 2636 | |
| 2637 | 2637 | if ($databaseName) { |
| 2638 | - $databaseName = $this->quote_string(\trim($databaseName)) . '.'; |
|
| 2638 | + $databaseName = $this->quote_string(\trim($databaseName)).'.'; |
|
| 2639 | 2639 | } |
| 2640 | 2640 | |
| 2641 | - $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE)"; |
|
| 2641 | + $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE)"; |
|
| 2642 | 2642 | |
| 2643 | 2643 | return $this->query($sql); |
| 2644 | 2644 | } |