From 965148eec703e042ee303442b4e4cbb29abbe45f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20Hrani=C4=8Dka?= Date: Thu, 2 Feb 2017 11:01:50 +0100 Subject: [PATCH] Selection::getPreviousAccessedColumns must return array or null [Closes #160] --- src/Database/Table/Selection.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Database/Table/Selection.php b/src/Database/Table/Selection.php index 3914e343d..cd8d26914 100644 --- a/src/Database/Table/Selection.php +++ b/src/Database/Table/Selection.php @@ -156,9 +156,9 @@ public function getSql(): string /** * Loads cache of previous accessed columns and returns it. * @internal - * @return array|bool + * @return array|NULL */ - public function getPreviousAccessedColumns() + public function getPreviousAccessedColumns(): ?array { if ($this->cache && $this->previousAccessedColumns === NULL) { $this->accessedColumns = $this->previousAccessedColumns = $this->cache->load($this->getGeneralCacheKey()); @@ -167,7 +167,7 @@ public function getPreviousAccessedColumns() } } - return array_keys(array_filter((array) $this->previousAccessedColumns)); + return array_keys(array_filter((array) $this->previousAccessedColumns)) ?: NULL; }