Trim whitespaces in the code

Author: avbdr

MysqliDb.php

@@ -21,7 +21,7 @@ class MysqliDb
     protected static $_instance;
     /**
      * Table prefix
-     * 
+     *
      * @var string
      */
     public static $prefix = '';
@@ -54,7 +54,7 @@ class MysqliDb
      *
      * @var array
      */
-    protected $_join = array(); 
+    protected $_join = array();
     /**
      * An array that holds where conditions 'fieldname' => 'value'
      *
@@ -64,11 +64,11 @@ class MysqliDb
     /**
      * Dynamic type list for order by condition value
      */
-    protected $_orderBy = array(); 
+    protected $_orderBy = array();
     /**
      * Dynamic type list for group by condition value
      */
-    protected $_groupBy = array(); 
+    protected $_groupBy = array();
     /**
      * Dynamic array that holds a combination of where condition/table data value types and parameter references
      *
@@ -79,13 +79,13 @@ class MysqliDb
      * Variable which holds an amount of returned rows during get/getOne/select queries
      *
      * @var string
-     */ 
+     */
     public $count = 0;
     /**
      * Variable which holds an amount of returned rows during get/getOne/select queries with withTotalCount()
      *
      * @var string
-     */ 
+     */
     public $totalCount = 0;
     /**
      * Variable which holds last statement error
@@ -113,7 +113,7 @@ class MysqliDb
     protected $isSubQuery = false;
 
     /**
-     * Name of the auto increment column 
+     * Name of the auto increment column
      *
      */
     protected $_lastInsertId = null;
@@ -240,7 +240,7 @@ protected function reset()
         $this->_where = array();
         $this->_join = array();
         $this->_orderBy = array();
-        $this->_groupBy = array(); 
+        $this->_groupBy = array();
         $this->_bindParams = array(''); // Create the empty 0 index
         $this->_query = null;
         $this->_queryOptions = array();
@@ -281,10 +281,10 @@ public function ObjectBuilder () {
         $this->returnType = 'Object';
         return $this;
     }
-    
+
     /**
      * Method to set a prefix
-     * 
+     *
      * @param string $prefix     Contains a tableprefix
      */
     public function setPrefix($prefix = '')
@@ -399,7 +399,7 @@ public function get($tableName, $numRows = null, $columns = '*')
         if (empty ($columns))
             $columns = '*';
 
-        $column = is_array($columns) ? implode(', ', $columns) : $columns; 
+        $column = is_array($columns) ? implode(', ', $columns) : $columns;
         $this->_tableName = self::$prefix . $tableName;
         $this->_query = 'SELECT ' . implode(' ', $this->_queryOptions) . ' ' .
                         $column . " FROM " . $this->_tableName;
@@ -423,7 +423,7 @@ public function get($tableName, $numRows = null, $columns = '*')
      *
      * @return array Contains the returned rows from the select query.
      */
