Merge pull request #1018 from RivenSkaye/master

Trace Defaults, Bug Fixes (#1001, #1013, #1015, #1016, #1018)

Trace Defaults: (Commits: 295c4c6, 057d820)
Establishes default settings for tracing mechanisms within the codebase.
Bug Fixes:
Fixes an error related to calling the end method on an stdClass object (Commit: d181606 - fixes #1001).
Resolves issues reported in tickets #1013, #1015, and #1016.
Additional Fix (stormwalkerec/php-mysqli-database-class): (Commit: a8de11f - fixes #1018)
Merges a separate fix from stormwalkerec/php-mysqli-database-class that addresses another reported issue (#1018).

Author: ThingEngineer

MysqliDb.php

@@ -216,9 +216,9 @@ class MysqliDb
     /**
      * Variables for query execution tracing
      */
-    protected $traceStartQ;
-    protected $traceEnabled;
-    protected $traceStripPrefix;
+    protected $traceStartQ = 0;
+    protected $traceEnabled = false;
+    protected $traceStripPrefix = '';
     public $trace = array();
 
     /**
@@ -790,11 +790,11 @@ public function getOne($tableName, $columns = '*')
     /**
      * A convenient SELECT COLUMN function to get a single column value from one row
      *
-     * @param string $tableName The name of the database table to work with.
-     * @param string $column    The desired column
-     * @param int    $limit     Limit of rows to select. Use null for unlimited..1 by default
+     * @param string    $tableName The name of the database table to work with.
+     * @param string    $column    The desired column
+     * @param int|null  $limit     Limit of rows to select. Use null for unlimited. 1 by default
      *
-     * @return mixed Contains the value of a returned column / array of values
+     * @return mixed    Contains the value of a returned column / array of values
      * @throws Exception
      */
     public function getValue($tableName, $column, $limit = 1)
@@ -1689,7 +1689,12 @@ protected function _dynamicBindResults(mysqli_stmt $stmt)
             }
             $this->count++;
             if ($this->_mapKey) {
-                $results[$row[$this->_mapKey]] = count($row) > 2 ? $result : end($result);
+                if (count($row) < 3 && $this->returnType == 'object') {
+                    $res = new ArrayIterator($result);
+                    $res->seek($_res->count() - 1);
+                    $results[$row[$this->_mapKey]] = $res->current();
+                }
+                else $results[$row[$this->_mapKey]] = count($row) > 2 ? $result : end($result);
             } else {
                 array_push($results, $result);
             }
@@ -2329,7 +2334,7 @@ public function _transaction_status_check()
      *
      * @return MysqliDb
      */
-    public function setTrace($enabled, $stripPrefix = null)
+    public function setTrace($enabled, $stripPrefix = '')
     {
         $this->traceEnabled = $enabled;
         $this->traceStripPrefix = $stripPrefix;
@@ -2350,7 +2355,7 @@ private function _traceGetCaller()
         }
 
         return __CLASS__ . "->" . $caller["function"] . "() >>  file \"" .
-            str_replace($this->traceStripPrefix, '', $caller["file"]) . "\" line #" . $caller["line"] . " ";
+        str_replace($this->traceStripPrefix , '', $caller["file"]) . "\" line #" . $caller["line"] . " ";
     }
 
     /**