Update ModelsCommand.php

.github/ISSUE_TEMPLATE/1_Bug_report.md

@@ -8,6 +8,7 @@ labels: bug
 ### Versions:
 - ide-helper Version: #.#.#
 - Laravel Version: #.#.# <!-- remove if not applicable -->
+- Lumen Version: #.#.# <!-- remove if not applicable -->
 - PHP Version: #.#.#
 
 ### Description:

.github/ISSUE_TEMPLATE/3_Support_question.md

@@ -8,6 +8,7 @@ labels: question
 ### Versions:
 - ide-helper Version: #.#.#
 - Laravel Version: #.#.# <!-- remove if not applicable -->
+- Lumen Version: #.#.# <!-- remove if not applicable -->
 - PHP Version: #.#.#
 
 ### Question:

.github/dependabot.yaml

@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: monthly
-    groups:
-      deps:
-        patterns:
-          - '*'

.github/workflows/composer-normalize.yml

@@ -3,7 +3,6 @@ name: normalize composer.json
 on:
   push:
     paths:
-      - .github/workflows/composer-normalize.yml
       - composer.json
 
 jobs:
@@ -12,17 +11,16 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Validate Composer configuration
         run: composer validate --strict
 
       - name: Normalize composer.json
         run: |
-          composer global config --no-plugins allow-plugins.ergebnis/composer-normalize true
           composer global require ergebnis/composer-normalize
           composer normalize
 
-      - uses: stefanzweifel/git-auto-commit-action@v5
+      - uses: stefanzweifel/git-auto-commit-action@v4.0.0
         with:
           commit_message: normalize composer.json

.github/workflows/fix-code-style.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -27,7 +27,7 @@ jobs:
       - run: composer fix-style
         continue-on-error: true
 
-      - uses: stefanzweifel/git-auto-commit-action@v5
+      - uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: composer fix-style
           commit_author: laravel-ide-helper <[email protected]>

.github/workflows/run-integration-tests.yml

@@ -11,37 +11,19 @@ on:
         - cron: '0 0 * * *'
 
 jobs:
-    php-laravel-integration-tests:
+    php-lumen-integration-tests:
         runs-on: ubuntu-20.04
         timeout-minutes: 15
         env:
             COMPOSER_NO_INTERACTION: 1
         strategy:
-            fail-fast: false
             matrix:
-                php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3]
-                laravel: [10.*, 9.*, 8.*]
-                exclude:
-                  - php: 8.0
-                    laravel: 10.*
-                  - php: 7.4
-                    laravel: 10.*
-                  - php: 7.3
-                    laravel: 10.*
-                  - php: 8.3
-                    laravel: 9.*
-                  - php: 7.4
-                    laravel: 9.*
-                  - php: 7.3
-                    laravel: 9.*
-                  - php: 8.3
-                    laravel: 8.*
-                  - php: 8.2
-                    laravel: 8.*
-        name: P${{ matrix.php }} - Laravel${{ matrix.laravel }}
+                php: [8.1, 8.0, 7.4, 7.3]
+                lumen: [8.*]
+        name: P${{ matrix.php }} - Lumen${{ matrix.lumen }}
         steps:
             - name: Checkout code
-              uses: actions/checkout@v4
+              uses: actions/checkout@v2
               with:
                   path: src
 
@@ -53,16 +35,83 @@ jobs:
 
             - name: Install dependencies
               run: |
