Merge branch 'master' into jenga201_master

This commit is contained in:
Markus Podar
2021-04-03 00:15:42 +02:00
8 changed files with 135 additions and 47 deletions
+5 -6
View File
@@ -1103,18 +1103,17 @@ class ModelsCommand extends Command
return;
}
$traits = class_uses(get_class($model), true);
$modelName = get_class($model);
$traits = class_uses($modelName, true);
if (!in_array('Illuminate\\Database\\Eloquent\\Factories\\HasFactory', $traits)) {
return;
}
$modelName = get_class($model);
$modelBaseName = class_basename($modelName);
$factory = "\Database\Factories\\{$modelBaseName}Factory";
if ($modelName::newFactory()) {
$factory = get_class($modelName::newFactory());
} else {
$factory = Factory::resolveFactoryName($modelName);
}
$factory = '\\' . trim($factory, '\\');