Merge pull request #299 from avbdr/master

fixes

Author: avbdr

MysqliDb.php

@@ -9,6 +9,7 @@
  * @author    Alexander V. Butenko <a.butenka@gmail.com>
  * @copyright Copyright (c) 2010
  * @license   http://opensource.org/licenses/gpl-3.0.html GNU Public License
+ * @link      http://github.com/joshcam/PHP-MySQLi-Database-Class 
  * @version   2.2
  **/
 class MysqliDb
@@ -307,7 +308,7 @@ public function rawQuery ($query, $bindParams = null)
         $this->_query = $query;
         $stmt = $this->_prepareQuery();
 
-        if (is_array($bindParams) === true) {
+        if (is_array ($bindParams) === true) {
             foreach ($bindParams as $prop => $val) {
                 $params[0] .= $this->_determineType($val);
                 array_push($params, $bindParams[$prop]);
@@ -915,9 +916,8 @@ 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();
-        }
 
         $row = array();
         while ($field = $meta->fetch_field()) {
@@ -975,9 +975,8 @@ protected function _dynamicBindResults(mysqli_stmt $stmt)
             $totalCount = $stmt->fetch_row();
             $this->totalCount = $totalCount[0];
         }
-        if ($this->returnType == 'Json') {
+        if ($this->returnType == 'Json')
             return json_encode ($results);
-        }
 
         return $results;
     }
@@ -1188,9 +1187,8 @@ protected function _buildLimit ($numRows) {
      */
     protected function _prepareQuery()
     {
-        if (!$stmt = $this->mysqli()->prepare($this->_query)) {
-            throw new Exception("Problem preparing query ($this->_query) " . $this->mysqli()->error);
-        }
+        if (!$stmt = $this->mysqli()->prepare($this->_query))
+            throw new Exception ("Problem preparing query ($this->_query) " . $this->mysqli()->error);
         if ($this->traceEnabled)
             $this->traceStartQ = microtime (true);
 
@@ -1218,11 +1216,10 @@ protected function refValues(Array &$arr)
         //Reference in the function arguments are required for HHVM to work
         //https://github.com/facebook/hhvm/issues/5155
         //Referenced data array is required by mysqli since PHP 5.3+
-        if (strnatcmp(phpversion(), '5.3') >= 0) {
+        if (strnatcmp (phpversion(), '5.3') >= 0) {
             $refs = array();
-            foreach ($arr as $key => $value) {
+            foreach ($arr as $key => $value)
                 $refs[$key] = & $arr[$key];
-            }
             return $refs;
         }
         return $arr;
@@ -1340,9 +1337,8 @@ public function now ($diff = null, $func = "NOW()") {
      * @param int increment by int or float. 1 by default
      */
     public function inc($num = 1) {
-        if(!is_numeric($num)){
-            throw new Exception('Argument supplied to inc must be a number');
-        }
+        if(!is_numeric($num))
+            throw new Exception ('Argument supplied to inc must be a number');
         return Array ("[I]" => "+" . $num);
     }
 
@@ -1351,9 +1347,8 @@ public function inc($num = 1) {
      * @param int increment by int or float. 1 by default
      */
     public function dec ($num = 1) {
-        if(!is_numeric($num)){
-            throw new Exception('Argument supplied to dec must be a number');
-        }
+        if(!is_numeric($num))
+            throw new Exception ('Argument supplied to dec must be a number');
         return Array ("[I]" => "-" . $num);
     }
 

dbObject.php

@@ -7,6 +7,7 @@
  * @author    Alexander V. Butenko <a.butenka@gmail.com>
  * @copyright Copyright (c) 2015
  * @license   http://opensource.org/licenses/gpl-3.0.html GNU Public License
+ * @link      http://github.com/joshcam/PHP-MySQLi-Database-Class 
  * @version   2.2
  *
  * @method int count ()