-                  composer create-project --prefer-dist laravel/laravel:${{ matrix.laravel }} --stability=dev --no-progress sample
+                  composer create-project --prefer-dist laravel/lumen:${{ matrix.lumen }} --no-progress sample
+                  cd sample
+                  composer require "league/flysystem:^1" --no-update --no-progress
+                  composer update  --prefer-stable --prefer-dist --no-progress
+
+            - name: Add package from source
+              run: |
+                  cd sample
+                  sed -e 's|"type": "project",|&\n"repositories": [ { "type": "path", "url": "../src" } ],|' -i composer.json
+                  composer require --dev "barryvdh/laravel-ide-helper:*"
+
+            - name: Insert service provider
+              run: sed -e 's|// \$app->register(App\\\Providers\\\EventServiceProvider::class);|&\n$app->register(\\Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider::class);|' -i sample/bootstrap/app.php
+
+            - name: Execute generate run
+              run: |
+                  cd sample
+                  php artisan ide-helper:generate
+
+            - name: Execute meta run
+              run: |
+                  cd sample
+                  php artisan ide-helper:meta -v
+
+            - name: Check file existence
+              run: |
+                ls sample/_ide_helper.php
+                ls sample/.phpstorm.meta.php
+
+            - name: Check logs
+              run: |
+                if [ `ls -1q "sample/storage/logs/" | wc -l` -gt 0 ]; then
+                  for logfile in sample/storage/logs/*; do
+                    echo "-- $logfile --"
+                    cat $logfile
+                  done
+                  exit 1
+                fi
+
+    php-laravel-integration-tests:
+        runs-on: ubuntu-20.04
+        timeout-minutes: 15
+        env:
+            COMPOSER_NO_INTERACTION: 1
+        strategy:
+            matrix:
+                php: [8.1, 8.0, 7.4, 7.3]
+                laravel: [9.*, 8.*]
+                exclude:
+                  - php: 7.4
+                    laravel: 9.*
+                  - php: 7.3
+                    laravel: 9.*
+        name: P${{ matrix.php }} - Laravel${{ matrix.laravel }}
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v2
+              with:
+                  path: src
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  coverage: none
+
+            - name: Install dependencies
+              run: |
+                  composer create-project --prefer-dist laravel/laravel:${{ matrix.laravel }} --no-progress sample
                   cd sample
-                  composer config minimum-stability dev
                   composer update --prefer-stable --prefer-dist --no-progress
 
             - name: Add package from source
               run: |
                   cd sample
                   sed -e 's|"type": "project",|&\n"repositories": [ { "type": "path", "url": "../src" } ],|' -i composer.json
-                  composer require --dev "barryvdh/laravel-ide-helper:*" --with-all-dependencies
+                  composer require --dev "barryvdh/laravel-ide-helper:*"
 
             - name: Execute generate run
               run: |

.github/workflows/run-static-analysis.yml

@@ -12,7 +12,7 @@ jobs:
         runs-on: ubuntu-20.04
 
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v2
               
             - name: Setup PHP
               uses: shivammathur/setup-php@v2

.github/workflows/run-tests.yml

@@ -20,16 +20,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, windows-2019]
-        php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3]
-        laravel: [8.*, 9.*, 10.*]
+        php: [8.1, 8.0, 7.4, 7.3]
+        laravel: [8.*, 9.*]
         dependency-version: [prefer-lowest, prefer-stable]
         exclude:
-          - php: 8.0
-            laravel: 10.*
-          - php: 7.4
-            laravel: 10.*
-          - php: 7.3
-            laravel: 10.*
           - php: 8.0
             dependency-version: prefer-lowest
           - php: 7.4
@@ -48,7 +42,7 @@ jobs:
         git config --global core.eol lf
 
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2

CHANGELOG.md

@@ -2,39 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
-[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v2.14.0...master)
+[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v2.12.3...master)
 --------------
 
-2024-02-05, 2.14.0
-------------------
-
-### Changed
-- Official support for Lumen has been dropped [#1425 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1425)
-- Refactor resolving of null information for custom casted attribute types [#1330 / wimski](https://github.com/barryvdh/laravel-ide-helper/pull/1330)
-
-### Fixed
-- Add support for attribute accessors marked as protected. [#1339 / pindab0ter](https://github.com/barryvdh/laravel-ide-helper/pull/1339)
-- Catch exceptions when loading aliases [#1465 / dongm2ez](https://github.com/barryvdh/laravel-ide-helper/pull/1465)
-
-### Added
-- Add support for nikic/php-parser 5 (next to 4) [#1502 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1502)
-- Add support for `immutable_date:*` and `immutable_datetime:*` casts. [#1380 / thekonz](https://github.com/barryvdh/laravel-ide-helper/pull/1380)
-
-2023-02-04, 2.13.0
-------------------
-
-### Fixed
+### Fixes
 - Fix return type of methods provided by `SoftDeletes` [#1345 / KentarouTakeda](https://github.com/barryvdh/laravel-ide-helper/pull/1345)
 - Handle PHP 8.1 deprecation warnings when passing `null` to `new \ReflectionClass` [#1351 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1351)
 - Fix issue where \Eloquent is not included when using write_mixin [#1352 / Jefemy](https://github.com/barryvdh/laravel-ide-helper/pull/1352)
 - Fix model factory method arguments for Laravel >= 9 [#1361 / wimski](https://github.com/barryvdh/laravel-ide-helper/pull/1361)
 - Improve return type of mock helper methods in tests [#1405 / bentleyo](https://github.com/barryvdh/laravel-ide-helper/pull/1405) 
-- Fix Castable class if failed to detect it from return types [#1388 / kwarcu](https://github.com/barryvdh/laravel-ide-helper/pull/1388)
 
 ### Added
-- Added Laravel 10 support [#1407 / lptn](https://github.com/barryvdh/laravel-ide-helper/pull/1407)
 - Add support for custom casts that implement `CastsInboundAttributes` [#1329 / sforward](https://github.com/barryvdh/laravel-ide-helper/pull/1329)
-- Add option `use_generics_annotations` for collection type hints [#1298 / tanerkay](https://github.com/barryvdh/laravel-ide-helper/pull/1298)
 
 2022-03-06, 2.12.3
 ------------------

README.md

@@ -1,4 +1,4 @@
-# IDE Helper Generator for Laravel
+# Laravel IDE Helper Generator
 
 [![Tests](https://github.com/barryvdh/laravel-ide-helper/actions/workflows/run-tests.yml/badge.svg)](https://github.com/barryvdh/laravel-ide-helper/actions)
 [![Packagist License](https://poser.pugx.org/barryvdh/laravel-ide-helper/license.png)](http://choosealicense.com/licenses/mit/)
@@ -23,6 +23,10 @@ It supports Laravel 8+ and PHP 7.3+
   - [Automatic PHPDocs generation for Laravel Fluent methods](#automatic-phpdocs-generation-for-laravel-fluent-methods)
   - [Auto-completion for factory builders](#auto-completion-for-factory-builders)
   - [PhpStorm Meta for Container instances](#phpstorm-meta-for-container-instances)
+- [Usage with Lumen](#usage-with-lumen)
+  - [Enabling Facades](#enabling-facades)
+  - [Adding the Service Provider](#adding-the-service-provider)
+  - [Adding Additional Facades](#adding-additional-facades)
 - [License](#license)
 
 ## Installation
@@ -33,10 +37,6 @@ Require this package with composer using the following command:
 composer require --dev barryvdh/laravel-ide-helper
 ```
 
-> [!NOTE]  
-> If you encounter version conflicts with doctrine/dbal, please try:
-> `composer require --dev barryvdh/laravel-ide-helper --with-all-dependencies`
- 
 This package makes use of [Laravels package auto-discovery mechanism](https://medium.com/@taylorotwell/package-auto-discovery-in-laravel-5-5-ea9e3ab20518), which means if you don't install dev dependencies in production, it also won't be loaded.
 
 If for some reason you want manually control this:
@@ -227,12 +227,6 @@ You may use the [`::withCount`](https://laravel.com/docs/master/eloquent-relatio
 
 By default, these attributes are generated in the phpdoc. You can turn them off by setting the config `write_model_relation_count_properties` to `false`.
 
-#### Generics annotations
-
-Laravel 9 introduced generics annotations in DocBlocks for collections. PhpStorm 2022.3 and above support the use of generics annotations within `@property` and `@property-read` declarations in DocBlocks, e.g. `Collection<User>` instead of `Collection|User[]`.
-
-These can be disabled by setting the config `use_generics_annotations` to `false`.
-
 #### Support `@comment` based on DocBlock
 
 In order to better support IDEs, relations and getters/setters can also add a comment to a property like table columns. Therefore a custom docblock `@comment` is used:
@@ -404,6 +398,66 @@ app(App\SomeClass::class);
 
 You can change the generated filename via the config `meta_filename`. This can be useful for cases where you want to take advantage of PhpStorm's support of the _directory_ `.phpstorm.meta.php/`: all files placed there are parsed, should you want to provide additional files to PhpStorm.
 
+## Usage with Lumen
+
+This package is focused on Laravel development, but it can also be used in Lumen with some workarounds.
+Because Lumen works a little different, as it is like a bare bone version of Laravel and the main configuration
+parameters are instead located in `bootstrap/app.php`, some alterations must be made.
+
+### Enabling Facades
+
+While Laravel IDE Helper can generate automatically default Facades for code hinting,
+Lumen doesn't come with Facades activated. If you plan in using them, you must enable
+them under the `Create The Application` section, uncommenting this line:
+
+```php
+// $app->withFacades();
+```
+
+From there, you should be able to use the `create_alias()` function to add additional Facades into your application.
+
+### Adding the Service Provider
+
+You can install Laravel IDE Helper in `app/Providers/AppServiceProvider.php`,
+and uncommenting this line that registers the App Service Providers, so it can properly load.
+
+```php
+// $app->register(App\Providers\AppServiceProvider::class);
+```
+
+If you are not using that line, that is usually handy to manage gracefully multiple Laravel/Lumen installations,
+you will have to add this line of code under the `Register Service Providers` section of your `bootstrap/app.php`.
+
+```php
+if ($app->environment() !== 'production') {
+    $app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
+}
+```
+
+After that, Laravel IDE Helper should work correctly. During the generation process,
+the script may throw exceptions saying that some Class(s) doesn't exist or there are some undefined indexes.
+This is normal, as Lumen has some default packages stripped away, like Cookies, Storage and Session.
+If you plan to add these packages, you will have to add them manually and create additional Facades if needed.
+
+### Adding Additional Facades
+
+Currently, Lumen IDE Helper doesn't take into account additional Facades created under `bootstrap/app.php` using `create_alias()`,
+so you need to create a `config/app.php` file and add your custom aliases under an `aliases` array again, like so:
+
+```php
+return [
+    'aliases' => [
+        'CustomAliasOne' => Example\Support\Facades\CustomAliasOne::class,
+        'CustomAliasTwo' => Example\Support\Facades\CustomAliasTwo::class,
+        //...
+    ]
+];
+```
+
+After you run `php artisan ide-helper:generate`, it's recommended (but not mandatory) to rename `config/app.php` to something else,
+until you have to re-generate the docs or after passing to production environment.
+Lumen 5.1+ will read this file for configuration parameters if it is present, and may overlap some configurations if it is completely populated.
+
 ## License
 
 The Laravel IDE Helper Generator is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)

composer.json

@@ -25,25 +25,25 @@
         "barryvdh/reflection-docblock": "^2.0.6",
         "composer/class-map-generator": "^1.0",
         "doctrine/dbal": "^2.6 || ^3",
-        "illuminate/console": "^8 || ^9 || ^10",
-        "illuminate/filesystem": "^8 || ^9 || ^10",
-        "illuminate/support": "^8 || ^9 || ^10",
-        "nikic/php-parser": "^4.18 || ^5",
+        "illuminate/console": "^8 || ^9",
+        "illuminate/filesystem": "^8 || ^9",
+        "illuminate/support": "^8 || ^9",
+        "nikic/php-parser": "^4.7",
         "phpdocumentor/type-resolver": "^1.1.0"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
         "friendsofphp/php-cs-fixer": "^2",
-        "illuminate/config": "^8 || ^9 || ^10",
-        "illuminate/view": "^8 || ^9 || ^10",
+        "illuminate/config": "^8 || ^9",
+        "illuminate/view": "^8 || ^9",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^6 || ^7 || ^8",
+        "orchestra/testbench": "^6 || ^7",
         "phpunit/phpunit": "^8.5 || ^9",
         "spatie/phpunit-snapshot-assertions": "^3 || ^4",
-        "vimeo/psalm": "^5.4"
+        "vimeo/psalm": "^3.12"
     },
     "suggest": {
-        "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9|^10)."
+        "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9)."
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -65,7 +65,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.14-dev"
+            "dev-master": "2.12-dev"
         },
         "laravel": {
             "providers": [

config/ide-helper.php

@@ -292,17 +292,6 @@ return [
     */
     'force_fqn' => false,
 
