Optimized assignment and condition #11795

cakephp · May 10, 2018 · 3a87631 · 3a87631
1 parent 6b17679
commit 3a87631
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/Database/Statement/BufferedStatement.php b/src/Database/Statement/BufferedStatement.php
@@ -112,11 +112,9 @@ public function fetch($type = parent::FETCH_TYPE_NUM)
      */
     public function fetchAssoc()
     {
-        if ($result = $this->fetch(static::FETCH_TYPE_ASSOC)) {
-            return $result;
-        }
+        $result = $this->fetch(static::FETCH_TYPE_ASSOC);
 
-        return [];
+        return $result ? $result : [];
     }
 
     /**

diff --git a/src/Database/Statement/StatementDecorator.php b/src/Database/Statement/StatementDecorator.php
@@ -226,11 +226,9 @@ public function fetch($type = self::FETCH_TYPE_NUM)
      */
     public function fetchAssoc()
     {
-        if ($result = $this->fetch(static::FETCH_TYPE_ASSOC)) {
-            return $result;
-        }
+        $result = $this->fetch(static::FETCH_TYPE_ASSOC);
 
-        return [];
+        return $result ? $result : [];
     }
 
     /**