Merge remote-tracking branch 'origin/8.x' into 8.x

Author: taylorotwell

src/Illuminate/Database/Eloquent/Factories/Factory.php

@@ -618,11 +618,7 @@ public static function useNamespace(string $namespace)
      */
     public static function factoryForModel(string $modelName)
     {
-        $resolver = static::$factoryNameResolver ?: function ($modelName) {
-            return static::$namespace.Str::singular(class_basename($modelName)).'Factory';
-        };
-
-        $factory = $resolver($modelName);
+        $factory = static::resolveFactoryName($modelName);
 
         return $factory::new();
     }
@@ -648,6 +644,25 @@ protected function withFaker()
         return Container::getInstance()->make(Generator::class);
     }
 
+    /**
+     * Get the factory name for the given model name.
+     *
+     * @param  string  $modelName
+     * @return string
+     */
+    public static function resolveFactoryName(string $modelName)
+    {
+        $resolver = static::$factoryNameResolver ?: function (string $modelName) {
+            $modelName = Str::startsWith($modelName, 'App\\Models\\')
+                ? Str::after($modelName, 'App\\Models\\')
+                : Str::after($modelName, 'App\\');
+
+            return static::$namespace.$modelName.'Factory';
+        };
+
+        return $resolver($modelName);
+    }
+
     /**
      * Proxy dynamic factory methods onto their proper methods.
      *

tests/Database/DatabaseEloquentFactoryTest.php

@@ -259,6 +259,22 @@ public function test_sequences()
         }));
     }
 
+    public function test_resolve_nested_model_factories()
+    {
+        Factory::useNamespace('Factories\\');
+
+        $resolves = [
+            'App\\Foo' => 'Factories\\FooFactory',
+            'App\\Models\\Foo' => 'Factories\\FooFactory',
+            'App\\Models\\Nested\\Foo' => 'Factories\\Nested\\FooFactory',
+            'App\\Models\\Really\\Nested\\Foo' => 'Factories\\Really\\Nested\\FooFactory',
+        ];
+
+        foreach ($resolves as $model => $factory) {
+            $this->assertEquals($factory, Factory::resolveFactoryName($model));
+        }
+    }
+
     public function test_model_has_factory()
     {
         Factory::guessFactoryNamesUsing(function ($model) {