voku / simple-mysqli

src/voku/db/DB.php

Spacing +36 added lines, -36 removed lines

@@ -433,19 +433,19 @@ 
         }
 
         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($firstKey, ' +') !== false) {
             $firstKey = \str_replace(' +', '', $firstKey);
-            $_value = $firstKey . ' + ' . $firstValue;
+            $_value = $firstKey.' + '.$firstValue;
           }
 
           if (\strpos($firstKey, ' -') !== false) {
             $firstKey = \str_replace(' -', '', $firstKey);
-            $_value = $firstKey . ' - ' . $firstValue;
+            $_value = $firstKey.' - '.$firstValue;
           }
         }
 
@@ -493,7 +493,7 @@ 
           $valueInner = "''";
         }
 
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
         $tmpCounter++;
       }
 
@@ -580,7 +580,7 @@ 
 
       // add ":" if needed
       if (\strpos($name, ':') !== 0) {
-        $nameTmp = ':' . $name;
+        $nameTmp = ':'.$name;
       } else {
         $nameTmp = $name;
       }
@@ -773,7 +773,7 @@ 
         $this->connected = $this->doctrine_connection->isConnected();
 
         if (!$this->connected) {
-          $error = 'Error connecting to mysql server: ' . $this->doctrine_connection->errorInfo();
+          $error = 'Error connecting to mysql server: '.$this->doctrine_connection->errorInfo();
           $this->debug->displayError($error, false);
           throw new DBConnectException($error, 101);
         }
@@ -790,7 +790,7 @@ 
         $this->connected = $this->doctrine_connection->isConnected();
 
         if (!$this->connected) {
-          $error = 'Error connecting to mysql server: ' . $this->doctrine_connection->errorInfo();
+          $error = 'Error connecting to mysql server: '.$this->doctrine_connection->errorInfo();
           $this->debug->displayError($error, false);
           throw new DBConnectException($error, 101);
         }
@@ -853,7 +853,7 @@ 
       );
 
     } 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);
     }
@@ -861,7 +861,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);
     }
@@ -902,10 +902,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);
   }
@@ -1108,7 +1108,7 @@ 
 
     if ($useCache === true) {
       $cache = new Cache(null, null, false, $useCache);
-      $cacheKey = 'sql-' . \md5($query);
+      $cacheKey = 'sql-'.\md5($query);
 
       if (
           $cache->getCacheIsReady() === true
@@ -1283,7 +1283,7 @@ 
     }
 
     if (
-        '' . $hostname . $username . $password . $database . $port . $charset == '' . $port . $charset
+        ''.$hostname.$username.$password.$database.$port.$charset == ''.$port.$charset
         &&
         null !== $firstInstance
     ) {
@@ -1301,11 +1301,11 @@ 
       } else {
         $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])) {
@@ -1445,10 +1445,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);
   }
@@ -1980,11 +1980,11 @@ 
 
       // 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++;
@@ -1998,7 +1998,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 === true) {
@@ -2006,7 +2006,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;
   }
@@ -2029,7 +2029,7 @@ 
         )
     );
 
-    return '`' . $str . '`';
+    return '`'.$str.'`';
   }
 
   /**
@@ -2099,10 +2099,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);
   }
@@ -2246,7 +2246,7 @@ 
     $var = $this->escape($var, false, false, null);
 
     if (\is_string($var)) {
-      $var = "'" . \trim($var, "'") . "'";
+      $var = "'".\trim($var, "'")."'";
     }
 
     return $var;
@@ -2283,10 +2283,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);
   }
@@ -2388,16 +2388,16 @@ 
       $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->isDoctrinePDOConnection() === true) {
 
       $doctrineWrappedConnection = $this->getDoctrinePDOConnection();
 
-      $doctrineWrappedConnection->exec('SET CHARACTER SET ' . $charset);
-      $doctrineWrappedConnection->exec("SET NAMES '" . $charset . "'");
+      $doctrineWrappedConnection->exec('SET CHARACTER SET '.$charset);
+      $doctrineWrappedConnection->exec("SET NAMES '".$charset."'");
 
       $return = true;
 
@@ -2542,7 +2542,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
            &&
@@ -2573,7 +2573,7 @@ 
       $result = $callback($this);
       if ($result === false) {
         /** @noinspection ThrowRawExceptionInspection */
