voku / simple-mysqli

src/voku/db/DB.php

Spacing +55 added lines, -55 removed lines

@@ -320,10 +320,10 @@ 
         }
 
         if ($port) {
-            $this->port = (int) $port;
+            $this->port = (int)$port;
         } else {
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
-            $this->port = (int) @\ini_get('mysqli.default_port');
+            $this->port = (int)@\ini_get('mysqli.default_port');
         }
 
         // fallback
@@ -376,7 +376,7 @@ 
         foreach ($arrayPair as $_key => $_value) {
             $_connector = '=';
             $_glueHelper = '';
-            $_key_upper = \strtoupper((string) $_key);
+            $_key_upper = \strtoupper((string)$_key);
 
             if (\strpos($_key_upper, ' NOT') !== false) {
                 $_connector = 'NOT';
@@ -458,30 +458,30 @@ 
                 }
 
                 if ($_connector === 'NOT IN' || $_connector === 'IN') {
-                    $_value = '(' . \implode(',', $_value) . ')';
+                    $_value = '('.\implode(',', $_value).')';
                 } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
-                    $_value = '(' . \implode(' AND ', $_value) . ')';
+                    $_value = '('.\implode(' AND ', $_value).')';
                 } elseif ($firstKey && $firstValue) {
-                    if (\strpos((string) $firstKey, ' +') !== false) {
-                        $firstKey = \str_replace(' +', '', (string) $firstKey);
-                        $_value = $firstKey . ' + ' . $firstValue;
+                    if (\strpos((string)$firstKey, ' +') !== false) {
+                        $firstKey = \str_replace(' +', '', (string)$firstKey);
+                        $_value = $firstKey.' + '.$firstValue;
                     }
 
-                    if (\strpos((string) $firstKey, ' -') !== false) {
-                        $firstKey = \str_replace(' -', '', (string) $firstKey);
-                        $_value = $firstKey . ' - ' . $firstValue;
+                    if (\strpos((string)$firstKey, ' -') !== false) {
+                        $firstKey = \str_replace(' -', '', (string)$firstKey);
+                        $_value = $firstKey.' - '.$firstValue;
                     }
                 }
             } else {
                 $_value = $this->secure($_value);
             }
 
-            $_key = UTF8::str_replace_last($_glueHelper, '', (string) $_key);
+            $_key = UTF8::str_replace_last($_glueHelper, '', (string)$_key);
             $_key = UTF8::str_replace_last($_connector, '', $_key);
 
             $quoteString = $this->quote_string(\trim($_key));
 
-            $_value = (array) $_value;
+            $_value = (array)$_value;
 
             if (!$_glueHelper) {
                 $_glueHelper = $glue;
@@ -505,7 +505,7 @@ 
                     $valueInner = "''";
                 }
 
-                $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
+                $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
                 $tmpCounter++;
             }
 
@@ -557,7 +557,7 @@ 
             unset($params[$key]);
 
             $sql = \substr_replace($sql, $replacement, $offset, 1);
-            $offset = \strpos($sql, '?', $offset + \strlen((string) $replacement));
+            $offset = \strpos($sql, '?', $offset + \strlen((string)$replacement));
         }
 
         return ['sql' => $sql, 'params' => $params];
@@ -594,7 +594,7 @@ 
 
             // add ":" if needed
             if (\strpos($name, ':') !== 0) {
-                $nameTmp = ':' . $name;
+                $nameTmp = ':'.$name;
             } else {
                 $nameTmp = $name;
             }
@@ -602,7 +602,7 @@ 
             if ($offset === null) {
                 $offset = \strpos($sql, $nameTmp);
             } else {
-                $offset = \strpos($sql, $nameTmp, $offset + \strlen((string) $replacement));
+                $offset = \strpos($sql, $nameTmp, $offset + \strlen((string)$replacement));
             }
 
             if ($offset === false) {
@@ -634,7 +634,7 @@ 
             return \mysqli_affected_rows($this->mysqli_link);
         }
 
