[Laravel5] Fix ORM issues (#5484)

* [Laravel5] Fix issue #5391

* [Laravel5] Fix issue #4897

* Update Laravel5.php (#1)

Author: edno

src/Codeception/Module/Laravel5.php

@@ -1039,10 +1039,7 @@ public function grabNumRecords($table, $attributes = [])
      */
     protected function findModel($modelClass, $attributes = [])
     {
-        $query = $this->getQueryBuilderFromModel($modelClass);
-        foreach ($attributes as $key => $value) {
-            $query->where($key, $value);
-        }
+        $query = $this->buildQuery($modelClass, $attributes);
 
         return $query->first();
     }
@@ -1054,11 +1051,7 @@ protected function findModel($modelClass, $attributes = [])
      */
     protected function findRecord($table, $attributes = [])
     {
-        $query = $this->getQueryBuilderFromTable($table);
-        foreach ($attributes as $key => $value) {
-            $query->where($key, $value);
-        }
-
+        $query = $this->buildQuery($table, $attributes);
         return (array) $query->first();
     }
 
@@ -1069,11 +1062,7 @@ protected function findRecord($table, $attributes = [])
      */
     protected function countModels($modelClass, $attributes = [])
     {
-        $query = $this->getQueryBuilderFromModel($modelClass);
-        foreach ($attributes as $key => $value) {
-            $query->where($key, $value);
-        }
-
+        $query = $this->buildQuery($modelClass, $attributes);
         return $query->count();
     }
 
@@ -1084,11 +1073,7 @@ protected function countModels($modelClass, $attributes = [])
      */
     protected function countRecords($table, $attributes = [])
     {
-        $query = $this->getQueryBuilderFromTable($table);
-        foreach ($attributes as $key => $value) {
-            $query->where($key, $value);
-        }
-
+        $query = $this->buildQuery($table, $attributes);
         return $query->count();
     }
 
@@ -1243,4 +1228,32 @@ private function getDomainRegex($route)
 
         return $compiledRoute->getHostRegex();
     }
+
+    /**
+     * Build Eloquent query with attributes
+     *
+     * @param string $table
+     * @param array $attributes
+     * @return EloquentModel
+     * @part orm
+     */
+    private function buildQuery($table, $attributes = [])
+    {
+        if (class_exists($table)) {
+            $query = $this->getQueryBuilderFromModel($table);
+        } else {
+            $query = $this->getQueryBuilderFromTable($table);
+        }
+
+        foreach ($attributes as $key => $value) {
+            if (\is_array($value)) {
+                call_user_func_array(array($query, "where"), $value);
+            } elseif (is_null($value)) {
+                $query->whereNull($key);
+            } else {
+                $query->where($key, $value);
+            }
+        }
+        return $query;
+    }
 }