voku / simple-mysqli

src/voku/db/Prepare.php

Doc Comments +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
    * @param mixed  $v34
    * @param mixed  $v35
    *
-   * @return mixed
+   * @return boolean
    */
   public function bind_param_debug($types, &$v1 = null, &$v2 = null, &$v3 = null, &$v4 = null, &$v5 = null, &$v6 = null, &$v7 = null, &$v8 = null, &$v9 = null, &$v10 = null, &$v11 = null, &$v12 = null, &$v13 = null, &$v14 = null, &$v15 = null, &$v16 = null, &$v17 = null, &$v18 = null, &$v19 = null, &$v20 = null, &$v21 = null, &$v22 = null, &$v23 = null, &$v24 = null, &$v25 = null, &$v26 = null, &$v27 = null, &$v28 = null, &$v29 = null, &$v30 = null, &$v31 = null, &$v32 = null, &$v33 = null, &$v34 = null, &$v35 = null)
   {

Spacing +9 added lines, -9 removed lines

@@ -81,7 +81,7 @@ 
 
     foreach ($this->_boundParams as $param) {
       $arguments[0] .= $param['type'];
-      $arguments[] =& $param['value'];
+      $arguments[] = & $param['value'];
     }
 
     return $arguments;
@@ -104,7 +104,7 @@ 
     $value = $this->_db->escape($value);
 
     if ($type === 's') {
-      $valueForSqlWithBoundParameters = "'" . $value . "'";
+      $valueForSqlWithBoundParameters = "'".$value."'";
     } elseif ($type === 'i') {
       $valueForSqlWithBoundParameters = (int)$value;
     } elseif ($type === 'd') {
@@ -185,7 +185,7 @@ 
       $trace = debug_backtrace();
     }
 
-    $args =& $trace[0]['args'];
+    $args = & $trace[0]['args'];
     $types = str_split($types);
 
     $args_count = count($args) - 1;
@@ -199,7 +199,7 @@ 
 
     $arg = 1;
     foreach ($types as $typeInner) {
-      $val =& $args[$arg];
+      $val = & $args[$arg];
       $this->_boundParams[] = array(
           'type'  => $typeInner,
           'value' => &$val,
@@ -335,7 +335,7 @@ 
     $bool = parent::prepare($query);
 
     if ($bool === false) {
-      $this->_debug->displayError('Can not prepare query: ' . $query . ' | ' . $this->error, false);
+      $this->_debug->displayError('Can not prepare query: '.$query.' | '.$this->error, false);
     }
 
     return $bool;
@@ -423,11 +423,11 @@ 
 
       // exit if we have more then 3 "DB server has gone away"-errors
       if ($RECONNECT_COUNTER > 3) {
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
         throw new DBGoneAwayException($errorMsg);
       }
 
-      $this->_debug->mailToAdmin('DB-Error', $errorMsg . ":\n<br />" . $sql);
+      $this->_debug->mailToAdmin('DB-Error', $errorMsg.":\n<br />".$sql);
 
       // reconnect
       $RECONNECT_COUNTER++;
@@ -437,10 +437,10 @@ 
       return $this->execute();
     }
 
-    $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
+    $this->_debug->mailToAdmin('SQL-Error', $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;
   }

src/voku/db/Debug.php

Spacing +11 added lines, -11 removed lines

@@ -133,9 +133,9 @@ 
     $this->logger(
         array(
             '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>',
         )
     );
 
@@ -148,11 +148,11 @@ 
         $box_bg = $this->css_mysql_box_bg;
 
         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>
         ';
@@ -293,21 +293,21 @@ 
     // get extra info
     $infoExtra = \mysqli_info($this->_db->getLink());
     if ($infoExtra) {
-      $infoExtra = ' | info => ' . $infoExtra;
+      $infoExtra = ' | info => '.$infoExtra;
     }
 
     //
     // 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(
         array(
             $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',
         )
     );
@@ -373,21 +373,21 @@ 
         $this->logger(
             array(
                 'debug',
-                $subject . ' | ' . $htmlBody,
+                $subject.' | '.$htmlBody,
             )
         );
       } elseif ($priority > 3) {
         $this->logger(
             array(
                 'error',
-                $subject . ' | ' . $htmlBody,
+                $subject.' | '.$htmlBody,
             )
         );
       } elseif ($priority < 3) {
         $this->logger(
             array(
                 'info',
-                $subject . ' | ' . $htmlBody,
+                $subject.' | '.$htmlBody,
             )
         );
       }

