From 67e79ceba35e714c6cd99a6fdbee25e480038369 Mon Sep 17 00:00:00 2001 From: Abel Hoogeveen Date: Tue, 5 Mar 2019 11:12:27 +0100 Subject: [PATCH] Release 1.2.0-RC3 --- composer.json | 6 +++--- src/FuzeWorks/Model/PDOTableModel.php | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 920418d..ba07c74 100644 --- a/composer.json +++ b/composer.json @@ -15,13 +15,13 @@ ], "require": { "php": ">=7.1.0", - "fuzeworks/core": "1.2.0-RC2", - "fuzeworks/mvcr": "1.2.0-RC2", + "fuzeworks/core": "1.2.0-RC3", + "fuzeworks/mvcr": "1.2.0-RC3", "ext-pdo": "*" }, "require-dev": { "phpunit/phpunit": "^7", - "fuzeworks/tracycomponent": "1.2.0-RC2" + "fuzeworks/tracycomponent": "1.2.0-RC3" }, "autoload": { "psr-4": { diff --git a/src/FuzeWorks/Model/PDOTableModel.php b/src/FuzeWorks/Model/PDOTableModel.php index c8ea837..62614be 100644 --- a/src/FuzeWorks/Model/PDOTableModel.php +++ b/src/FuzeWorks/Model/PDOTableModel.php @@ -167,6 +167,9 @@ class PDOTableModel implements iDatabaseTableModel // And return the result $fetchMode = (isset($options['fetchMode']) ? $options['fetchMode'] : PDO::FETCH_ASSOC); + if (is_array($fetchMode)) + return $this->lastStatement->fetchAll(...$fetchMode); + return $this->lastStatement->fetchAll($fetchMode); }