-    public function getOne($tableName, $columns = '*') 
+    public function getOne($tableName, $columns = '*')
     {
         $res = $this->get ($tableName, 1, $columns);
 
@@ -444,7 +444,7 @@ public function getOne($tableName, $columns = '*')
      *
      * @return string Contains the value of a returned column.
      */
-    public function getValue($tableName, $column) 
+    public function getValue($tableName, $column)
     {
         $res = $this->ArrayBuilder()->get ($tableName, 1, "{$column} as retval");
 
@@ -563,12 +563,12 @@ public function where($whereProp, $whereValue = 'DBNULL', $operator = '=', $cond
         return $this;
     }
 
-    /** 
-     * This function store update column's name and column name of the 
+    /**
+     * This function store update column's name and column name of the
      * autoincrement column
-     * 
+     *
      * @param Array Variable with values
-     * @param String Variable value 
+     * @param String Variable value
      */
     public function onDuplicate($_updateColumns, $_lastInsertId = null)
     {
@@ -632,7 +632,7 @@ public function orderBy($orderByField, $orderbyDirection = "DESC", $customFields
         $orderbyDirection = strtoupper (trim ($orderbyDirection));
         $orderByField = preg_replace ("/[^-a-z0-9\.\(\),_`]+/i",'', $orderByField);
 
-        // Add table prefix to orderByField if needed. 
+        // Add table prefix to orderByField if needed.
         //FIXME: We are adding prefix only if table is enclosed into `` to distinguish aliases
         // from table names
         $orderByField = preg_replace('/(\`)([`a-zA-Z0-9_]*\.)/', '\1' . self::$prefix.  '\2', $orderByField);
@@ -650,7 +650,7 @@ public function orderBy($orderByField, $orderbyDirection = "DESC", $customFields
 
         $this->_orderBy[$orderByField] = $orderbyDirection;
         return $this;
-    } 
+    }
 
     /**
      * This method allows you to specify multiple (method chaining optional) GROUP BY statements for SQL queries.
@@ -667,7 +667,7 @@ public function groupBy($groupByField)
 
         $this->_groupBy[] = $groupByField;
         return $this;
-    } 
+    }
 
     /**
      * This methods returns the ID of the last inserted item
@@ -805,30 +805,30 @@ private function _buildInsert ($tableName, $insertData, $operation)
         return true;
     }
 
-    /** 
+    /**
      * Helper function to add variables into the query statement
-     * 
+     *
      * @param Array Variable with values
      */
     protected function _buildDuplicate($tableData)
     {
         if (is_array($this->_updateColumns) && !empty($this->_updateColumns)) {
             $this->_query .= " on duplicate key update ";
             if ($this->_lastInsertId) {
-                $this->_lastQuery .= $this->_lastInsertId."=LAST_INSERT_ID(".$this->_lastInsertId."),";
+                $this->_lastQuery .= $this->_lastInsertId."=LAST_INSERT_ID (".$this->_lastInsertId."),";
                 $this->_lastInsertId = null;
             }
-            
+
             foreach ($this->_updateColumns as $column) {
                 $this->_query .= "`" . $column . "` = ";
-                
+
                 // Simple value
                 if (!is_array ($tableData[$column])) {
                     $this->_bindParam($tableData[$column]);
                     $this->_query .= '?, ';
                     continue;
                 }
-                
+
                 // Function value
                 $arr = $tableData[$column];
                 $key = key($arr);
@@ -912,7 +912,7 @@ protected function _dynamicBindResults(mysqli_stmt $stmt)
 
         // if $meta is false yet sqlstate is true, there's no sql error but the query is
         // most likely an update/insert/delete which doesn't produce any results
-        if(!$meta && $stmt->sqlstate) { 
+        if(!$meta && $stmt->sqlstate) {
             return array();
         }
 
@@ -1234,7 +1234,7 @@ public function getLastQuery () {
 
     /**
      * Method returns mysql error
-     * 
+     *
      * @return string
      */
     public function getLastError () {
@@ -1246,7 +1246,7 @@ public function getLastError () {
     /**
      * Mostly internal method to get query and its params out of subquery object
      * after get() and getAll()
-     * 
+     *
      * @return array
      */
     public function getSubQuery () {
@@ -1321,7 +1321,7 @@ public function inc($num = 1) {
     public function dec ($num = 1) {
         return Array ("[I]" => "-" . (int)$num);
     }
-    
+
     /**
      * Method generates change boolean function call
      * @param string column name. null by default

tests/mysqliDbTests.php

@@ -11,7 +11,7 @@
 
 $db = new Mysqlidb(Array (
                 'host' => 'localhost',
-                'username' => 'root', 
+                'username' => 'root',
                 'password' => '',
                 'db' => 'testdb',
                 'prefix' => $prefix,
@@ -380,7 +380,7 @@ function createTable ($name, $data) {
 $db->delete("users");
 $db->get("users");
 if ($db->count != 0) {
-    echo "Invalid users count after delete"; 
+    echo "Invalid users count after delete";
     exit;
 }
 $db->delete("products");