diff --git a/composer.json b/composer.json index 366d0e6..d35ddd6 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "require": { "php": "^8.2", "ext-json": "*", - "barryvdh/reflection-docblock": "^2.3", + "barryvdh/reflection-docblock": "^2.4", "composer/class-map-generator": "^1.0", "illuminate/console": "^11.15 || ^12", "illuminate/database": "^11.15 || ^12", diff --git a/tests/Console/ModelsCommand/AdvancedCasts/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/AdvancedCasts/__snapshots__/Test__test__1.php index e5873ef..983fb7f 100644 --- a/tests/Console/ModelsCommand/AdvancedCasts/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/AdvancedCasts/__snapshots__/Test__test__1.php @@ -13,8 +13,6 @@ use Illuminate\Database\Eloquent\Casts\AsEnumCollection; use Illuminate\Database\Eloquent\Model; /** - * - * * @property \Illuminate\Support\Carbon $cast_to_date_serialization * @property \Illuminate\Support\Carbon $cast_to_datetime_serialization * @property \Illuminate\Support\Carbon $cast_to_custom_datetime diff --git a/tests/Console/ModelsCommand/AllowGlobDirectory/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/AllowGlobDirectory/__snapshots__/Test__test__1.php index 2f5be85..2b17017 100644 --- a/tests/Console/ModelsCommand/AllowGlobDirectory/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/AllowGlobDirectory/__snapshots__/Test__test__1.php @@ -7,8 +7,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AllowGlobDirecto use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable diff --git a/tests/Console/ModelsCommand/ArrayCastsWithComment/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/ArrayCastsWithComment/__snapshots__/Test__test__1.php index cb5c665..665cf0a 100644 --- a/tests/Console/ModelsCommand/ArrayCastsWithComment/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/ArrayCastsWithComment/__snapshots__/Test__test__1.php @@ -7,8 +7,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ArrayCastsWithCo use Illuminate\Database\Eloquent\Model; /** - * - * * @property array|null $cast_to_array -- These three should not be duplicated * @property array $cast_to_json some-description * @property \Illuminate\Support\Collection $cast_to_collection some-description diff --git a/tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php index ccb67e3..63d9f48 100644 --- a/tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $id * @property string|null $name * @property string|null $name_read @@ -85,8 +83,6 @@ use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $id * @property int $diverging_type_hinted_get_and_set * @property string|null $name diff --git a/tests/Console/ModelsCommand/Comment/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Comment/__snapshots__/Test__test__1.php index 71806e7..40b2981 100644 --- a/tests/Console/ModelsCommand/Comment/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Comment/__snapshots__/Test__test__1.php @@ -10,8 +10,6 @@ use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Database\Eloquent\Relations\MorphTo; /** - * - * * @property int $id * @property string $both_same_name I'm a getter * @property string $both_without_getter_comment diff --git a/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php index b2a1211..fcea0a1 100644 --- a/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php @@ -9,8 +9,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; /** - * - * * @property int $id * @property-read SimpleCollection $relationHasMany * @property-read int|null $relation_has_many_count diff --git a/tests/Console/ModelsCommand/CustomDate/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/CustomDate/__snapshots__/Test__test__1.php index 4fb13b5..ea34886 100644 --- a/tests/Console/ModelsCommand/CustomDate/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/CustomDate/__snapshots__/Test__test__1.php @@ -7,8 +7,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomDate\Model use Illuminate\Database\Eloquent\Model; /** - * - * * @property \Carbon\CarbonImmutable|null $created_at * @property \Carbon\CarbonImmutable|null $updated_at * @method static \Illuminate\Database\Eloquent\Builder|CustomDate newModelQuery() diff --git a/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php index 20d5f8e..54411a6 100644 --- a/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php @@ -13,8 +13,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGeneratePhpdocWithExternalEloquentBuilder\Models{ /** - * - * * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable diff --git a/tests/Console/ModelsCommand/DynamicRelations/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/DynamicRelations/__snapshots__/Test__test__1.php index 5e8bc21..d3ddf23 100644 --- a/tests/Console/ModelsCommand/DynamicRelations/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/DynamicRelations/__snapshots__/Test__test__1.php @@ -10,8 +10,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasOne; /** - * - * * @property-read \Illuminate\Database\Eloquent\Collection $regularHasMany * @property-read int|null $regular_has_many_count * @method static \Illuminate\Database\Eloquent\Builder|Dynamic newModelQuery() diff --git a/tests/Console/ModelsCommand/Factories/__snapshots__/Test__testFactory__1.php b/tests/Console/ModelsCommand/Factories/__snapshots__/Test__testFactory__1.php index 1bb554f..5d386f3 100644 --- a/tests/Console/ModelsCommand/Factories/__snapshots__/Test__testFactory__1.php +++ b/tests/Console/ModelsCommand/Factories/__snapshots__/Test__testFactory__1.php @@ -9,8 +9,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; /** - * - * * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\CustomSpace\ModelWithCustomNamespaceFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|ModelWithCustomNamespace newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|ModelWithCustomNamespace newQuery() @@ -41,8 +39,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; /** - * - * * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Factories\ModelWithFactoryFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|ModelWithFactory newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|ModelWithFactory newQuery() @@ -60,8 +56,6 @@ declare(strict_types=1); namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models; /** - * - * * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Factories\ModelWithNestedFactoryFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|ModelWithNestedFactory newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|ModelWithNestedFactory newQuery() @@ -81,8 +75,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; /** - * - * * @method static \Illuminate\Database\Eloquent\Builder|ModelWithoutFactory newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|ModelWithoutFactory newQuery() * @method static \Illuminate\Database\Eloquent\Builder|ModelWithoutFactory query() diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php index 6a27b3d..46145aa 100644 --- a/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php @@ -9,8 +9,6 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php index 798eca8..5b12d69 100644 --- a/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php @@ -7,8 +7,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php index 83a8862..b041db7 100644 --- a/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php @@ -7,8 +7,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $id * @property string|null $charNullable * @property string $charNotNullable diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php index fff06f2..799c7ae 100644 --- a/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php @@ -7,8 +7,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable diff --git a/tests/Console/ModelsCommand/GenerateMixinCollection/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateMixinCollection/__snapshots__/Test__test__1.php index 9e25cab..ab332dd 100644 --- a/tests/Console/ModelsCommand/GenerateMixinCollection/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenerateMixinCollection/__snapshots__/Test__test__1.php @@ -67,8 +67,6 @@ class WithCollection extends Model namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\Models{ /** - * - * * @property-read \Illuminate\Support\Collection $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>> $collection_with_nested_template * @property-read \Illuminate\Support\Collection $collection_with_non_model_template diff --git a/tests/Console/ModelsCommand/GeneratePhpDocWithTypedScopeParameter/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpDocWithTypedScopeParameter/__snapshots__/Test__test__1.php index da52497..ccde876 100644 --- a/tests/Console/ModelsCommand/GeneratePhpDocWithTypedScopeParameter/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpDocWithTypedScopeParameter/__snapshots__/Test__test__1.php @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; /** - * - * * @method static Builder|Comment newModelQuery() * @method static Builder|Comment newQuery() * @method static Builder|Comment query() diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php index 3db1b7b..a194fd7 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php @@ -13,8 +13,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Models{ /** - * - * * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilderWithFqn/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilderWithFqn/__snapshots__/Test__test__1.php index 26ef561..8683a31 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilderWithFqn/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilderWithFqn/__snapshots__/Test__test__1.php @@ -8,8 +8,6 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExte use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithForcedFqn/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithForcedFqn/__snapshots__/Test__test__1.php index 5dae7e5..f067899 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithForcedFqn/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithForcedFqn/__snapshots__/Test__test__1.php @@ -9,8 +9,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; /** - * - * * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php index 795571d..b59895a 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php @@ -15,8 +15,6 @@ use Illuminate\Database\Query\Builder as QueryBuilder; use Illuminate\Support\Carbon; /** - * - * * @property int $id * @property string|null $char_nullable * @property CastType $char_not_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/__snapshots__/Test__test__1.php index a91dd40..b076bb2 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/__snapshots__/Test__test__1.php @@ -13,8 +13,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Models{ /** - * - * * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithMixin/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithMixin/__snapshots__/Test__test__1.php index 71f7846..d6c9340 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithMixin/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithMixin/__snapshots__/Test__test__1.php @@ -45,8 +45,6 @@ class Post extends Model namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models{ /** - * - * * @property $someProp * @method someMethod(string $method) * @method static \Illuminate\Database\Eloquent\Builder|FinalPost newModelQuery() @@ -60,8 +58,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models{ /** - * - * * @property $someProp * @method someMethod(string $method) * @property int $id diff --git a/tests/Console/ModelsCommand/GenericsSyntaxDisabled/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenericsSyntaxDisabled/__snapshots__/Test__test__1.php index fd80086..cc698aa 100644 --- a/tests/Console/ModelsCommand/GenericsSyntaxDisabled/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenericsSyntaxDisabled/__snapshots__/Test__test__1.php @@ -9,8 +9,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; /** - * - * * @property int $id * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $regularBelongsToMany * @property-read int|null $regular_belongs_to_many_count diff --git a/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php index 8c93b10..580fa63 100644 --- a/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php @@ -8,8 +8,6 @@ use DateTime; use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $id * @property-read int|null $attribute_return_type_int_or_null * @property-read array $attribute_returns_array diff --git a/tests/Console/ModelsCommand/Ignored/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Ignored/__snapshots__/Test__test__1.php index 0ccd946..ae5690c 100644 --- a/tests/Console/ModelsCommand/Ignored/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Ignored/__snapshots__/Test__test__1.php @@ -7,8 +7,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Ignored\Models; use Illuminate\Database\Eloquent\Model; /** - * - * * @method static \Illuminate\Database\Eloquent\Builder|NotIgnored newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|NotIgnored newQuery() * @method static \Illuminate\Database\Eloquent\Builder|NotIgnored query() diff --git a/tests/Console/ModelsCommand/Interfaces/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Interfaces/__snapshots__/Test__test__1.php index d37bfc4..dfbce9a 100644 --- a/tests/Console/ModelsCommand/Interfaces/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Interfaces/__snapshots__/Test__test__1.php @@ -13,8 +13,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Interfaces\Models{ /** - * - * * @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|User newQuery() * @method static \Illuminate\Database\Eloquent\Builder|User query() diff --git a/tests/Console/ModelsCommand/LaravelCustomCasts/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/LaravelCustomCasts/__snapshots__/Test__test__1.php index 064bfb2..1a46742 100644 --- a/tests/Console/ModelsCommand/LaravelCustomCasts/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/LaravelCustomCasts/__snapshots__/Test__test__1.php @@ -24,8 +24,6 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Cas use Illuminate\Database\Eloquent\Model; /** - * - * * @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_return_type * @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_return_docblock * @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_return_docblock_fqn diff --git a/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php index 6da7dd3..e550fca 100644 --- a/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php @@ -7,8 +7,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\MagicWhere\Model use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable diff --git a/tests/Console/ModelsCommand/ModelHooks/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/ModelHooks/__snapshots__/Test__test__1.php index e3e55d2..898f2de 100644 --- a/tests/Console/ModelsCommand/ModelHooks/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/ModelHooks/__snapshots__/Test__test__1.php @@ -7,8 +7,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ModelHooks\Model use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $id * @property-read string $custom * @method static \Illuminate\Database\Eloquent\Builder|Simple custom($custom) diff --git a/tests/Console/ModelsCommand/Morphs/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Morphs/__snapshots__/Test__test__1.php index d6b52e1..e7a0b22 100644 --- a/tests/Console/ModelsCommand/Morphs/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Morphs/__snapshots__/Test__test__1.php @@ -8,8 +8,6 @@ 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 diff --git a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php index 4e716fa..35761a5 100644 --- a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php +++ b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php @@ -7,8 +7,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspec use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $id * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery() diff --git a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php index 8c37bd7..e4fe635 100644 --- a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php +++ b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php @@ -7,8 +7,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspec use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $id * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery() diff --git a/tests/Console/ModelsCommand/Pivot/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Pivot/__snapshots__/Test__test__1.php index b1dd876..b7efb0e 100644 --- a/tests/Console/ModelsCommand/Pivot/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Pivot/__snapshots__/Test__test__1.php @@ -9,8 +9,6 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Pivot\Models\Pivots\Di use Illuminate\Database\Eloquent\Model; /** - * - * * @property-read DifferentCustomPivot|CustomPivot|null $pivot * @property-read \Illuminate\Database\Eloquent\Collection $relationCustomPivotUsingSameAccessor * @property-read int|null $relation_custom_pivot_using_same_accessor_count @@ -75,8 +73,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Pivot\Models\Piv 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() @@ -94,8 +90,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Pivot\Models\Piv use Illuminate\Database\Eloquent\Relations\Pivot; /** - * - * * @method static \Illuminate\Database\Eloquent\Builder|DifferentCustomPivot newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|DifferentCustomPivot newQuery() * @method static \Illuminate\Database\Eloquent\Builder|DifferentCustomPivot query() diff --git a/tests/Console/ModelsCommand/QueryScopes/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/QueryScopes/__snapshots__/Test__test__1.php index af379f7..e6b2588 100644 --- a/tests/Console/ModelsCommand/QueryScopes/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/QueryScopes/__snapshots__/Test__test__1.php @@ -9,8 +9,6 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; /** - * - * * @method static Builder|Comment local() Scope using the 'Scope' attribute * @method static Builder|Comment newModelQuery() * @method static Builder|Comment newQuery() @@ -48,8 +46,6 @@ 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 @@ -215,8 +211,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\QueryScopes\Mode 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() diff --git a/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php index fb3f7e5..48f72bf 100644 --- a/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; /** - * - * * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable diff --git a/tests/Console/ModelsCommand/Relations/__snapshots__/Test__testRelationNotNullable__1.php b/tests/Console/ModelsCommand/Relations/__snapshots__/Test__testRelationNotNullable__1.php index 2c2b66c..124ac59 100644 --- a/tests/Console/ModelsCommand/Relations/__snapshots__/Test__testRelationNotNullable__1.php +++ b/tests/Console/ModelsCommand/Relations/__snapshots__/Test__testRelationNotNullable__1.php @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * - * * @property int $id * @property int $not_null_column_with_foreign_key_constraint * @property int $not_null_column_with_no_foreign_key_constraint @@ -61,8 +59,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * - * * @property int $id * @property int $not_null_column_with_foreign_key_constraint * @property int $not_null_column_with_no_foreign_key_constraint @@ -132,8 +128,6 @@ use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\Relations\MorphToMany; /** - * - * * @property int $id * @property-read Simple $relationBelongsTo * @property-read AnotherModel $relationBelongsToInAnotherNamespace diff --git a/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php index 919c1d2..645fc76 100644 --- a/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * - * * @property int $id * @property int $not_null_column_with_foreign_key_constraint * @property int $not_null_column_with_no_foreign_key_constraint @@ -61,8 +59,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * - * * @property int $id * @property int $not_null_column_with_foreign_key_constraint * @property int $not_null_column_with_no_foreign_key_constraint @@ -132,8 +128,6 @@ use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\Relations\MorphToMany; /** - * - * * @property int $id * @property-read Simple|null $relationBelongsTo * @property-read AnotherModel|null $relationBelongsToInAnotherNamespace diff --git a/tests/Console/ModelsCommand/SimpleCasts/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/SimpleCasts/__snapshots__/Test__test__1.php index b18dac9..4d7dd7c 100644 --- a/tests/Console/ModelsCommand/SimpleCasts/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/SimpleCasts/__snapshots__/Test__test__1.php @@ -7,8 +7,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SimpleCasts\Mode use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $cast_to_int * @property int $cast_to_integer * @property float $cast_to_real diff --git a/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php index ea1ec77..198d088 100644 --- a/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; /** - * - * * @property int $id * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery() diff --git a/tests/Console/ModelsCommand/UnionTypes/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/UnionTypes/__snapshots__/Test__test__1.php index 720c528..2bd5523 100644 --- a/tests/Console/ModelsCommand/UnionTypes/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/UnionTypes/__snapshots__/Test__test__1.php @@ -9,8 +9,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Query\Builder; /** - * - * * @property-read string|int|null $foo * @property-read \Illuminate\Database\Eloquent\Collection $withUnionTypeReturn * @property-read int|null $with_union_type_return_count diff --git a/tests/Console/ModelsCommand/Variadic/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Variadic/__snapshots__/Test__test__1.php index 9f1d537..8a9f616 100644 --- a/tests/Console/ModelsCommand/Variadic/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Variadic/__snapshots__/Test__test__1.php @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; /** - * - * * @property int $id * @method static Builder|Simple newModelQuery() * @method static Builder|Simple newQuery() diff --git a/tests/Console/__snapshots__/EloquentCommandTest__testCommand__1.txt b/tests/Console/__snapshots__/EloquentCommandTest__testCommand__1.txt index 60c7b34..ae319a4 100644 --- a/tests/Console/__snapshots__/EloquentCommandTest__testCommand__1.txt +++ b/tests/Console/__snapshots__/EloquentCommandTest__testCommand__1.txt @@ -1,6 +1,4 @@ /** - * - * * @mixin \Eloquent * @mixin \Illuminate\Database\Eloquent\Builder * @mixin \Illuminate\Database\Query\Builder diff --git a/tests/MacroTest.php b/tests/MacroTest.php index f1cce9a..6b18c54 100644 --- a/tests/MacroTest.php +++ b/tests/MacroTest.php @@ -242,13 +242,11 @@ class MacroTest extends TestCase $macro = new Macro($reflectionMethod, 'URL', new ReflectionClass(UrlGenerator::class), 'macroName'); $output = <<<'DOC' /** - * - * * @param string $foo * @param int $bar - * @return string + * @return string * @see \Barryvdh\LaravelIdeHelper\Tests\UrlGeneratorMacroClass::__invoke() - * @static + * @static */ DOC; $this->assertSame($output, $macro->getDocComment('')); diff --git a/tests/MethodTest.php b/tests/MethodTest.php index e48a9af..4821e44 100644 --- a/tests/MethodTest.php +++ b/tests/MethodTest.php @@ -36,12 +36,10 @@ class MethodTest extends TestCase $output = <<<'DOC' /** - * - * * @param string $last * @param string $first * @param string $middle - * @static + * @static */ DOC; $this->assertSame($output, $method->getDocComment('')); @@ -71,8 +69,8 @@ DOC; * @param array $values * @param array|string $uniqueBy * @param array|null $update - * @return int - * @static + * @return int + * @static */ DOC; $this->assertSame($output, $method->getDocComment('')); @@ -104,8 +102,8 @@ DOC; * @param mixed $operator * @param mixed $value * @param string $boolean - * @return \Illuminate\Database\Eloquent\Builder - * @static + * @return \Illuminate\Database\Eloquent\Builder + * @static */ DOC; $this->assertSame($output, $method->getDocComment('')); @@ -134,8 +132,8 @@ DOC; * @param string|array|\Illuminate\Contracts\Database\Query\Expression $columns * @param string $boolean * @param bool $not - * @return \Illuminate\Database\Eloquent\Builder - * @static + * @return \Illuminate\Database\Eloquent\Builder + * @static */ DOC; @@ -177,10 +175,8 @@ DOC; $output = <<<'DOC' /** - * - * - * @return \Illuminate\Foundation\Application - * @static + * @return \Illuminate\Foundation\Application + * @static */ DOC; @@ -208,8 +204,8 @@ DOC; * @template TValue * @param (\Closure(): TValue)|list $columns * @param (\Closure(): TValue)|null $callback - * @return TModel|TValue - * @static + * @return TModel|TValue + * @static */ DOC; $this->assertSame($output, $method->getDocComment(''));