mirror of
https://github.com/barryvdh/laravel-ide-helper.git
synced 2026-08-18 18:13:11 +00:00
Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
160c12d20f | ||
|
|
2dba19133c | ||
|
|
001091e605 | ||
|
|
ccac27c8cf | ||
|
|
f5759e2001 | ||
|
|
f7a3dc8ff2 | ||
|
|
672acce5ae | ||
|
|
67c00c0978 | ||
|
|
a1573919c1 | ||
|
|
0cf178aca9 | ||
|
|
c6509b658f | ||
|
|
6338abb2d7 | ||
|
|
ac7e186270 |
+15
-1
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v3.0.0...master)
|
[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v3.1.0...master)
|
||||||
--------------
|
--------------
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
@@ -11,6 +11,20 @@ All notable changes to this project will be documented in this file.
|
|||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
|
2024-07-12, 3.1.0
|
||||||
|
------------------
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fix return value of query scopes from parent class [#1366 / sforward](https://github.com/barryvdh/laravel-ide-helper/pull/1366)
|
||||||
|
- Add static to isBuiltin() check in ide-helper:models [#1541 / bram-pkg](https://github.com/barryvdh/laravel-ide-helper/pull/1541)
|
||||||
|
- Fix for getSomethingAttribute functions which return a collection with type templating in the phpDoc. [#1567 / stefanScrumble](https://github.com/barryvdh/laravel-ide-helper/pull/1567)
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Add type to pivot when using a custom pivot class [#1518 / d3v2a](https://github.com/barryvdh/laravel-ide-helper/pull/1518)
|
||||||
|
- Add support in morphTo relationship for null values [#1547 / matysekmichal](https://github.com/barryvdh/laravel-ide-helper/pull/1547)
|
||||||
|
- Add support for AsEnumCollection casts [#1557 / Braunson](https://github.com/barryvdh/laravel-ide-helper/pull/1557)
|
||||||
|
- Support for Attribute class in attributes [#1567 / stefanScrumble](https://github.com/barryvdh/laravel-ide-helper/pull/1567)
|
||||||
|
|
||||||
2024-03-01, 3.0.0
|
2024-03-01, 3.0.0
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -65,7 +65,7 @@
|
|||||||
},
|
},
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "3.0-dev"
|
"dev-master": "3.1-dev"
|
||||||
},
|
},
|
||||||
"laravel": {
|
"laravel": {
|
||||||
"providers": [
|
"providers": [
|
||||||
|
|||||||
+25
-25
@@ -4,21 +4,21 @@ return [
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Filename & Format
|
| Filename
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| The default filename
|
| The default filename.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'filename' => '_ide_helper.php',
|
'filename' => '_ide_helper.php',
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Models filename
|
| Models filename
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| The default filename for the models helper file
|
| The default filename for the models helper file.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -26,7 +26,7 @@ return [
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Where to write the PhpStorm specific meta file
|
| PhpStorm meta filename
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| PhpStorm also supports the directory `.phpstorm.meta.php/` with arbitrary
|
| PhpStorm also supports the directory `.phpstorm.meta.php/` with arbitrary
|
||||||
@@ -41,7 +41,7 @@ return [
|
|||||||
| Fluent helpers
|
| Fluent helpers
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Set to true to generate commonly used Fluent methods
|
| Set to true to generate commonly used Fluent methods.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ return [
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Factory Builders
|
| Factory builders
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Set to true to generate factory generators for better factory()
|
| Set to true to generate factory generators for better factory()
|
||||||
@@ -63,10 +63,10 @@ return [
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Write Model Magic methods
|
| Write model magic methods
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Set to false to disable write magic methods of model
|
| Set to false to disable write magic methods of model.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -74,10 +74,10 @@ return [
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Write Model External Eloquent Builder methods
|
| Write model external Eloquent builder methods
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Set to false to disable write external eloquent builder methods
|
| Set to false to disable write external Eloquent builder methods.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -85,7 +85,7 @@ return [
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Write Model relation count properties
|
| Write model relation count properties
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Set to false to disable writing of relation count properties to model DocBlocks.
|
| Set to false to disable writing of relation count properties to model DocBlocks.
|
||||||
@@ -96,11 +96,11 @@ return [
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Write Eloquent Model Mixins
|
| Write Eloquent model mixins
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| This will add the necessary DocBlock mixins to the model class
|
| This will add the necessary DocBlock mixins to the model class
|
||||||
| contained in the Laravel Framework. This helps the IDE with
|
| contained in the Laravel framework. This helps the IDE with
|
||||||
| auto-completion.
|
| auto-completion.
|
||||||
|
|
|
|
||||||
| Please be aware that this setting changes a file within the /vendor directory.
|
| Please be aware that this setting changes a file within the /vendor directory.
|
||||||
@@ -134,7 +134,7 @@ return [
|
|||||||
| for models.
|
| for models.
|
||||||
|
|
|
|
||||||
| glob patterns are supported to easier reach models in sub-directories,
|
| glob patterns are supported to easier reach models in sub-directories,
|
||||||
| e.g. `app/Services/* /Models` (without the space)
|
| e.g. `app/Services/* /Models` (without the space).
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -152,7 +152,7 @@ return [
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
'ignored_models' => [
|
'ignored_models' => [
|
||||||
|
// App\MyModel::class,
|
||||||
],
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -160,7 +160,7 @@ return [
|
|||||||
| Models hooks
|
| Models hooks
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Define which hook classes you want to run for models to add custom information
|
| Define which hook classes you want to run for models to add custom information.
|
||||||
|
|
|
|
||||||
| Hooks should implement Barryvdh\LaravelIdeHelper\Contracts\ModelHookInterface.
|
| Hooks should implement Barryvdh\LaravelIdeHelper\Contracts\ModelHookInterface.
|
||||||
|
|
|
|
||||||
@@ -175,7 +175,7 @@ return [
|
|||||||
| Extra classes
|
| Extra classes
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| These implementations are not really extended, but called with magic functions
|
| These implementations are not really extended, but called with magic functions.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -197,7 +197,7 @@ return [
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
'interfaces' => [
|
'interfaces' => [
|
||||||
|
// App\MyInterface::class => App\MyImplementation::class,
|
||||||
],
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -228,7 +228,7 @@ return [
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Property Casts
|
| Property casts
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Cast the given "real type" to the given "type".
|
| Cast the given "real type" to the given "type".
|
||||||
@@ -255,9 +255,9 @@ return [
|
|||||||
| Force FQN usage
|
| Force FQN usage
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Use the fully qualified (class) name in docBlock,
|
| Use the fully qualified (class) name in DocBlocks,
|
||||||
| event if class exists in a given file
|
| even if the class exists in the same namespace
|
||||||
| or there is an import (use className) of a given class
|
| or there is an import (use className) of the class.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'force_fqn' => false,
|
'force_fqn' => false,
|
||||||
@@ -279,8 +279,8 @@ return [
|
|||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Sometimes it's needed to create custom relation types. The key of the array
|
| Sometimes it's needed to create custom relation types. The key of the array
|
||||||
| is the Relationship Method name. The value of the array is the canonical class
|
| is the relationship method name. The value of the array is the fully-qualified
|
||||||
| name of the Relationship, e.g. `'relationName' => RelationShipClass::class`.
|
| class name of the relationship, e.g. `'relationName' => RelationShipClass::class`.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'additional_relation_types' => [],
|
'additional_relation_types' => [],
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
namespace Barryvdh\LaravelIdeHelper\Console;
|
namespace Barryvdh\LaravelIdeHelper\Console;
|
||||||
|
|
||||||
use Barryvdh\LaravelIdeHelper\Contracts\ModelHookInterface;
|
use Barryvdh\LaravelIdeHelper\Contracts\ModelHookInterface;
|
||||||
|
use Barryvdh\LaravelIdeHelper\Parsers\PhpDocReturnTypeParser;
|
||||||
use Barryvdh\Reflection\DocBlock;
|
use Barryvdh\Reflection\DocBlock;
|
||||||
use Barryvdh\Reflection\DocBlock\Context;
|
use Barryvdh\Reflection\DocBlock\Context;
|
||||||
use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
|
use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
|
||||||
@@ -23,6 +24,7 @@ use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
|
|||||||
use Illuminate\Contracts\Database\Eloquent\CastsInboundAttributes;
|
use Illuminate\Contracts\Database\Eloquent\CastsInboundAttributes;
|
||||||
use Illuminate\Database\Eloquent\Casts\AsArrayObject;
|
use Illuminate\Database\Eloquent\Casts\AsArrayObject;
|
||||||
use Illuminate\Database\Eloquent\Casts\AsCollection;
|
use Illuminate\Database\Eloquent\Casts\AsCollection;
|
||||||
|
use Illuminate\Database\Eloquent\Casts\AsEnumCollection;
|
||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
@@ -34,8 +36,10 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
|
|||||||
use Illuminate\Database\Eloquent\Relations\HasOneThrough;
|
use Illuminate\Database\Eloquent\Relations\HasOneThrough;
|
||||||
use Illuminate\Database\Eloquent\Relations\MorphMany;
|
use Illuminate\Database\Eloquent\Relations\MorphMany;
|
||||||
use Illuminate\Database\Eloquent\Relations\MorphOne;
|
use Illuminate\Database\Eloquent\Relations\MorphOne;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\MorphPivot;
|
||||||
use Illuminate\Database\Eloquent\Relations\MorphTo;
|
use Illuminate\Database\Eloquent\Relations\MorphTo;
|
||||||
use Illuminate\Database\Eloquent\Relations\MorphToMany;
|
use Illuminate\Database\Eloquent\Relations\MorphToMany;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\Pivot;
|
||||||
use Illuminate\Database\Eloquent\Relations\Relation;
|
use Illuminate\Database\Eloquent\Relations\Relation;
|
||||||
use Illuminate\Database\Schema\Builder;
|
use Illuminate\Database\Schema\Builder;
|
||||||
use Illuminate\Filesystem\Filesystem;
|
use Illuminate\Filesystem\Filesystem;
|
||||||
@@ -108,7 +112,7 @@ class ModelsCommand extends Command
|
|||||||
protected $phpstorm_noinspections;
|
protected $phpstorm_noinspections;
|
||||||
protected $write_model_external_builder_methods;
|
protected $write_model_external_builder_methods;
|
||||||
/**
|
/**
|
||||||
* @var bool[string]
|
* @var array<string, true>
|
||||||
*/
|
*/
|
||||||
protected $nullableColumns = [];
|
protected $nullableColumns = [];
|
||||||
/**
|
/**
|
||||||
@@ -194,7 +198,7 @@ class ModelsCommand extends Command
|
|||||||
protected function getArguments()
|
protected function getArguments()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
['model', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Which models to include', []],
|
['model', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Which models to include', []],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -206,20 +210,21 @@ class ModelsCommand extends Command
|
|||||||
protected function getOptions()
|
protected function getOptions()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
['filename', 'F', InputOption::VALUE_OPTIONAL, 'The path to the helper file'],
|
['filename', 'F', InputOption::VALUE_OPTIONAL, 'The path to the helper file'],
|
||||||
['dir', 'D', InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
|
['dir', 'D', InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
|
||||||
'The model dir, supports glob patterns', [], ],
|
'The model dir, supports glob patterns', [], ],
|
||||||
['write', 'W', InputOption::VALUE_NONE, 'Write to Model file'],
|
['write', 'W', InputOption::VALUE_NONE, 'Write to Model file'],
|
||||||
['write-mixin', 'M', InputOption::VALUE_NONE,
|
['write-mixin', 'M', InputOption::VALUE_NONE,
|
||||||
"Write models to {$this->filename} and adds @mixin to each model, avoiding IDE duplicate declaration warnings",
|
"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'],
|
['nowrite', 'N', InputOption::VALUE_NONE, 'Don\'t write to Model file'],
|
||||||
['reset', 'R', InputOption::VALUE_NONE, 'Refresh the properties/methods list, but keep the text'],
|
['reset', 'R', InputOption::VALUE_NONE, 'Remove the original phpdocs instead of appending'],
|
||||||
['phpstorm-noinspections', 'p', InputOption::VALUE_NONE,
|
['smart-reset', 'r', InputOption::VALUE_NONE, 'Refresh the properties/methods list, but keep the text'],
|
||||||
'Add PhpFullyQualifiedNameUsageInspection and PhpUnnecessaryFullyQualifiedNameInspection PHPStorm ' .
|
['phpstorm-noinspections', 'p', InputOption::VALUE_NONE,
|
||||||
'noinspection tags',
|
'Add PhpFullyQualifiedNameUsageInspection and PhpUnnecessaryFullyQualifiedNameInspection PHPStorm ' .
|
||||||
],
|
'noinspection tags',
|
||||||
['ignore', 'I', InputOption::VALUE_OPTIONAL, 'Which models to ignore', ''],
|
],
|
||||||
|
['ignore', 'I', InputOption::VALUE_OPTIONAL, 'Which models to ignore', ''],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -405,6 +410,7 @@ class ModelsCommand extends Command
|
|||||||
$realType = '\Carbon\CarbonImmutable';
|
$realType = '\Carbon\CarbonImmutable';
|
||||||
break;
|
break;
|
||||||
case AsCollection::class:
|
case AsCollection::class:
|
||||||
|
case AsEnumCollection::class:
|
||||||
case 'collection':
|
case 'collection':
|
||||||
$realType = '\Illuminate\Support\Collection';
|
$realType = '\Illuminate\Support\Collection';
|
||||||
break;
|
break;
|
||||||
@@ -578,10 +584,7 @@ class ModelsCommand extends Command
|
|||||||
$isAttribute = is_a($type, '\Illuminate\Database\Eloquent\Casts\Attribute', true);
|
$isAttribute = is_a($type, '\Illuminate\Database\Eloquent\Casts\Attribute', true);
|
||||||
$method = $reflection->getName();
|
$method = $reflection->getName();
|
||||||
if (
|
if (
|
||||||
Str::startsWith($method, 'get') && Str::endsWith(
|
Str::startsWith($method, 'get') && Str::endsWith($method, 'Attribute') && $method !== 'getAttribute'
|
||||||
$method,
|
|
||||||
'Attribute'
|
|
||||||
) && $method !== 'getAttribute'
|
|
||||||
) {
|
) {
|
||||||
//Magic get<name>Attribute
|
//Magic get<name>Attribute
|
||||||
$name = Str::snake(substr($method, 3, -9));
|
$name = Str::snake(substr($method, 3, -9));
|
||||||
@@ -597,15 +600,14 @@ class ModelsCommand extends Command
|
|||||||
$this->setProperty(
|
$this->setProperty(
|
||||||
Str::snake($method),
|
Str::snake($method),
|
||||||
$type,
|
$type,
|
||||||
$types->has('get'),
|
$types->has('get') ?: null,
|
||||||
$types->has('set'),
|
$types->has('set') ?: null,
|
||||||
$this->getCommentFromDocBlock($reflection)
|
$this->getCommentFromDocBlock($reflection)
|
||||||
);
|
);
|
||||||
} elseif (
|
} elseif (
|
||||||
Str::startsWith($method, 'set') && Str::endsWith(
|
Str::startsWith($method, 'set') &&
|
||||||
$method,
|
Str::endsWith($method, 'Attribute') &&
|
||||||
'Attribute'
|
$method !== 'setAttribute'
|
||||||
) && $method !== 'setAttribute'
|
|
||||||
) {
|
) {
|
||||||
//Magic set<name>Attribute
|
//Magic set<name>Attribute
|
||||||
$name = Str::snake(substr($method, 3, -9));
|
$name = Str::snake(substr($method, 3, -9));
|
||||||
@@ -614,7 +616,7 @@ class ModelsCommand extends Command
|
|||||||
$this->setProperty($name, null, null, true, $comment);
|
$this->setProperty($name, null, null, true, $comment);
|
||||||
}
|
}
|
||||||
} elseif (Str::startsWith($method, 'scope') && $method !== 'scopeQuery' && $method !== 'scope' && $method !== 'scopes') {
|
} elseif (Str::startsWith($method, 'scope') && $method !== 'scopeQuery' && $method !== 'scope' && $method !== 'scopes') {
|
||||||
//Magic set<name>Attribute
|
//Magic scope<name>Attribute
|
||||||
$name = Str::camel(substr($method, 5));
|
$name = Str::camel(substr($method, 5));
|
||||||
if (!empty($name)) {
|
if (!empty($name)) {
|
||||||
$comment = $this->getCommentFromDocBlock($reflection);
|
$comment = $this->getCommentFromDocBlock($reflection);
|
||||||
@@ -626,8 +628,8 @@ class ModelsCommand extends Command
|
|||||||
get_class($model->newModelQuery())
|
get_class($model->newModelQuery())
|
||||||
);
|
);
|
||||||
$modelName = $this->getClassNameInDestinationFile(
|
$modelName = $this->getClassNameInDestinationFile(
|
||||||
$reflection->getDeclaringClass(),
|
new ReflectionClass($model),
|
||||||
$reflection->getDeclaringClass()->getName()
|
get_class($model)
|
||||||
);
|
);
|
||||||
$this->setMethod($name, $builder . '|' . $modelName, $args, $comment);
|
$this->setMethod($name, $builder . '|' . $modelName, $args, $comment);
|
||||||
}
|
}
|
||||||
@@ -708,6 +710,17 @@ class ModelsCommand extends Command
|
|||||||
strpos(get_class($relationObj), 'Many') !== false
|
strpos(get_class($relationObj), 'Many') !== false
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
|
if ($relationObj instanceof BelongsToMany) {
|
||||||
|
$pivot = get_class($relationObj->newPivot());
|
||||||
|
if (!in_array($pivot, [Pivot::class, MorphPivot::class])) {
|
||||||
|
$this->setProperty(
|
||||||
|
$relationObj->getPivotAccessor(),
|
||||||
|
$this->getClassNameInDestinationFile($model, $pivot),
|
||||||
|
true,
|
||||||
|
false
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
//Collection or array of models (because Collection is Arrayable)
|
//Collection or array of models (because Collection is Arrayable)
|
||||||
$relatedClass = '\\' . get_class($relationObj->getRelated());
|
$relatedClass = '\\' . get_class($relationObj->getRelated());
|
||||||
$collectionClass = $this->getCollectionClass($relatedClass);
|
$collectionClass = $this->getCollectionClass($relatedClass);
|
||||||
@@ -745,7 +758,8 @@ class ModelsCommand extends Command
|
|||||||
$this->getClassNameInDestinationFile($model, Model::class) . '|\Eloquent',
|
$this->getClassNameInDestinationFile($model, Model::class) . '|\Eloquent',
|
||||||
true,
|
true,
|
||||||
null,
|
null,
|
||||||
$comment
|
$comment,
|
||||||
|
$this->isMorphToRelationNullable($relationObj)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
//Single model is returned
|
//Single model is returned
|
||||||
@@ -805,6 +819,33 @@ class ModelsCommand extends Command
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the morphTo relation is nullable
|
||||||
|
*
|
||||||
|
* @param Relation $relationObj
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
protected function isMorphToRelationNullable(Relation $relationObj): bool
|
||||||
|
{
|
||||||
|
$reflectionObj = new ReflectionObject($relationObj);
|
||||||
|
|
||||||
|
if (!$reflectionObj->hasProperty('foreignKey')) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$fkProp = $reflectionObj->getProperty('foreignKey');
|
||||||
|
$fkProp->setAccessible(true);
|
||||||
|
|
||||||
|
foreach (Arr::wrap($fkProp->getValue($relationObj)) as $foreignKey) {
|
||||||
|
if (isset($this->nullableColumns[$foreignKey])) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $name
|
* @param string $name
|
||||||
* @param string|null $type
|
* @param string|null $type
|
||||||
@@ -1236,6 +1277,13 @@ class ModelsCommand extends Command
|
|||||||
$phpdoc = new DocBlock($reflection, $context);
|
$phpdoc = new DocBlock($reflection, $context);
|
||||||
|
|
||||||
if ($phpdoc->hasTag('return')) {
|
if ($phpdoc->hasTag('return')) {
|
||||||
|
$returnTag = $phpdoc->getTagsByName('return')[0];
|
||||||
|
|
||||||
|
$typeParser = new PhpDocReturnTypeParser($returnTag->getContent(), $context->getNamespaceAliases());
|
||||||
|
if ($typeAlias = $typeParser->parse()) {
|
||||||
|
return $typeAlias;
|
||||||
|
}
|
||||||
|
|
||||||
$type = $phpdoc->getTagsByName('return')[0]->getType();
|
$type = $phpdoc->getTagsByName('return')[0]->getType();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1585,7 +1633,7 @@ class ModelsCommand extends Command
|
|||||||
protected function getReflectionNamedType(ReflectionNamedType $paramType): string
|
protected function getReflectionNamedType(ReflectionNamedType $paramType): string
|
||||||
{
|
{
|
||||||
$parameterName = $paramType->getName();
|
$parameterName = $paramType->getName();
|
||||||
if (!$paramType->isBuiltin()) {
|
if (!$paramType->isBuiltin() && $paramType->getName() !== 'static') {
|
||||||
$parameterName = '\\' . $parameterName;
|
$parameterName = '\\' . $parameterName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,79 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Parsers;
|
||||||
|
|
||||||
|
class PhpDocReturnTypeParser
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
private string $typeAlias;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
private array $namespaceAliases;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $typeAlias
|
||||||
|
* @param array $namespaceAliases
|
||||||
|
*/
|
||||||
|
public function __construct(string $typeAlias, array $namespaceAliases)
|
||||||
|
{
|
||||||
|
$this->typeAlias = $typeAlias;
|
||||||
|
$this->namespaceAliases = $namespaceAliases;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return string|null
|
||||||
|
*/
|
||||||
|
public function parse(): string|null
|
||||||
|
{
|
||||||
|
$matches = [];
|
||||||
|
preg_match('/(\w+)(<.*>)/', $this->typeAlias, $matches);
|
||||||
|
$matchCount = count($matches);
|
||||||
|
|
||||||
|
if ($matchCount === 0 || $matchCount === 1) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (empty($this->namespaceAliases[$matches[1]])) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->namespaceAliases[$matches[1]] . $this->parseTemplate($matches[2] ?? null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string|null $template
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
private function parseTemplate(string|null $template): string
|
||||||
|
{
|
||||||
|
if ($template === null || $template === '') {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$type = '';
|
||||||
|
$result = '';
|
||||||
|
|
||||||
|
foreach (str_split($template) as $char) {
|
||||||
|
$match = preg_match('/[A-z]/', $char);
|
||||||
|
|
||||||
|
if (!$match) {
|
||||||
|
$type = $this->namespaceAliases[$type] ?? $type;
|
||||||
|
$result .= $type;
|
||||||
|
$result .= $char;
|
||||||
|
$type = '';
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$type .= $char;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Mo
|
|||||||
|
|
||||||
use Illuminate\Database\Eloquent\Casts\AsArrayObject;
|
use Illuminate\Database\Eloquent\Casts\AsArrayObject;
|
||||||
use Illuminate\Database\Eloquent\Casts\AsCollection;
|
use Illuminate\Database\Eloquent\Casts\AsCollection;
|
||||||
|
use Illuminate\Database\Eloquent\Casts\AsEnumCollection;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class AdvancedCast extends Model
|
class AdvancedCast extends Model
|
||||||
@@ -24,6 +25,7 @@ class AdvancedCast extends Model
|
|||||||
'cast_to_encrypted_json' => 'encrypted:json',
|
'cast_to_encrypted_json' => 'encrypted:json',
|
||||||
'cast_to_encrypted_object' => 'encrypted:object',
|
'cast_to_encrypted_object' => 'encrypted:object',
|
||||||
'cast_to_as_collection' => AsCollection::class,
|
'cast_to_as_collection' => AsCollection::class,
|
||||||
|
'cast_to_as_enum_collection' => AsEnumCollection::class,
|
||||||
'cast_to_as_array_object' => AsArrayObject::class,
|
'cast_to_as_array_object' => AsArrayObject::class,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Mo
|
|||||||
|
|
||||||
use Illuminate\Database\Eloquent\Casts\AsArrayObject;
|
use Illuminate\Database\Eloquent\Casts\AsArrayObject;
|
||||||
use Illuminate\Database\Eloquent\Casts\AsCollection;
|
use Illuminate\Database\Eloquent\Casts\AsCollection;
|
||||||
|
use Illuminate\Database\Eloquent\Casts\AsEnumCollection;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -24,12 +25,14 @@ use Illuminate\Database\Eloquent\Model;
|
|||||||
* @property array $cast_to_encrypted_json
|
* @property array $cast_to_encrypted_json
|
||||||
* @property object $cast_to_encrypted_object
|
* @property object $cast_to_encrypted_object
|
||||||
* @property \Illuminate\Support\Collection $cast_to_as_collection
|
* @property \Illuminate\Support\Collection $cast_to_as_collection
|
||||||
|
* @property \Illuminate\Support\Collection $cast_to_as_enum_collection
|
||||||
* @property \ArrayObject $cast_to_as_array_object
|
* @property \ArrayObject $cast_to_as_array_object
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast newModelQuery()
|
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast newModelQuery()
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast newQuery()
|
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast newQuery()
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast query()
|
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast query()
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToAsArrayObject($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToAsArrayObject($value)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToAsCollection($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToAsCollection($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToAsEnumCollection($value)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToCustomDatetime($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToCustomDatetime($value)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToDateSerialization($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToDateSerialization($value)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToDatetimeSerialization($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToDatetimeSerialization($value)
|
||||||
@@ -60,6 +63,7 @@ class AdvancedCast extends Model
|
|||||||
'cast_to_encrypted_json' => 'encrypted:json',
|
'cast_to_encrypted_json' => 'encrypted:json',
|
||||||
'cast_to_encrypted_object' => 'encrypted:object',
|
'cast_to_encrypted_object' => 'encrypted:object',
|
||||||
'cast_to_as_collection' => AsCollection::class,
|
'cast_to_as_collection' => AsCollection::class,
|
||||||
|
'cast_to_as_enum_collection' => AsEnumCollection::class,
|
||||||
'cast_to_as_array_object' => AsArrayObject::class,
|
'cast_to_as_array_object' => AsArrayObject::class,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Attributes\Models;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
class BackedAttribute extends Model
|
||||||
|
{
|
||||||
|
protected function name(): Attribute
|
||||||
|
{
|
||||||
|
return new Attribute(
|
||||||
|
function (?string $name): ?string {
|
||||||
|
return $name;
|
||||||
|
},
|
||||||
|
function (?string $name): ?string {
|
||||||
|
return $name;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function nameRead(): Attribute
|
||||||
|
{
|
||||||
|
return new Attribute(
|
||||||
|
function (?string $name): ?string {
|
||||||
|
return $name;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function nameWrite(): Attribute
|
||||||
|
{
|
||||||
|
return new Attribute(
|
||||||
|
set: function (?string $name): ?string {
|
||||||
|
return $name;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function nonBackedSet(): Attribute
|
||||||
|
{
|
||||||
|
return new Attribute(
|
||||||
|
set: function (?string $name): ?string {
|
||||||
|
return $name;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function nonBackedGet(): Attribute
|
||||||
|
{
|
||||||
|
return new Attribute(
|
||||||
|
get: function (): ?string {
|
||||||
|
return 'test';
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,6 +7,83 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Attributes\Model
|
|||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @property int $id
|
||||||
|
* @property string|null $name
|
||||||
|
* @property string|null $name_read
|
||||||
|
* @property string|null $name_write
|
||||||
|
* @property-read string|null $non_backed_get
|
||||||
|
* @property-write string|null $non_backed_set
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|BackedAttribute newModelQuery()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|BackedAttribute newQuery()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|BackedAttribute query()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|BackedAttribute whereId($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|BackedAttribute whereName($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|BackedAttribute whereNameRead($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|BackedAttribute whereNameWrite($value)
|
||||||
|
* @mixin \Eloquent
|
||||||
|
*/
|
||||||
|
class BackedAttribute extends Model
|
||||||
|
{
|
||||||
|
protected function name(): Attribute
|
||||||
|
{
|
||||||
|
return new Attribute(
|
||||||
|
function (?string $name): ?string {
|
||||||
|
return $name;
|
||||||
|
},
|
||||||
|
function (?string $name): ?string {
|
||||||
|
return $name;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function nameRead(): Attribute
|
||||||
|
{
|
||||||
|
return new Attribute(
|
||||||
|
function (?string $name): ?string {
|
||||||
|
return $name;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function nameWrite(): Attribute
|
||||||
|
{
|
||||||
|
return new Attribute(
|
||||||
|
set: function (?string $name): ?string {
|
||||||
|
return $name;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function nonBackedSet(): Attribute
|
||||||
|
{
|
||||||
|
return new Attribute(
|
||||||
|
set: function (?string $name): ?string {
|
||||||
|
return $name;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function nonBackedGet(): Attribute
|
||||||
|
{
|
||||||
|
return new Attribute(
|
||||||
|
get: function (): ?string {
|
||||||
|
return 'test';
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Attributes\Models;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\Models;
|
||||||
|
|
||||||
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\CollectionModel;
|
||||||
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\NonModel;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Illuminate\Support\Collection as IntCollection;
|
||||||
|
|
||||||
|
class WithCollection extends Model
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @return Collection<int, string>
|
||||||
|
*/
|
||||||
|
public function getCollectionAttribute(): Collection
|
||||||
|
{
|
||||||
|
return new Collection();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection
|
||||||
|
*/
|
||||||
|
public function getCollectionWithoutTemplateAttribute(): Collection
|
||||||
|
{
|
||||||
|
return new Collection();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCollectionWithoutDocBlockAttribute(): Collection
|
||||||
|
{
|
||||||
|
return new Collection();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, NonModel>
|
||||||
|
*/
|
||||||
|
public function getCollectionWithNonModelTemplateAttribute(): Collection
|
||||||
|
{
|
||||||
|
return new Collection();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<Collection, CollectionModel<IntCollection, CollectionModel<int, NonModel>>>
|
||||||
|
*/
|
||||||
|
public function getCollectionWithNestedTemplateAttribute(): Collection
|
||||||
|
{
|
||||||
|
return new Collection();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels;
|
||||||
|
|
||||||
|
class CollectionModel
|
||||||
|
{
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels;
|
||||||
|
|
||||||
|
class NonModel
|
||||||
|
{
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection;
|
||||||
|
|
||||||
|
use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
|
||||||
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
|
||||||
|
|
||||||
|
class Test extends AbstractModelsCommand
|
||||||
|
{
|
||||||
|
public function test(): void
|
||||||
|
{
|
||||||
|
$command = $this->app->make(ModelsCommand::class);
|
||||||
|
|
||||||
|
$tester = $this->runCommand($command, [
|
||||||
|
'--write-mixin' => true,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertSame(0, $tester->getStatusCode());
|
||||||
|
$this->assertStringContainsString('Written new phpDocBlock to', $tester->getDisplay());
|
||||||
|
$this->assertMatchesMockedSnapshot();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\Models;
|
||||||
|
|
||||||
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\CollectionModel;
|
||||||
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\NonModel;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Illuminate\Support\Collection as IntCollection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @mixin IdeHelperWithCollection
|
||||||
|
*/
|
||||||
|
class WithCollection extends Model
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @return Collection<int, string>
|
||||||
|
*/
|
||||||
|
public function getCollectionAttribute(): Collection
|
||||||
|
{
|
||||||
|
return new Collection();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection
|
||||||
|
*/
|
||||||
|
public function getCollectionWithoutTemplateAttribute(): Collection
|
||||||
|
{
|
||||||
|
return new Collection();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCollectionWithoutDocBlockAttribute(): Collection
|
||||||
|
{
|
||||||
|
return new Collection();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, NonModel>
|
||||||
|
*/
|
||||||
|
public function getCollectionWithNonModelTemplateAttribute(): Collection
|
||||||
|
{
|
||||||
|
return new Collection();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<Collection, CollectionModel<IntCollection, CollectionModel<int, NonModel>>>
|
||||||
|
*/
|
||||||
|
public function getCollectionWithNestedTemplateAttribute(): Collection
|
||||||
|
{
|
||||||
|
return new Collection();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
<?php
|
||||||
|
|
||||||
|
// @formatter:off
|
||||||
|
// phpcs:ignoreFile
|
||||||
|
/**
|
||||||
|
* A helper file for your Eloquent Models
|
||||||
|
* Copy the phpDocs from this file to the correct Model,
|
||||||
|
* And remove them from this file, to prevent double declarations.
|
||||||
|
*
|
||||||
|
* @author Barry vd. Heuvel <[email protected]>
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\Models{
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @property-read \Illuminate\Support\Collection<int, string> $collection
|
||||||
|
* @property-read \Illuminate\Support\Collection<\Illuminate\Support\Collection, \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\CollectionModel<\Illuminate\Support\Collection, \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\CollectionModel<int, \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\NonModel>>> $collection_with_nested_template
|
||||||
|
* @property-read \Illuminate\Support\Collection<int, \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\NonModel> $collection_with_non_model_template
|
||||||
|
* @property-read \Illuminate\Support\Collection $collection_without_doc_block
|
||||||
|
* @property-read \Illuminate\Support\Collection $collection_without_template
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|WithCollection newModelQuery()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|WithCollection newQuery()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|WithCollection query()
|
||||||
|
* @mixin \Eloquent
|
||||||
|
*/
|
||||||
|
#[\AllowDynamicProperties]
|
||||||
|
class IdeHelperWithCollection {}
|
||||||
|
}
|
||||||
|
|
||||||
+21
@@ -0,0 +1,21 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts;
|
||||||
|
|
||||||
|
use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
class CustomCasterWithStaticReturnType implements CastsAttributes
|
||||||
|
{
|
||||||
|
public function get(Model $model, string $key, mixed $value, array $attributes): static
|
||||||
|
{
|
||||||
|
// TODO: Implement get() method.
|
||||||
|
}
|
||||||
|
|
||||||
|
public function set(Model $model, string $key, mixed $value, array $attributes): array
|
||||||
|
{
|
||||||
|
// TODO: Implement set() method.
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -15,6 +15,7 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Cas
|
|||||||
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CustomCasterWithPrimitiveDocblockReturn;
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CustomCasterWithPrimitiveDocblockReturn;
|
||||||
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CustomCasterWithPrimitiveReturn;
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CustomCasterWithPrimitiveReturn;
|
||||||
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CustomCasterWithReturnType;
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CustomCasterWithReturnType;
|
||||||
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CustomCasterWithStaticReturnType;
|
||||||
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\ExtendedSelfCastingCasterWithStaticDocblockReturn;
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\ExtendedSelfCastingCasterWithStaticDocblockReturn;
|
||||||
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\ExtendedSelfCastingCasterWithThisDocblockReturn;
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\ExtendedSelfCastingCasterWithThisDocblockReturn;
|
||||||
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\InboundAttributeCaster;
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\InboundAttributeCaster;
|
||||||
@@ -26,6 +27,7 @@ class CustomCast extends Model
|
|||||||
{
|
{
|
||||||
protected $casts = [
|
protected $casts = [
|
||||||
'casted_property_with_return_type' => CustomCasterWithReturnType::class,
|
'casted_property_with_return_type' => CustomCasterWithReturnType::class,
|
||||||
|
'casted_property_with_static_return_type' => CustomCasterWithStaticReturnType::class,
|
||||||
'casted_property_with_return_docblock' => CustomCasterWithDocblockReturn::class,
|
'casted_property_with_return_docblock' => CustomCasterWithDocblockReturn::class,
|
||||||
'casted_property_with_return_docblock_fqn' => CustomCasterWithDocblockReturnFqn::class,
|
'casted_property_with_return_docblock_fqn' => CustomCasterWithDocblockReturnFqn::class,
|
||||||
'casted_property_with_return_primitive' => CustomCasterWithPrimitiveReturn::class,
|
'casted_property_with_return_primitive' => CustomCasterWithPrimitiveReturn::class,
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Cas
|
|||||||
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CustomCasterWithPrimitiveDocblockReturn;
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CustomCasterWithPrimitiveDocblockReturn;
|
||||||
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CustomCasterWithPrimitiveReturn;
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CustomCasterWithPrimitiveReturn;
|
||||||
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CustomCasterWithReturnType;
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CustomCasterWithReturnType;
|
||||||
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CustomCasterWithStaticReturnType;
|
||||||
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\ExtendedSelfCastingCasterWithStaticDocblockReturn;
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\ExtendedSelfCastingCasterWithStaticDocblockReturn;
|
||||||
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\ExtendedSelfCastingCasterWithThisDocblockReturn;
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\ExtendedSelfCastingCasterWithThisDocblockReturn;
|
||||||
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\InboundAttributeCaster;
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\InboundAttributeCaster;
|
||||||
@@ -39,6 +40,7 @@ use Illuminate\Database\Eloquent\Model;
|
|||||||
* @property ExtendedSelfCastingCasterWithStaticDocblockReturn $extended_casted_property_with_static_return_docblock
|
* @property ExtendedSelfCastingCasterWithStaticDocblockReturn $extended_casted_property_with_static_return_docblock
|
||||||
* @property ExtendedSelfCastingCasterWithThisDocblockReturn $extended_casted_property_with_this_return_docblock
|
* @property ExtendedSelfCastingCasterWithThisDocblockReturn $extended_casted_property_with_this_return_docblock
|
||||||
* @property SelfCastingCasterWithStaticDocblockReturn $casted_property_with_static_return_docblock_and_param
|
* @property SelfCastingCasterWithStaticDocblockReturn $casted_property_with_static_return_docblock_and_param
|
||||||
|
* @property CustomCasterWithStaticReturnType $casted_property_with_static_return_type
|
||||||
* @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_castable
|
* @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_castable
|
||||||
* @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_anonymous_cast
|
* @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_anonymous_cast
|
||||||
* @property CastableWithoutReturnType $casted_property_without_return_type
|
* @property CastableWithoutReturnType $casted_property_without_return_type
|
||||||
@@ -67,6 +69,7 @@ class CustomCast extends Model
|
|||||||
{
|
{
|
||||||
protected $casts = [
|
protected $casts = [
|
||||||
'casted_property_with_return_type' => CustomCasterWithReturnType::class,
|
'casted_property_with_return_type' => CustomCasterWithReturnType::class,
|
||||||
|
'casted_property_with_static_return_type' => CustomCasterWithStaticReturnType::class,
|
||||||
'casted_property_with_return_docblock' => CustomCasterWithDocblockReturn::class,
|
'casted_property_with_return_docblock' => CustomCasterWithDocblockReturn::class,
|
||||||
'casted_property_with_return_docblock_fqn' => CustomCasterWithDocblockReturnFqn::class,
|
'casted_property_with_return_docblock_fqn' => CustomCasterWithDocblockReturnFqn::class,
|
||||||
'casted_property_with_return_primitive' => CustomCasterWithPrimitiveReturn::class,
|
'casted_property_with_return_primitive' => CustomCasterWithPrimitiveReturn::class,
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Morphs\Models;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\MorphTo;
|
||||||
|
|
||||||
|
class Morphs extends Model
|
||||||
|
{
|
||||||
|
public function relationMorphTo(): MorphTo
|
||||||
|
{
|
||||||
|
return $this->morphTo();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function nullableRelationMorphTo(): MorphTo
|
||||||
|
{
|
||||||
|
return $this->morphTo();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Morphs;
|
||||||
|
|
||||||
|
use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
|
||||||
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
|
||||||
|
|
||||||
|
class Test extends AbstractModelsCommand
|
||||||
|
{
|
||||||
|
public function test(): void
|
||||||
|
{
|
||||||
|
$command = $this->app->make(ModelsCommand::class);
|
||||||
|
|
||||||
|
$tester = $this->runCommand($command, [
|
||||||
|
'--write' => true,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertSame(0, $tester->getStatusCode());
|
||||||
|
$this->assertStringContainsString('Written new phpDocBlock to', $tester->getDisplay());
|
||||||
|
$this->assertMatchesMockedSnapshot();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Morphs\Models;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\MorphTo;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @property string $relation_morph_to_type
|
||||||
|
* @property int $relation_morph_to_id
|
||||||
|
* @property string|null $nullable_relation_morph_to_type
|
||||||
|
* @property int|null $nullable_relation_morph_to_id
|
||||||
|
* @property-read Model|\Eloquent|null $nullableRelationMorphTo
|
||||||
|
* @property-read Model|\Eloquent $relationMorphTo
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Morphs newModelQuery()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Morphs newQuery()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Morphs query()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Morphs whereNullableRelationMorphToId($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Morphs whereNullableRelationMorphToType($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Morphs whereRelationMorphToId($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Morphs whereRelationMorphToType($value)
|
||||||
|
* @mixin \Eloquent
|
||||||
|
*/
|
||||||
|
class Morphs extends Model
|
||||||
|
{
|
||||||
|
public function relationMorphTo(): MorphTo
|
||||||
|
{
|
||||||
|
return $this->morphTo();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function nullableRelationMorphTo(): MorphTo
|
||||||
|
{
|
||||||
|
return $this->morphTo();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Pivot\Models;
|
||||||
|
|
||||||
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Pivot\Models\Pivots\CustomPivot;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
class ModelWithPivot extends Model
|
||||||
|
{
|
||||||
|
public function relationWithCustomPivot()
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(ModelwithPivot::class)
|
||||||
|
->using(CustomPivot::class)
|
||||||
|
->as('customAccessor');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Pivot\Models\Pivots;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Relations\Pivot;
|
||||||
|
|
||||||
|
class CustomPivot extends Pivot
|
||||||
|
{
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Pivot;
|
||||||
|
|
||||||
|
use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
|
||||||
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
|
||||||
|
|
||||||
|
class Test extends AbstractModelsCommand
|
||||||
|
{
|
||||||
|
public function test(): void
|
||||||
|
{
|
||||||
|
$command = $this->app->make(ModelsCommand::class);
|
||||||
|
|
||||||
|
$tester = $this->runCommand($command, [
|
||||||
|
'--write' => true,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertSame(0, $tester->getStatusCode());
|
||||||
|
$this->assertStringContainsString('Written new phpDocBlock to', $tester->getDisplay());
|
||||||
|
$this->assertMatchesMockedSnapshot();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Pivot\Models;
|
||||||
|
|
||||||
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Pivot\Models\Pivots\CustomPivot;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @property-read CustomPivot $customAccessor
|
||||||
|
* @property-read \Illuminate\Database\Eloquent\Collection<int, ModelWithPivot> $relationWithCustomPivot
|
||||||
|
* @property-read int|null $relation_with_custom_pivot_count
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|ModelWithPivot newModelQuery()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|ModelWithPivot newQuery()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|ModelWithPivot query()
|
||||||
|
* @mixin \Eloquent
|
||||||
|
*/
|
||||||
|
class ModelWithPivot extends Model
|
||||||
|
{
|
||||||
|
public function relationWithCustomPivot()
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(ModelwithPivot::class)
|
||||||
|
->using(CustomPivot::class)
|
||||||
|
->as('customAccessor');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Pivot\Models\Pivots;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Relations\Pivot;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|CustomPivot newModelQuery()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|CustomPivot newQuery()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|CustomPivot query()
|
||||||
|
* @mixin \Eloquent
|
||||||
|
*/
|
||||||
|
class CustomPivot extends Pivot
|
||||||
|
{
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\QueryScopes\Models;
|
||||||
|
|
||||||
|
class Post extends PostParent
|
||||||
|
{
|
||||||
|
public function scopePublic($query)
|
||||||
|
{
|
||||||
|
return $query;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\QueryScopes\Models;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
class PostParent extends Model
|
||||||
|
{
|
||||||
|
public function scopeActive($query)
|
||||||
|
{
|
||||||
|
return $query;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\QueryScopes;
|
||||||
|
|
||||||
|
use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
|
||||||
|
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
|
||||||
|
|
||||||
|
class Test extends AbstractModelsCommand
|
||||||
|
{
|
||||||
|
public function test(): void
|
||||||
|
{
|
||||||
|
$command = $this->app->make(ModelsCommand::class);
|
||||||
|
|
||||||
|
$tester = $this->runCommand($command, [
|
||||||
|
'--write' => true,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertSame(0, $tester->getStatusCode());
|
||||||
|
$this->assertStringContainsString('Written new phpDocBlock to', $tester->getDisplay());
|
||||||
|
$this->assertMatchesMockedSnapshot();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,189 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\QueryScopes\Models;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @property int $id
|
||||||
|
* @property string|null $char_nullable
|
||||||
|
* @property string $char_not_nullable
|
||||||
|
* @property string|null $string_nullable
|
||||||
|
* @property string $string_not_nullable
|
||||||
|
* @property string|null $text_nullable
|
||||||
|
* @property string $text_not_nullable
|
||||||
|
* @property string|null $medium_text_nullable
|
||||||
|
* @property string $medium_text_not_nullable
|
||||||
|
* @property string|null $long_text_nullable
|
||||||
|
* @property string $long_text_not_nullable
|
||||||
|
* @property int|null $integer_nullable
|
||||||
|
* @property int $integer_not_nullable
|
||||||
|
* @property int|null $tiny_integer_nullable
|
||||||
|
* @property int $tiny_integer_not_nullable
|
||||||
|
* @property int|null $small_integer_nullable
|
||||||
|
* @property int $small_integer_not_nullable
|
||||||
|
* @property int|null $medium_integer_nullable
|
||||||
|
* @property int $medium_integer_not_nullable
|
||||||
|
* @property int|null $big_integer_nullable
|
||||||
|
* @property int $big_integer_not_nullable
|
||||||
|
* @property int|null $unsigned_integer_nullable
|
||||||
|
* @property int $unsigned_integer_not_nullable
|
||||||
|
* @property int|null $unsigned_tiny_integer_nullable
|
||||||
|
* @property int $unsigned_tiny_integer_not_nullable
|
||||||
|
* @property int|null $unsigned_small_integer_nullable
|
||||||
|
* @property int $unsigned_small_integer_not_nullable
|
||||||
|
* @property int|null $unsigned_medium_integer_nullable
|
||||||
|
* @property int $unsigned_medium_integer_not_nullable
|
||||||
|
* @property int|null $unsigned_big_integer_nullable
|
||||||
|
* @property int $unsigned_big_integer_not_nullable
|
||||||
|
* @property float|null $float_nullable
|
||||||
|
* @property float $float_not_nullable
|
||||||
|
* @property float|null $double_nullable
|
||||||
|
* @property float $double_not_nullable
|
||||||
|
* @property string|null $decimal_nullable
|
||||||
|
* @property string $decimal_not_nullable
|
||||||
|
* @property int|null $boolean_nullable
|
||||||
|
* @property int $boolean_not_nullable
|
||||||
|
* @property string|null $enum_nullable
|
||||||
|
* @property string $enum_not_nullable
|
||||||
|
* @property string|null $json_nullable
|
||||||
|
* @property string $json_not_nullable
|
||||||
|
* @property string|null $jsonb_nullable
|
||||||
|
* @property string $jsonb_not_nullable
|
||||||
|
* @property string|null $date_nullable
|
||||||
|
* @property string $date_not_nullable
|
||||||
|
* @property string|null $datetime_nullable
|
||||||
|
* @property string $datetime_not_nullable
|
||||||
|
* @property string|null $datetimetz_nullable
|
||||||
|
* @property string $datetimetz_not_nullable
|
||||||
|
* @property string|null $time_nullable
|
||||||
|
* @property string $time_not_nullable
|
||||||
|
* @property string|null $timetz_nullable
|
||||||
|
* @property string $timetz_not_nullable
|
||||||
|
* @property string|null $timestamp_nullable
|
||||||
|
* @property string $timestamp_not_nullable
|
||||||
|
* @property string|null $timestamptz_nullable
|
||||||
|
* @property string $timestamptz_not_nullable
|
||||||
|
* @property int|null $year_nullable
|
||||||
|
* @property int $year_not_nullable
|
||||||
|
* @property string|null $binary_nullable
|
||||||
|
* @property string $binary_not_nullable
|
||||||
|
* @property string|null $uuid_nullable
|
||||||
|
* @property string $uuid_not_nullable
|
||||||
|
* @property string|null $ipaddress_nullable
|
||||||
|
* @property string $ipaddress_not_nullable
|
||||||
|
* @property string|null $macaddress_nullable
|
||||||
|
* @property string $macaddress_not_nullable
|
||||||
|
* @property \Illuminate\Support\Carbon|null $created_at
|
||||||
|
* @property \Illuminate\Support\Carbon|null $updated_at
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post active()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post newModelQuery()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post newQuery()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post public()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post query()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereBigIntegerNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereBigIntegerNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereBinaryNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereBinaryNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereBooleanNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereBooleanNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereCharNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereCharNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereCreatedAt($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereDateNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereDateNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereDatetimeNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereDatetimeNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereDatetimetzNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereDatetimetzNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereDecimalNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereDecimalNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereDoubleNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereDoubleNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereEnumNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereEnumNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereFloatNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereFloatNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereId($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereIntegerNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereIntegerNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereIpaddressNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereIpaddressNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereJsonNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereJsonNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereJsonbNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereJsonbNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereLongTextNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereLongTextNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereMacaddressNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereMacaddressNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereMediumIntegerNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereMediumIntegerNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereMediumTextNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereMediumTextNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereSmallIntegerNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereSmallIntegerNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereStringNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereStringNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereTextNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereTextNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereTimeNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereTimeNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereTimestampNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereTimestampNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereTimestamptzNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereTimestamptzNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereTimetzNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereTimetzNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedSmallIntegerNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedSmallIntegerNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedTinyIntegerNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedTinyIntegerNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereUpdatedAt($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereUuidNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereUuidNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereYearNotNullable($value)
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|Post whereYearNullable($value)
|
||||||
|
* @mixin \Eloquent
|
||||||
|
*/
|
||||||
|
class Post extends PostParent
|
||||||
|
{
|
||||||
|
public function scopePublic($query)
|
||||||
|
{
|
||||||
|
return $query;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\QueryScopes\Models;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|PostParent active()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|PostParent newModelQuery()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|PostParent newQuery()
|
||||||
|
* @method static \Illuminate\Database\Eloquent\Builder|PostParent query()
|
||||||
|
* @mixin \Eloquent
|
||||||
|
*/
|
||||||
|
class PostParent extends Model
|
||||||
|
{
|
||||||
|
public function scopeActive($query)
|
||||||
|
{
|
||||||
|
return $query;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -22,6 +22,7 @@ class SimpleCast extends Model
|
|||||||
'cast_to_array' => 'array',
|
'cast_to_array' => 'array',
|
||||||
'cast_to_json' => 'json',
|
'cast_to_json' => 'json',
|
||||||
'cast_to_collection' => 'collection',
|
'cast_to_collection' => 'collection',
|
||||||
|
'cast_to_enum_collection' => 'collection',
|
||||||
'cast_to_date' => 'date',
|
'cast_to_date' => 'date',
|
||||||
'cast_to_datetime' => 'datetime',
|
'cast_to_datetime' => 'datetime',
|
||||||
'cast_to_date_serialization' => 'date:Y-m-d',
|
'cast_to_date_serialization' => 'date:Y-m-d',
|
||||||
|
|||||||
@@ -88,6 +88,7 @@ class SimpleCast extends Model
|
|||||||
'cast_to_array' => 'array',
|
'cast_to_array' => 'array',
|
||||||
'cast_to_json' => 'json',
|
'cast_to_json' => 'json',
|
||||||
'cast_to_collection' => 'collection',
|
'cast_to_collection' => 'collection',
|
||||||
|
'cast_to_enum_collection' => 'collection',
|
||||||
'cast_to_date' => 'date',
|
'cast_to_date' => 'date',
|
||||||
'cast_to_datetime' => 'datetime',
|
'cast_to_datetime' => 'datetime',
|
||||||
'cast_to_date_serialization' => 'date:Y-m-d',
|
'cast_to_date_serialization' => 'date:Y-m-d',
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ class AdvancedCastsTable extends Migration
|
|||||||
$table->string('cast_to_encrypted_json');
|
$table->string('cast_to_encrypted_json');
|
||||||
$table->string('cast_to_encrypted_object');
|
$table->string('cast_to_encrypted_object');
|
||||||
$table->string('cast_to_as_collection');
|
$table->string('cast_to_as_collection');
|
||||||
|
$table->string('cast_to_as_enum_collection');
|
||||||
$table->string('cast_to_as_array_object');
|
$table->string('cast_to_as_array_object');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
class BackedAttributeTable extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::create('backed_attributes', function (Blueprint $table) {
|
||||||
|
$table->bigIncrements('id');
|
||||||
|
$table->string('name');
|
||||||
|
$table->string('name_read');
|
||||||
|
$table->string('name_write');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
class MorphsTable extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::create('morphs', function (Blueprint $table) {
|
||||||
|
$table->morphs('relation_morph_to');
|
||||||
|
$table->nullableMorphs('nullable_relation_morph_to');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user