voku / simple-mysqli

src/voku/db/ActiveRecord.php

Doc Comments +2 added lines, -2 removed lines

@@ -503,7 +503,7 @@ 
   /**
    * Helper function to build SQL with sql parts.
    *
-   * @param array $sqls The SQL part will be build.
+   * @param string[] $sqls The SQL part will be build.
    *
    * @return string
    */
@@ -706,7 +706,7 @@ 
    * Magic function to SET values of the current object.
    *
    * @param mixed $var
-   * @param mixed $val
+   * @param ActiveRecord $val
    */
   public function __set($var, $val)
   {

Spacing +9 added lines, -9 removed lines

@@ -324,7 +324,7 @@ 
     $value = $this->_filterParam($this->dirty);
     $this->insert = new Expressions(
         array(
-            'operator' => 'INSERT INTO ' . $this->table,
+            'operator' => 'INSERT INTO '.$this->table,
             'target'   => new WrapExpressions(array('target' => array_keys($this->dirty))),
         )
     );
@@ -490,13 +490,13 @@ 
   private function _buildSqlCallback(&$n, $i, $o)
   {
     if ('select' === $n && null == $o->$n) {
-      $n = strtoupper($n) . ' ' . $o->table . '.*';
+      $n = strtoupper($n).' '.$o->table.'.*';
     } elseif (('update' === $n || 'from' === $n) && 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.' ' : '';
     }
   }
 
@@ -596,10 +596,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;
       }
     } else if (is_string($value)) {
-      $this->params[$ph = self::PREFIX . ++self::$count] = $value;
+      $this->params[$ph = self::PREFIX.++self::$count] = $value;
       $value = $ph;
     }
 
@@ -621,7 +621,7 @@ 
     $value = $this->_filterParam($value);
     $exp = new Expressions(
         array(
-            'source'   => ('where' == $name ? $this->table . '.' : '') . $field,
+            'source'   => ('where' == $name ? $this->table.'.' : '').$field,
             'operator' => $operator,
             'target'   => is_array($value)
                 ? new WrapExpressions(
@@ -655,7 +655,7 @@ 
     $this->join = new Expressions(
         array(
             'source'   => $this->join ?: '',
-            'operator' => $type . ' JOIN',
+            'operator' => $type.' JOIN',
             'target'   => new Expressions(
                 array('source' => $table, 'operator' => 'ON', 'target' => $on)
             ),

src/voku/db/DB.php

Spacing +34 added lines, -34 removed lines

@@ -438,9 +438,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 {
@@ -485,7 +485,7 @@ 
           $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue
         }
 
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
         $tmpCounter++;
       }
 
@@ -679,7 +679,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);
     }
@@ -687,7 +687,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);
     }
@@ -728,10 +728,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);
   }
@@ -801,8 +801,8 @@ 
         $nameTmp = substr($name, 1);
       }
 
-      $parseKeyInner = $nameTmp . '-' . $parseKey;
-      $sql = str_replace(':' . $nameTmp, $parseKeyInner, $sql);
+      $parseKeyInner = $nameTmp.'-'.$parseKey;
+      $sql = str_replace(':'.$nameTmp, $parseKeyInner, $sql);
     }
 
     foreach ($params as $name => $value) {
@@ -811,7 +811,7 @@ 
         $nameTmp = substr($name, 1);
       }
 
-      $parseKeyInner = $nameTmp . '-' . $parseKey;
+      $parseKeyInner = $nameTmp.'-'.$parseKey;
       $sqlBefore = $sql;
 
       while (strpos($sql, $parseKeyInner) !== false) {
@@ -988,7 +988,7 @@ 
 
     if ($useCache === true) {
       $cache = new Cache(null, null, false, $useCache);
-      $cacheKey = 'sql-' . md5($query);
+      $cacheKey = 'sql-'.md5($query);
 
       if (
           $cache->getCacheIsReady() === true
@@ -1098,7 +1098,7 @@ 
     static $firstInstance = null;
 
     if (
-        $hostname . $username . $password . $database . $port . $charset == ''
+        $hostname.$username.$password.$database.$port.$charset == ''
         &&
         null !== $firstInstance
     ) {
@@ -1108,7 +1108,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
@@ -1116,7 +1116,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])) {
@@ -1203,10 +1203,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);
   }
@@ -1437,7 +1437,7 @@ 
 
     // DEBUG
     var_dump($params);
-    echo $sql . "\n";
+    echo $sql."\n";
 
     $query_start_time = microtime(true);
     $query_result = \mysqli_real_query($this->link, $sql);
@@ -1520,11 +1520,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++;
@@ -1538,7 +1538,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) {
@@ -1546,7 +1546,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;
   }
@@ -1569,7 +1569,7 @@ 
         )
     );
 
-    return '`' . $str . '`';
+    return '`'.$str.'`';
   }
 
   /**
@@ -1640,10 +1640,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);
   }
@@ -1731,7 +1731,7 @@ 
     $var = $this->escape($var, false, false, null);
 
     if (is_string($var)) {
-      $var = "'" . trim($var, "'") . "'";
+      $var = "'".trim($var, "'")."'";
     }
 
     return $var;
@@ -1768,10 +1768,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);
   }
@@ -1814,10 +1814,10 @@ 
     $return = mysqli_set_charset($this->link, $charset);
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
     /** @noinspection UsageOfSilenceOperatorInspection */
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
     /** @noinspection UsageOfSilenceOperatorInspection */
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
 
     return $return;
   }
@@ -1945,7 +1945,7 @@ 
       $result = call_user_func($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();
@@ -1998,10 +1998,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);
   }
@@ -2015,7 +2015,7 @@ 
    */
   public function table_exists($table)
   {
-    $check = $this->query("SELECT 1 FROM " . $this->quote_string($table));
+    $check = $this->query("SELECT 1 FROM ".$this->quote_string($table));
     if (
         $check !== false
         &&
@@ -2039,7 +2039,7 @@ 
     if (!empty($tables)) {
       $optimized = 0;
       foreach ($tables as $table) {
-        $optimize = "OPTIMIZE TABLE `" . trim($table) . "`";
+        $optimize = "OPTIMIZE TABLE `".trim($table)."`";
         $this->link->query($optimize);
         if (!$this->link->error) {
           $optimized++;

src/voku/db/Expressions.php

Spacing +1 added lines, -1 removed lines

@@ -18,6 +18,6 @@
 {
   public function __toString()
   {
-    return $this->source . ' ' . $this->operator . ' ' . $this->target;
+    return $this->source.' '.$this->operator.' '.$this->target;
   }
 }

src/voku/db/WrapExpressions.php

Spacing +2 added lines, -2 removed lines

@@ -16,9 +16,9 @@
     }
 
     if ($this->start) {
-      return $this->start . implode($delimiter, $this->target->getArray()) . ($this->end ?: ')');
+      return $this->start.implode($delimiter, $this->target->getArray()).($this->end ?: ')');
     }
 
-    return '(' . implode($delimiter, $this->target->getArray()) . ($this->end ? $this->end : ')');
+    return '('.implode($delimiter, $this->target->getArray()).($this->end ? $this->end : ')');
   }
 }