src/voku/db/Helper.php

Doc Comments +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
   /**
    * Check if "mysqlnd"-driver is used.
    *
-   * @return bool
+   * @return boolean|null
    */
   public static function isMysqlndIsUsed()
   {
@@ -150,7 +150,7 @@ 
    *
    * @param DB $dbConnection
    *
-   * @return string
+   * @return integer|null
    */
   public static function get_mysql_client_version(DB $dbConnection = null)
   {
@@ -173,7 +173,7 @@ 
    *
    * @param DB $dbConnection
    *
-   * @return string
+   * @return integer|null
    */
   public static function get_mysql_server_version(DB $dbConnection = null)
   {

Spacing +19 added lines, -19 removed lines

@@ -29,7 +29,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++;
@@ -57,7 +57,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/Result.php

Spacing +2 added lines, -2 removed lines

@@ -622,7 +622,7 @@ 
   {
     if ($as_array) {
       return array_map(
-          function ($object) {
+          function($object) {
             return (array)$object;
           },
           \mysqli_fetch_fields($this->_result)
@@ -734,7 +734,7 @@ 
     }
 
     return array_map(
-        function ($values) use ($keys) {
+        function($values) use ($keys) {
           return array_combine($keys, $values);
         }, $rows
     );

Doc Comments +1 added lines, -1 removed lines

@@ -595,7 +595,7 @@
    *                              parameter)<br>
    *                              <strong>object</strong>: use a object and fill the the data into
    *                              </p>
-   * @param null|array    $params optional
+   * @param null|string    $params optional
    *                              <p>
    *                              An array of parameters to pass to the constructor, used if $class is a
    *                              string.

src/voku/db/DB.php

Doc Comments +1 added lines, -1 removed lines

@@ -249,7 +249,7 @@
    * @param string         $username
    * @param string         $password
    * @param string         $database
-   * @param int|string     $port          <p>default is (int)3306</p>
+   * @param integer     $port          <p>default is (int)3306</p>
    * @param string         $charset       <p>default is 'utf8' or 'utf8mb4' (if supported)</p>
    * @param bool|string $exit_on_error   <p>Throw a 'Exception' when a query failed, otherwise it will return 'false'.
    *                                     Use a empty string "" or false to disable it.</p>

Spacing +32 added lines, -32 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);
   }
@@ -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
         &&

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

@@ -378,7 +378,7 @@ 
     $value = $this->_filterParam($this->dirty);
     $this->insert = new ActiveRecordExpressions(
         array(
-            'operator' => 'INSERT INTO ' . $this->table,
+            'operator' => 'INSERT INTO '.$this->table,
             'target'   => new ActiveRecordExpressionsWrap(array('target' => array_keys($this->dirty))),
         )
     );
@@ -556,7 +556,7 @@ 
         null === $o->$n
     ) {
 
-      $n = strtoupper($n) . ' ' . $o->table . '.*';
+      $n = strtoupper($n).' '.$o->table.'.*';
 
     } elseif (
         (
@@ -568,15 +568,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.' ' : '';
 
     }
   }
@@ -689,10 +689,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;
     }
 
@@ -714,7 +714,7 @@ 
     $value = $this->_filterParam($value);
     $exp = new ActiveRecordExpressions(
         array(
-            'source'   => ('where' == $name ? $this->table . '.' : '') . $field,
+            'source'   => ('where' == $name ? $this->table.'.' : '').$field,
             'operator' => $operator,
             'target'   => is_array($value)
                 ? new ActiveRecordExpressionsWrap(
@@ -748,7 +748,7 @@ 
     $this->join = new ActiveRecordExpressions(
         array(
             'source'   => $this->join ?: '',
-            'operator' => $type . ' JOIN',
+            'operator' => $type.' JOIN',
             'target'   => new ActiveRecordExpressions(
                 array('source' => $table, 'operator' => 'ON', 'target' => $on)
             ),

src/voku/db/ActiveRecordExpressionsWrap.php

Spacing +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
     $delimiter = $this->delimiter ?: ',';
 
     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 : ')');
   }
 }

src/voku/db/ActiveRecordExpressions.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;
   }
 }