update factory find model logic

laravel · Jun 30, 2020 · d5cf953 · d5cf953
1 parent 75ad66c
commit d5cf953
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Factories/Factory.php b/src/Illuminate/Database/Eloquent/Factories/Factory.php
@@ -549,7 +549,11 @@ public function newModel(array $attributes = [])
     public function modelName()
     {
         $resolver = static::$modelNameResolver ?: function (self $factory) {
-            return 'App\\'.Str::replaceLast('Factory', '', class_basename($factory));
+            $factoryBasename = Str::replaceLast('Factory', '', class_basename($factory));
+
+            return class_exists('App\\Models\\'.$factoryBasename)
+                        ? 'App\\Models\\'.$factoryBasename
+                        : 'App\\'.$factoryBasename;
         };
 
         return $this->model ?: $resolver($this);