-        return (int) $this->affected_rows;
+        return (int)$this->affected_rows;
     }
 
     /**
@@ -848,10 +848,10 @@ 
                 $this->database,
                 $this->port,
                 $this->socket,
-                (int) $flags
+                (int)$flags
             );
         } catch (\Exception $e) {
-            $error = 'Error connecting to mysql server: ' . $e->getMessage();
+            $error = 'Error connecting to mysql server: '.$e->getMessage();
             $this->debug->displayError($error, false);
 
             throw new DBConnectException($error, 100, $e);
@@ -860,7 +860,7 @@ 
 
         $errno = \mysqli_connect_errno();
         if (!$this->connected || $errno) {
-            $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
+            $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
             $this->debug->displayError($error, false);
 
             throw new DBConnectException($error, 101);
@@ -883,7 +883,7 @@ 
         }
 
         if (!$this->connected) {
-            $error = 'Error connecting to mysql server: ' . \print_r($this->doctrine_connection ? $this->doctrine_connection->errorInfo() : [], false);
+            $error = 'Error connecting to mysql server: '.\print_r($this->doctrine_connection ? $this->doctrine_connection->errorInfo() : [], false);
             $this->debug->displayError($error, false);
 
             throw new DBConnectException($error, 101);
@@ -929,10 +929,10 @@ 
         }
 
         if ($databaseName) {
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
         }
 
-        $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE (${WHERE})";
+        $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE (${WHERE})";
 
         $return = $this->query($sql);
 
@@ -1033,14 +1033,14 @@ 
                 $var = $var->format('Y-m-d H:i:s');
                 $type = 'string';
             } elseif (\method_exists($var, '__toString')) {
-                $var = (string) $var;
+                $var = (string)$var;
                 $type = 'string';
             }
         }
 
         switch ($type) {
             case 'boolean':
-                $var = (int) $var;
+                $var = (int)$var;
 
                 break;
 
@@ -1084,7 +1084,7 @@ 
                     }
                 } else {
                     $varCleaned = [];
-                    foreach ((array) $var as $key => $value) {
+                    foreach ((array)$var as $key => $value) {
                         $key = $this->escape($key, $stripe_non_utf8, $html_entity_decode);
                         $value = $this->escape($value, $stripe_non_utf8, $html_entity_decode);
 
@@ -1148,7 +1148,7 @@ 
 
         if ($useCache) {
             $cache = new Cache(null, null, false, $useCache);
-            $cacheKey = 'sql-' . \md5($query);
+            $cacheKey = 'sql-'.\md5($query);
 
             if (
                 $cache->getCacheIsReady()
@@ -1324,7 +1324,7 @@ 
         }
 
         if (
-            '' . $hostname . $username . $password . $database . $port . $charset === '' . $port . $charset
+            ''.$hostname.$username.$password.$database.$port.$charset === ''.$port.$charset
             &&
             $firstInstance instanceof self
         ) {
@@ -1340,13 +1340,13 @@ 
             if (\is_object($extra_config_value)) {
                 $extra_config_value_tmp = \spl_object_hash($extra_config_value);
             } else {
-                $extra_config_value_tmp = (string) $extra_config_value;
+                $extra_config_value_tmp = (string)$extra_config_value;
             }
-            $extra_config_string .= $extra_config_key . $extra_config_value_tmp;
+            $extra_config_string .= $extra_config_key.$extra_config_value_tmp;
         }
 
         $connection = \md5(
-            $hostname . $username . $password . $database . $port . $charset . (int) $exit_on_error . (int) $echo_on_error . $logger_class_name . $logger_level . $extra_config_string
+            $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
         );
 
         if (!isset($instance[$connection])) {
@@ -1489,10 +1489,10 @@ 
         $SET = $this->_parseArrayPair($data);
 
         if ($databaseName) {
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
         }
 
-        $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET ${SET}";
+        $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET ${SET}";
 
         $return = $this->query($sql);
         if ($return === false) {
@@ -2023,12 +2023,12 @@ 
 
             // exit if we have more then 3 "DB server has gone away"-errors
             if ($RECONNECT_COUNTER > 3) {
-                $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
+                $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
 
                 throw new DBGoneAwayException($errorMessage);
             }
 
-            $this->debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
+            $this->debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
 
             // reconnect
             $RECONNECT_COUNTER++;
@@ -2042,7 +2042,7 @@ 
             return false;
         }
 
-        $this->debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
+        $this->debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
 
         $force_exception_after_error = null; // auto
         if ($this->in_transaction) {
@@ -2050,7 +2050,7 @@ 
         }
         // this query returned an error, we must display it (only for dev) !!!
 
-        $this->debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error);
+        $this->debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error);
 
         return false;
     }
@@ -2068,12 +2068,12 @@ 
             '`',
             '``',
             \trim(
-                (string) $this->escape($str, false),
+                (string)$this->escape($str, false),
                 '`'
             )
         );
 
-        return '`' . $str . '`';
+        return '`'.$str.'`';
     }
 
     /**
@@ -2142,10 +2142,10 @@ 
         $values = \implode(',', $data);
 
         if ($databaseName) {
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
         }
 
-        $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " (${columns}) VALUES (${values})";
+        $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." (${columns}) VALUES (${values})";
 
         $return = $this->query($sql);
         \assert(\is_int($return) || $return === false);
@@ -2244,7 +2244,7 @@ 
                 }
             } else {
                 $varCleaned = [];
-                foreach ((array) $var as $key => $value) {
+                foreach ((array)$var as $key => $value) {
                     $key = $this->escape($key, false, false, $convert_array);
                     $value = $this->secure($value);
 
@@ -2291,7 +2291,7 @@ 
         $var = $this->escape($var, false, false, null);
 
         if (\is_string($var)) {
-            $var = "'" . \trim($var, "'") . "'";
+            $var = "'".\trim($var, "'")."'";
         }
 
         return $var;
@@ -2332,10 +2332,10 @@ 
         }
 
         if ($databaseName) {
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
         }
 
-        $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE (${WHERE})";
+        $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE (${WHERE})";
 
         $return = $this->query($sql);
         \assert($return instanceof Result || $return === false);
@@ -2388,7 +2388,7 @@ 
     public function setConfigExtra(array $extra_config)
     {
         if (isset($extra_config['session_to_db'])) {
-            $this->session_to_db = (bool) $extra_config['session_to_db'];
+            $this->session_to_db = (bool)$extra_config['session_to_db'];
         }
 
         if (isset($extra_config['doctrine'])) {
@@ -2451,9 +2451,9 @@ 
             $return = \mysqli_set_charset($this->mysqli_link, $charset);
 
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
-            @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET ' . $charset);
+            @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET '.$charset);
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
-            @\mysqli_query($this->mysqli_link, "SET NAMES '" . $charset . "'");
+            @\mysqli_query($this->mysqli_link, "SET NAMES '".$charset."'");
         } elseif ($this->doctrine_connection && $this->isDoctrinePDOConnection()) {
             $doctrineWrappedConnection = $this->getDoctrinePDOConnection();
             if (!$doctrineWrappedConnection instanceof Connection) {
@@ -2461,9 +2461,9 @@ 
             }
 
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
-            @$doctrineWrappedConnection->exec('SET CHARACTER SET ' . $charset);
+            @$doctrineWrappedConnection->exec('SET CHARACTER SET '.$charset);
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
-            @$doctrineWrappedConnection->exec("SET NAMES '" . $charset . "'");
+            @$doctrineWrappedConnection->exec("SET NAMES '".$charset."'");
 
             $return = true;
         } else {
@@ -2604,7 +2604,7 @@ 
      */
     public function table_exists(string $table): bool
     {
-        $check = $this->query('SELECT 1 FROM ' . $this->quote_string($table));
+        $check = $this->query('SELECT 1 FROM '.$this->quote_string($table));
 
         return $check !== false
                &&
@@ -2635,7 +2635,7 @@ 
             $result = $callback($this);
             if ($result === false) {
                 /** @noinspection ThrowRawExceptionInspection */
-                throw new \Exception('call_user_func [' . \print_r($callback, true) . '] === false');
+                throw new \Exception('call_user_func ['.\print_r($callback, true).'] === false');
             }
 
             return $this->commit();
@@ -2697,10 +2697,10 @@ 
         }
 
         if ($databaseName) {
-            $databaseName = $this->quote_string(\trim($databaseName)) . '.';
+            $databaseName = $this->quote_string(\trim($databaseName)).'.';
         }
 
