mirrors/barryvdh_laravel-ide-helper
1
0
Fork 0
mirror of https://github.com/barryvdh/laravel-ide-helper.git synced 2026-08-18 18:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feat-docblocks

Browse Source
This commit is contained in:
Barry vd. Heuvel
2024-02-19 13:02:08 +01:00
parent 391872ba66 02af2a278a
commit 12222b1901
45 changed files with 27 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Console/ModelsCommand.php
+7 -20
View File
@@ -106,7 +106,6 @@ class ModelsCommand extends Command
protected $write_mixin = false;
protected $dirs = [];
protected $reset;
protected $keep_text;
protected $phpstorm_noinspections;
protected $write_model_external_builder_methods;
/**
@@ -152,11 +151,8 @@ class ModelsCommand extends Command
);
$model = $this->argument('model');
$ignore = $this->option('ignore');
$this->reset = $this->option('reset');
$this->reset = $this->option('reset') || $this->option('smart-reset');
$this->phpstorm_noinspections = $this->option('phpstorm-noinspections');
if ($this->option('smart-reset')) {
$this->keep_text = $this->reset = true;
}
$this->write_model_magic_where = $this->laravel['config']->get('ide-helper.write_model_magic_where', true);
$this->write_model_external_builder_methods = $this->laravel['config']->get('ide-helper.write_model_external_builder_methods', true);
$this->write_model_relation_count_properties =
@@ -219,8 +215,8 @@ class ModelsCommand extends Command
"Write models to {$this->filename} and adds @mixin to each model, avoiding IDE duplicate declaration warnings",
],
['nowrite', 'N', InputOption::VALUE_NONE, 'Don\'t write to Model file'],
['reset', 'R', InputOption::VALUE_NONE, 'Remove the original phpdocs instead of appending'],
['smart-reset', 'r', InputOption::VALUE_NONE, 'Refresh the properties/methods list, but keep the text'],
['reset', 'R', InputOption::VALUE_NONE, 'Refresh the properties/methods list, but keep the text'],
['smart-reset', 'r', InputOption::VALUE_NONE, 'Deprecated: same as --reset'],
['phpstorm-noinspections', 'p', InputOption::VALUE_NONE,
'Add PhpFullyQualifiedNameUsageInspection and PhpUnnecessaryFullyQualifiedNameInspection PHPStorm ' .
'noinspection tags',
@@ -379,7 +375,7 @@ class ModelsCommand extends Command
break;
case 'boolean':
case 'bool':
$realType = 'boolean';
$realType = 'bool';
break;
case 'decimal':
case 'string':
@@ -395,7 +391,7 @@ class ModelsCommand extends Command
case 'int':
case 'integer':
case 'timestamp':
$realType = 'integer';
$realType = 'int';
break;
case 'real':
case 'double':
@@ -522,9 +518,9 @@ class ModelsCommand extends Command
'integer', 'int', 'int4',
'smallint', 'int2',
'mediumint',
'bigint', 'int8' => 'integer',
'bigint', 'int8' => 'int',
'boolean', 'bool' => 'boolean',
'boolean', 'bool' => 'bool',
'float', 'real', 'float4',
'double', 'float8' => 'float',
@@ -892,15 +888,6 @@ class ModelsCommand extends Command
if ($this->reset) {
$phpdoc->clearTags();
if (!$this->keep_text) {
$phpdoc->setSummary('');
$phpdoc->setDescription(null);
}
}
// Set default summary to classname
if (!$phpdoc->getSummary()) {
$phpdoc->setSummary($class);
}
$existingTags = $phpdoc->getTags();