voku / simple-mysqli

src/voku/db/Helper.php

Spacing +20 added lines, -20 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace voku\db;
 
@@ -31,7 +31,7 @@ 
     $optimized = 0;
     if (!empty($tables)) {
       foreach ($tables as $table) {
-        $optimize = 'OPTIMIZE TABLE ' . $dbConnection->quote_string($table);
+        $optimize = 'OPTIMIZE TABLE '.$dbConnection->quote_string($table);
         $result = $dbConnection->query($optimize);
         if ($result) {
           $optimized++;
@@ -59,7 +59,7 @@ 
     $optimized = 0;
     if (!empty($tables)) {
       foreach ($tables as $table) {
-        $optimize = 'REPAIR TABLE ' . $dbConnection->quote_string($table);
+        $optimize = 'REPAIR TABLE '.$dbConnection->quote_string($table);
         $result = $dbConnection->query($optimize);
         if ($result) {
           $optimized++;
@@ -176,23 +176,23 @@ 
 
     $whereSQL = $dbConnection->_parseArrayPair($whereArray, 'AND');
     if ($whereSQL) {
-      $whereSQL = 'AND ' . $whereSQL;
+      $whereSQL = 'AND '.$whereSQL;
     }
 
     if ($databaseName) {
-      $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.';
+      $databaseName = $dbConnection->quote_string(trim($databaseName)).'.';
     }
 
     // get the row
-    $query = 'SELECT ' . $dbConnection->quote_string($searchFieldName) . ', ' . $dbConnection->quote_string($idFieldName) . ' 
-      FROM ' . $databaseName . $dbConnection->quote_string($table) . '
+    $query = 'SELECT '.$dbConnection->quote_string($searchFieldName).', '.$dbConnection->quote_string($idFieldName).' 
+      FROM ' . $databaseName.$dbConnection->quote_string($table).'
       WHERE 1 = 1
-      ' . $whereSQL . '
+      ' . $whereSQL.'
     ';
 
     if ($useCache === true) {
       $cache = new Cache(null, null, false, $useCache);
-      $cacheKey = 'sql-phonetic-search-' . \md5($query);
+      $cacheKey = 'sql-phonetic-search-'.\md5($query);
 
       if (
           $cache->getCacheIsReady() === true
@@ -322,10 +322,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) {
@@ -371,17 +371,17 @@ 
 
     $whereSQL = $dbConnection->_parseArrayPair($whereArray, 'AND');
     if ($whereSQL) {
-      $whereSQL = 'AND ' . $whereSQL;
+      $whereSQL = 'AND '.$whereSQL;
     }
 
     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);
 
@@ -401,11 +401,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
             }
@@ -416,10 +416,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/ActiveRecord.php

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace voku\db;
 
@@ -583,7 +583,7 @@ 
     $value = $this->_filterParam($this->dirty);
     $this->insert = new ActiveRecordExpressions(
         [
-            'operator' => 'INSERT INTO ' . $this->table,
+            'operator' => 'INSERT INTO '.$this->table,
             'target'   => new ActiveRecordExpressionsWrap(['target' => \array_keys($this->dirty)]),
         ]
     );
@@ -794,7 +794,7 @@ 
         null === $o->{$n}
     ) {
 
-      $n = \strtoupper($n) . ' ' . $o->table . '.*';
+      $n = \strtoupper($n).' '.$o->table.'.*';
 
     } elseif (
         (
@@ -806,15 +806,15 @@ 
         null === $o->{$n}
     ) {
 
-      $n = \strtoupper($n) . ' ' . $o->table;
+      $n = \strtoupper($n).' '.$o->table;
 
     } elseif ('delete' === $n) {
 
-      $n = \strtoupper($n) . ' ';
+      $n = \strtoupper($n).' ';
 
     } else {
 
-      $n = (null !== $o->{$n}) ? $o->{$n} . ' ' : '';
+      $n = (null !== $o->{$n}) ? $o->{$n}.' ' : '';
 
     }
   }
@@ -927,10 +927,10 @@ 
   {
     if (\is_array($value)) {
       foreach ($value as $key => $val) {
-        $this->params[$value[$key] = self::PREFIX . ++self::$count] = $val;
+        $this->params[$value[$key] = self::PREFIX.++self::$count] = $val;
       }
     } elseif (\is_string($value)) {
-      $this->params[$ph = self::PREFIX . ++self::$count] = $value;
+      $this->params[$ph = self::PREFIX.++self::$count] = $value;
       $value = $ph;
     }
 
@@ -951,7 +951,7 @@ 
     $value = $this->_filterParam($value);
     $exp = new ActiveRecordExpressions(
         [
-            'source'   => ('where' == $name ? $this->table . '.' : '') . $field,
+            'source'   => ('where' == $name ? $this->table.'.' : '').$field,
             'operator' => $operator,
             'target'   => \is_array($value)
                 ? new ActiveRecordExpressionsWrap(
@@ -984,7 +984,7 @@ 
     $this->join = new ActiveRecordExpressions(
         [
             'source'   => $this->join ?: '',
-            'operator' => $type . ' JOIN',
+            'operator' => $type.' JOIN',
             'target'   => new ActiveRecordExpressions(
                 ['source' => $table, 'operator' => 'ON', 'target' => $on]
             ),

src/voku/db/DB.php

Spacing +33 added lines, -33 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace voku\db;
 
@@ -449,9 +449,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 {
@@ -498,7 +498,7 @@ 
           $valueInner = "''";
         }
 
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
         $tmpCounter++;
       }
 
@@ -705,7 +705,7 @@ 
       );
 
     } catch (\Exception $e) {
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
       $this->_debug->displayError($error, true);
       throw new DBConnectException($error, 100, $e);
     }
@@ -713,7 +713,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, true);
       throw new DBConnectException($error, 101);
     }
@@ -754,10 +754,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);
   }
@@ -830,8 +830,8 @@ 
         $nameTmp = \substr($name, 1);
       }
 
-      $parseKeyInner = $nameTmp . '-' . $PARSE_KEY_CACHE;
-      $sql = \str_replace(':' . $nameTmp, $parseKeyInner, $sql);
+      $parseKeyInner = $nameTmp.'-'.$PARSE_KEY_CACHE;
+      $sql = \str_replace(':'.$nameTmp, $parseKeyInner, $sql);
     }
 
     foreach ($params as $name => $value) {
@@ -840,7 +840,7 @@ 
         $nameTmp = \substr($name, 1);
       }
 
-      $parseKeyInner = $nameTmp . '-' . $PARSE_KEY_CACHE;
+      $parseKeyInner = $nameTmp.'-'.$PARSE_KEY_CACHE;
       $sqlBefore = $sql;
       $secureParamValue = $this->secure($params[$name]);
 
@@ -1016,7 +1016,7 @@ 
 
     if ($useCache === true) {
       $cache = new Cache(null, null, false, $useCache);
-      $cacheKey = 'sql-' . \md5($query);
+      $cacheKey = 'sql-'.\md5($query);
 
       if (
           $cache->getCacheIsReady() === true
@@ -1126,7 +1126,7 @@ 
     static $firstInstance = null;
 
     if (
-        $hostname . $username . $password . $database . $port . $charset == '3306utf8'
+        $hostname.$username.$password.$database.$port.$charset == '3306utf8'
         &&
         null !== $firstInstance
     ) {
@@ -1136,7 +1136,7 @@ 
     $extra_config_string = '';
     if (\is_array($extra_config) === true) {
       foreach ($extra_config as $extra_config_key => $extra_config_value) {
-        $extra_config_string .= $extra_config_key . (string)$extra_config_value;
+        $extra_config_string .= $extra_config_key.(string)$extra_config_value;
       }
     } else {
       // only for backward compatibility
@@ -1144,7 +1144,7 @@ 
     }
 
     $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])) {
@@ -1231,10 +1231,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);
   }
@@ -1545,11 +1545,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++;
@@ -1563,7 +1563,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) {
@@ -1571,7 +1571,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;
   }
@@ -1594,7 +1594,7 @@ 
         )
     );
 
-    return '`' . $str . '`';
+    return '`'.$str.'`';
   }
 
   /**
@@ -1665,10 +1665,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);
   }
@@ -1764,7 +1764,7 @@ 
     $var = $this->escape($var, false, false, null);
 
     if (\is_string($var)) {
-      $var = "'" . \trim($var, "'") . "'";
+      $var = "'".\trim($var, "'")."'";
     }
 
     return $var;
@@ -1801,10 +1801,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);
   }
@@ -1846,9 +1846,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;
   }
@@ -1982,7 +1982,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();
@@ -2035,10 +2035,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);
   }
@@ -2052,7 +2052,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
            &&