Check for method existence

laravel · Sep 24, 2020 · 70a73ab · 70a73ab
1 parent 6321ae0
commit 70a73ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Factories/Factory.php b/src/Illuminate/Database/Eloquent/Factories/Factory.php
@@ -707,7 +707,9 @@ public function __call($method, $parameters)
 
         $relationshipClass = get_class($this->newModel()->{$relationship}()->getRelated());
 
-        $factory = $relationshipClass::newFactory() ?: static::factoryForModel($relationshipClass);
+        $factory = method_exists($relationshipClass, 'newFactory') && $relationshipClass::newFactory()
+            ? $relationshipClass::newFactory()
+            : static::factoryForModel($relationshipClass);
 
         if (Str::startsWith($method, 'for')) {
             return $this->for($factory->state($parameters[0] ?? []), $relationship);

diff --git a/tests/Database/DatabaseEloquentFactoryTest.php b/tests/Database/DatabaseEloquentFactoryTest.php
@@ -399,8 +399,6 @@ public function definition()
 
 class FactoryTestPost extends Eloquent
 {
-    use HasFactory;
-
     protected $table = 'posts';
 
     public function user()
@@ -435,8 +433,6 @@ public function definition()
 
 class FactoryTestComment extends Eloquent
 {
-    use HasFactory;
-
     protected $table = 'comments';
 
     public function commentable()
@@ -459,8 +455,6 @@ public function definition()
 
 class FactoryTestRole extends Eloquent
 {
-    use HasFactory;
-
     protected $table = 'roles';
 
     public function users()