-        $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET ${SET} WHERE (${WHERE})";
+        $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET ${SET} WHERE (${WHERE})";
 
         $return = $this->query($sql);
         \assert(\is_int($return) || $return === false);

src/voku/db/Debug.php

Spacing +18 added lines, -18 removed lines

@@ -113,7 +113,7 @@ 
         } else {
 
             // for testing with dev-address
-            $noDev = isset($_GET['noDev']) ? (int) $_GET['noDev'] : 0;
+            $noDev = isset($_GET['noDev']) ? (int)$_GET['noDev'] : 0;
             $remoteIpAddress = $_SERVER['REMOTE_ADDR'] ?? false;
 
             if (
@@ -163,7 +163,7 @@ 
     {
         $fileInfo = $this->getFileAndLineFromSql();
 
-        $log = '[' . \date('Y-m-d H:i:s') . ']: SQL-Error: ' . $error . ' | Trace: ' . $fileInfo['path'] . '<br>';
+        $log = '['.\date('Y-m-d H:i:s').']: SQL-Error: '.$error.' | Trace: '.$fileInfo['path'].'<br>';
 
         $this->logger(['error', $log]);
 
@@ -179,17 +179,17 @@ 
 
             if (\PHP_SAPI === 'cli') {
                 echo "\n";
-                echo 'Error: ' . $error . "\n";
-                echo 'Trace: ' . $fileInfo['path'] . "\n";
+                echo 'Error: '.$error."\n";
+                echo 'Trace: '.$fileInfo['path']."\n";
                 echo "\n";
             } else {
                 echo '
-                <div class="OBJ-mysql-box" style="border: ' . $box_border . '; background: ' . $box_bg . '; padding: 10px; margin: 10px;">
+                <div class="OBJ-mysql-box" style="border: ' . $box_border.'; background: '.$box_bg.'; padding: 10px; margin: 10px;">
                   <b style="font-size: 14px;">MYSQL Error:</b>
                   <code style="display: block;">
-                    Error:' . $error . '
+                    Error:' . $error.'
                     <br><br>
-                    Trace: ' . $fileInfo['path'] . '
+                    Trace: ' . $fileInfo['path'].'
                   </code>
                 </div>
                 ';
@@ -244,7 +244,7 @@ 
                 continue;
             }
 
-            $path .= ($referrer[$key]['class'] ?? $referrer[$key]['file'] ?? '') . '::' . ($referrer[$key]['function'] ?? '') . ':' . ($referrer[$key - 1]['line'] ?? '') . ' <- ';
+            $path .= ($referrer[$key]['class'] ?? $referrer[$key]['file'] ?? '').'::'.($referrer[$key]['function'] ?? '').':'.($referrer[$key - 1]['line'] ?? '').' <- ';
         }
 
         $return['path'] = $path;
@@ -324,11 +324,11 @@ 
                 /** @noinspection PhpUsageOfSilenceOperatorInspection */
                 $traceStringExtra = @\mysqli_info($tmpLink);
                 if ($traceStringExtra) {
-                    $traceStringExtra = ' | info => ' . $traceStringExtra;
+                    $traceStringExtra = ' | info => '.$traceStringExtra;
                 }
             }
 
-            $traceStringExtra = ' | results => ' . \print_r($results, true) . $traceStringExtra;
+            $traceStringExtra = ' | results => '.\print_r($results, true).$traceStringExtra;
         }
 
         static $SLOW_QUERY_WARNING = null;
