Prevent calling end on stdClass, fixes #1001

RivenSkaye · RivenSkaye · commit d18160668eec · 2023-07-24T16:00:00.000+02:00
diff --git a/MysqliDb.php b/MysqliDb.php
@@ -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);
             }

Original file line number	Diff line number	Diff line change
`@@ -1689,7 +1689,12 @@ protected function _dynamicBindResults(mysqli_stmt $stmt)`
`1689`	`1689`	`}`
`1690`	`1690`	`$this->count++;`
`1691`	`1691`	`if ($this->_mapKey) {`
`1692`		`- $results[$row[$this->_mapKey]] = count($row) > 2 ? $result : end($result);`
	`1692`	`+ if (count($row) < 3 && $this->returnType == 'object') {`
	`1693`	`+ $res = new ArrayIterator($result);`
	`1694`	`+ $res->seek($_res->count() - 1);`
	`1695`	`+ $results[$row[$this->_mapKey]] = $res->current();`
	`1696`	`+ }`
	`1697`	`+ else $results[$row[$this->_mapKey]] = count($row) > 2 ? $result : end($result);`
`1693`	`1698`	`} else {`
`1694`	`1699`	`array_push($results, $result);`
`1695`	`1700`	`}`