@@ -21,6 +21,6 @@ |
||
| 21 | 21 | */ |
| 22 | 22 | public function __toString() |
| 23 | 23 | { |
| 24 | - return $this->source . ' ' . $this->operator . ' ' . $this->target; |
|
| 24 | + return $this->source.' '.$this->operator.' '.$this->target; |
|
| 25 | 25 | } |
| 26 | 26 | } |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | /** |
| 437 | 437 | * Fetch all results as "\Generator" via yield. |
| 438 | 438 | * |
| 439 | - * @param object|string $class <p> |
|
| 439 | + * @param boolean $class <p> |
|
| 440 | 440 | * <strong>string</strong>: create a new object (with optional constructor |
| 441 | 441 | * parameter)<br> |
| 442 | 442 | * <strong>object</strong>: use a object and fill the the data into |
@@ -864,7 +864,7 @@ discard block |
||
| 864 | 864 | /** |
| 865 | 865 | * Fetch as "\Generator" via yield. |
| 866 | 866 | * |
| 867 | - * @param object|string $class <p> |
|
| 867 | + * @param boolean $class <p> |
|
| 868 | 868 | * <strong>string</strong>: create a new object (with optional constructor |
| 869 | 869 | * parameter)<br> |
| 870 | 870 | * <strong>object</strong>: use a object and fill the the data into |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | && |
| 108 | 108 | !$result instanceof \Doctrine\DBAL\Statement |
| 109 | 109 | ) { |
| 110 | - throw new \InvalidArgumentException('$result must be ' . \mysqli_result::class . ' or ' . \Doctrine\DBAL\Statement::class . ' !'); |
|
| 110 | + throw new \InvalidArgumentException('$result must be '.\mysqli_result::class.' or '.\Doctrine\DBAL\Statement::class.' !'); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | $this->_result = $result; |
@@ -812,7 +812,7 @@ discard block |
||
| 812 | 812 | { |
| 813 | 813 | if ($as_array) { |
| 814 | 814 | return \array_map( |
| 815 | - function ($object) { |
|
| 815 | + function($object) { |
|
| 816 | 816 | return (array)$object; |
| 817 | 817 | }, |
| 818 | 818 | $this->fetch_fields() |
@@ -986,7 +986,7 @@ discard block |
||
| 986 | 986 | } |
| 987 | 987 | |
| 988 | 988 | return \array_map( |
| 989 | - function ($values) use ($keys) { |
|
| 989 | + function($values) use ($keys) { |
|
| 990 | 990 | return \array_combine($keys, $values); |
| 991 | 991 | }, $rows |
| 992 | 992 | ); |
@@ -1102,7 +1102,7 @@ discard block |
||
| 1102 | 1102 | $fieldTmp->{$metadataTmpKey} = $metadataTmpValue; |
| 1103 | 1103 | } |
| 1104 | 1104 | |
| 1105 | - $typeNativeTmp = 'MYSQL_TYPE_' . $metadataTmp['native_type']; |
|
| 1105 | + $typeNativeTmp = 'MYSQL_TYPE_'.$metadataTmp['native_type']; |
|
| 1106 | 1106 | $typeTmp = $THIS_CLASS_TMP->getConstant($typeNativeTmp); |
| 1107 | 1107 | if ($typeTmp) { |
| 1108 | 1108 | $fieldTmp->type = $typeTmp; |
@@ -659,7 +659,7 @@ |
||
| 659 | 659 | * @param array $param <p> |
| 660 | 660 | * The param will be bind to the $sql query. |
| 661 | 661 | * </p> |
| 662 | - * @param null|self $obj <p> |
|
| 662 | + * @param null|\self $obj <p> |
|
| 663 | 663 | * The object, if find record in database, we will assign the attributes into |
| 664 | 664 | * this object. |
| 665 | 665 | * </p> |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | null === $active_record->{$sql_string_part} |
| 416 | 416 | ) { |
| 417 | 417 | |
| 418 | - $sql_string_part = \strtoupper($sql_string_part) . ' ' . $active_record->table . '.*'; |
|
| 418 | + $sql_string_part = \strtoupper($sql_string_part).' '.$active_record->table.'.*'; |
|
| 419 | 419 | |
| 420 | 420 | } elseif ( |
| 421 | 421 | ( |
@@ -427,15 +427,15 @@ discard block |
||
| 427 | 427 | null === $active_record->{$sql_string_part} |
| 428 | 428 | ) { |
| 429 | 429 | |
| 430 | - $sql_string_part = \strtoupper($sql_string_part) . ' ' . $active_record->table; |
|
| 430 | + $sql_string_part = \strtoupper($sql_string_part).' '.$active_record->table; |
|
| 431 | 431 | |
| 432 | 432 | } elseif ('delete' === $sql_string_part) { |
| 433 | 433 | |
| 434 | - $sql_string_part = \strtoupper($sql_string_part) . ' '; |
|
| 434 | + $sql_string_part = \strtoupper($sql_string_part).' '; |
|
| 435 | 435 | |
| 436 | 436 | } else { |
| 437 | 437 | |
| 438 | - $sql_string_part = (null !== $active_record->{$sql_string_part}) ? $active_record->{$sql_string_part} . ' ' : ''; |
|
| 438 | + $sql_string_part = (null !== $active_record->{$sql_string_part}) ? $active_record->{$sql_string_part}.' ' : ''; |
|
| 439 | 439 | |
| 440 | 440 | } |
| 441 | 441 | } |
@@ -451,10 +451,10 @@ discard block |
||
| 451 | 451 | { |
| 452 | 452 | if (\is_array($value)) { |
| 453 | 453 | foreach ($value as $key => $val) { |
| 454 | - $this->params[$value[$key] = self::PREFIX . ++self::$count] = $val; |
|
| 454 | + $this->params[$value[$key] = self::PREFIX.++self::$count] = $val; |
|
| 455 | 455 | } |
| 456 | 456 | } elseif (\is_string($value)) { |
| 457 | - $this->params[$ph = self::PREFIX . ++self::$count] = $value; |
|
| 457 | + $this->params[$ph = self::PREFIX.++self::$count] = $value; |
|
| 458 | 458 | $value = $ph; |
| 459 | 459 | } |
| 460 | 460 | |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | $value = $this->_filterParam($value); |
| 476 | 476 | $expression = new ActiveRecordExpressions( |
| 477 | 477 | [ |
| 478 | - 'source' => ('where' === strtolower($name) ? $this->table . '.' : '') . $field, |
|
| 478 | + 'source' => ('where' === strtolower($name) ? $this->table.'.' : '').$field, |
|
| 479 | 479 | 'operator' => $operator, |
| 480 | 480 | 'target' => \is_array($value) |
| 481 | 481 | ? new ActiveRecordExpressionsWrap( |
@@ -939,7 +939,7 @@ discard block |
||
| 939 | 939 | $value = $this->_filterParam($this->dirty); |
| 940 | 940 | $this->insert = new ActiveRecordExpressions( |
| 941 | 941 | [ |
| 942 | - 'operator' => 'INSERT INTO ' . $this->table, |
|
| 942 | + 'operator' => 'INSERT INTO '.$this->table, |
|
| 943 | 943 | 'target' => new ActiveRecordExpressionsWrap(['target' => \array_keys($this->dirty)]), |
| 944 | 944 | ] |
| 945 | 945 | ); |
@@ -985,7 +985,7 @@ discard block |
||
| 985 | 985 | $this->join = new ActiveRecordExpressions( |
| 986 | 986 | [ |
| 987 | 987 | 'source' => $this->join ?: '', |
| 988 | - 'operator' => $type . ' JOIN', |
|
| 988 | + 'operator' => $type.' JOIN', |
|
| 989 | 989 | 'target' => new ActiveRecordExpressions( |
| 990 | 990 | [ |
| 991 | 991 | 'source' => $table, |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | $optimized = 0; |
| 32 | 32 | if (!empty($tables)) { |
| 33 | 33 | foreach ($tables as $table) { |
| 34 | - $optimize = 'OPTIMIZE TABLE ' . $dbConnection->quote_string($table); |
|
| 34 | + $optimize = 'OPTIMIZE TABLE '.$dbConnection->quote_string($table); |
|
| 35 | 35 | $result = $dbConnection->query($optimize); |
| 36 | 36 | if ($result) { |
| 37 | 37 | $optimized++; |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $optimized = 0; |
| 60 | 60 | if (!empty($tables)) { |
| 61 | 61 | foreach ($tables as $table) { |
| 62 | - $optimize = 'REPAIR TABLE ' . $dbConnection->quote_string($table); |
|
| 62 | + $optimize = 'REPAIR TABLE '.$dbConnection->quote_string($table); |
|
| 63 | 63 | $result = $dbConnection->query($optimize); |
| 64 | 64 | if ($result) { |
| 65 | 65 | $optimized++; |
@@ -176,23 +176,23 @@ discard block |
||
| 176 | 176 | |
| 177 | 177 | $whereSQL = $dbConnection->_parseArrayPair($whereArray, 'AND'); |
| 178 | 178 | if ($whereSQL) { |
| 179 | - $whereSQL = 'AND ' . $whereSQL; |
|
| 179 | + $whereSQL = 'AND '.$whereSQL; |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | if ($databaseName) { |
| 183 | - $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.'; |
|
| 183 | + $databaseName = $dbConnection->quote_string(trim($databaseName)).'.'; |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | // get the row |
| 187 | - $query = 'SELECT ' . $dbConnection->quote_string($searchFieldName) . ', ' . $dbConnection->quote_string($idFieldName) . ' |
|
| 188 | - FROM ' . $databaseName . $dbConnection->quote_string($table) . ' |
|
| 187 | + $query = 'SELECT '.$dbConnection->quote_string($searchFieldName).', '.$dbConnection->quote_string($idFieldName).' |
|
| 188 | + FROM ' . $databaseName.$dbConnection->quote_string($table).' |
|
| 189 | 189 | WHERE 1 = 1 |
| 190 | - ' . $whereSQL . ' |
|
| 190 | + ' . $whereSQL.' |
|
| 191 | 191 | '; |
| 192 | 192 | |
| 193 | 193 | if ($useCache === true) { |
| 194 | 194 | $cache = new Cache(null, null, false, $useCache); |
| 195 | - $cacheKey = 'sql-phonetic-search-' . \md5($query); |
|
| 195 | + $cacheKey = 'sql-phonetic-search-'.\md5($query); |
|
| 196 | 196 | |
| 197 | 197 | if ( |
| 198 | 198 | $cache->getCacheIsReady() === true |
@@ -322,10 +322,10 @@ discard block |
||
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | if ($databaseName) { |
| 325 | - $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.'; |
|
| 325 | + $databaseName = $dbConnection->quote_string(trim($databaseName)).'.'; |
|
| 326 | 326 | } |
| 327 | 327 | |
| 328 | - $sql = 'SHOW COLUMNS FROM ' . $databaseName . $dbConnection->escape($table); |
|
| 328 | + $sql = 'SHOW COLUMNS FROM '.$databaseName.$dbConnection->escape($table); |
|
| 329 | 329 | $result = $dbConnection->query($sql); |
| 330 | 330 | |
| 331 | 331 | if ($result && $result->num_rows > 0) { |
@@ -371,17 +371,17 @@ discard block |
||
| 371 | 371 | |
| 372 | 372 | $whereSQL = $dbConnection->_parseArrayPair($whereArray, 'AND'); |
| 373 | 373 | if ($whereSQL) { |
| 374 | - $whereSQL = 'AND ' . $whereSQL; |
|
| 374 | + $whereSQL = 'AND '.$whereSQL; |
|
| 375 | 375 | } |
| 376 | 376 | |
| 377 | 377 | if ($databaseName) { |
| 378 | - $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.'; |
|
| 378 | + $databaseName = $dbConnection->quote_string(trim($databaseName)).'.'; |
|
| 379 | 379 | } |
| 380 | 380 | |
| 381 | 381 | // get the row |
| 382 | - $query = 'SELECT * FROM ' . $databaseName . $dbConnection->quote_string($table) . ' |
|
| 382 | + $query = 'SELECT * FROM '.$databaseName.$dbConnection->quote_string($table).' |
|
| 383 | 383 | WHERE 1 = 1 |
| 384 | - ' . $whereSQL . ' |
|
| 384 | + ' . $whereSQL.' |
|
| 385 | 385 | '; |
| 386 | 386 | $result = $dbConnection->query($query); |
| 387 | 387 | |
@@ -401,11 +401,11 @@ discard block |
||
| 401 | 401 | |
| 402 | 402 | if (!\in_array($fieldName, $ignoreArray, true)) { |
| 403 | 403 | if (\array_key_exists($fieldName, $updateArray)) { |
| 404 | - $insert_keys .= ',' . $fieldName; |
|
| 404 | + $insert_keys .= ','.$fieldName; |
|
| 405 | 405 | $insert_values .= ',?'; |
| 406 | 406 | $bindings[] = $updateArray[$fieldName]; // INFO: do not escape non selected data |
| 407 | 407 | } else { |
| 408 | - $insert_keys .= ',' . $fieldName; |
|
| 408 | + $insert_keys .= ','.$fieldName; |
|
| 409 | 409 | $insert_values .= ',?'; |
| 410 | 410 | $bindings[] = $value; // INFO: do not escape non selected data |
| 411 | 411 | } |
@@ -416,10 +416,10 @@ discard block |
||
| 416 | 416 | $insert_values = ltrim($insert_values, ','); |
| 417 | 417 | |
| 418 | 418 | // insert the "copied" row |
| 419 | - $new_query = 'INSERT INTO ' . $databaseName . $dbConnection->quote_string($table) . ' |
|
| 420 | - (' . $insert_keys . ') |
|
| 419 | + $new_query = 'INSERT INTO '.$databaseName.$dbConnection->quote_string($table).' |
|
| 420 | + (' . $insert_keys.') |
|
| 421 | 421 | VALUES |
| 422 | - (' . $insert_values . ') |
|
| 422 | + (' . $insert_values.') |
|
| 423 | 423 | '; |
| 424 | 424 | |
| 425 | 425 | return $dbConnection->query($new_query, $bindings); |
@@ -983,7 +983,7 @@ |
||
| 983 | 983 | * @param string $query <p>sql-query</p> |
| 984 | 984 | * @param bool $useCache optional <p>use cache?</p> |
| 985 | 985 | * @param int $cacheTTL optional <p>cache-ttl in seconds</p> |
| 986 | - * @param DB|null $db optional <p>the database connection</p> |
|
| 986 | + * @param null|\self $db optional <p>the database connection</p> |
|
| 987 | 987 | * |
| 988 | 988 | * @return mixed "array" by "<b>SELECT</b>"-queries<br /> |
| 989 | 989 | * "int" (insert_id) by "<b>INSERT</b>"-queries<br /> |
@@ -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 | } |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | foreach ($this->_boundParams as $param) { |
| 84 | 84 | $arguments[0] .= $param['type']; |
| 85 | - $arguments[] =& $param['value']; |
|
| 85 | + $arguments[] = & $param['value']; |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | return $arguments; |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | $value = $this->_db->escape($value); |
| 106 | 106 | |
| 107 | 107 | if ($type === 's') { |
| 108 | - $valueForSqlWithBoundParameters = "'" . $value . "'"; |
|
| 108 | + $valueForSqlWithBoundParameters = "'".$value."'"; |
|
| 109 | 109 | } elseif ($type === 'i') { |
| 110 | 110 | $valueForSqlWithBoundParameters = (int)$value; |
| 111 | 111 | } elseif ($type === 'd') { |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | // debug_backtrace returns arguments by reference, see comments at http://php.net/manual/de/function.func-get-args.php |
| 149 | 149 | $trace = \debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 1); |
| 150 | 150 | |
| 151 | - $args =& $trace[0]['args']; |
|
| 151 | + $args = & $trace[0]['args']; |
|
| 152 | 152 | $typesArray = \str_split($types); |
| 153 | 153 | |
| 154 | 154 | $args_count = \count($args) - 1; |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | $arg = 1; |
| 164 | 164 | foreach ($typesArray as $typeInner) { |
| 165 | - $val =& $args[$arg]; |
|
| 165 | + $val = & $args[$arg]; |
|
| 166 | 166 | $this->_boundParams[] = [ |
| 167 | 167 | 'type' => $typeInner, |
| 168 | 168 | 'value' => &$val, |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | $bool = parent::prepare($query); |
| 299 | 299 | |
| 300 | 300 | if ($bool === false) { |
| 301 | - $this->_debug->displayError('Can not prepare query: ' . $query . ' | ' . $this->error, false); |
|
| 301 | + $this->_debug->displayError('Can not prepare query: '.$query.' | '.$this->error, false); |
|
| 302 | 302 | } |
| 303 | 303 | |
| 304 | 304 | return $bool; |
@@ -386,11 +386,11 @@ discard block |
||
| 386 | 386 | |
| 387 | 387 | // exit if we have more then 3 "DB server has gone away"-errors |
| 388 | 388 | if ($RECONNECT_COUNTER > 3) { |
| 389 | - $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5); |
|
| 389 | + $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg.":\n<br />".$sql, 5); |
|
| 390 | 390 | throw new DBGoneAwayException($errorMsg); |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | - $this->_debug->mailToAdmin('DB-Error', $errorMsg . ":\n<br />" . $sql); |
|
| 393 | + $this->_debug->mailToAdmin('DB-Error', $errorMsg.":\n<br />".$sql); |
|
| 394 | 394 | |
| 395 | 395 | // reconnect |
| 396 | 396 | $RECONNECT_COUNTER++; |
@@ -400,10 +400,10 @@ discard block |
||
| 400 | 400 | return $this->execute(); |
| 401 | 401 | } |
| 402 | 402 | |
| 403 | - $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql); |
|
| 403 | + $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql); |
|
| 404 | 404 | |
| 405 | 405 | // this query returned an error, we must display it (only for dev) !!! |
| 406 | - $this->_debug->displayError($errorMsg . ' | ' . $sql); |
|
| 406 | + $this->_debug->displayError($errorMsg.' | '.$sql); |
|
| 407 | 407 | |
| 408 | 408 | return false; |
| 409 | 409 | } |
@@ -139,9 +139,9 @@ discard block |
||
| 139 | 139 | $this->logger( |
| 140 | 140 | [ |
| 141 | 141 | 'error', |
| 142 | - '<strong>' . \date( |
|
| 142 | + '<strong>'.\date( |
|
| 143 | 143 | 'd. m. Y G:i:s' |
| 144 | - ) . ' (' . $fileInfo['file'] . ' line: ' . $fileInfo['line'] . ') (sql-error):</strong> ' . $error . '<br>', |
|
| 144 | + ).' ('.$fileInfo['file'].' line: '.$fileInfo['line'].') (sql-error):</strong> '.$error.'<br>', |
|
| 145 | 145 | ] |
| 146 | 146 | ); |
| 147 | 147 | |
@@ -156,11 +156,11 @@ discard block |
||
| 156 | 156 | $box_bg = $this->css_mysql_box_bg; |
| 157 | 157 | |
| 158 | 158 | echo ' |
| 159 | - <div class="OBJ-mysql-box" style="border:' . $box_border . '; background:' . $box_bg . '; padding:10px; margin:10px;"> |
|
| 159 | + <div class="OBJ-mysql-box" style="border:' . $box_border.'; background:'.$box_bg.'; padding:10px; margin:10px;"> |
|
| 160 | 160 | <b style="font-size:14px;">MYSQL Error:</b> |
| 161 | 161 | <code style="display:block;"> |
| 162 | - file / line: ' . $fileInfo['file'] . ' / ' . $fileInfo['line'] . ' |
|
| 163 | - ' . $error . ' |
|
| 162 | + file / line: ' . $fileInfo['file'].' / '.$fileInfo['line'].' |
|
| 163 | + ' . $error.' |
|
| 164 | 164 | </code> |
| 165 | 165 | </div> |
| 166 | 166 | '; |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
| 302 | 302 | $infoExtra = @\mysqli_info($tmpLink); |
| 303 | 303 | if ($infoExtra) { |
| 304 | - $infoExtra = ' | info => ' . $infoExtra; |
|
| 304 | + $infoExtra = ' | info => '.$infoExtra; |
|
| 305 | 305 | } |
| 306 | 306 | } |
| 307 | 307 | |
@@ -309,14 +309,14 @@ discard block |
||
| 309 | 309 | // logging |
| 310 | 310 | // |
| 311 | 311 | |
| 312 | - $info = 'time => ' . \round($duration, 5) . ' | results => ' . (int)$results . $infoExtra . ' | SQL => ' . UTF8::htmlentities($sql); |
|
| 312 | + $info = 'time => '.\round($duration, 5).' | results => '.(int)$results.$infoExtra.' | SQL => '.UTF8::htmlentities($sql); |
|
| 313 | 313 | |
| 314 | 314 | $fileInfo = $this->getFileAndLineFromSql(); |
| 315 | 315 | |
| 316 | 316 | return $this->logger( |
| 317 | 317 | [ |
| 318 | 318 | $logLevel, |
| 319 | - '<strong>' . \date('d. m. Y G:i:s') . ' (' . $fileInfo['file'] . ' line: ' . $fileInfo['line'] . '):</strong> ' . $info . '<br>', |
|
| 319 | + '<strong>'.\date('d. m. Y G:i:s').' ('.$fileInfo['file'].' line: '.$fileInfo['line'].'):</strong> '.$info.'<br>', |
|
| 320 | 320 | 'sql', |
| 321 | 321 | ] |
| 322 | 322 | ); |
@@ -382,21 +382,21 @@ discard block |
||
| 382 | 382 | $this->logger( |
| 383 | 383 | [ |
| 384 | 384 | 'debug', |
| 385 | - $subject . ' | ' . $htmlBody, |
|
| 385 | + $subject.' | '.$htmlBody, |
|
| 386 | 386 | ] |
| 387 | 387 | ); |
| 388 | 388 | } elseif ($priority > 3) { |
| 389 | 389 | $this->logger( |
| 390 | 390 | [ |
| 391 | 391 | 'error', |
| 392 | - $subject . ' | ' . $htmlBody, |
|
| 392 | + $subject.' | '.$htmlBody, |
|
| 393 | 393 | ] |
| 394 | 394 | ); |
| 395 | 395 | } elseif ($priority < 3) { |
| 396 | 396 | $this->logger( |
| 397 | 397 | [ |
| 398 | 398 | 'info', |
| 399 | - $subject . ' | ' . $htmlBody, |
|
| 399 | + $subject.' | '.$htmlBody, |
|
| 400 | 400 | ] |
| 401 | 401 | ); |
| 402 | 402 | } |