-    /*
-    |--------------------------------------------------------------------------
-    | Use generics syntax
-    |--------------------------------------------------------------------------
-    |
-    | Use generics syntax within DocBlocks,
-    | e.g. `Collection<User>` instead of `Collection|User[]`.
-    |
-    */
-    'use_generics_annotations' => true,
-
     /*
     |--------------------------------------------------------------------------
     | Additional relation types

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.4.0@62db5d4f6a7ae0a20f7cc5a4952d730272fc0863">
+<files psalm-version="3.15@de6e7f324f44dde540ebe7ebd4eb481b97c86f30">
   <file src="src/Factories.php">
     <UndefinedClass occurrences="2">
       <code>Factory</code>
@@ -7,12 +7,13 @@
     </UndefinedClass>
   </file>
   <file src="src/Generator.php">
-    <UndefinedClass occurrences="6">
+    <UndefinedClass occurrences="7">
       <code>\Auth</code>
-      <code>\Cache</code>
-      <code>\Cache</code>
       <code>\DB</code>
+      <code>\Cache</code>
+      <code>\Cache</code>
       <code>\Queue</code>
+      <code>\SSH</code>
       <code>\Storage</code>
     </UndefinedClass>
   </file>

src/Alias.php

@@ -20,7 +20,6 @@ use Illuminate\Config\Repository as ConfigRepository;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Support\Facades\Facade;
 use ReflectionClass;
-use Throwable;
 
 class Alias
 {
@@ -302,7 +301,7 @@ class Alias
                 "\nPlease configure your database connection correctly, or use the sqlite memory driver (-M)." .
                 " Skipping $facade."
             );
-        } catch (Throwable $e) {
+        } catch (\Exception $e) {
             $this->error('Exception: ' . $e->getMessage() . "\nSkipping $facade.");
         }
     }
@@ -324,7 +323,7 @@ class Alias
     protected function addMagicMethods()
     {
         foreach ($this->magicMethods as $magic => $real) {
-            [$className, $name] = explode('::', $real);
+            list($className, $name) = explode('::', $real);
             if ((!class_exists($className) && !interface_exists($className)) || !method_exists($className, $name)) {
                 continue;
             }

src/Console/ModelsCommand.php

@@ -231,7 +231,6 @@ class ModelsCommand extends Command
         $output = "<?php
 
 // @formatter:off
-// phpcs:ignoreFile
 /**
  * A helper file for your Eloquent Models
  * Copy the phpDocs from this file to the correct Model,
@@ -370,10 +369,6 @@ class ModelsCommand extends Command
                 $type = 'date';
             } elseif (Str::startsWith($type, 'immutable_custom_datetime:')) {
                 $type = 'immutable_date';
-            } elseif (Str::startsWith($type, 'immutable_date:')) {
-                $type = 'immutable_date';
-            } elseif (Str::startsWith($type, 'immutable_datetime:')) {
-                $type = 'immutable_datetime';
             } elseif (Str::startsWith($type, 'encrypted:')) {
                 $type = Str::after($type, ':');
             }
@@ -442,46 +437,14 @@ class ModelsCommand extends Command
             $realType = $this->checkForCastableCasts($realType, $params);
             $realType = $this->checkForCustomLaravelCasts($realType);
             $realType = $this->getTypeOverride($realType);
-            $realType = $this->getTypeInModel($model, $realType);
-            $realType = $this->applyNullability($realType, isset($this->nullableColumns[$name]));
+            $this->properties[$name]['type'] = $this->getTypeInModel($model, $realType);
 
-            $this->properties[$name]['type'] = $realType;
+            if (isset($this->nullableColumns[$name])) {
+                $this->properties[$name]['type'] .= '|null';
+            }
         }
     }
 
-    protected function applyNullability(?string $type, bool $isNullable): ?string
-    {
-        if (!$type) {
-            return null;
-        }
-
-        $nullString = null;
-
-        // Find instance of:
-        // A) start of string or non-word character (like space or pipe) followed by 'null|'
-        // B) '|null' followed by end of string or non-word character (like space or pipe)
-        // This will find 'or null' instances at the beginning, middle or end of a type string,
-        // but will exclude solo/pure null instances and null being part of a type's name (e.g. class 'Benull').
-        if (preg_match('/(?:(?:^|\W)(null\|))|(\|null(?:$|\W))/', $type, $matches) === 1) {
-            $nullString = array_pop($matches);
-        }
-
-        // Return the current type string if:
-        // A) the type can be null and the type contains a null instance
-        // B) the type can not be null and the type does not contain a null instance
-        if (!($isNullable xor $nullString)) {
-            return $type;
-        }
-
-        if ($isNullable) {
-            $type .= '|null';
-        } else {
-            $type = str_replace($nullString, '', $type);
-        }
-
-        return $type;
-    }
-
     /**
      * Returns the override type for the give type.
      *
@@ -606,27 +569,13 @@ class ModelsCommand extends Command
      */
     public function getPropertiesFromMethods($model)
     {
-        $reflectionClass = new ReflectionClass($model);
-        $reflections = $reflectionClass->getMethods();
-        if ($reflections) {
-            // Filter out private methods because they can't be used to generate magic properties and HasAttributes'
-            // methods that resemble mutators but aren't.
-            $reflections = array_filter($reflections, function (\ReflectionMethod $methodReflection) {
-                return !$methodReflection->isPrivate() && !(
-                    in_array(
-                        \Illuminate\Database\Eloquent\Concerns\HasAttributes::class,
-                        $methodReflection->getDeclaringClass()->getTraitNames()
-                    ) && (
-                        $methodReflection->getName() === 'setClassCastableAttribute' ||
-                        $methodReflection->getName() === 'setEnumCastableAttribute'
-                    )
-                );
-            });
-            sort($reflections);
-            foreach ($reflections as $reflection) {
+        $methods = get_class_methods($model);
+        if ($methods) {
+            sort($methods);
+            foreach ($methods as $method) {
+                $reflection = new \ReflectionMethod($model, $method);
                 $type = $this->getReturnTypeFromReflection($reflection);
                 $isAttribute = is_a($type, '\Illuminate\Database\Eloquent\Casts\Attribute', true);
-                $method = $reflection->getName();
                 if (
                     Str::startsWith($method, 'get') && Str::endsWith(
                         $method,
@@ -643,15 +592,16 @@ class ModelsCommand extends Command
                     }
                 } elseif ($isAttribute) {
                     $name = Str::snake($method);
-                    $types = $this->getAttributeReturnType($model, $reflection);
-                    $comment = $this->getCommentFromDocBlock($reflection);
+                    $types = $this->getAttributeReturnType($model, $method);
 
                     if ($types->has('get')) {
                         $type = $this->getTypeInModel($model, $types['get']);
+                        $comment = $this->getCommentFromDocBlock($reflection);
                         $this->setProperty($name, $type, true, null, $comment);
                     }
 
                     if ($types->has('set')) {
+                        $comment = $this->getCommentFromDocBlock($reflection);
                         $this->setProperty($name, null, null, true, $comment);
                     }
                 } elseif (
@@ -727,7 +677,8 @@ class ModelsCommand extends Command
                         $search = '$this->' . $relation . '(';
                         if (stripos($code, $search) || ltrim($impl, '\\') === ltrim((string)$type, '\\')) {
                             //Resolve the relation's model to a Relation object.
-                            if ($reflection->getNumberOfParameters()) {
+                            $methodReflection = new \ReflectionMethod($model, $method);
+                            if ($methodReflection->getNumberOfParameters()) {
                                 continue;
                             }
 
@@ -735,12 +686,11 @@ class ModelsCommand extends Command
                             // Adding constraints requires reading model properties which
                             // can cause errors. Since we don't need constraints we can
                             // disable them when we fetch the relation to avoid errors.
-                            $relationObj = Relation::noConstraints(function () use ($model, $reflection) {
+                            $relationObj = Relation::noConstraints(function () use ($model, $method) {
                                 try {
-                                    $methodName = $reflection->getName();
-                                    return $model->$methodName();
+                                    return $model->$method();
                                 } catch (Throwable $e) {
-                                    $this->warn(sprintf('Error resolving relation model of %s:%s() : %s', get_class($model), $reflection->getName(), $e->getMessage()));
+                                    $this->warn(sprintf('Error resolving relation model of %s:%s() : %s', get_class($model), $method, $e->getMessage()));
 
                                     return null;
                                 }
@@ -763,10 +713,9 @@ class ModelsCommand extends Command
                                         $model,
                                         $collectionClass
                                     );
-                                    $collectionTypeHint = $this->getCollectionTypeHint($collectionClassNameInModel, $relatedModel);
                                     $this->setProperty(
                                         $method,
-                                        $collectionTypeHint,
+                                        $collectionClassNameInModel . '|' . $relatedModel . '[]',
                                         true,
                                         null,
                                         $comment
@@ -1131,23 +1080,6 @@ class ModelsCommand extends Command
         return '\\' . get_class($model->newCollection());
     }
 
-    /**
-     * Determine a model classes' collection type hint.
-     *
-     * @param string $collectionClassNameInModel
-     * @param string $relatedModel
-     * @return string
-     */
-    protected function getCollectionTypeHint(string $collectionClassNameInModel, string $relatedModel): string
-    {
-        $useGenericsSyntax = $this->laravel['config']->get('ide-helper.use_generics_annotations', true);
-        if ($useGenericsSyntax) {
-            return $collectionClassNameInModel . '<int, ' . $relatedModel . '>';
-        } else {
-            return $collectionClassNameInModel . '|' . $relatedModel . '[]';
-        }
-    }
-
     /**
      * Returns the available relation types
      */
@@ -1173,13 +1105,10 @@ class ModelsCommand extends Command
         return $this->laravel['config']->get('ide-helper.model_camel_case_properties', false);
     }
 
-    protected function getAttributeReturnType(Model $model, \ReflectionMethod $reflectionMethod): Collection
+    protected function getAttributeReturnType(Model $model, string $method): Collection
     {
-        // Private/protected ReflectionMethods require setAccessible prior to PHP 8.1
-        $reflectionMethod->setAccessible(true);
-
         /** @var Attribute $attribute */
-        $attribute = $reflectionMethod->invoke($model);
+        $attribute = $model->{$method}();
 
         return collect([
             'get' => $attribute->get ? optional(new \ReflectionFunction($attribute->get))->getReturnType() : null,
@@ -1188,7 +1117,7 @@ class ModelsCommand extends Command
             ->filter()
             ->map(function ($type) {
                 if ($type instanceof \ReflectionUnionType) {
-                    $types = collect($type->getTypes())
+                    $types =collect($type->getTypes())
                         /** @var ReflectionType $reflectionType */
                         ->map(function ($reflectionType) {
                             return collect($this->extractReflectionTypes($reflectionType));
@@ -1276,7 +1205,7 @@ class ModelsCommand extends Command
         $type = implode('|', $types);
 
         if ($returnType->allowsNull()) {
-            $type .= '|null';
+            $type .='|null';
         }
 
         return $type;
@@ -1348,9 +1277,8 @@ class ModelsCommand extends Command
         if ($collectionClass !== '\\' . \Illuminate\Database\Eloquent\Collection::class) {
             $collectionClassInModel = $this->getClassNameInDestinationFile($model, $collectionClass);
 
-            $collectionTypeHint = $this->getCollectionTypeHint($collectionClassInModel, 'static');
-            $this->setMethod('get', $collectionTypeHint, ['$columns = [\'*\']']);
-            $this->setMethod('all', $collectionTypeHint, ['$columns = [\'*\']']);
+            $this->setMethod('get', $collectionClassInModel . '|static[]', ['$columns = [\'*\']']);
+            $this->setMethod('all', $collectionClassInModel . '|static[]', ['$columns = [\'*\']']);
         }
     }
 
@@ -1400,7 +1328,7 @@ class ModelsCommand extends Command
 
         return $this->getReturnTypeFromReflection($methodReflection) ??
             $this->getReturnTypeFromDocBlock($methodReflection, $reflection) ??
-            $type;
+            'mixed';
     }
 
     /**
@@ -1518,10 +1446,10 @@ class ModelsCommand extends Command
             $type = implode('|', $types);
 
             if ($paramType->allowsNull()) {
-                if (count($types) == 1) {
+                if (count($types)==1) {
                     $type = '?' . $type;
                 } else {
-                    $type .= '|null';
+                    $type .='|null';
                 }
             }
 
@@ -1598,7 +1526,7 @@ class ModelsCommand extends Command
         } else {
             $types = [];
             foreach ($reflection_type->getTypes() as $named_type) {
-                if ($named_type->getName() === 'null') {
+                if ($named_type->getName()==='null') {
                     continue;
                 }
 

src/Generator.php

@@ -127,6 +127,15 @@ class Generator
         } catch (\Exception $e) {
         }
 
+        try {
+            if (class_exists('SSH') && is_a('SSH', '\Illuminate\Support\Facades\SSH', true)) {
+                $class = get_class(\SSH::connection());
+                $this->extra['SSH'] = [$class];
+                $this->interfaces['\Illuminate\Remote\ConnectionInterface'] = $class;
+            }
+        } catch (\Exception $e) {
+        }
+
         try {
             if (class_exists('Storage') && is_a('Storage', '\Illuminate\Support\Facades\Storage', true)) {
                 $class = get_class(\Storage::disk());

src/UsesResolver.php

@@ -64,7 +64,7 @@ class UsesResolver
             '\\'
         );
 
-        $parser = (new ParserFactory())->createForHostVersion();
+        $parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
         $namespaceData = null;
 
         foreach ($parser->parse($code) as $node) {

tests/Console/ModelsCommand/ArrayCastsWithComment/Models/ArrayCastsWithComment.php

@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ArrayCastsWithComment\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property array<int, string>|null $cast_to_array -- These three should not be duplicated
- * @property array<int, string> $cast_to_json some-description
- * @property \Illuminate\Support\Collection<int, string> $cast_to_collection some-description
- *
- * @property array|null $cast_to_encrypted_array -- These three are OK (no types)
- * @property array $cast_to_encrypted_json some-description
- * @property \Illuminate\Support\Collection $cast_to_encrypted_collection some-description
- *
- * @property string $cast_to_string -- The next three are OK (no description), this not included
- *
- * @property array<int, string>|null $cast_to_immutable_date
- * @property array<int, string> $cast_to_immutable_date_serialization
- * @property \Illuminate\Support\Collection<int, string> $cast_to_immutable_custom_datetime
- */
-class ArrayCastsWithComment extends Model
-{
-    protected $table = 'simple_casts';
-
-    protected $casts = [
-        'cast_to_array' => 'array',
-        'cast_to_json' => 'json',
-        'cast_to_collection' => 'collection',
-
-        'cast_to_encrypted_array' => 'array',
-        'cast_to_encrypted_json' => 'json',
-        'cast_to_encrypted_collection' => 'collection',
-
-        'cast_to_string' => 'string',
-
-        'cast_to_immutable_date' => 'array',
-        'cast_to_immutable_date_serialization' => 'json',
-        'cast_to_immutable_custom_datetime' => 'collection',
-    ];
-}

tests/Console/ModelsCommand/ArrayCastsWithComment/Test.php

@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ArrayCastsWithComment;
-
-use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
-use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
-
-class Test extends AbstractModelsCommand
-{
-    /**
-     * The generated snapshot is wrong until
-     * https://github.com/barryvdh/laravel-ide-helper/issues/1505 is fixed
-     */
-    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/ArrayCastsWithComment/__snapshots__/Test__test__1.php

@@ -1,97 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ArrayCastsWithComment\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ArrayCastsWithComment\Models\ArrayCastsWithComment
- *
- * @property array<int, string>|null $cast_to_array -- These three should not be duplicated
- * @property array<int, string> $cast_to_json some-description
- * @property \Illuminate\Support\Collection<int, string> $cast_to_collection some-description
- * @property array|null $cast_to_encrypted_array -- These three are OK (no types)
- * @property array $cast_to_encrypted_json some-description
- * @property \Illuminate\Support\Collection $cast_to_encrypted_collection some-description
- * @property string $cast_to_string -- The next three are OK (no description), this not included
- * @property array<int, string>|null $cast_to_immutable_date
- * @property array<int, string> $cast_to_immutable_date_serialization
- * @property \Illuminate\Support\Collection<int, string> $cast_to_immutable_custom_datetime
- * @property string $cast_to_int
- * @property string $cast_to_integer
- * @property string $cast_to_real
- * @property string $cast_to_float
- * @property string $cast_to_double
- * @property string $cast_to_decimal
- * @property string $cast_to_bool
- * @property string $cast_to_boolean
- * @property string $cast_to_object
- * @property array $cast_to_array
- * @property array $cast_to_json
- * @property \Illuminate\Support\Collection $cast_to_collection
- * @property string $cast_to_date
- * @property string $cast_to_datetime
- * @property string $cast_to_date_serialization
- * @property string $cast_to_datetime_serialization
- * @property string $cast_to_custom_datetime
- * @property string $cast_to_immutable_datetime
- * @property string $cast_to_immutable_datetime_serialization
- * @property string $cast_to_timestamp
- * @property string $cast_to_encrypted
- * @property string $cast_to_encrypted_object
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment query()
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToArray($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToBool($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToBoolean($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToCollection($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToCustomDatetime($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToDateSerialization($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToDatetime($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToDatetimeSerialization($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToDecimal($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToDouble($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToEncrypted($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToEncryptedArray($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToEncryptedCollection($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToEncryptedJson($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToEncryptedObject($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToFloat($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToImmutableCustomDatetime($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToImmutableDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToImmutableDateSerialization($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToImmutableDatetime($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToImmutableDatetimeSerialization($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToInt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToInteger($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToJson($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToObject($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToReal($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToString($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ArrayCastsWithComment whereCastToTimestamp($value)
- * @mixin \Eloquent
- */
-class ArrayCastsWithComment extends Model
-{
-    protected $table = 'simple_casts';
-
-    protected $casts = [
-        'cast_to_array' => 'array',
-        'cast_to_json' => 'json',
-        'cast_to_collection' => 'collection',
-
-        'cast_to_encrypted_array' => 'array',
-        'cast_to_encrypted_json' => 'json',
-        'cast_to_encrypted_collection' => 'collection',
-
-        'cast_to_string' => 'string',
-
-        'cast_to_immutable_date' => 'array',
-        'cast_to_immutable_date_serialization' => 'json',
-        'cast_to_immutable_custom_datetime' => 'collection',
-    ];
-}

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

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class Simple extends Model
 {
-    protected function name(): Attribute
+    public function name(): Attribute
     {
         return new Attribute(
             function (?string $name): ?string {
@@ -29,7 +29,7 @@ class Simple extends Model
      *
      * @return \Illuminate\Database\Eloquent\Casts\Attribute
      */
-    protected function notAnAttribute()
+    public function notAnAttribute()
     {
         return new Attribute(
             function (?string $value): ?string {

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

@@ -20,7 +20,7 @@ use Illuminate\Database\Eloquent\Model;
  */
 class Simple extends Model
 {
-    protected function name(): Attribute
+    public function name(): Attribute
     {
         return new Attribute(
             function (?string $name): ?string {
@@ -40,7 +40,7 @@ class Simple extends Model
      *
      * @return \Illuminate\Database\Eloquent\Casts\Attribute
      */
-    protected function notAnAttribute()
+    public function notAnAttribute()
     {
         return new Attribute(
             function (?string $value): ?string {

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

@@ -21,7 +21,7 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
  * This is second line, success too.
  * @property-read string $many_format_comment There is format comment, success.
  * @property-read string $not_comment
- * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationHasMany HasMany relations.
+ * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $relationHasMany HasMany relations.
  * @property-read int|null $relation_has_many_count
  * @property-read Simple|null $relationHasOne Others relations.
  * @property-read Model|\Eloquent $relationMorphTo MorphTo relations.

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

@@ -12,10 +12,10 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
  * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomCollection\Models\Simple
  *
  * @property integer $id
- * @property-read SimpleCollection<int, Simple> $relationHasMany
+ * @property-read SimpleCollection|Simple[] $relationHasMany
  * @property-read int|null $relation_has_many_count
- * @method static SimpleCollection<int, static> all($columns = ['*'])
- * @method static SimpleCollection<int, static> get($columns = ['*'])
+ * @method static SimpleCollection|static[] all($columns = ['*'])
+ * @method static SimpleCollection|static[] get($columns = ['*'])
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple query()

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

@@ -1,7 +1,6 @@
 <?php
 
 // @formatter:off
-// phpcs:ignoreFile
 /**
  * A helper file for your Eloquent Models
  * Copy the phpDocs from this file to the correct Model,

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

@@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
 /**
  * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DynamicRelations\Models\Dynamic
  *
- * @property-read \Illuminate\Database\Eloquent\Collection<int, Dynamic> $regularHasMany
+ * @property-read \Illuminate\Database\Eloquent\Collection|Dynamic[] $regularHasMany
  * @property-read int|null $regular_has_many_count
  * @method static \Illuminate\Database\Eloquent\Builder|Dynamic newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Dynamic newQuery()

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

@@ -1,7 +1,6 @@
 <?php
 
 // @formatter:off
-// phpcs:ignoreFile
 /**
  * A helper file for your Eloquent Models
  * Copy the phpDocs from this file to the correct Model,

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

@@ -84,7 +84,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string $macaddress_not_nullable
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post> $posts
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post[] $posts
  * @property-read int|null $posts_count
  * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post newQuery()

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

@@ -90,7 +90,7 @@ use Illuminate\Support\Carbon;
  * @property string $macaddress_not_nullable
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
- * @property-read Collection<int, Post> $posts
+ * @property-read Collection|Post[] $posts
  * @property-read int|null $posts_count
  * @method static EloquentBuilder|Post newModelQuery()
  * @method static EloquentBuilder|Post newQuery()

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

@@ -1,7 +1,6 @@
 <?php
 
 // @formatter:off
-// phpcs:ignoreFile
 /**
  * A helper file for your Eloquent Models
  * Copy the phpDocs from this file to the correct Model,

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

@@ -17,7 +17,6 @@ class Post extends Model
 <?php
 
 // @formatter:off
-// phpcs:ignoreFile
 /**
  * A helper file for your Eloquent Models
  * Copy the phpDocs from this file to the correct Model,

tests/Console/ModelsCommand/GenericsSyntaxDisabled/Models/Simple.php

@@ -1,23 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenericsSyntaxDisabled\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
-class Simple extends Model
-{
-    // Regular relations
-    public function regularHasMany(): HasMany
-    {
-        return $this->hasMany(Simple::class);
-    }
-
-    public function regularBelongsToMany(): BelongsToMany
-    {
-        return $this->belongsToMany(Simple::class);
-    }
-}

tests/Console/ModelsCommand/GenericsSyntaxDisabled/Test.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenericsSyntaxDisabled;
-
-use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
-use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
-
-class Test extends AbstractModelsCommand
-{
-    protected function getEnvironmentSetUp($app)
-    {
-        parent::getEnvironmentSetUp($app);
-
-        $app['config']->set('ide-helper.use_generics_annotations', false);
-    }
-
-    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/GenericsSyntaxDisabled/__snapshots__/Test__test__1.php

@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenericsSyntaxDisabled\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
-/**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenericsSyntaxDisabled\Models\Simple
- *
- * @property integer $id
- * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $regularBelongsToMany
- * @property-read int|null $regular_belongs_to_many_count
- * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $regularHasMany
- * @property-read int|null $regular_has_many_count
- * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|Simple query()
- * @method static \Illuminate\Database\Eloquent\Builder|Simple whereId($value)
- * @mixin \Eloquent
- */
-class Simple extends Model
-{
-    // Regular relations
-    public function regularHasMany(): HasMany
-    {
-        return $this->hasMany(Simple::class);
-    }
-
-    public function regularBelongsToMany(): BelongsToMany
-    {
-        return $this->belongsToMany(Simple::class);
-    }
-}

tests/Console/ModelsCommand/Getter/Models/Simple.php

@@ -103,8 +103,4 @@ class Simple extends Model
     public function getAttributeReturnsVoidAttribute(): void
     {
     }
-
-    private function getInvalidAccessModifierAttribute()
-    {
-    }
 }

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

@@ -133,8 +133,4 @@ class Simple extends Model
     public function getAttributeReturnsVoidAttribute(): void
     {
     }
-
-    private function getInvalidAccessModifierAttribute()
-    {
-    }
 }

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

@@ -1,7 +1,6 @@
 <?php
 
 // @formatter:off
-// phpcs:ignoreFile
 /**
  * A helper file for your Eloquent Models
  * Copy the phpDocs from this file to the correct Model,

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

@@ -31,7 +31,6 @@ class CustomCast extends Model
         'casted_property_with_return_primitive' => CustomCasterWithPrimitiveReturn::class,
         'casted_property_with_return_primitive_docblock' => CustomCasterWithPrimitiveDocblockReturn::class,
         'casted_property_with_return_nullable_primitive' => CustomCasterWithNullablePrimitiveReturn::class,
-        'casted_property_with_return_nullable_primitive_and_nullable_column' => CustomCasterWithNullablePrimitiveReturn::class,
         'casted_property_without_return' => CustomCasterWithoutReturnType::class,
         'casted_property_with_param' => CustomCasterWithParam::class . ':param',
         'casted_property_with_static_return_docblock' => SelfCastingCasterWithStaticDocblockReturn::class,

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

@@ -29,9 +29,8 @@ use Illuminate\Database\Eloquent\Model;
  * @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
  * @property array $casted_property_with_return_primitive
- * @property array $casted_property_with_return_primitive_docblock
- * @property array $casted_property_with_return_nullable_primitive
- * @property array|null $casted_property_with_return_nullable_primitive_and_nullable_column
+ * @property array|null $casted_property_with_return_primitive_docblock
+ * @property array|null $casted_property_with_return_nullable_primitive
  * @property $casted_property_without_return
  * @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_param
  * @property SelfCastingCasterWithStaticDocblockReturn $casted_property_with_static_return_docblock
@@ -41,7 +40,7 @@ use Illuminate\Database\Eloquent\Model;
  * @property SelfCastingCasterWithStaticDocblockReturn $casted_property_with_static_return_docblock_and_param
  * @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
+ * @property mixed $casted_property_without_return_type
  * @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $cast_without_property
  * @property mixed $cast_inbound_attribute
  * @method static \Illuminate\Database\Eloquent\Builder|CustomCast newModelQuery()
@@ -51,7 +50,6 @@ use Illuminate\Database\Eloquent\Model;
  * @method static \Illuminate\Database\Eloquent\Builder|CustomCast whereCastedPropertyWithReturnDocblock($value)
  * @method static \Illuminate\Database\Eloquent\Builder|CustomCast whereCastedPropertyWithReturnDocblockFqn($value)
  * @method static \Illuminate\Database\Eloquent\Builder|CustomCast whereCastedPropertyWithReturnNullablePrimitive($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CustomCast whereCastedPropertyWithReturnNullablePrimitiveAndNullableColumn($value)
  * @method static \Illuminate\Database\Eloquent\Builder|CustomCast whereCastedPropertyWithReturnPrimitive($value)
  * @method static \Illuminate\Database\Eloquent\Builder|CustomCast whereCastedPropertyWithReturnPrimitiveDocblock($value)
  * @method static \Illuminate\Database\Eloquent\Builder|CustomCast whereCastedPropertyWithReturnType($value)
@@ -72,7 +70,6 @@ class CustomCast extends Model
         'casted_property_with_return_primitive' => CustomCasterWithPrimitiveReturn::class,
         'casted_property_with_return_primitive_docblock' => CustomCasterWithPrimitiveDocblockReturn::class,
         'casted_property_with_return_nullable_primitive' => CustomCasterWithNullablePrimitiveReturn::class,
-        'casted_property_with_return_nullable_primitive_and_nullable_column' => CustomCasterWithNullablePrimitiveReturn::class,
         'casted_property_without_return' => CustomCasterWithoutReturnType::class,
         'casted_property_with_param' => CustomCasterWithParam::class . ':param',
         'casted_property_with_static_return_docblock' => SelfCastingCasterWithStaticDocblockReturn::class,

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

@@ -83,7 +83,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
  * @property string $macaddress_not_nullable
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \Illuminate\Database\Eloquent\Collection<int, Post> $relationHasMany
+ * @property-read \Illuminate\Database\Eloquent\Collection|Post[] $relationHasMany
  * @method static \Illuminate\Database\Eloquent\Builder|Post newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Post newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Post query()

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

@@ -75,27 +75,27 @@ use Illuminate\Database\Eloquent\Relations\MorphToMany;
  * @property integer $id
  * @property-read Simple|null $relationBelongsTo
  * @property-read AnotherModel|null $relationBelongsToInAnotherNamespace
- * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationBelongsToMany
+ * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $relationBelongsToMany
  * @property-read int|null $relation_belongs_to_many_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationBelongsToManyWithSub
+ * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $relationBelongsToManyWithSub
  * @property-read int|null $relation_belongs_to_many_with_sub_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationBelongsToManyWithSubAnother
+ * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $relationBelongsToManyWithSubAnother
  * @property-read int|null $relation_belongs_to_many_with_sub_another_count
  * @property-read AnotherModel|null $relationBelongsToSameNameAsColumn
- * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationHasMany
+ * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $relationHasMany
  * @property-read int|null $relation_has_many_count
  * @property-read Simple|null $relationHasOne
  * @property-read Simple $relationHasOneWithDefault
- * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationMorphMany
+ * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $relationMorphMany
  * @property-read int|null $relation_morph_many_count
  * @property-read Simple|null $relationMorphOne
  * @property-read Model|\Eloquent $relationMorphTo
- * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationMorphedByMany
+ * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $relationMorphedByMany
  * @property-read int|null $relation_morphed_by_many_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationSampleRelationType
+ * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $relationSampleRelationType
  * @property-read int|null $relation_sample_relation_type_count
  * @property-read Model|\Eloquent $relationSampleToAnyMorphedRelationType
- * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationSampleToAnyRelationType
+ * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $relationSampleToAnyRelationType
  * @property-read int|null $relation_sample_to_any_relation_type_count
  * @property-read Simple $relationSampleToManyRelationType
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery()

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

@@ -28,10 +28,8 @@ class SimpleCast extends Model
         'cast_to_datetime_serialization' => 'datetime:Y-m-d H:i:s',
         'cast_to_custom_datetime' => 'custom_datetime:Y-m-d H:i:s',
         'cast_to_immutable_date' => 'immutable_date',
-        'cast_to_immutable_date_serialization' => 'immutable_date:Y-m-d',
         'cast_to_immutable_custom_datetime' => 'immutable_custom_datetime:Y-m-d H:i:s',
         'cast_to_immutable_datetime' => 'immutable_datetime',
-        'cast_to_immutable_datetime_serialization' => 'immutable_datetime:Y-m-d H:i:s',
         'cast_to_timestamp' => 'timestamp',
         'cast_to_encrypted' => 'encrypted',
         'cast_to_encrypted_array' => 'encrypted:array',

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

@@ -28,10 +28,8 @@ use Illuminate\Database\Eloquent\Model;
  * @property \Illuminate\Support\Carbon $cast_to_datetime_serialization
  * @property \Illuminate\Support\Carbon $cast_to_custom_datetime
  * @property \Carbon\CarbonImmutable $cast_to_immutable_date
- * @property \Carbon\CarbonImmutable $cast_to_immutable_date_serialization
  * @property \Carbon\CarbonImmutable $cast_to_immutable_custom_datetime
  * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime
- * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime_serialization
  * @property integer $cast_to_timestamp
  * @property mixed $cast_to_encrypted
  * @property array $cast_to_encrypted_array
@@ -60,9 +58,7 @@ use Illuminate\Database\Eloquent\Model;
  * @method static \Illuminate\Database\Eloquent\Builder|SimpleCast whereCastToFloat($value)
  * @method static \Illuminate\Database\Eloquent\Builder|SimpleCast whereCastToImmutableCustomDatetime($value)
  * @method static \Illuminate\Database\Eloquent\Builder|SimpleCast whereCastToImmutableDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|SimpleCast whereCastToImmutableDateSerialization($value)
  * @method static \Illuminate\Database\Eloquent\Builder|SimpleCast whereCastToImmutableDatetime($value)
- * @method static \Illuminate\Database\Eloquent\Builder|SimpleCast whereCastToImmutableDatetimeSerialization($value)
  * @method static \Illuminate\Database\Eloquent\Builder|SimpleCast whereCastToInt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|SimpleCast whereCastToInteger($value)
  * @method static \Illuminate\Database\Eloquent\Builder|SimpleCast whereCastToJson($value)
@@ -94,10 +90,8 @@ class SimpleCast extends Model
         'cast_to_datetime_serialization' => 'datetime:Y-m-d H:i:s',
         'cast_to_custom_datetime' => 'custom_datetime:Y-m-d H:i:s',
         'cast_to_immutable_date' => 'immutable_date',
-        'cast_to_immutable_date_serialization' => 'immutable_date:Y-m-d',
         'cast_to_immutable_custom_datetime' => 'immutable_custom_datetime:Y-m-d H:i:s',
         'cast_to_immutable_datetime' => 'immutable_datetime',
-        'cast_to_immutable_datetime_serialization' => 'immutable_datetime:Y-m-d H:i:s',
         'cast_to_timestamp' => 'timestamp',
         'cast_to_encrypted' => 'encrypted',
         'cast_to_encrypted_array' => 'encrypted:array',

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

@@ -12,7 +12,7 @@ use Illuminate\Database\Query\Builder;
  * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\UnionTypes\Models\UnionTypeModel
  *
  * @property-read string|int|null $foo
- * @property-read \Illuminate\Database\Eloquent\Collection<int, UnionTypeModel> $withUnionTypeReturn
+ * @property-read \Illuminate\Database\Eloquent\Collection|UnionTypeModel[] $withUnionTypeReturn
  * @property-read int|null $with_union_type_return_count
  * @method static \Illuminate\Database\Eloquent\Builder|UnionTypeModel newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UnionTypeModel newQuery()

tests/Console/ModelsCommand/migrations/____custom_casts_table.php

@@ -17,7 +17,6 @@ class CustomCastsTable extends Migration
             $table->string('casted_property_with_return_primitive');
             $table->string('casted_property_with_return_primitive_docblock');
             $table->string('casted_property_with_return_nullable_primitive');
-            $table->string('casted_property_with_return_nullable_primitive_and_nullable_column')->nullable();
             $table->string('casted_property_without_return');
             $table->string('casted_property_with_param');
             $table->string('casted_property_with_static_return_docblock');

tests/Console/ModelsCommand/migrations/____simple_casts_table.php

@@ -30,10 +30,8 @@ class SimpleCastsTable extends Migration
             $table->string('cast_to_datetime_serialization');
             $table->string('cast_to_custom_datetime');
             $table->string('cast_to_immutable_date');
-            $table->string('cast_to_immutable_date_serialization');
             $table->string('cast_to_immutable_custom_datetime');
             $table->string('cast_to_immutable_datetime');
-            $table->string('cast_to_immutable_datetime_serialization');
             $table->string('cast_to_timestamp');
             $table->string('cast_to_encrypted');
             $table->string('cast_to_encrypted_array');