composer fix-style

CHANGELOG.md

@@ -2,28 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
-[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v3.1.0...master)
+[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v3.0.0...master)
 --------------
 
 ### Fixed
+- Fix return value of query scopes from parent class [#1366 / sforward](https://github.com/barryvdh/laravel-ide-helper/pull/1366)
 
 ### Changed
 
-### 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
 ------------------

composer.json

@@ -65,7 +65,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1-dev"
+            "dev-master": "3.0-dev"
         },
         "laravel": {
             "providers": [

config/ide-helper.php

@@ -4,21 +4,21 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Filename
+    | Filename & Format
     |--------------------------------------------------------------------------
     |
-    | The default filename.
+    | The default filename
     |
     */
 
-    'filename' => '_ide_helper.php',
+    'filename'  => '_ide_helper.php',
 
     /*
     |--------------------------------------------------------------------------
     | Models filename
     |--------------------------------------------------------------------------
     |
-    | The default filename for the models helper file.
+    | The default filename for the models helper file
     |
     */
 
@@ -26,7 +26,7 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | PhpStorm meta filename
+    | Where to write the PhpStorm specific meta file
     |--------------------------------------------------------------------------
     |
     | PhpStorm also supports the directory `.phpstorm.meta.php/` with arbitrary
@@ -41,7 +41,7 @@ return [
     | 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()
@@ -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.
@@ -96,11 +96,11 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Write Eloquent model mixins
+    | Write Eloquent Model Mixins
     |--------------------------------------------------------------------------
     |
     | 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.
     |
     | Please be aware that this setting changes a file within the /vendor directory.
@@ -134,7 +134,7 @@ return [
     | for models.
     |
     | 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' => [
-        // App\MyModel::class,
+
     ],
 
     /*
@@ -160,7 +160,7 @@ return [
     | 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.
     |
@@ -175,7 +175,7 @@ return [
     | 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' => [
-        // App\MyInterface::class => App\MyImplementation::class,
+
     ],
 
     /*
@@ -228,7 +228,7 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Property casts
+    | Property Casts
     |--------------------------------------------------------------------------
     |
     | Cast the given "real type" to the given "type".
@@ -255,9 +255,9 @@ return [
     | Force FQN usage
     |--------------------------------------------------------------------------
     |
-    | Use the fully qualified (class) name in DocBlocks,
+    | Use the fully qualified (class) name in docBlock,
-    | even if the class exists in the same namespace
+    | event if class exists in a given file
-    | or there is an import (use className) of the class.
+    | or there is an import (use className) of a given class
     |
     */
     'force_fqn' => false,
@@ -279,8 +279,8 @@ return [
     |--------------------------------------------------------------------------
     |
     | 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 fully-qualified
+    | is the Relationship Method name. The value of the array is the canonical class
-    | class name of the relationship, e.g. `'relationName' => RelationShipClass::class`.
+    | name of the Relationship, e.g. `'relationName' => RelationShipClass::class`.
     |
     */
     'additional_relation_types' => [],

src/Console/ModelsCommand.php

@@ -12,7 +12,6 @@
 namespace Barryvdh\LaravelIdeHelper\Console;
 
 use Barryvdh\LaravelIdeHelper\Contracts\ModelHookInterface;
-use Barryvdh\LaravelIdeHelper\Parsers\PhpDocReturnTypeParser;
 use Barryvdh\Reflection\DocBlock;
 use Barryvdh\Reflection\DocBlock\Context;
 use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
@@ -24,7 +23,6 @@ use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Contracts\Database\Eloquent\CastsInboundAttributes;
 use Illuminate\Database\Eloquent\Casts\AsArrayObject;
 use Illuminate\Database\Eloquent\Casts\AsCollection;
-use Illuminate\Database\Eloquent\Casts\AsEnumCollection;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Model;
@@ -112,7 +110,7 @@ class ModelsCommand extends Command
     protected $phpstorm_noinspections;
     protected $write_model_external_builder_methods;
     /**
-     * @var array<string, true>
+     * @var bool[string]
      */
     protected $nullableColumns = [];
     /**
@@ -198,7 +196,7 @@ class ModelsCommand extends Command
     protected function getArguments()
     {
         return [
-            ['model', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Which models to include', []],
+          ['model', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Which models to include', []],
         ];
     }
 
@@ -210,21 +208,20 @@ class ModelsCommand extends Command
     protected function getOptions()
     {
         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, 'Remove the original phpdocs instead of appending'],
+          ['reset', 'R', InputOption::VALUE_NONE, 'Refresh the properties/methods list, but keep the text'],
-            ['smart-reset', 'r', InputOption::VALUE_NONE, 'Refresh the properties/methods list, but keep the text'],
+          ['phpstorm-noinspections', 'p', InputOption::VALUE_NONE,
-            ['phpstorm-noinspections', 'p', InputOption::VALUE_NONE,
+              'Add PhpFullyQualifiedNameUsageInspection and PhpUnnecessaryFullyQualifiedNameInspection PHPStorm ' .
-                'Add PhpFullyQualifiedNameUsageInspection and PhpUnnecessaryFullyQualifiedNameInspection PHPStorm ' .
+              'noinspection tags',
-                'noinspection tags',
+          ],
-            ],
+          ['ignore', 'I', InputOption::VALUE_OPTIONAL, 'Which models to ignore', ''],
-            ['ignore', 'I', InputOption::VALUE_OPTIONAL, 'Which models to ignore', ''],
         ];
     }
 
@@ -410,7 +407,6 @@ class ModelsCommand extends Command
                     $realType = '\Carbon\CarbonImmutable';
                     break;
                 case AsCollection::class:
-                case AsEnumCollection::class:
                 case 'collection':
                     $realType = '\Illuminate\Support\Collection';
                     break;
@@ -584,7 +580,10 @@ class ModelsCommand extends Command
                 $isAttribute = is_a($type, '\Illuminate\Database\Eloquent\Casts\Attribute', true);
                 $method = $reflection->getName();
                 if (
-                    Str::startsWith($method, 'get') && Str::endsWith($method, 'Attribute') && $method !== 'getAttribute'
+                    Str::startsWith($method, 'get') && Str::endsWith(
+                        $method,
+                        'Attribute'
+                    ) && $method !== 'getAttribute'
                 ) {
                     //Magic get<name>Attribute
                     $name = Str::snake(substr($method, 3, -9));
@@ -600,14 +599,15 @@ class ModelsCommand extends Command
                     $this->setProperty(
                         Str::snake($method),
                         $type,
-                        $types->has('get') ?: null,
+                        $types->has('get'),
-                        $types->has('set') ?: null,
+                        $types->has('set'),
                         $this->getCommentFromDocBlock($reflection)
                     );
                 } elseif (
-                    Str::startsWith($method, 'set') &&
+                    Str::startsWith($method, 'set') && Str::endsWith(
-                    Str::endsWith($method, 'Attribute') &&
+                        $method,
-                    $method !== 'setAttribute'
+                        'Attribute'
+                    ) && $method !== 'setAttribute'
                 ) {
                     //Magic set<name>Attribute
                     $name = Str::snake(substr($method, 3, -9));
@@ -758,8 +758,7 @@ class ModelsCommand extends Command
                                         $this->getClassNameInDestinationFile($model, Model::class) . '|\Eloquent',
                                         true,
                                         null,
-                                        $comment,
+                                        $comment
-                                        $this->isMorphToRelationNullable($relationObj)
                                     );
                                 } else {
                                     //Single model is returned
@@ -819,33 +818,6 @@ class ModelsCommand extends Command
         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|null $type
@@ -1277,13 +1249,6 @@ class ModelsCommand extends Command
         $phpdoc = new DocBlock($reflection, $context);
 
         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();
         }
 
@@ -1633,7 +1598,7 @@ class ModelsCommand extends Command
     protected function getReflectionNamedType(ReflectionNamedType $paramType): string
     {
         $parameterName = $paramType->getName();
-        if (!$paramType->isBuiltin() && $paramType->getName() !== 'static') {
+        if (!$paramType->isBuiltin()) {
             $parameterName = '\\' . $parameterName;
         }
 

src/Parsers/PhpDocReturnTypeParser.php

@@ -1,79 +0,0 @@
-<?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;
-    }
-}

tests/Console/ModelsCommand/AdvancedCasts/Models/AdvancedCast.php

@@ -6,7 +6,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Mo
 
 use Illuminate\Database\Eloquent\Casts\AsArrayObject;
 use Illuminate\Database\Eloquent\Casts\AsCollection;
-use Illuminate\Database\Eloquent\Casts\AsEnumCollection;
 use Illuminate\Database\Eloquent\Model;
 
 class AdvancedCast extends Model
@@ -25,7 +24,6 @@ class AdvancedCast extends Model
         'cast_to_encrypted_json' => 'encrypted:json',
         'cast_to_encrypted_object' => 'encrypted:object',
         'cast_to_as_collection' => AsCollection::class,
-        'cast_to_as_enum_collection' => AsEnumCollection::class,
         'cast_to_as_array_object' => AsArrayObject::class,
     ];
 }

tests/Console/ModelsCommand/AdvancedCasts/__snapshots__/Test__test__1.php

@@ -6,7 +6,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Mo
 
 use Illuminate\Database\Eloquent\Casts\AsArrayObject;
 use Illuminate\Database\Eloquent\Casts\AsCollection;
-use Illuminate\Database\Eloquent\Casts\AsEnumCollection;
 use Illuminate\Database\Eloquent\Model;
 
 /**
@@ -25,14 +24,12 @@ use Illuminate\Database\Eloquent\Model;
  * @property array $cast_to_encrypted_json
  * @property object $cast_to_encrypted_object
  * @property \Illuminate\Support\Collection $cast_to_as_collection
- * @property \Illuminate\Support\Collection $cast_to_as_enum_collection
  * @property \ArrayObject $cast_to_as_array_object
  * @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast query()
  * @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 whereCastToAsEnumCollection($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 whereCastToDatetimeSerialization($value)
@@ -63,7 +60,6 @@ class AdvancedCast extends Model
         'cast_to_encrypted_json' => 'encrypted:json',
         'cast_to_encrypted_object' => 'encrypted:object',
         'cast_to_as_collection' => AsCollection::class,
-        'cast_to_as_enum_collection' => AsEnumCollection::class,
         'cast_to_as_array_object' => AsArrayObject::class,
     ];
 }

tests/Console/ModelsCommand/Attributes/Models/BackedAttribute.php

@@ -1,59 +0,0 @@
-<?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';
-            },
-        );
-    }
-}

tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php

@@ -7,83 +7,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Attributes\Model
 use Illuminate\Database\Eloquent\Casts\Attribute;
 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;
-
 /**
  * 
  *

tests/Console/ModelsCommand/GenerateMixinCollection/Models/WithCollection.php

@@ -1,51 +0,0 @@
-<?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();
-    }
-}

tests/Console/ModelsCommand/GenerateMixinCollection/NonModels/CollectionModel.php

@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels;
-
-class CollectionModel
-{
-}

tests/Console/ModelsCommand/GenerateMixinCollection/NonModels/NonModel.php

@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels;
-
-class NonModel
-{
-}

tests/Console/ModelsCommand/GenerateMixinCollection/Test.php

@@ -1,24 +0,0 @@
-<?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();
-    }
-}

tests/Console/ModelsCommand/GenerateMixinCollection/__snapshots__/Test__test__1.php

@@ -1,85 +0,0 @@
-<?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 {}
-}
-

tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithStaticReturnType.php

@@ -1,21 +0,0 @@
-<?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.
-    }
-}

tests/Console/ModelsCommand/LaravelCustomCasts/Models/CustomCast.php

@@ -15,7 +15,6 @@ 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\CustomCasterWithPrimitiveReturn;
 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\ExtendedSelfCastingCasterWithThisDocblockReturn;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\InboundAttributeCaster;
@@ -27,7 +26,6 @@ class CustomCast extends Model
 {
     protected $casts = [
         '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_fqn' => CustomCasterWithDocblockReturnFqn::class,
         'casted_property_with_return_primitive' => CustomCasterWithPrimitiveReturn::class,

tests/Console/ModelsCommand/LaravelCustomCasts/__snapshots__/Test__test__1.php

@@ -15,7 +15,6 @@ 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\CustomCasterWithPrimitiveReturn;
 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\ExtendedSelfCastingCasterWithThisDocblockReturn;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\InboundAttributeCaster;
@@ -40,7 +39,6 @@ use Illuminate\Database\Eloquent\Model;
  * @property ExtendedSelfCastingCasterWithStaticDocblockReturn $extended_casted_property_with_static_return_docblock
  * @property ExtendedSelfCastingCasterWithThisDocblockReturn $extended_casted_property_with_this_return_docblock
  * @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_anonymous_cast
  * @property CastableWithoutReturnType $casted_property_without_return_type
@@ -69,7 +67,6 @@ class CustomCast extends Model
 {
     protected $casts = [
         '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_fqn' => CustomCasterWithDocblockReturnFqn::class,
         'casted_property_with_return_primitive' => CustomCasterWithPrimitiveReturn::class,

tests/Console/ModelsCommand/Morphs/Models/Morphs.php

@@ -1,21 +0,0 @@
-<?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();
-    }
-}

tests/Console/ModelsCommand/Morphs/Test.php

@@ -1,24 +0,0 @@
-<?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();
-    }
-}

tests/Console/ModelsCommand/Morphs/__snapshots__/Test__test__1.php

@@ -1,39 +0,0 @@
-<?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();
-    }
-}

tests/Console/ModelsCommand/SimpleCasts/Models/SimpleCast.php

@@ -22,7 +22,6 @@ class SimpleCast extends Model
         'cast_to_array' => 'array',
         'cast_to_json' => 'json',
         'cast_to_collection' => 'collection',
-        'cast_to_enum_collection' => 'collection',
         'cast_to_date' => 'date',
         'cast_to_datetime' => 'datetime',
         'cast_to_date_serialization' => 'date:Y-m-d',

tests/Console/ModelsCommand/SimpleCasts/__snapshots__/Test__test__1.php

@@ -88,7 +88,6 @@ class SimpleCast extends Model
         'cast_to_array' => 'array',
         'cast_to_json' => 'json',
         'cast_to_collection' => 'collection',
-        'cast_to_enum_collection' => 'collection',
         'cast_to_date' => 'date',
         'cast_to_datetime' => 'datetime',
         'cast_to_date_serialization' => 'date:Y-m-d',

tests/Console/ModelsCommand/migrations/____advanced_casts_table.php

@@ -24,7 +24,6 @@ class AdvancedCastsTable extends Migration
             $table->string('cast_to_encrypted_json');
             $table->string('cast_to_encrypted_object');
             $table->string('cast_to_as_collection');
-            $table->string('cast_to_as_enum_collection');
             $table->string('cast_to_as_array_object');
         });
     }

tests/Console/ModelsCommand/migrations/____backed_attribute_table.php

@@ -1,20 +0,0 @@
-<?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');
-        });
-    }
-}

tests/Console/ModelsCommand/migrations/____morphs_table.php

@@ -1,18 +0,0 @@
-<?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');
-        });
-    }
-}