From 0aa750e2c6a38a9f49419db4fed3fc0601299ee6 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Wed, 1 Mar 2017 11:42:42 -0500 Subject: [PATCH] Make sure to always return the correct type from the Memcached->getMultiple call --- src/Driver/ApcuDriver.php | 7 +------ src/Driver/MemcachedDriver.php | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Driver/ApcuDriver.php b/src/Driver/ApcuDriver.php index 98c12b4..8577b76 100644 --- a/src/Driver/ApcuDriver.php +++ b/src/Driver/ApcuDriver.php @@ -142,12 +142,7 @@ class ApcuDriver extends AbstractDriver { */ public function flush(): bool { - if (function_exists('apcu_clear_cache')) - { - return apcu_clear_cache(); - } - - return TRUE; + return apcu_clear_cache(); } /** diff --git a/src/Driver/MemcachedDriver.php b/src/Driver/MemcachedDriver.php index f8ab27e..8776030 100644 --- a/src/Driver/MemcachedDriver.php +++ b/src/Driver/MemcachedDriver.php @@ -101,7 +101,8 @@ class MemcachedDriver extends AbstractDriver { */ public function getMultiple(array $keys = []): array { - return $this->conn->getMulti($keys); + $return = $this->conn->getMulti($keys); + return ($return === FALSE) ? [] : $return; } /**