voku / simple-mysqli

src/voku/db/Helper.php

Spacing +11 added lines, -11 removed lines

@@ -146,10 +146,10 @@ 
     }
 
     if ($databaseName) {
-      $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.';
+      $databaseName = $dbConnection->quote_string(trim($databaseName)).'.';
     }
 
-    $sql = 'SHOW COLUMNS FROM ' . $databaseName . $dbConnection->escape($table);
+    $sql = 'SHOW COLUMNS FROM '.$databaseName.$dbConnection->escape($table);
     $result = $dbConnection->query($sql);
 
     if ($result && $result->num_rows > 0) {
@@ -195,17 +195,17 @@ 
 
     $whereSQL = '';
     foreach ($whereArray as $key => $value) {
-      $whereSQL .= ' AND ' . $dbConnection->escape($key) . ' = ' . $dbConnection->escape($value);
+      $whereSQL .= ' AND '.$dbConnection->escape($key).' = '.$dbConnection->escape($value);
     }
 
     if ($databaseName) {
-      $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.';
+      $databaseName = $dbConnection->quote_string(trim($databaseName)).'.';
     }
 
     // get the row
-    $query = 'SELECT * FROM ' . $databaseName . $dbConnection->quote_string($table) . '
+    $query = 'SELECT * FROM '.$databaseName.$dbConnection->quote_string($table).'
       WHERE 1 = 1
-      ' . $whereSQL . '
+      ' . $whereSQL.'
     ';
     $result = $dbConnection->query($query);
 
@@ -225,11 +225,11 @@ 
 
           if (!in_array($fieldName, $ignoreArray, true)) {
             if (array_key_exists($fieldName, $updateArray)) {
-              $insert_keys .= ',' . $fieldName;
+              $insert_keys .= ','.$fieldName;
               $insert_values .= ',?';
               $bindings[] = $updateArray[$fieldName]; // INFO: do not escape non selected data
             } else {
-              $insert_keys .= ',' . $fieldName;
+              $insert_keys .= ','.$fieldName;
               $insert_values .= ',?';
               $bindings[] = $value; // INFO: do not escape non selected data
             }
@@ -240,10 +240,10 @@ 
         $insert_values = ltrim($insert_values, ',');
 
         // insert the "copied" row
-        $new_query = 'INSERT INTO ' . $databaseName . $dbConnection->quote_string($table) . ' 
-          (' . $insert_keys . ')
+        $new_query = 'INSERT INTO '.$databaseName.$dbConnection->quote_string($table).' 
+          (' . $insert_keys.')
           VALUES 
-          (' . $insert_values . ')
+          (' . $insert_values.')
         ';
         return $dbConnection->query($new_query, $bindings);
       }

src/voku/db/DB.php

Spacing +29 added lines, -29 removed lines

@@ -282,12 +282,12 @@ 
           $this->socket
       );
     } catch (\Exception $e) {
-      $this->_debug->displayError('Error connecting to mysql server: ' . $e->getMessage(), true);
+      $this->_debug->displayError('Error connecting to mysql server: '.$e->getMessage(), true);
     }
     \mysqli_report(MYSQLI_REPORT_OFF);
 
     if (!$this->connected) {
-      $this->_debug->displayError('Error connecting to mysql server: ' . \mysqli_connect_error(), true);
+      $this->_debug->displayError('Error connecting to mysql server: '.\mysqli_connect_error(), true);
     } else {
       $this->set_charset($this->charset);
     }
@@ -382,7 +382,7 @@ 
     static $firstInstance = null;
 
     if (
-        $hostname . $username . $password . $database . $port . $charset == ''
+        $hostname.$username.$password.$database.$port.$charset == ''
         &&
         null !== $firstInstance
     ) {
@@ -390,7 +390,7 @@ 
     }
 
     $connection = md5(
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . (int)$session_to_db
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.(int)$session_to_db
     );
 
     if (!isset($instance[$connection])) {
@@ -600,7 +600,7 @@ 
     $var = $this->escape($var, false, false, null);
 
     if (is_string($var)) {
-      $var = "'" . trim($var, "'") . "'";
+      $var = "'".trim($var, "'")."'";
     }
 
     return $var;
@@ -786,11 +786,11 @@ 
 
       // exit if we have more then 3 "DB server has gone away"-errors
       if ($RECONNECT_COUNTER > 3) {
-        $this->_debug->mailToAdmin('SQL-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
+        $this->_debug->mailToAdmin('SQL-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
         throw new \Exception($errorMsg);
       }
 
-      $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
+      $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql);
 
       // reconnect
       $RECONNECT_COUNTER++;
@@ -800,10 +800,10 @@ 
       return $this->query($sql, $sqlParams);
     }
 
-    $this->_debug->mailToAdmin('SQL-Warning', $errorMsg . ":\n<br />" . $sql);
+    $this->_debug->mailToAdmin('SQL-Warning', $errorMsg.":\n<br />".$sql);
 
     // this query returned an error, we must display it (only for dev) !!!
-    $this->_debug->displayError($errorMsg . ' | ' . $sql);
+    $this->_debug->displayError($errorMsg.' | '.$sql);
 
     return false;
   }
@@ -872,7 +872,7 @@ 
 
     if ($useCache === true) {
       $cache = new Cache(null, null, false, $useCache);
-      $cacheKey = 'sql-' . md5($query);
+      $cacheKey = 'sql-'.md5($query);
 
       if (
           $cache->getCacheIsReady() === true
@@ -987,9 +987,9 @@ 
 
     $return = mysqli_set_charset($this->link, $charset);
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
 
     return $return;
   }
@@ -1076,10 +1076,10 @@ 
 
       if ($this->_debug->checkForDev() === true) {
         echo "Info: maybe you have to increase your 'max_allowed_packet = 30M' in the config: 'my.conf' \n<br />";
-        echo 'Error:' . $errorMsg;
+        echo 'Error:'.$errorMsg;
       }
 
-      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg . ":\n<br />" . $sql);
+      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg.":\n<br />".$sql);
     }
 
     // return the result only if there was a "SELECT"-query
@@ -1118,7 +1118,7 @@ 
     }
 
     if (\mysqli_connect_errno()) {
-      $this->_debug->displayError('Error connecting to mysql server: ' . \mysqli_connect_error(), true);
+      $this->_debug->displayError('Error connecting to mysql server: '.\mysqli_connect_error(), true);
 
       return false;
     }
@@ -1229,10 +1229,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);
   }
@@ -1329,9 +1329,9 @@ 
           }
 
           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).')';
           }
 
         } else {
@@ -1376,7 +1376,7 @@ 
             $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue
           }
 
-          $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
+          $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
           $tmpCounter++;
         }
 
@@ -1409,7 +1409,7 @@ 
         )
     );
 
-    return '`' . $str . '`';
+    return '`'.$str.'`';
   }
 
   /**
@@ -1465,10 +1465,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);
   }
@@ -1511,10 +1511,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);
   }
@@ -1548,10 +1548,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);
   }
@@ -1585,10 +1585,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);
   }