@@ -356,7 +356,7 @@ 
             $queryStatus = ' ERROR (REPEAT) ';
         }
 
-        $queryLog = '[' . \date('Y-m-d H:i:s') . ']: ' . $queryStatus . ' Duration: SQL::::DURATION-START' . \round($duration, 5) . 'SQL::::DURATION-END | Repeat: ' . $QUERY_LOG_FILE_INFO[$cacheKey] . ' | Host: ' . $this->_db->getConfig()['hostname'] . ' | Trace: ' . $fileInfo['path'] . ' | SQL: SQL::::QUERY-START ' . \str_replace("\n", '', $sql) . ' SQL::::QUERY-END' . $traceStringExtra . "\n";
+        $queryLog = '['.\date('Y-m-d H:i:s').']: '.$queryStatus.' Duration: SQL::::DURATION-START'.\round($duration, 5).'SQL::::DURATION-END | Repeat: '.$QUERY_LOG_FILE_INFO[$cacheKey].' | Host: '.$this->_db->getConfig()['hostname'].' | Trace: '.$fileInfo['path'].' | SQL: SQL::::QUERY-START '.\str_replace("\n", '', $sql).' SQL::::QUERY-END'.$traceStringExtra."\n";
 
         return $this->logger([$logLevel, $queryLog, 'sql']);
     }
@@ -429,11 +429,11 @@ 
             mailToAdmin($subject, $htmlBody, $priority);
         } else {
             if ($priority === 3) {
-                $this->logger(['debug', $subject . ' | ' . $htmlBody]);
+                $this->logger(['debug', $subject.' | '.$htmlBody]);
             } elseif ($priority > 3) {
-                $this->logger(['error', $subject . ' | ' . $htmlBody]);
+                $this->logger(['error', $subject.' | '.$htmlBody]);
             } else {
-                $this->logger(['info', $subject . ' | ' . $htmlBody]);
+                $this->logger(['info', $subject.' | '.$htmlBody]);
             }
         }
     }
@@ -445,7 +445,7 @@ 
      */
     public function setEchoOnError($echo_on_error)
     {
-        $this->echo_on_error = (bool) $echo_on_error;
+        $this->echo_on_error = (bool)$echo_on_error;
     }
 
     /**
@@ -455,7 +455,7 @@ 
      */
     public function setExitOnError($exit_on_error)
     {
-        $this->exit_on_error = (bool) $exit_on_error;
+        $this->exit_on_error = (bool)$exit_on_error;
     }
 
     /**
@@ -465,7 +465,7 @@ 
      */
     public function setLoggerClassName($logger_class_name)
     {
-        $this->logger_class_name = (string) $logger_class_name;
+        $this->logger_class_name = (string)$logger_class_name;
     }
 
     /**
@@ -475,6 +475,6 @@ 
      */
     public function setLoggerLevel($logger_level)
     {
-        $this->logger_level = (string) $logger_level;
+        $this->logger_level = (string)$logger_level;
     }
 }