mirror of
https://github.com/barryvdh/laravel-ide-helper.git
synced 2026-08-18 18:13:11 +00:00
Generate cleaner model mixin classes (#1268)
* Generate cleaner model mixin classes * Fix test
This commit is contained in:
@@ -918,6 +918,13 @@ class ModelsCommand extends Command
|
||||
if (!$phpdocMixin->getText()) {
|
||||
$mixinDocComment = preg_replace("/\s\*\s*\n/", '', $mixinDocComment);
|
||||
}
|
||||
|
||||
foreach ($phpdoc->getTagsByName('mixin') as $tag) {
|
||||
if (Str::startsWith($tag->getContent(), 'IdeHelper')) {
|
||||
$phpdoc->deleteTag($tag);
|
||||
}
|
||||
}
|
||||
$docComment = $serializer->getDocComment($phpdoc);
|
||||
}
|
||||
|
||||
if ($this->write) {
|
||||
@@ -939,11 +946,15 @@ class ModelsCommand extends Command
|
||||
}
|
||||
|
||||
$classname = $this->write_mixin ? $mixinClassName : $classname;
|
||||
$output = "namespace {$namespace}{\n{$docComment}\n\t{$keyword}class {$classname} extends \Eloquent ";
|
||||
$output = "namespace {$namespace}{\n{$docComment}\n\t{$keyword}class {$classname} ";
|
||||
|
||||
if ($interfaceNames) {
|
||||
$interfaces = implode(', \\', $interfaceNames);
|
||||
$output .= "implements \\{$interfaces} ";
|
||||
if (!$this->write_mixin) {
|
||||
$output .= "extends \Eloquent ";
|
||||
|
||||
if ($interfaceNames) {
|
||||
$interfaces = implode(', \\', $interfaceNames);
|
||||
$output .= "implements \\{$interfaces} ";
|
||||
}
|
||||
}
|
||||
|
||||
return $output . "{}\n}\n\n";
|
||||
|
||||
Reference in New Issue
Block a user