em

Author: ethan

src/EntityManager.php

@@ -98,14 +98,12 @@ public function findAllBySql($sql = '', $params = array())
     {
         $models = parent::findAllBySql($sql, $params);
 
-        if ($this->fetchClass === null) {
-            return $models;
-        } else {
-            array_walk($models, function (&$model) {
+        array_walk($models, function (&$model) {
+            if (is_object($model)) {
                 static::$modelStorage->attach($model, serialize((array)$model));
-            });
-            return $models;
-        }
+            }
+        });
+        return $models;
     }
 
     private function getPkWhere(array $attributes)