-        throw new \Exception('call_user_func [' . $callback . '] === false');
+        throw new \Exception('call_user_func ['.$callback.'] === false');
       }
 
       return $this->commit();
@@ -2632,10 +2632,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);
   }

src/voku/db/Debug.php

Spacing +13 added lines, -13 removed lines

@@ -139,9 +139,9 @@ 
     $this->logger(
         [
             'error',
-            '<strong>' . \date(
+            '<strong>'.\date(
                 'd. m. Y G:i:s'
-            ) . ' (' . $fileInfo['file'] . ' line: ' . $fileInfo['line'] . ') (sql-error):</strong> ' . $error . '<br>',
+            ).' ('.$fileInfo['file'].' line: '.$fileInfo['line'].') (sql-error):</strong> '.$error.'<br>',
         ]
     );
 
@@ -157,16 +157,16 @@ 
 
       if (\PHP_SAPI === 'cli') {
         echo "\n";
-        echo 'file:line -> ' . $fileInfo['file'] . ':' . $fileInfo['line'] . "\n";
-        echo 'error: ' . \str_replace(  ["\r\n", "\n", "\r"], '', $error);
+        echo 'file:line -> '.$fileInfo['file'].':'.$fileInfo['line']."\n";
+        echo 'error: '.\str_replace(["\r\n", "\n", "\r"], '', $error);
         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;">
-            file:line -> ' . $fileInfo['file'] . ':' . $fileInfo['line'] . '
-            ' . $error . '
+            file:line -> ' . $fileInfo['file'].':'.$fileInfo['line'].'
+            ' . $error.'
           </code>
         </div>
         ';
@@ -308,7 +308,7 @@ 
       /** @noinspection PhpUsageOfSilenceOperatorInspection */
       $infoExtra = @\mysqli_info($tmpLink);
       if ($infoExtra) {
-        $infoExtra = ' | info => ' . $infoExtra;
+        $infoExtra = ' | info => '.$infoExtra;
       }
     }
 
@@ -316,14 +316,14 @@ 
     // logging
     //
 
-    $info = 'time => ' . \round($duration, 5) . ' | results => ' . (int)$results . $infoExtra . ' | SQL => ' . UTF8::htmlentities($sql);
+    $info = 'time => '.\round($duration, 5).' | results => '.(int)$results.$infoExtra.' | SQL => '.UTF8::htmlentities($sql);
 
     $fileInfo = $this->getFileAndLineFromSql();
 
     return $this->logger(
         [
             $logLevel,
-            '<strong>' . \date('d. m. Y G:i:s') . ' (' . $fileInfo['file'] . ' line: ' . $fileInfo['line'] . '):</strong> ' . $info . '<br>',
+            '<strong>'.\date('d. m. Y G:i:s').' ('.$fileInfo['file'].' line: '.$fileInfo['line'].'):</strong> '.$info.'<br>',
             'sql',
         ]
     );
@@ -389,21 +389,21 @@ 
         $this->logger(
             [
                 'debug',
-                $subject . ' | ' . $htmlBody,
+                $subject.' | '.$htmlBody,
             ]
         );
       } elseif ($priority > 3) {
         $this->logger(
             [
                 'error',
-                $subject . ' | ' . $htmlBody,
+                $subject.' | '.$htmlBody,
             ]
         );
       } elseif ($priority < 3) {
         $this->logger(
             [
                 'info',
-                $subject . ' | ' . $htmlBody,
+                $subject.' | '.$htmlBody,
             ]
         );
       }