Update CHANGELOG.md

.gitattributes

@@ -2,14 +2,14 @@
 # https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
 
 # Ignore all test and documentation with "export-ignore".
-/.editorconfig                export-ignore
+/.gitattributes     export-ignore
-/.gitattributes               export-ignore
+/.github            export-ignore
-/.github                      export-ignore
+/.gitignore         export-ignore
-/.gitignore                   export-ignore
+/.editorconfig      export-ignore
-/.php-cs-fixer.cache          export-ignore
+/phpunit.xml.dist   export-ignore
-/.php-cs-fixer.php            export-ignore
+/tests              export-ignore
-/.php-cs-fixer.tests.cache    export-ignore
+/.php_cs.common.php export-ignore
-/phpunit.xml.dist             export-ignore
+/.php_cs.dist       export-ignore
-/psalm-baseline.xml           export-ignore
+/.php_cs.tests.php  export-ignore
-/psalm.xml                    export-ignore
+/psalm.xml          export-ignore
-/tests                        export-ignore
+/psalm-baseline.xml export-ignore

.github/workflows/composer-normalize.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   normalize:
     timeout-minutes: 15
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Git checkout
         uses: actions/checkout@v4

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

@@ -7,7 +7,7 @@ jobs:
   fix-style:
     name: Fix Code Style
     timeout-minutes: 15
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     env:
       COMPOSER_NO_INTERACTION: 1
 
@@ -18,7 +18,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.0
           coverage: none
 
       - name: Install dependencies

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

@@ -12,19 +12,32 @@ on:
 
 jobs:
     php-laravel-integration-tests:
-        runs-on: ubuntu-22.04
+        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]
+                php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3]
-                laravel: [11.*, 10.*]
+                laravel: [10.*, 9.*, 8.*]
                 exclude:
-                  - php: 8.1
+                  - php: 8.0
-                    laravel: 11.*
+                    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 }}
         steps:
             - name: Checkout code

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

@@ -9,15 +9,15 @@ on:
 jobs:
     build:
         timeout-minutes: 15
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-20.04
 
         steps:
             - uses: actions/checkout@v4
-
+              
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                php-version: 8.3
+                php-version: 8.0
                 coverage: none
                 extensions: pdo_sqlite
 

.github/workflows/run-tests.yml

@@ -18,15 +18,28 @@ jobs:
       COMPOSER_NO_INTERACTION: 1
 
     strategy:
-      fail-fast: false
       matrix:
-        os: [ubuntu-22.04, windows-2019]
+        os: [ubuntu-20.04, windows-2019]
-        php: [8.3, 8.2, 8.1]
+        php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3]
-        laravel: [10.*, 11.*]
+        laravel: [8.*, 9.*, 10.*]
-        stability: [prefer-lowest, prefer-stable]
+        dependency-version: [prefer-lowest, prefer-stable]
         exclude:
-          - php: 8.1
+          - php: 8.0
-            laravel: 11.*
+            laravel: 10.*
+          - php: 7.4
+            laravel: 10.*
+          - php: 7.3
+            laravel: 10.*
+          - php: 8.0
+            dependency-version: prefer-lowest
+          - php: 7.4
+            laravel: 9.*
+          - php: 7.3
+            laravel: 9.*
+          - os: windows-2019
+            php: 7.4
+          - os: windows-2019
+            php: 7.3
     steps:
     - name: Set git to use LF
       if: ${{ matrix.os == 'windows-2019' }}
@@ -49,7 +62,7 @@ jobs:
         composer remove vimeo/psalm --no-update --dev
         composer remove friendsofphp/php-cs-fixer --no-update --dev
         composer require "laravel/framework:${{ matrix.laravel }}" --no-update --no-progress
-        composer update --prefer-dist --no-progress --${{ matrix.stability }}
+        composer update --prefer-dist --no-progress
 
     - name: Execute Unit Tests
       run: composer test-ci

.gitignore

@@ -1,8 +1,8 @@
 .phpunit.result.cache
 
 /.idea
-/.php-cs-fixer.cache
+/.php_cs
-/.php-cs-fixer.php
+/.php_cs.cache
-/.php-cs-fixer.tests.cache
+/.php_cs.tests.cache
 /composer.lock
 /vendor

.php_cs.common.php

@@ -30,6 +30,7 @@ return [
     ],
     'return_type_declaration' => true,
     'short_scalar_cast' => true,
+    'single_blank_line_before_namespace' => true,
     'single_trait_insert_per_statement' => true,
     'ternary_operator_spaces' => true,
     'visibility_required' => [
@@ -55,7 +56,7 @@ return [
     'no_unused_imports' => true,
     'single_quote' => true,
     'space_after_semicolon' => true,
-    'trailing_comma_in_multiline' => true,
+    'trailing_comma_in_multiline_array' => true,
     'trim_array_spaces' => true,
     'unary_operator_spaces' => true,
     'whitespace_after_comma_in_array' => true,

.php_cs.dist

@@ -5,10 +5,10 @@ $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__)
     ->exclude('tests');
 
-$config = require __DIR__ . '/.php-cs-fixer.common.php';
+$config = require __DIR__ . '/.php_cs.common.php';
 
-return (new PhpCsFixer\Config())
+return PhpCsFixer\Config::create()
     ->setFinder($finder)
     ->setRules($config)
     ->setRiskyAllowed(true)
-    ->setCacheFile(__DIR__ . '/.php-cs-fixer.cache');
+    ->setCacheFile(__DIR__ . '/.php_cs.cache');

.php_cs.tests.php

@@ -5,7 +5,7 @@ $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__ . '/tests')
     ->exclude('__snapshots__');
 
-$config = require __DIR__ . '/.php-cs-fixer.common.php';
+$config = require __DIR__ . '/.php_cs.common.php';
 
 // Additional rules for tests
 $config = array_merge(
@@ -15,8 +15,8 @@ $config = array_merge(
     ]
 );
 
-return (new PhpCsFixer\Config())
+return PhpCsFixer\Config::create()
     ->setFinder($finder)
     ->setRules($config)
     ->setRiskyAllowed(true)
-    ->setCacheFile(__DIR__ . '/.php-cs-fixer.tests.cache');
+    ->setCacheFile(__DIR__ . '/.php_cs.tests.cache');

CHANGELOG.md

@@ -2,60 +2,9 @@
 
 All notable changes to this project will be documented in this file.
 
-[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v2.15.0...master)
+[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v2.14.0...master)
 --------------
 
-### Fixed
-
-### Added
-- Support for Laravel 11 [#1520 / KentarouTakeda](https://github.com/barryvdh/laravel-ide-helper/pull/1520)
-
-### Changed
-- Merge --reset and --smart-reset, to always keep the text. Always skipp the classname [#1523 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1523)
-- Use short types (`int` and `bool` instead of `integer` and `boolean`) [#1524 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1524)
-
-### Removed
-- Support for Laravel 9 and use of doctrine/dbal [#1512 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1512) 
-  With this functionality gone, a few changes have been made:
-  - support for custom datatypes has been dropped (config `custom_db_types`) unknown data types default to `string` now and to fix the type, add a proper cast in Eloquent
-  - You _might_ have top-level dependency on doctrine/dbal. This may have been in the past due to ide-helper, we suggest to check if you still need it and remove it otherwise
-  - Minimum PHP version, due to Laravel 10, is now PHP 8.1
-
-2024-02-15, 2.15.1
-------------------
-
-### Fixed
-- Fix final class keyword in wrong position [#1517 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1517)
-
-### Changed
-
-### Added
-
-2024-02-14, 2.15.0
-------------------
-### Fixed
-- Fix case issue in `ModelsCommand::unsetMethod()` [#1453 / leo108](https://github.com/barryvdh/laravel-ide-helper/pull/1453)
-- Fix non-facade classes will result in no autocomplete [#841 / netpok](https://github.com/barryvdh/laravel-ide-helper/pull/841)
-- Skip swoole, otherwise fatal error [#1477 / TimoFrenzel](https://github.com/barryvdh/laravel-ide-helper/pull/1477)
-- Fix vulnerability CVE-2021-43608 [#1392 / allanlaal](https://github.com/barryvdh/laravel-ide-helper/pull/1392)
-- Reset foreignKeyConstraintsColumns on model loop start [#1461 / snmatsui](https://github.com/barryvdh/laravel-ide-helper/pull/1461)
-- Accept scope & scopes as relation [#1452 / Muetze42](https://github.com/barryvdh/laravel-ide-helper/pull/1452)
-- Fix #1300 relation_return_type must take precedence if it is defined [#1394 / menthol](https://github.com/barryvdh/laravel-ide-helper/pull/1394)
-
-### Changed
-- Disable inspections of helper files [#1486 / eidng8](https://github.com/barryvdh/laravel-ide-helper/pull/1486)
-- Removed support for Laravel 8 and therefore for PHP < 8.0 [#1504 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1504)
-
-### Added
-- Add support for enum default arguments using enum cases. [#1464 / d8vjork](https://github.com/barryvdh/laravel-ide-helper/pull/1464)
-- Add support for real-time facades in the helper file. [#1455 / filipac](https://github.com/barryvdh/laravel-ide-helper/pull/1455)
-- Add support for relations with composite keys. [#1479 / calebdw](https://github.com/barryvdh/laravel-ide-helper/pull/1479)
-- Add support for attribute accessors with no backing field or type hinting [#1411 / pindab0ter](https://github.com/barryvdh/laravel-ide-helper/pull/1411).
-- Add support for AsCollection and AsArrayObject casts [#1393 / pataar](https://github.com/barryvdh/laravel-ide-helper/pull/1393)
-- Reintroduce support for multi-db setups [#1426 / benpoulson](https://github.com/barryvdh/laravel-ide-helper/pull/1426)
-- Support the BINARY(...) database field type [#1434 / Sfonxs](https://github.com/barryvdh/laravel-ide-helper/pull/1434)
-- Add AllowDynamicProperties Attribute to cooperate with php8.2 deprecation [#1428 / GeoSot](https://github.com/barryvdh/laravel-ide-helper/pull/1428)
-
 2024-02-05, 2.14.0
 ------------------
 
@@ -64,12 +13,12 @@ All notable changes to this project will be documented in this file.
 - 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)
-- Add support for attribute accessors marked as protected. [#1339 / pindab0ter](https://github.com/barryvdh/laravel-ide-helper/pull/1339)
 
 2023-02-04, 2.13.0
 ------------------

README.md

@@ -11,7 +11,7 @@
 This package generates helper files that enable your IDE to provide accurate autocompletion.
 Generation is done based on the files in your project, so they are always up-to-date.
 
-The 3.x branch supports Laravel 10 and 11. For older version, use the 2.x releases.
+It supports Laravel 8+ and PHP 7.3+
 
 - [Installation](#installation)
 - [Usage](#usage)
@@ -72,7 +72,7 @@ If for some reason you want manually control this:
 _Check out [this Laracasts video](https://laracasts.com/series/how-to-be-awesome-in-phpstorm/episodes/15) for a quick introduction/explanation!_
 
 - `php artisan ide-helper:generate` - [PHPDoc generation for Laravel Facades ](#automatic-phpdoc-generation-for-laravel-facades)
-- `php artisan ide-helper:models` - [PHPDocs for models](#automatic-phpdocs-for-models)
+- `php artisan ide-helper:models` - [PHPDocs for models](#automatic-PHPDocs-for-models)
 - `php artisan ide-helper:meta` - [PhpStorm Meta file](#phpstorm-meta-for-container-instances)
 
 
@@ -113,10 +113,6 @@ The generator tries to identify the real class, but if it cannot be found, you c
 Some classes need a working database connection. If you do not have a default working connection, some facades will not be included.
 You can use an in-memory SQLite driver by adding the `-M` option.
 
-If you use [real-time facades](https://laravel.com/docs/master/facades#real-time-facades) in your app, those will also be included in the generated file using a `@mixin` annotation and extending the original class underneath the facade. 
-
-**Note**: this feature uses the generated real-time facades files in the `storage/framework/cache` folder. Those files are generated on-demand as you use the real-time facade, so if the framework has not generated that first, it will not be included in the helper file. Run the route/command/code first and then regenerate the helper file and this time the real-time facade will be included in it.
-
 You can choose to include helper files. This is not enabled by default, but you can override it with the `--helpers (-H)` option.
 The `Illuminate/Support/helpers.php` is already set up, but you can add/remove your own files in the config file.
 
@@ -149,9 +145,9 @@ The class name will be different from the model, avoiding the IDE duplicate anno
 
 > Please make sure to back up your models, before writing the info.
 
-Writing to the models should keep the existing comments and only append new properties/methods. It will not update changed properties/methods.
+Writing to the models should keep the existing comments and only append new properties/methods.
-
+The existing PHPDoc is replaced, or added if not found.
-With the `--reset (-R)` option, the whole existing PHPDoc is replaced, including any comments that have been made. The `--smart-reset` option will instead keep the 'text' part of the phpdoc comment, and just replace all the property/method defininitions.
+With the `--reset (-R)` option, the existing PHPDocs are ignored, and only the newly found columns/relations are saved as PHPDocs.
 
 ```bash
 php artisan ide-helper:models "App\Models\Post"
@@ -271,6 +267,26 @@ add support for creating a new dedicated class instead of using local scopes in
 
 If for some reason it's undesired to have them generated (one for each column), you can disable this via config `write_model_external_builder_methods` and setting it to `false`.
 
+#### Unsupported or custom database types
+
+Common column types (e.g. varchar, integer) are correctly mapped to PHP types (`string`, `int`).
+
+But sometimes you may want to use custom column types in your database like `geography`, `jsonb`, `citext`, `bit`, etc. which may throw an "Unknown database type"-Exception.
+
+For those special cases, you can map them via the config `custom_db_types`. Example:
+```php
+'custom_db_types' => [
+    'mysql' => [
+        'geography' => 'array',
+        'point' => 'array',
+    ],
+    'postgresql' => [
+        'jsonb' => 'string',
+        '_int4' => 'array',
+    ],
+],
+```
+
 #### Custom Relationship Types
 
 If you are using relationships not built into Laravel you will need to specify the name and returning class in the config to get proper generation.

composer.json

@@ -20,31 +20,30 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^7.3 || ^8.0",
         "ext-json": "*",
-        "barryvdh/reflection-docblock": "^2.1.1",
+        "barryvdh/reflection-docblock": "^2.0.6",
         "composer/class-map-generator": "^1.0",
-        "illuminate/console": "^10 || ^11",
+        "doctrine/dbal": "^2.6 || ^3",
-        "illuminate/database": "^10.38 || ^11",
+        "illuminate/console": "^8 || ^9 || ^10",
-        "illuminate/filesystem": "^10 || ^11",
+        "illuminate/filesystem": "^8 || ^9 || ^10",
-        "illuminate/support": "^10 || ^11",
+        "illuminate/support": "^8 || ^9 || ^10",
         "nikic/php-parser": "^4.18 || ^5",
-        "phpdocumentor/reflection-docblock": "^5.3",
         "phpdocumentor/type-resolver": "^1.1.0"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
-        "friendsofphp/php-cs-fixer": "^3",
+        "friendsofphp/php-cs-fixer": "^2",
-        "illuminate/config": "^9 || ^10 || ^11",
+        "illuminate/config": "^8 || ^9 || ^10",
-        "illuminate/view": "^9 || ^10 || ^11",
+        "illuminate/view": "^8 || ^9 || ^10",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^8 || ^9",
+        "orchestra/testbench": "^6 || ^7 || ^8",
-        "phpunit/phpunit": "^10.5",
+        "phpunit/phpunit": "^8.5 || ^9",
-        "spatie/phpunit-snapshot-assertions": "^4 || ^5",
+        "spatie/phpunit-snapshot-assertions": "^3 || ^4",
         "vimeo/psalm": "^5.4"
     },
     "suggest": {
-        "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9|^10|^11)."
+        "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9|^10)."
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -66,7 +65,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0-dev"
+            "dev-master": "2.14-dev"
         },
         "laravel": {
             "providers": [
@@ -82,7 +81,7 @@
         ],
         "fix-style": [
             "php-cs-fixer fix",
-            "php-cs-fixer fix --config=.php-cs-fixer.tests.php"
+            "php-cs-fixer fix --config=.php_cs.tests.php"
         ],
         "psalm-set-baseline": "psalm --set-baseline=psalm-baseline.xml",
         "test": "phpunit",

config/ide-helper.php

@@ -200,6 +200,36 @@ return [
 
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Support for custom DB types
+    |--------------------------------------------------------------------------
+    |
+    | This setting allow you to map any custom database type (that you may have
+    | created using CREATE TYPE statement or imported using database plugin
+    | / extension to a Doctrine type.
+    |
+    | Each key in this array is a name of the Doctrine2 DBAL Platform. Currently valid names are:
+    | 'postgresql', 'db2', 'drizzle', 'mysql', 'oracle', 'sqlanywhere', 'sqlite', 'mssql'
+    |
+    | This name is returned by getName() method of the specific Doctrine/DBAL/Platforms/AbstractPlatform descendant
+    |
+    | The value of the array is an array of type mappings. Key is the name of the custom type,
+    | (for example, "jsonb" from Postgres 9.4) and the value is the name of the corresponding Doctrine2 type (in
+    | our case it is 'json_array'. Doctrine types are listed here:
+    | https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/types.html#types
+    |
+    | So to support jsonb in your models when working with Postgres, just add the following entry to the array below:
+    |
+    | "postgresql" => array(
+    |       "jsonb" => "json_array",
+    |  ),
+    |
+    */
+    'custom_db_types' => [
+
+    ],
+
     /*
      |--------------------------------------------------------------------------
      | Support for camel cased models
@@ -292,8 +322,7 @@ return [
     |
     | When using custom relation types its possible for the class name to not contain
     | the proper return type of the relation. The key of the array is the relationship
-    | method name. The value of the array is the return type of the relation ('many'
+    | method name. The value of the array is the return type of the relation.
-    | or 'morphTo').
     | e.g. `'relationName' => 'many'`.
     |
     */

psalm-baseline.xml

@@ -16,9 +16,4 @@
       <code>\Storage</code>
     </UndefinedClass>
   </file>
-  <file src="src/Console/ModelsCommand.php">
-    <UndefinedClass occurrences="1">
-      <code>\UnitEnum</code>
-    </UndefinedClass>
-  </file>
 </files>

resources/views/helper.php

@@ -8,7 +8,6 @@
  */
 ?>
 
-/* @noinspection ALL */
 // @formatter:off
 // phpcs:ignoreFile
 
@@ -23,12 +22,15 @@
  */
 
 <?php foreach ($namespaces_by_extends_ns as $namespace => $aliases) : ?>
-namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> {
+    <?php if ($namespace == '\Illuminate\Database\Eloquent') :
+        continue;
+    endif; ?>
+namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> { 
     <?php foreach ($aliases as $alias) : ?>
-        <?= trim($alias->getDocComment('    ')) ?>
+        <?= trim($alias->getDocComment('    ')) ?> 
         <?= $alias->getClassType() ?> <?= $alias->getExtendsClass() ?> {
         <?php foreach ($alias->getMethods() as $method) : ?>
-            <?= trim($method->getDocComment('        ')) ?>
+            <?= trim($method->getDocComment('        ')) ?> 
         public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
         {<?php if ($method->getDeclaringClass() !== $method->getRoot()) : ?>
             //Method inherited from <?= $method->getDeclaringClass() ?>
@@ -39,19 +41,19 @@ namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> {
             <?php endif?>
             <?= $method->shouldReturn() ? 'return ' : '' ?><?= $method->getRootMethodCall() ?>;
         }
-        <?php endforeach; ?>
+        <?php endforeach; ?> 
     }
-    <?php endforeach; ?>
+    <?php endforeach; ?> 
 }
 
 <?php endforeach; ?>
 
 <?php foreach ($namespaces_by_alias_ns as $namespace => $aliases) : ?>
-namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> {
+namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> { 
     <?php foreach ($aliases as $alias) : ?>
         <?= $alias->getClassType() ?> <?= $alias->getShortName() ?> extends <?= $alias->getExtends() ?> {<?php if ($alias->getExtendsNamespace() == '\Illuminate\Database\Eloquent') : ?>
-            <?php foreach ($alias->getMethods() as $method) : ?>
+            <?php foreach ($alias->getMethods() as $method) : ?> 
-                <?= trim($method->getDocComment('            ')) ?>
+                <?= trim($method->getDocComment('            ')) ?> 
             public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
             {<?php if ($method->getDeclaringClass() !== $method->getRoot()) : ?>
                 //Method inherited from <?= $method->getDeclaringClass() ?>
@@ -64,24 +66,14 @@ namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> {
             }
             <?php endforeach; ?>
         <?php endif; ?>}
-    <?php endforeach; ?>
+    <?php endforeach; ?> 
 }
 
 <?php endforeach; ?>
 
-<?php foreach($real_time_facades as $name): ?>
-<?php $nested = explode('\\', str_replace('\\' . class_basename($name), '', $name)); ?>
-namespace <?php echo implode('\\', $nested); ?> {
-    /**
-     * @mixin <?= str_replace('Facades', '', $name) ?>
-     */
-    class <?= class_basename($name) ?> extends <?= str_replace('Facades', '', $name) ?> {}
-}
-<?php endforeach; ?>
-
 <?php if ($helpers) : ?>
 namespace {
-    <?= $helpers ?>
+    <?= $helpers ?> 
 }
 <?php endif; ?>
 

resources/views/meta.php

@@ -1,8 +1,6 @@
 <?= '<?php' ?>
 
-/* @noinspection ALL */
 // @formatter:off
-// phpcs:ignoreFile
 
 namespace PHPSTORM_META {
 

src/Alias.php

@@ -11,15 +11,14 @@
 
 namespace Barryvdh\LaravelIdeHelper;
 
-use Barryvdh\LaravelIdeHelper\DocBlock\DocBlockBuilder;
+use Barryvdh\Reflection\DocBlock;
+use Barryvdh\Reflection\DocBlock\Context;
+use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
+use Barryvdh\Reflection\DocBlock\Tag\MethodTag;
 use Closure;
 use Illuminate\Config\Repository as ConfigRepository;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Support\Facades\Facade;
-use phpDocumentor\Reflection\DocBlock;
-use phpDocumentor\Reflection\DocBlock\Serializer;
-use phpDocumentor\Reflection\DocBlock\Tags\Method as MethodTag;
-use phpDocumentor\Reflection\Types\Context;
 use ReflectionClass;
 use Throwable;
 
@@ -42,7 +41,6 @@ class Alias
     protected $magicMethods = [];
     protected $interfaces = [];
     protected $phpdoc = null;
-    protected $phpdocContext = null;
     protected $classAliases = [];
 
     /** @var ConfigRepository  */
@@ -84,11 +82,8 @@ class Alias
         if (!empty($this->namespace)) {
             $this->classAliases = (new UsesResolver())->loadFromClass($this->root);
 
-            //Create a DocBlock
+            //Create a DocBlock and serializer instance
-            $this->phpdocContext = new Context($this->namespace, $this->classAliases);
+            $this->phpdoc = new DocBlock(new ReflectionClass($alias), new Context($this->namespace, $this->classAliases));
-            $reflector = new ReflectionClass($alias);
-
-            $this->phpdoc = DocBlockBuilder::createFromReflector($reflector, $this->phpdocContext);
         }
 
         if ($facade === '\Illuminate\Database\Eloquent\Model') {
@@ -334,7 +329,7 @@ class Alias
                 continue;
             }
             $method = new \ReflectionMethod($className, $name);
-            $class = new ReflectionClass($className);
+            $class = new \ReflectionClass($className);
 
             if (!in_array($magic, $this->usedMethods)) {
                 if ($class !== $this->root) {
@@ -353,7 +348,7 @@ class Alias
     protected function detectMethods()
     {
         foreach ($this->classes as $class) {
-            $reflection = new ReflectionClass($class);
+            $reflection = new \ReflectionClass($class);
 
             $methods = $reflection->getMethods(\ReflectionMethod::IS_PUBLIC);
             if ($methods) {
@@ -427,7 +422,8 @@ class Alias
      */
     public function getDocComment($prefix = "\t\t")
     {
-        $serializer = new Serializer(1, $prefix);
+        $serializer = new DocBlockSerializer(1, $prefix);
+
         if (!$this->phpdoc) {
             return '';
         }
@@ -437,13 +433,13 @@ class Alias
             // we can perform reflection on the class and
             // add in the original class DocBlock
             if (count($this->phpdoc->getTags()) === 0) {
-                $reflector = new ReflectionClass($this->root);
+                $class = new ReflectionClass($this->root);
-                $this->phpdoc = DocBlockBuilder::createFromReflector($reflector, $this->phpdocContext);
+                $this->phpdoc = new DocBlock($class->getDocComment());
             }
         }
 
         $this->removeDuplicateMethodsFromPhpDoc();
-        return $serializer->getDocComment($this->phpdoc->getDocBlock());
+        return $serializer->getDocComment($this->phpdoc);
     }
 
     /**
@@ -460,7 +456,7 @@ class Alias
 
         foreach ($this->phpdoc->getTags() as $tag) {
             if ($tag instanceof MethodTag && in_array($tag->getMethodName(), $methodNames)) {
-                $this->phpdoc->removeTag($tag);
+                $this->phpdoc->deleteTag($tag);
             }
         }
     }

src/Console/GeneratorCommand.php

@@ -42,7 +42,7 @@ class GeneratorCommand extends Command
     /** @var \Illuminate\Config\Repository */
     protected $config;
 
-    /** @var Filesystem */
+    /** @var \Illuminate\Filesystem\Filesystem */
     protected $files;
 
     /** @var \Illuminate\View\Factory */
@@ -54,7 +54,7 @@ class GeneratorCommand extends Command
     /**
      *
      * @param \Illuminate\Config\Repository $config
-     * @param Filesystem $files
+     * @param \Illuminate\Filesystem\Filesystem $files
      * @param \Illuminate\View\Factory $view
      */
     public function __construct(

src/Console/ModelsCommand.php

@@ -12,14 +12,17 @@
 namespace Barryvdh\LaravelIdeHelper\Console;
 
 use Barryvdh\LaravelIdeHelper\Contracts\ModelHookInterface;
-use Barryvdh\LaravelIdeHelper\DocBlock\DocBlockBuilder;
+use Barryvdh\Reflection\DocBlock;
+use Barryvdh\Reflection\DocBlock\Context;
+use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
+use Barryvdh\Reflection\DocBlock\Tag;
 use Composer\ClassMapGenerator\ClassMapGenerator;
+use Doctrine\DBAL\Exception as DBALException;
+use Doctrine\DBAL\Types\Type;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Database\Eloquent\Castable;
 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\Attribute;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Model;
@@ -34,15 +37,9 @@ use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\Relations\Relation;
-use Illuminate\Database\Schema\Builder;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
-use phpDocumentor\Reflection\DocBlock\Serializer;
-use phpDocumentor\Reflection\DocBlock\Tag;
-use phpDocumentor\Reflection\DocBlock\Tags\BaseTag;
-use phpDocumentor\Reflection\DocBlockFactory;
 use phpDocumentor\Reflection\Types\ContextFactory;
 use ReflectionClass;
 use ReflectionNamedType;
@@ -106,6 +103,7 @@ class ModelsCommand extends Command
     protected $write_mixin = false;
     protected $dirs = [];
     protected $reset;
+    protected $keep_text;
     protected $phpstorm_noinspections;
     protected $write_model_external_builder_methods;
     /**
@@ -151,8 +149,11 @@ class ModelsCommand extends Command
         );
         $model = $this->argument('model');
         $ignore = $this->option('ignore');
-        $this->reset = $this->option('reset') || $this->option('smart-reset');
+        $this->reset = $this->option('reset');
         $this->phpstorm_noinspections = $this->option('phpstorm-noinspections');
+        if ($this->option('smart-reset')) {
+            $this->keep_text = $this->reset = true;
+        }
         $this->write_model_magic_where = $this->laravel['config']->get('ide-helper.write_model_magic_where', true);
         $this->write_model_external_builder_methods = $this->laravel['config']->get('ide-helper.write_model_external_builder_methods', true);
         $this->write_model_relation_count_properties =
@@ -215,8 +216,8 @@ class ModelsCommand extends Command
               "Write models to {$this->filename} and adds @mixin to each model, avoiding IDE duplicate declaration warnings",
           ],
           ['nowrite', 'N', InputOption::VALUE_NONE, 'Don\'t write to Model file'],
-          ['reset', 'R', InputOption::VALUE_NONE, 'Refresh the properties/methods list, but keep the text'],
+          ['reset', 'R', InputOption::VALUE_NONE, 'Remove the original phpdocs instead of appending'],
-          ['smart-reset', 'r', InputOption::VALUE_NONE, 'Deprecated: same as --reset'],
+          ['smart-reset', 'r', InputOption::VALUE_NONE, 'Refresh the properties/methods list, but keep the text'],
           ['phpstorm-noinspections', 'p', InputOption::VALUE_NONE,
               'Add PhpFullyQualifiedNameUsageInspection and PhpUnnecessaryFullyQualifiedNameInspection PHPStorm ' .
               'noinspection tags',
@@ -240,6 +241,8 @@ class ModelsCommand extends Command
  */
 \n\n";
 
+        $hasDoctrine = interface_exists('Doctrine\DBAL\Driver');
+
         if (empty($loadModels)) {
             $models = $this->loadModels();
         } else {
@@ -263,7 +266,6 @@ class ModelsCommand extends Command
             }
             $this->properties = [];
             $this->methods = [];
-            $this->foreignKeyConstraintsColumns = [];
             if (class_exists($name)) {
                 try {
                     // handle abstract classes, interfaces, ...
@@ -282,7 +284,9 @@ class ModelsCommand extends Command
 
                     $model = $this->laravel->make($name);
 
-                    $this->getPropertiesFromTable($model);
+                    if ($hasDoctrine) {
+                        $this->getPropertiesFromTable($model);
+                    }
 
                     if (method_exists($model, 'getCasts')) {
                         $this->castPropertiesType($model);
@@ -306,6 +310,13 @@ class ModelsCommand extends Command
             }
         }
 
+        if (!$hasDoctrine) {
+            $this->error(
+                'Warning: `"doctrine/dbal": "~2.3"` is required to load database information. ' .
+                'Please require that in your composer.json and run `composer update`.'
+            );
+        }
+
         return $output;
     }
 
@@ -343,7 +354,7 @@ class ModelsCommand extends Command
     /**
      * cast the properties's type from $casts.
      *
-     * @param Model $model
+     * @param \Illuminate\Database\Eloquent\Model $model
      */
     public function castPropertiesType($model)
     {
@@ -375,7 +386,7 @@ class ModelsCommand extends Command
                     break;
                 case 'boolean':
                 case 'bool':
-                    $realType = 'bool';
+                    $realType = 'boolean';
                     break;
                 case 'decimal':
                 case 'string':
@@ -391,7 +402,7 @@ class ModelsCommand extends Command
                 case 'int':
                 case 'integer':
                 case 'timestamp':
-                    $realType = 'int';
+                    $realType = 'integer';
                     break;
                 case 'real':
                 case 'double':
@@ -406,13 +417,9 @@ class ModelsCommand extends Command
                 case 'immutable_datetime':
                     $realType = '\Carbon\CarbonImmutable';
                     break;
-                case AsCollection::class:
                 case 'collection':
                     $realType = '\Illuminate\Support\Collection';
                     break;
-                case AsArrayObject::class:
-                    $realType = '\ArrayObject';
-                    break;
                 default:
                     // In case of an optional custom cast parameter , only evaluate
                     // the `$type` until the `:`
@@ -491,16 +498,33 @@ class ModelsCommand extends Command
     /**
      * Load the properties from the database table.
      *
-     * @param Model $model
+     * @param \Illuminate\Database\Eloquent\Model $model
      *
+     * @throws DBALException If custom field failed to register
      */
     public function getPropertiesFromTable($model)
     {
-        $table = $model->getTable();
+        $database = $model->getConnection()->getDatabaseName();
-        $schema = $model->getConnection()->getSchemaBuilder();
+        $table = $model->getConnection()->getTablePrefix() . $model->getTable();
-        $columns = $schema->getColumns($table);
+        $schema = $model->getConnection()->getDoctrineSchemaManager();
-        $driverName = $model->getConnection()->getDriverName();
+        $databasePlatform = $schema->getDatabasePlatform();
+        $databasePlatform->registerDoctrineTypeMapping('enum', 'string');
 
+        $platformName = $databasePlatform->getName();
+        $customTypes = $this->laravel['config']->get("ide-helper.custom_db_types.{$platformName}", []);
+        foreach ($customTypes as $yourTypeName => $doctrineTypeName) {
+            try {
+                if (!Type::hasType($yourTypeName)) {
+                    Type::addType($yourTypeName, get_class(Type::getType($doctrineTypeName)));
+                }
+            } catch (DBALException $exception) {
+                $this->error("Failed registering custom db type \"$yourTypeName\" as \"$doctrineTypeName\"");
+                throw $exception;
+            }
+            $databasePlatform->registerDoctrineTypeMapping($yourTypeName, $doctrineTypeName);
+        }
+
+        $columns = $schema->listTableColumns($table, $database);
 
         if (!$columns) {
             return;
@@ -508,28 +532,49 @@ class ModelsCommand extends Command
 
         $this->setForeignKeys($schema, $table);
         foreach ($columns as $column) {
-            $name = $column['name'];
+            $name = $column->getName();
             if (in_array($name, $model->getDates())) {
                 $type = $this->dateClass;
             } else {
-                // Match types to php equivalent
+                $type = $column->getType()->getName();
-                $type = match ($column['type_name']) {
+                switch ($type) {
-                    'tinyint', 'bit',
+                    case 'string':
-                    'integer', 'int', 'int4',
+                    case 'text':
-                    'smallint', 'int2',
+                    case 'date':
-                    'mediumint',
+                    case 'time':
-                    'bigint', 'int8' => 'int',
+                    case 'guid':
-
+                    case 'datetimetz':
-                    'boolean', 'bool' => 'bool',
+                    case 'datetime':
-
+                    case 'decimal':
-                    'float', 'real', 'float4',
+                        $type = 'string';
-                    'double', 'float8' => 'float',
+                        break;
-
+                    case 'integer':
-                    default => 'string',
+                    case 'bigint':
-                };
+                    case 'smallint':
+                        $type = 'integer';
+                        break;
+                    case 'boolean':
+                        switch ($platformName) {
+                            case 'sqlite':
+                            case 'mysql':
+                                $type = 'integer';
+                                break;
+                            default:
+                                $type = 'boolean';
+                                break;
+                        }
+                        break;
+                    case 'float':
+                        $type = 'float';
+                        break;
+                    default:
+                        $type = 'mixed';
+                        break;
+                }
             }
 
-            if ($column['nullable']) {
+            $comment = $column->getComment();
+            if (!$column->getNotnull()) {
                 $this->nullableColumns[$name] = true;
             }
             $this->setProperty(
@@ -537,8 +582,8 @@ class ModelsCommand extends Command
                 $this->getTypeInModel($model, $type),
                 true,
                 true,
-                $column['comment'],
+                $comment,
-                $column['nullable']
+                !$column->getNotnull()
             );
             if ($this->write_model_magic_where) {
                 $builderClass = $this->write_model_external_builder_methods
@@ -557,7 +602,7 @@ class ModelsCommand extends Command
     }
 
     /**
-     * @param Model $model
+     * @param \Illuminate\Database\Eloquent\Model $model
      */
     public function getPropertiesFromMethods($model)
     {
@@ -568,7 +613,10 @@ class ModelsCommand extends Command
             // methods that resemble mutators but aren't.
             $reflections = array_filter($reflections, function (\ReflectionMethod $methodReflection) {
                 return !$methodReflection->isPrivate() && !(
-                    $methodReflection->getDeclaringClass()->getName() === Model::class && (
+                    in_array(
+                        \Illuminate\Database\Eloquent\Concerns\HasAttributes::class,
+                        $methodReflection->getDeclaringClass()->getTraitNames()
+                    ) && (
                         $methodReflection->getName() === 'setClassCastableAttribute' ||
                         $methodReflection->getName() === 'setEnumCastableAttribute'
                     )
@@ -594,15 +642,18 @@ class ModelsCommand extends Command
                         $this->setProperty($name, $type, true, null, $comment);
                     }
                 } elseif ($isAttribute) {
-                    $types = $this->getAttributeTypes($model, $reflection);
+                    $name = Str::snake($method);
-                    $type = $this->getTypeInModel($model, $types->get('get') ?: $types->get('set')) ?: null;
+                    $types = $this->getAttributeReturnType($model, $reflection);
-                    $this->setProperty(
+                    $comment = $this->getCommentFromDocBlock($reflection);
-                        Str::snake($method),
+
-                        $type,
+                    if ($types->has('get')) {
-                        $types->has('get'),
+                        $type = $this->getTypeInModel($model, $types['get']);
-                        $types->has('set'),
+                        $this->setProperty($name, $type, true, null, $comment);
-                        $this->getCommentFromDocBlock($reflection)
+                    }
-                    );
+
+                    if ($types->has('set')) {
+                        $this->setProperty($name, null, null, true, $comment);
+                    }
                 } elseif (
                     Str::startsWith($method, 'set') && Str::endsWith(
                         $method,
@@ -615,7 +666,7 @@ class ModelsCommand extends Command
                         $comment = $this->getCommentFromDocBlock($reflection);
                         $this->setProperty($name, null, null, true, $comment);
                     }
-                } elseif (Str::startsWith($method, 'scope') && $method !== 'scopeQuery' && $method !== 'scope' && $method !== 'scopes') {
+                } elseif (Str::startsWith($method, 'scope') && $method !== 'scopeQuery') {
                     //Magic set<name>Attribute
                     $name = Str::camel(substr($method, 5));
                     if (!empty($name)) {
@@ -701,14 +752,9 @@ class ModelsCommand extends Command
                                     get_class($relationObj->getRelated())
                                 );
 
-                                $relationReturnType = $this->getRelationReturnTypes()[$relation] ?? false;
-
                                 if (
-                                    $relationReturnType === 'many' ||
+                                    strpos(get_class($relationObj), 'Many') !== false ||
-                                    (
+                                    ($this->getRelationReturnTypes()[$relation] ?? '') === 'many'
-                                        !$relationReturnType &&
-                                        strpos(get_class($relationObj), 'Many') !== false
-                                    )
                                 ) {
                                     //Collection or array of models (because Collection is Arrayable)
                                     $relatedClass = '\\' . get_class($relationObj->getRelated());
@@ -731,15 +777,12 @@ class ModelsCommand extends Command
                                             'int|null',
                                             true,
                                             false
-                                            // What kind of comments should be added to the relation count here?
+                                        // What kind of comments should be added to the relation count here?
                                         );
                                     }
                                 } elseif (
-                                    $relationReturnType === 'morphTo' ||
+                                    $relation === 'morphTo' ||
-                                    (
+                                    ($this->getRelationReturnTypes()[$relation] ?? '') === 'morphTo'
-                                        !$relationReturnType &&
-                                        $relation === 'morphTo'
-                                    )
                                 ) {
                                     // Model isn't specified because relation is polymorphic
                                     $this->setProperty(
@@ -794,17 +837,12 @@ class ModelsCommand extends Command
         $fkProp = $reflectionObj->getProperty('foreignKey');
         $fkProp->setAccessible(true);
 
-        foreach (Arr::wrap($fkProp->getValue($relationObj)) as $foreignKey) {
+        if ($relation === 'belongsTo') {
-            if (isset($this->nullableColumns[$foreignKey])) {
+            return isset($this->nullableColumns[$fkProp->getValue($relationObj)]) ||
-                return true;
+                !in_array($fkProp->getValue($relationObj), $this->foreignKeyConstraintsColumns, true);
-            }
-
-            if (!in_array($foreignKey, $this->foreignKeyConstraintsColumns, true)) {
-                return true;
-            }
         }
 
-        return false;
+        return isset($this->nullableColumns[$fkProp->getValue($relationObj)]);
     }
 
     /**
@@ -853,12 +891,7 @@ class ModelsCommand extends Command
 
     public function unsetMethod($name)
     {
-        foreach ($this->methods as $k => $v) {
+        unset($this->methods[strtolower($name)]);
-            if (strtolower($k) === strtolower($name)) {
-                unset($this->methods[$k]);
-                return;
-            }
-        }
     }
 
     public function getMethodType(Model $model, string $classType)
@@ -883,14 +916,22 @@ class ModelsCommand extends Command
             $reflection->getInterfaceNames(),
             $reflection->getParentClass()->getInterfaceNames()
         );
-        $phpDocContext = (new ContextFactory())->createFromReflector($reflection);
-        $phpdoc = DocBlockBuilder::createFromReflector($reflection, $phpDocContext);
 
         if ($this->reset) {
-            $phpdoc->clearTags();
+            $phpdoc = new DocBlock('', new Context($namespace));
+            if ($this->keep_text) {
+                $phpdoc->setText(
+                    (new DocBlock($reflection, new Context($namespace)))->getText()
+                );
+            }
+        } else {
+            $phpdoc = new DocBlock($reflection, new Context($namespace));
+        }
+
+        if (!$phpdoc->getText()) {
+            $phpdoc->setText($class);
         }
 
-        $existingTags = $phpdoc->getTags();
         $properties = [];
         $methods = [];
         foreach ($phpdoc->getTags() as $tag) {
@@ -921,8 +962,8 @@ class ModelsCommand extends Command
             }
 
             $tagLine = trim("@{$attr} {$property['type']} {$name} {$property['comment']}");
-
+            $tag = Tag::createInstance($tagLine, $phpdoc);
-            $phpdoc->appendTagline($tagLine);
+            $phpdoc->appendTag($tag);
         }
 
         ksort($this->methods);
@@ -936,14 +977,21 @@ class ModelsCommand extends Command
             if ($method['comment'] !== '') {
                 $tagLine .= " {$method['comment']}";
             }
-
+            $tag = Tag::createInstance($tagLine, $phpdoc);
-            $phpdoc->appendTagline($tagLine);
+            $phpdoc->appendTag($tag);
         }
 
         if ($this->write) {
             $eloquentClassNameInModel = $this->getClassNameInDestinationFile($reflection, 'Eloquent');
 
-            $phpdoc->appendTagline('@mixin ' . $eloquentClassNameInModel);
+            // remove the already existing tag to prevent duplicates
+            foreach ($phpdoc->getTagsByName('mixin') as $tag) {
+                if ($tag->getContent() === $eloquentClassNameInModel) {
+                    $phpdoc->deleteTag($tag);
+                }
+            }
+
+            $phpdoc->appendTag(Tag::createInstance('@mixin ' . $eloquentClassNameInModel, $phpdoc));
         }
 
         if ($this->phpstorm_noinspections) {
@@ -951,40 +999,43 @@ class ModelsCommand extends Command
              * Facades, Eloquent API
              * @see https://www.jetbrains.com/help/phpstorm/php-fully-qualified-name-usage.html
              */
-            $phpdoc->appendTagline('@noinspection PhpFullyQualifiedNameUsageInspection');
+            $phpdoc->appendTag(Tag::createInstance('@noinspection PhpFullyQualifiedNameUsageInspection', $phpdoc));
             /**
              * Relations, other models in the same namespace
              * @see https://www.jetbrains.com/help/phpstorm/php-unnecessary-fully-qualified-name.html
              */
-            $phpdoc->appendTagline('@noinspection PhpUnnecessaryFullyQualifiedNameInspection');
+            $phpdoc->appendTag(
+                Tag::createInstance('@noinspection PhpUnnecessaryFullyQualifiedNameInspection', $phpdoc)
+            );
         }
 
-        $serializer = new Serializer();
+        $serializer = new DocBlockSerializer();
+        $docComment = $serializer->getDocComment($phpdoc);
 
         if ($this->write_mixin) {
+            $phpdocMixin = new DocBlock($reflection, new Context($namespace));
             // remove all mixin tags prefixed with IdeHelper
-            $mixinTags = array_filter($existingTags, function (Tag $tag) {
+            foreach ($phpdocMixin->getTagsByName('mixin') as $tag) {
-                return !($tag instanceof BaseTag) || !Str::startsWith($tag->getDescription(), 'IdeHelper');
+                if (Str::startsWith($tag->getContent(), 'IdeHelper')) {
-            });
+                    $phpdocMixin->deleteTag($tag);
-
-            $phpdocMixin = DocBlockBuilder::create($phpdoc->getSummary(), $phpdoc->getDescription(), $mixinTags, $phpDocContext);
-            $mixinClassName = "IdeHelper{$classname}";
-            $phpdocMixin->appendTagline("@mixin {$mixinClassName}");
-
-            foreach ($phpdoc->getTags() as $tag) {
-                if ($tag instanceof BaseTag && Str::startsWith($tag->getDescription(), 'IdeHelper')) {
-                    $phpdoc->removeTag($tag);
                 }
             }
 
-            $mixinDocComment = $serializer->getDocComment($phpdocMixin->getDocBlock());
+            $mixinClassName = "IdeHelper{$classname}";
+            $phpdocMixin->appendTag(Tag::createInstance("@mixin {$mixinClassName}", $phpdocMixin));
+            $mixinDocComment = $serializer->getDocComment($phpdocMixin);
             // remove blank lines if there's no text
-            if (!$phpdocMixin->getSummary()) {
+            if (!$phpdocMixin->getText()) {
                 $mixinDocComment = preg_replace("/\s\*\s*\n/", '', $mixinDocComment);
             }
-        }
 
-        $docComment = $serializer->getDocComment($phpdoc->getDocBlock());
+            foreach ($phpdoc->getTagsByName('mixin') as $tag) {
+                if (Str::startsWith($tag->getContent(), 'IdeHelper')) {
+                    $phpdoc->deleteTag($tag);
+                }
+            }
+            $docComment = $serializer->getDocComment($phpdoc);
+        }
 
         if ($this->write) {
             $modelDocComment = $this->write_mixin ? $mixinDocComment : $docComment;
@@ -1005,9 +1056,7 @@ class ModelsCommand extends Command
         }
 
         $classname = $this->write_mixin ? $mixinClassName : $classname;
-
+        $output = "namespace {$namespace}{\n{$docComment}\n\t{$keyword}class {$classname} ";
-        $allowDynamicAttributes = $this->write_mixin ? "#[\AllowDynamicProperties]\n\t" : '';
-        $output = "namespace {$namespace}{\n{$docComment}\n\t{$allowDynamicAttributes}{$keyword}class {$classname} ";
 
         if (!$this->write_mixin) {
             $output .= "extends \Eloquent ";
@@ -1050,8 +1099,6 @@ class ModelsCommand extends Command
                     $default = 'null';
                 } elseif (is_int($default)) {
                     //$default = $default;
-                } elseif ($default instanceof \UnitEnum) {
-                    $default = '\\' . get_class($default) . '::' . $default->name;
                 } else {
                     $default = "'" . trim($default) . "'";
                 }
@@ -1079,7 +1126,7 @@ class ModelsCommand extends Command
             return '\Illuminate\Database\Eloquent\Collection';
         }
 
-        /** @var Model $model */
+        /** @var \Illuminate\Database\Eloquent\Model $model */
         $model = new $className();
         return '\\' . get_class($model->newCollection());
     }
@@ -1126,10 +1173,7 @@ class ModelsCommand extends Command
         return $this->laravel['config']->get('ide-helper.model_camel_case_properties', false);
     }
 
-    /**
+    protected function getAttributeReturnType(Model $model, \ReflectionMethod $reflectionMethod): Collection
-     * @psalm-suppress NoValue
-     */
-    protected function getAttributeTypes(Model $model, \ReflectionMethod $reflectionMethod): Collection
     {
         // Private/protected ReflectionMethods require setAccessible prior to PHP 8.1
         $reflectionMethod->setAccessible(true);
@@ -1137,25 +1181,13 @@ class ModelsCommand extends Command
         /** @var Attribute $attribute */
         $attribute = $reflectionMethod->invoke($model);
 
-        $methods = new Collection();
+        return collect([
-
+            'get' => $attribute->get ? optional(new \ReflectionFunction($attribute->get))->getReturnType() : null,
-        if ($attribute->get) {
+            'set' => $attribute->set ? optional(new \ReflectionFunction($attribute->set))->getReturnType() : null,
-            $methods['get'] = optional(new \ReflectionFunction($attribute->get))->getReturnType();
+        ])
-        }
+            ->filter()
-        if ($attribute->set) {
-            $function = optional(new \ReflectionFunction($attribute->set));
-            if ($function->getNumberOfParameters() === 0) {
-                $methods['set'] = null;
-            } else {
-                $methods['set'] = $function->getParameters()[0]->getType();
-            }
-        }
-
-        return $methods
             ->map(function ($type) {
-                if ($type === null) {
+                if ($type instanceof \ReflectionUnionType) {
-                    $types = collect([]);
-                } elseif ($type instanceof \ReflectionUnionType) {
                     $types = collect($type->getTypes())
                         /** @var ReflectionType $reflectionType */
                         ->map(function ($reflectionType) {
@@ -1166,7 +1198,7 @@ class ModelsCommand extends Command
                     $types = collect($this->extractReflectionTypes($type));
                 }
 
-                if ($type && $type->allowsNull()) {
+                if ($type->allowsNull()) {
                     $types->push('null');
                 }
 
@@ -1191,20 +1223,21 @@ class ModelsCommand extends Command
      *
      * @return null|string
      */
-    protected function getCommentFromDocBlock(\ReflectionMethod $reflection): ?string
+    protected function getCommentFromDocBlock(\ReflectionMethod $reflection)
     {
-        if (!$reflection->getDocComment()) {
-            return '';
-        }
-
         $phpDocContext = (new ContextFactory())->createFromReflector($reflection);
-        $phpdoc = (DocBlockFactory::createInstance())->create($reflection, $phpDocContext);
+        $context = new Context(
+            $phpDocContext->getNamespace(),
+            $phpDocContext->getNamespaceAliases()
+        );
+        $comment = '';
+        $phpdoc = new DocBlock($reflection, $context);
 
-        foreach ($phpdoc->getTagsByName('comment') as $tag) {
+        if ($phpdoc->hasTag('comment')) {
-            return $tag;
+            $comment = $phpdoc->getTagsByName('comment')[0]->getContent();
         }
 
-        return '';
+        return $comment;
     }
 
     /**
@@ -1214,19 +1247,21 @@ class ModelsCommand extends Command
      *
      * @return null|string
      */
-    protected function getReturnTypeFromDocBlock(\ReflectionMethod $reflection, \Reflector $reflectorForContext = null): ?string
+    protected function getReturnTypeFromDocBlock(\ReflectionMethod $reflection, \Reflector $reflectorForContext = null)
     {
-        if (!$reflection->getDocComment()) {
-            return null;
-        }
         $phpDocContext = (new ContextFactory())->createFromReflector($reflectorForContext ?? $reflection);
-        $phpdoc = (DocBlockFactory::createInstance())->create($reflection, $phpDocContext);
+        $context = new Context(
+            $phpDocContext->getNamespace(),
+            $phpDocContext->getNamespaceAliases()
+        );
+        $type = null;
+        $phpdoc = new DocBlock($reflection, $context);
 
-        foreach ($phpdoc->getTagsByName('return') as $tag) {
+        if ($phpdoc->hasTag('return')) {
-            return $tag;
+            $type = $phpdoc->getTagsByName('return')[0]->getType();
         }
 
-        return null;
+        return $type;
     }
 
     protected function getReturnTypeFromReflection(\ReflectionMethod $reflection): ?string
@@ -1250,7 +1285,7 @@ class ModelsCommand extends Command
 
     /**
      * Generates methods provided by the SoftDeletes trait
-     * @param Model $model
+     * @param \Illuminate\Database\Eloquent\Model $model
      */
     protected function getSoftDeleteMethods($model)
     {
@@ -1267,7 +1302,7 @@ class ModelsCommand extends Command
     /**
      * Generate factory method from "HasFactory" trait.
      *
-     * @param Model $model
+     * @param \Illuminate\Database\Eloquent\Model $model
      */
     protected function getFactoryMethods($model)
     {
@@ -1295,12 +1330,16 @@ class ModelsCommand extends Command
             return;
         }
 
-        $this->setMethod('factory', $factory, ['$count = null, $state = []']);
+        if (version_compare($this->laravel->version(), '9', '>=')) {
+            $this->setMethod('factory', $factory, ['$count = null, $state = []']);
+        } else {
+            $this->setMethod('factory', $factory, ['...$parameters']);
+        }
     }
 
     /**
      * Generates methods that return collections
-     * @param Model $model
+     * @param \Illuminate\Database\Eloquent\Model $model
      */
     protected function getCollectionMethods($model)
     {
@@ -1343,7 +1382,7 @@ class ModelsCommand extends Command
             return $type;
         }
 
-        $reflection = new ReflectionClass($type);
+        $reflection = new \ReflectionClass($type);
 
         if (!$reflection->implementsInterface(Castable::class)) {
             return $type;
@@ -1375,7 +1414,7 @@ class ModelsCommand extends Command
             return $type;
         }
 
-        $reflection = new ReflectionClass($type);
+        $reflection = new \ReflectionClass($type);
 
         if (!$reflection->implementsInterface(CastsAttributes::class)) {
             return $type;
@@ -1413,7 +1452,8 @@ class ModelsCommand extends Command
     {
         $reflection = $model instanceof ReflectionClass
             ? $model
-            : new ReflectionObject($model);
+            : new ReflectionObject($model)
+        ;
 
         $className = trim($className, '\\');
         $writingToExternalFile = !$this->write || $this->write_mixin;
@@ -1580,7 +1620,7 @@ class ModelsCommand extends Command
     }
 
     /**
-     * @param Model $model
+     * @param \Illuminate\Database\Eloquent\Model $model
      * @throws \Illuminate\Contracts\Container\BindingResolutionException
      * @throws \RuntimeException
      */
@@ -1602,13 +1642,14 @@ class ModelsCommand extends Command
     }
 
     /**
-     * @param Builder $schema
+     * @param \Doctrine\DBAL\Schema\AbstractSchemaManager $schema
      * @param string $table
+     * @throws DBALException
      */
     protected function setForeignKeys($schema, $table)
     {
-        foreach ($schema->getForeignKeys($table) as $foreignKeyConstraint) {
+        foreach ($schema->listTableForeignKeys($table) as $foreignKeyConstraint) {
-            foreach ($foreignKeyConstraint['columns'] as $columnName) {
+            foreach ($foreignKeyConstraint->getLocalColumns() as $columnName) {
                 $this->foreignKeyConstraintsColumns[] = $columnName;
             }
         }

src/DocBlock/DocBlockBuilder.php

@@ -1,162 +0,0 @@
-<?php
-
-namespace Barryvdh\LaravelIdeHelper\DocBlock;
-
-use phpDocumentor\Reflection\DocBlock;
-use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
-use phpDocumentor\Reflection\DocBlock\StandardTagFactory;
-use phpDocumentor\Reflection\DocBlock\Tag;
-use phpDocumentor\Reflection\DocBlock\TagFactory;
-use phpDocumentor\Reflection\DocBlockFactory;
-use phpDocumentor\Reflection\TypeResolver;
-use phpDocumentor\Reflection\Types\Context;
-
-class DocBlockBuilder
-{
-    /** @var $tagFactory TagFactory  */
-    private $tagFactory = null;
-
-    private function __construct(
-        protected string $summary = '',
-        protected ?DocBlock\Description $description = null,
-        protected array $tags = [],
-        protected ?Context $context = null
-    ) {
-    }
-
-    public static function createFromReflector(\Reflector $reflector, ?Context $context = null): static
-    {
-        if ($doc = $reflector->getDocComment()) {
-            $docblock = DocBlockFactory::createInstance()->create($doc, $context);
-
-            return new static(
-                $docblock->getSummary(),
-                $docblock->getDescription(),
-                $docblock->getTags(),
-                $docblock->getContext()
-            );
-        }
-
-        return static::create('', null, [], $context);
-    }
-
-    public static function create(
-        string $summary = '',
-        ?DocBlock\Description $description = null,
-        array $tags = null,
-        ?Context $context = null
-    ): static {
-        return new static($summary, $description, $tags, $context);
-    }
-
-    public function getDocBlock(): DocBlock
-    {
-        $tags = collect($this->tags)->unique(function (Tag $tag) {
-            if (method_exists($tag, 'getVariableName')) {
-                return $tag->getName() . ' ' . $tag->getVariableName();
-            }
-            return (string) $tag;
-        })->toArray();
-
-        return new DocBlock($this->summary, $this->description, $tags, $this->context);
-    }
-
-    public function getSummary(): ?string
-    {
-        return $this->summary;
-    }
-
-    public function setSummary(string $summary)
-    {
-        $this->summary = $summary;
-    }
-
-    public function getDescription(): ?DocBlock\Description
-    {
-        return $this->description;
-    }
-
-    public function setDescription(?DocBlock\Description $description)
-    {
-        $this->description = $description;
-    }
-
-    public function getContext()
-    {
-        return $this->context;
-    }
-    public function getTags()
-    {
-        return $this->tags;
-    }
-
-    public function appendTagline(string $tagline)
-    {
-        $tag = $this->getTagFactory()->create($tagline, $this->context);
-
-        $this->appendTag($tag);
-    }
-
-    public function hasTag(string $name): bool
-    {
-        /** @var Tag $tag */
-        foreach ($this->tags as $tag) {
-            if ($tag->getName() === $name) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public function getTagsByName($name)
-    {
-        $result = [];
-
-        /** @var Tag $tag */
-        foreach ($this->tags as $tag) {
-            if ($tag->getName() != $name) {
-                continue;
-            }
-
-            $result[] = $tag;
-        }
-
-        return $result;
-    }
-
-    public function appendTag(Tag $tag)
-    {
-        $this->tags[] = $tag;
-    }
-
-    public function removeTag(Tag $tagToRemove)
-    {
-        foreach ($this->tags as $i => $tag) {
-            if ($tag === $tagToRemove) {
-                unset($this->tags[$i]);
-                break;
-            }
-        }
-    }
-
-    public function clearTags()
-    {
-        $this->tags = [];
-    }
-
-    private function getTagFactory(): TagFactory
-    {
-        if ($this->tagFactory === null) {
-            $fqsenResolver = new LocalFsqenResolver();
-            $tagFactory = new StandardTagFactory($fqsenResolver);
-            $descriptionFactory = new DescriptionFactory($tagFactory);
-
-            $tagFactory->addService($descriptionFactory);
-            $tagFactory->addService(new TypeResolver($fqsenResolver));
-
-            $this->tagFactory = $tagFactory;
-        }
-        return $this->tagFactory;
-    }
-}

src/DocBlock/LocalFsqenResolver.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace Barryvdh\LaravelIdeHelper\DocBlock;
-
-use phpDocumentor\Reflection\Fqsen;
-use phpDocumentor\Reflection\FqsenResolver;
-use phpDocumentor\Reflection\Types\Context;
-
-class LocalFsqenResolver extends FqsenResolver
-{
-    public function resolve(string $fqsen, ?Context $context = null): Fqsen
-    {
-        return new Fqsen($fqsen);
-    }
-}

src/Generator.php

@@ -13,13 +13,8 @@ namespace Barryvdh\LaravelIdeHelper;
 
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Facade;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Macroable;
-use PhpParser\Lexer\Emulative;
-use PhpParser\Node\Stmt\Class_;
-use PhpParser\Node\Stmt\Namespace_;
-use PhpParser\Parser\Php7;
 use ReflectionClass;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -31,7 +26,7 @@ class Generator
     /** @var \Illuminate\View\Factory */
     protected $view;
 
-    /** @var OutputInterface */
+    /** @var \Symfony\Component\Console\Output\OutputInterface */
     protected $output;
 
     protected $extra = [];
@@ -42,7 +37,7 @@ class Generator
     /**
      * @param \Illuminate\Config\Repository $config
      * @param \Illuminate\View\Factory $view
-     * @param OutputInterface $output
+     * @param \Symfony\Component\Console\Output\OutputInterface $output
      * @param string $helpers
      */
     public function __construct(
@@ -80,7 +75,6 @@ class Generator
         return $this->view->make('helper')
             ->with('namespaces_by_extends_ns', $this->getAliasesByExtendsNamespace())
             ->with('namespaces_by_alias_ns', $this->getAliasesByAliasNamespace())
-            ->with('real_time_facades', $this->getRealTimeFacades())
             ->with('helpers', $this->helpers)
             ->with('version', $app->version())
             ->with('include_fluent', $this->config->get('ide-helper.include_fluent', true))
@@ -159,11 +153,6 @@ class Generator
                 continue;
             }
 
-            // Skip the swoole
-            if ($facade == 'SwooleTW\Http\Server\Facades\Server' && $name == 'Server' && !class_exists('Swoole\Http\Server')) {
-                continue;
-            }
-
             $magicMethods = array_key_exists($name, $this->magic) ? $this->magic[$name] : [];
             $alias = new Alias($this->config, $name, $facade, $magicMethods, $this->interfaces);
             if ($alias->isValid()) {
@@ -179,51 +168,6 @@ class Generator
         return $aliases;
     }
 
-    protected function getRealTimeFacades()
-    {
-        $facades = [];
-        $realTimeFacadeFiles = glob(storage_path('framework/cache/facade-*.php'));
-        foreach ($realTimeFacadeFiles as $file) {
-            try {
-                $name = $this->getFullyQualifiedClassNameInFile($file);
-                $facades[$name] = $name;
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-
-        return $facades;
-    }
-
-    protected function getFullyQualifiedClassNameInFile(string $path)
-    {
-        $contents = file_get_contents($path);
-
-        $parsers = new Php7(new Emulative());
-
-        $parsed = collect($parsers->parse($contents) ?: []);
-
-        $namespace = $parsed->first(function ($node) {
-            return $node instanceof Namespace_;
-        });
-
-        if ($namespace) {
-            $name = $namespace->name->toString();
-
-            $class = collect($namespace->stmts)->first(function ($node) {
-                return $node instanceof Class_;
-            });
-
-            if ($class) {
-                $name .= '\\' . $class->name->toString();
-            }
-
-            return $name;
-        }
-    }
-
-
-
     /**
      * Regroup aliases by namespace of extended classes
      *
@@ -231,9 +175,7 @@ class Generator
      */
     protected function getAliasesByExtendsNamespace()
     {
-        $aliases = $this->getValidAliases()->filter(static function (Alias $alias) {
+        $aliases = $this->getValidAliases();
-            return is_subclass_of($alias->getExtends(), Facade::class);
-        });
 
         $this->addMacroableClasses($aliases);
 

src/Listeners/GenerateModelHelper.php

@@ -16,15 +16,15 @@ class GenerateModelHelper
      */
     public static $shouldRun = false;
 
-    /** @var Artisan */
+    /** @var \Illuminate\Contracts\Console\Kernel */
     protected $artisan;
 
-    /** @var Config */
+    /** @var \Illuminate\Contracts\Config\Repository */
     protected $config;
 
     /**
-     * @param  Artisan  $artisan
+     * @param  \Illuminate\Contracts\Console\Kernel  $artisan
-     * @param  Config  $config
+     * @param  \Illuminate\Contracts\Config\Repository  $config
      */
     public function __construct(Artisan $artisan, Config $config)
     {

src/Macro.php

@@ -2,8 +2,8 @@
 
 namespace Barryvdh\LaravelIdeHelper;
 
-use Barryvdh\LaravelIdeHelper\DocBlock\DocBlockBuilder;
 use Barryvdh\Reflection\DocBlock;
+use Barryvdh\Reflection\DocBlock\Tag;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Support\Collection;
 
@@ -35,7 +35,7 @@ class Macro extends Method
      */
     protected function initPhpDoc($method)
     {
-        $this->phpdoc = DocBlockBuilder::createFromReflector($method);
+        $this->phpdoc = new DocBlock($method);
 
         $this->addLocationToPhpDoc();
 
@@ -56,7 +56,7 @@ class Macro extends Method
                 $name = $parameter->isVariadic() ? '...' : '';
                 $name .= '$' . $parameter->getName();
 
-                $this->phpdoc->appendTagline("@param {$type} {$name}");
+                $this->phpdoc->appendTag(Tag::createInstance("@param {$type} {$name}"));
             }
         }
 
@@ -64,8 +64,8 @@ class Macro extends Method
         if ($method->hasReturnType() && !$this->phpdoc->hasTag('return')) {
             $builder = EloquentBuilder::class;
             $return = $method->getReturnType();
-            $type = $this->concatReflectionTypes($return);
 
+            $type = $this->concatReflectionTypes($return);
 
             /** @psalm-suppress UndefinedClass */
             if (!$return instanceof \ReflectionUnionType) {
@@ -73,7 +73,7 @@ class Macro extends Method
                 $type .= $return->allowsNull() ? '|null' : '';
             }
 
-            $this->phpdoc->appendTagLine("@return {$type}");
+            $this->phpdoc->appendTag(Tag::createInstance("@return {$type}"));
         }
     }
 
@@ -109,9 +109,9 @@ class Macro extends Method
             });
 
         if ($enclosingMethod) {
-            $this->phpdoc->appendTagLine(
+            $this->phpdoc->appendTag(Tag::createInstance(
                 '@see \\' . $enclosingClass->getName() . '::' . $enclosingMethod->getName() . '()'
-            );
+            ));
         }
     }
 

src/Method.php

@@ -11,18 +11,18 @@
 
 namespace Barryvdh\LaravelIdeHelper;
 
-use Barryvdh\LaravelIdeHelper\DocBlock\DocBlockBuilder;
 use Barryvdh\Reflection\DocBlock;
+use Barryvdh\Reflection\DocBlock\Context;
+use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
 use Barryvdh\Reflection\DocBlock\Tag;
+use Barryvdh\Reflection\DocBlock\Tag\ParamTag;
+use Barryvdh\Reflection\DocBlock\Tag\ReturnTag;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Str;
-use phpDocumentor\Reflection\DocBlock\Serializer;
-use phpDocumentor\Reflection\DocBlock\Tags\InvalidTag;
-use phpDocumentor\Reflection\DocBlock\Tags\Return_;
 
 class Method
 {
-    /** @var DocBlockBuilder  */
+    /** @var \Barryvdh\Reflection\DocBlock  */
     protected $phpdoc;
 
     /** @var \ReflectionMethod  */
@@ -63,9 +63,11 @@ class Method
         //Create a DocBlock and serializer instance
         $this->initPhpDoc($method);
 
-        //Normalize the returns and inherit the docs from parents/interfaces
+        //Normalize the description and inherit the docs from parents/interfaces
         try {
+            $this->normalizeParams($this->phpdoc);
             $this->normalizeReturn($this->phpdoc);
+            $this->normalizeDescription($this->phpdoc);
         } catch (\Exception $e) {
         }
 
@@ -73,7 +75,7 @@ class Method
         $this->getParameters($method);
 
         //Make the method static
-        $this->phpdoc->appendTagline('@static');
+        $this->phpdoc->appendTag(Tag::createInstance('@static', $this->phpdoc));
     }
 
     /**
@@ -81,8 +83,7 @@ class Method
      */
     protected function initPhpDoc($method)
     {
-        $context = new \phpDocumentor\Reflection\Types\Context($this->namespace, $this->classAliases);
+        $this->phpdoc = new DocBlock($method, new Context($this->namespace, $this->classAliases));
-        $this->phpdoc = DocBlockBuilder::createFromReflector($method, $context);
     }
 
     /**
@@ -144,8 +145,8 @@ class Method
      */
     public function getDocComment($prefix = "\t\t")
     {
-        $serializer = new Serializer(1, $prefix);
+        $serializer = new DocBlockSerializer(1, $prefix);
-        return $serializer->getDocComment($this->phpdoc->getDocBlock());
+        return $serializer->getDocComment($this->phpdoc);
     }
 
     /**
@@ -190,12 +191,68 @@ class Method
         return $implode ? implode(', ', $this->params_with_default) : $this->params_with_default;
     }
 
+    /**
+     * Get the description and get the inherited docs.
+     *
+     * @param DocBlock $phpdoc
+     */
+    protected function normalizeDescription(DocBlock $phpdoc)
+    {
+        //Get the short + long description from the DocBlock
+        $description = $phpdoc->getText();
+
+        //Loop through parents/interfaces, to fill in {@inheritdoc}
+        if (strpos($description, '{@inheritdoc}') !== false) {
+            $inheritdoc = $this->getInheritDoc($this->method);
+            $inheritDescription = $inheritdoc->getText();
+
+            $description = str_replace('{@inheritdoc}', $inheritDescription, $description);
+            $phpdoc->setText($description);
+
+            $this->normalizeParams($inheritdoc);
+            $this->normalizeReturn($inheritdoc);
+
+            //Add the tags that are inherited
+            $inheritTags = $inheritdoc->getTags();
+            if ($inheritTags) {
+                /** @var Tag $tag */
+                foreach ($inheritTags as $tag) {
+                    $tag->setDocBlock();
+                    $phpdoc->appendTag($tag);
+                }
+            }
+        }
+    }
+
+    /**
+     * Normalize the parameters
+     *
+     * @param DocBlock $phpdoc
+     */
+    protected function normalizeParams(DocBlock $phpdoc)
+    {
+        //Get the return type and adjust them for beter autocomplete
+        $paramTags = $phpdoc->getTagsByName('param');
+        if ($paramTags) {
+            /** @var ParamTag $tag */
+            foreach ($paramTags as $tag) {
+                // Convert the keywords
+                $content = $this->convertKeywords($tag->getContent());
+                $tag->setContent($content);
+
+                // Get the expanded type and re-set the content
+                $content = $tag->getType() . ' ' . $tag->getVariableName() . ' ' . $tag->getDescription();
+                $tag->setContent(trim($content));
+            }
+        }
+    }
+
     /**
      * Normalize the return tag (make full namespace, replace interfaces)
      *
      * @param DocBlock $phpdoc
      */
-    protected function normalizeReturn(DocBlockBuilder $phpdoc)
+    protected function normalizeReturn(DocBlock $phpdoc)
     {
         //Get the return type and adjust them for better autocomplete
         $returnTags = $phpdoc->getTagsByName('return');
@@ -205,13 +262,8 @@ class Method
             return;
         }
 
-
+        /** @var ReturnTag $tag */
-        /** @var Return_ $tag */
         $tag = reset($returnTags);
-
-        if ($tag instanceof InvalidTag) {
-            return;
-        }
         // Get the expanded type
         $returnValue = $tag->getType();
 
@@ -220,17 +272,15 @@ class Method
             $returnValue = str_replace($interface, $real, $returnValue);
         }
 
+        // Set the changed content
+        $tag->setContent($returnValue . ' ' . $tag->getDescription());
         $this->return = $returnValue;
 
-        if ($returnValue === '$this') {
+        if ($tag->getType() === '$this') {
-            $returnValue = Str::contains($this->root, Builder::class)
+            Str::contains($this->root, Builder::class)
-                ? $this->root . '|static'
+                ? $tag->setType($this->root . '|static')
-                : $this->root;
+                : $tag->setType($this->root);
         }
-
-        // Set the changed content
-        $this->phpdoc->removeTag($tag);
-        $this->phpdoc->appendTagline('@return ' . $returnValue . ' ' . $tag->getDescription());
     }
 
     /**
@@ -299,4 +349,31 @@ class Method
         $this->params = $params;
         $this->params_with_default = $paramsWithDefault;
     }
+
+    /**
+     * @param \ReflectionMethod $reflectionMethod
+     * @return DocBlock
+     */
+    protected function getInheritDoc($reflectionMethod)
+    {
+        $parentClass = $reflectionMethod->getDeclaringClass()->getParentClass();
+
+        //Get either a parent or the interface
+        if ($parentClass) {
+            $method = $parentClass->getMethod($reflectionMethod->getName());
+        } else {
+            $method = $reflectionMethod->getPrototype();
+        }
+        if ($method) {
+            $namespace = $method->getDeclaringClass()->getNamespaceName();
+            $phpdoc = new DocBlock($method, new Context($namespace, $this->classAliases));
+
+            if (strpos($phpdoc->getText(), '{@inheritdoc}') !== false) {
+                //Not at the end yet, try another parent/interface..
+                return $this->getInheritDoc($method);
+            }
+
+            return $phpdoc;
+        }
+    }
 }

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

@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Models;
-
-use Illuminate\Database\Eloquent\Casts\AsArrayObject;
-use Illuminate\Database\Eloquent\Casts\AsCollection;
-use Illuminate\Database\Eloquent\Model;
-
-class AdvancedCast extends Model
-{
-    protected $casts = [
-        'cast_to_date_serialization' => 'date:Y-m-d',
-        '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_custom_datetime' => 'immutable_custom_datetime:Y-m-d H:i:s',
-        'cast_to_immutable_datetime' => 'immutable_datetime',
-        'cast_to_timestamp' => 'timestamp',
-        'cast_to_encrypted' => 'encrypted',
-        'cast_to_encrypted_array' => 'encrypted:array',
-        'cast_to_encrypted_collection' => 'encrypted:collection',
-        'cast_to_encrypted_json' => 'encrypted:json',
-        'cast_to_encrypted_object' => 'encrypted:object',
-        'cast_to_as_collection' => AsCollection::class,
-        'cast_to_as_array_object' => AsArrayObject::class,
-    ];
-}

tests/Console/ModelsCommand/AdvancedCasts/Test.php

@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts;
-
-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/AdvancedCasts/__snapshots__/Test__test__1.php

@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Models;
-
-use Illuminate\Database\Eloquent\Casts\AsArrayObject;
-use Illuminate\Database\Eloquent\Casts\AsCollection;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property \Illuminate\Support\Carbon $cast_to_date_serialization
- * @property \Illuminate\Support\Carbon $cast_to_datetime_serialization
- * @property \Illuminate\Support\Carbon $cast_to_custom_datetime
- * @property \Carbon\CarbonImmutable $cast_to_immutable_date
- * @property \Carbon\CarbonImmutable $cast_to_immutable_custom_datetime
- * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime
- * @property int $cast_to_timestamp
- * @property mixed $cast_to_encrypted
- * @property array $cast_to_encrypted_array
- * @property \Illuminate\Support\Collection $cast_to_encrypted_collection
- * @property array $cast_to_encrypted_json
- * @property object $cast_to_encrypted_object
- * @property \Illuminate\Support\Collection $cast_to_as_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 whereCastToCustomDatetime($value)
- * @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToDateSerialization($value)
- * @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToDatetimeSerialization($value)
- * @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToEncrypted($value)
- * @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToEncryptedArray($value)
- * @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToEncryptedCollection($value)
- * @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToEncryptedJson($value)
- * @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToEncryptedObject($value)
- * @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToImmutableCustomDatetime($value)
- * @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToImmutableDate($value)
- * @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToImmutableDatetime($value)
- * @method static \Illuminate\Database\Eloquent\Builder|AdvancedCast whereCastToTimestamp($value)
- * @mixin \Eloquent
- */
-class AdvancedCast extends Model
-{
-    protected $casts = [
-        'cast_to_date_serialization' => 'date:Y-m-d',
-        '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_custom_datetime' => 'immutable_custom_datetime:Y-m-d H:i:s',
-        'cast_to_immutable_datetime' => 'immutable_datetime',
-        'cast_to_timestamp' => 'timestamp',
-        'cast_to_encrypted' => 'encrypted',
-        'cast_to_encrypted_array' => 'encrypted:array',
-        'cast_to_encrypted_collection' => 'encrypted:collection',
-        'cast_to_encrypted_json' => 'encrypted:json',
-        'cast_to_encrypted_object' => 'encrypted:object',
-        'cast_to_as_collection' => AsCollection::class,
-        'cast_to_as_array_object' => AsArrayObject::class,
-    ];
-}

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

@@ -7,7 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AllowGlobDirecto
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AllowGlobDirectory\Services\Post\Models\Post
+ *
+ * @property integer $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -18,34 +20,36 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property int|null $integer_nullable
+ * @property integer|null $integer_nullable
- * @property int $integer_not_nullable
+ * @property integer $integer_not_nullable
- * @property int|null $tiny_integer_nullable
+ * @property integer|null $tiny_integer_nullable
- * @property int $tiny_integer_not_nullable
+ * @property integer $tiny_integer_not_nullable
- * @property int|null $small_integer_nullable
+ * @property integer|null $small_integer_nullable
- * @property int $small_integer_not_nullable
+ * @property integer $small_integer_not_nullable
- * @property int|null $medium_integer_nullable
+ * @property integer|null $medium_integer_nullable
- * @property int $medium_integer_not_nullable
+ * @property integer $medium_integer_not_nullable
- * @property int|null $big_integer_nullable
+ * @property integer|null $big_integer_nullable
- * @property int $big_integer_not_nullable
+ * @property integer $big_integer_not_nullable
- * @property int|null $unsigned_integer_nullable
+ * @property integer|null $unsigned_integer_nullable
- * @property int $unsigned_integer_not_nullable
+ * @property integer $unsigned_integer_not_nullable
- * @property int|null $unsigned_tiny_integer_nullable
+ * @property integer|null $unsigned_tiny_integer_nullable
- * @property int $unsigned_tiny_integer_not_nullable
+ * @property integer $unsigned_tiny_integer_not_nullable
- * @property int|null $unsigned_small_integer_nullable
+ * @property integer|null $unsigned_small_integer_nullable
- * @property int $unsigned_small_integer_not_nullable
+ * @property integer $unsigned_small_integer_not_nullable
- * @property int|null $unsigned_medium_integer_nullable
+ * @property integer|null $unsigned_medium_integer_nullable
- * @property int $unsigned_medium_integer_not_nullable
+ * @property integer $unsigned_medium_integer_not_nullable
- * @property int|null $unsigned_big_integer_nullable
+ * @property integer|null $unsigned_big_integer_nullable
- * @property int $unsigned_big_integer_not_nullable
+ * @property integer $unsigned_big_integer_not_nullable
  * @property float|null $float_nullable
  * @property float $float_not_nullable
  * @property float|null $double_nullable
  * @property float $double_not_nullable
  * @property string|null $decimal_nullable
  * @property string $decimal_not_nullable
- * @property int|null $boolean_nullable
+ * @property string|null $unsigned_decimal_nullable
- * @property int $boolean_not_nullable
+ * @property string $unsigned_decimal_not_nullable
+ * @property integer|null $boolean_nullable
+ * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -66,10 +70,10 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property int|null $year_nullable
+ * @property integer|null $year_nullable
- * @property int $year_not_nullable
+ * @property integer $year_not_nullable
- * @property string|null $binary_nullable
+ * @property mixed|null $binary_nullable
- * @property string $binary_not_nullable
+ * @property mixed $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -139,6 +143,8 @@ use Illuminate\Database\Eloquent\Model;
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)

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

@@ -7,16 +7,18 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ArrayCastsWithCo
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property array<int,string>|null $cast_to_array -- These three should not be duplicated
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ArrayCastsWithComment\Models\ArrayCastsWithComment
- * @property array<int,string> $cast_to_json some-description
+ *
- * @property \Illuminate\Support\Collection<int,string> $cast_to_collection some-description
+ * @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>|null $cast_to_immutable_date
- * @property array<int,string> $cast_to_immutable_date_serialization
+ * @property array<int, string> $cast_to_immutable_date_serialization
- * @property \Illuminate\Support\Collection<int,string> $cast_to_immutable_custom_datetime
+ * @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
@@ -26,6 +28,9 @@ use Illuminate\Database\Eloquent\Model;
  * @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

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

@@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Model;
 
 class Simple extends Model
 {
-    // With a backed property
     protected function name(): Attribute
     {
         return new Attribute(
@@ -17,91 +16,18 @@ class Simple extends Model
                 return $name;
             },
             function (?string $name): ?string {
-                return $name;
+                return $name === null ? null : ucfirst($name);
             }
         );
     }
 
-    // Without backed properties
-
-    protected function typeHintedGetAndSet(): Attribute
-    {
-        return new Attribute(
-            function (): ?string {
-                return $this->name;
-            },
-            function (?string $name) {
-                $this->name = $name;
-            }
-        );
-    }
-
-    protected function divergingTypeHintedGetAndSet(): Attribute
-    {
-        return new Attribute(
-            function (): int {
-                return strlen($this->name);
-            },
-            function (?string $name) {
-                $this->name = $name;
-            }
-        );
-    }
-
-    protected function typeHintedGet(): Attribute
-    {
-        return Attribute::get(function (): ?string {
-            return $this->name;
-        });
-    }
-
-    protected function typeHintedSet(): Attribute
-    {
-        return Attribute::set(function (?string $name) {
-            $this->name = $name;
-        });
-    }
-
-    protected function nonTypeHintedGetAndSet(): Attribute
-    {
-        return new Attribute(
-            function () {
-                return $this->name;
-            },
-            function ($name) {
-                $this->name = $name;
-            }
-        );
-    }
-
-    protected function nonTypeHintedGet(): Attribute
-    {
-        return Attribute::get(function () {
-            return $this->name;
-        });
-    }
-
-    protected function nonTypeHintedSet(): Attribute
-    {
-        return Attribute::set(function ($name) {
-            $this->name = $name;
-        });
-    }
-
-    protected function parameterlessSet(): Attribute
-    {
-        return Attribute::set(function () {
-            $this->name = null;
-        });
-    }
-
     /**
      * ide-helper does not recognize this method being an Attribute
      * because the method has no actual return type;
      * phpdoc is ignored here deliberately due to performance reasons and also
      * isn't supported by Laravel itself.
      *
-     * @return Attribute
+     * @return \Illuminate\Database\Eloquent\Casts\Attribute
      */
     protected function notAnAttribute()
     {

tests/Console/ModelsCommand/Attributes/Test.php

@@ -9,6 +9,15 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
 
 class Test extends AbstractModelsCommand
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (!class_exists('\Illuminate\Database\Eloquent\Casts\Attribute')) {
+            $this->markTestSkipped('This test requires Laravel 8.77 or newer');
+        }
+    }
+
     public function test(): void
     {
         $command = $this->app->make(ModelsCommand::class);

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

@@ -8,16 +8,10 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Attributes\Models\Simple
- * @property int $diverging_type_hinted_get_and_set
+ *
+ * @property integer $id
  * @property string|null $name
- * @property-read mixed $non_type_hinted_get
- * @property mixed $non_type_hinted_get_and_set
- * @property-write mixed $non_type_hinted_set
- * @property-write mixed $parameterless_set
- * @property-read string|null $type_hinted_get
- * @property string|null $type_hinted_get_and_set
- * @property-write string|null $type_hinted_set
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple query()
@@ -26,7 +20,6 @@ use Illuminate\Database\Eloquent\Model;
  */
 class Simple extends Model
 {
-    // With a backed property
     protected function name(): Attribute
     {
         return new Attribute(
@@ -34,91 +27,18 @@ class Simple extends Model
                 return $name;
             },
             function (?string $name): ?string {
-                return $name;
+                return $name === null ? null : ucfirst($name);
             }
         );
     }
 
-    // Without backed properties
-
-    protected function typeHintedGetAndSet(): Attribute
-    {
-        return new Attribute(
-            function (): ?string {
-                return $this->name;
-            },
-            function (?string $name) {
-                $this->name = $name;
-            }
-        );
-    }
-
-    protected function divergingTypeHintedGetAndSet(): Attribute
-    {
-        return new Attribute(
-            function (): int {
-                return strlen($this->name);
-            },
-            function (?string $name) {
-                $this->name = $name;
-            }
-        );
-    }
-
-    protected function typeHintedGet(): Attribute
-    {
-        return Attribute::get(function (): ?string {
-            return $this->name;
-        });
-    }
-
-    protected function typeHintedSet(): Attribute
-    {
-        return Attribute::set(function (?string $name) {
-            $this->name = $name;
-        });
-    }
-
-    protected function nonTypeHintedGetAndSet(): Attribute
-    {
-        return new Attribute(
-            function () {
-                return $this->name;
-            },
-            function ($name) {
-                $this->name = $name;
-            }
-        );
-    }
-
-    protected function nonTypeHintedGet(): Attribute
-    {
-        return Attribute::get(function () {
-            return $this->name;
-        });
-    }
-
-    protected function nonTypeHintedSet(): Attribute
-    {
-        return Attribute::set(function ($name) {
-            $this->name = $name;
-        });
-    }
-
-    protected function parameterlessSet(): Attribute
-    {
-        return Attribute::set(function () {
-            $this->name = null;
-        });
-    }
-
     /**
      * ide-helper does not recognize this method being an Attribute
      * because the method has no actual return type;
      * phpdoc is ignored here deliberately due to performance reasons and also
      * isn't supported by Laravel itself.
      *
-     * @return Attribute
+     * @return \Illuminate\Database\Eloquent\Casts\Attribute
      */
     protected function notAnAttribute()
     {

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

@@ -10,7 +10,9 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Comment\Models\Simple
+ *
+ * @property integer $id
  * @property string $both_same_name I'm a getter
  * @property string $both_without_getter_comment
  * @property-read string $faker_comment

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

@@ -9,11 +9,13 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomCollection\Models\Simple
+ *
+ * @property integer $id
  * @property-read SimpleCollection<int, Simple> $relationHasMany
  * @property-read int|null $relation_has_many_count
- * @method static void SimpleCollection() <int, static> all($columns = ['*'])
+ * @method static SimpleCollection<int, static> all($columns = ['*'])
- * @method static void SimpleCollection() <int, static> get($columns = ['*'])
+ * @method static SimpleCollection<int, 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/CustomDate/__snapshots__/Test__test__1.php

@@ -7,6 +7,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomDate\Model
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomDate\Models\CustomDate
+ *
  * @property \Carbon\CarbonImmutable|null $created_at
  * @property \Carbon\CarbonImmutable|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|CustomDate newModelQuery()

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

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomPhpdocTags\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * The `@SuppressWarnings` tag below contains no space before the `(` but when
- * the class phpdoc is written back, one is inserted.
- *
- * @link https://github.com/barryvdh/laravel-ide-helper/issues/666
- *
- * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
- */
-class Simple extends Model
-{
-}

tests/Console/ModelsCommand/CustomPhpdocTags/Test.php

@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomPhpdocTags;
-
-use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
-use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
-
-class Test extends AbstractModelsCommand
-{
-    /**
-     * This test makes sure that custom phpdoc tags are not mangled, e.g.
-     * there are no spaces inserted etc.
-     *
-     * @link https://github.com/barryvdh/laravel-ide-helper/issues/666
-     */
-    public function testNoSpaceAfterCustomPhpdocTag(): 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/CustomPhpdocTags/__snapshots__/Test__testNoSpaceAfterCustomPhpdocTag__1.php

@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomPhpdocTags\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * The `@SuppressWarnings` tag below contains no space before the `(` but when
- * the class phpdoc is written back, one is inserted.
- *
- * @link https://github.com/barryvdh/laravel-ide-helper/issues/666
- * @SuppressWarnings (PHPMD.ExcessiveClassComplexity)
- * @property int $id
- * @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
-{
-}

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

@@ -13,7 +13,9 @@
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGeneratePhpdocWithExternalEloquentBuilder\Models{
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGeneratePhpdocWithExternalEloquentBuilder\Models\Post
+ *
+ * @property integer $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -24,34 +26,36 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGenerateP
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property int|null $integer_nullable
+ * @property integer|null $integer_nullable
- * @property int $integer_not_nullable
+ * @property integer $integer_not_nullable
- * @property int|null $tiny_integer_nullable
+ * @property integer|null $tiny_integer_nullable
- * @property int $tiny_integer_not_nullable
+ * @property integer $tiny_integer_not_nullable
- * @property int|null $small_integer_nullable
+ * @property integer|null $small_integer_nullable
- * @property int $small_integer_not_nullable
+ * @property integer $small_integer_not_nullable
- * @property int|null $medium_integer_nullable
+ * @property integer|null $medium_integer_nullable
- * @property int $medium_integer_not_nullable
+ * @property integer $medium_integer_not_nullable
- * @property int|null $big_integer_nullable
+ * @property integer|null $big_integer_nullable
- * @property int $big_integer_not_nullable
+ * @property integer $big_integer_not_nullable
- * @property int|null $unsigned_integer_nullable
+ * @property integer|null $unsigned_integer_nullable
- * @property int $unsigned_integer_not_nullable
+ * @property integer $unsigned_integer_not_nullable
- * @property int|null $unsigned_tiny_integer_nullable
+ * @property integer|null $unsigned_tiny_integer_nullable
- * @property int $unsigned_tiny_integer_not_nullable
+ * @property integer $unsigned_tiny_integer_not_nullable
- * @property int|null $unsigned_small_integer_nullable
+ * @property integer|null $unsigned_small_integer_nullable
- * @property int $unsigned_small_integer_not_nullable
+ * @property integer $unsigned_small_integer_not_nullable
- * @property int|null $unsigned_medium_integer_nullable
+ * @property integer|null $unsigned_medium_integer_nullable
- * @property int $unsigned_medium_integer_not_nullable
+ * @property integer $unsigned_medium_integer_not_nullable
- * @property int|null $unsigned_big_integer_nullable
+ * @property integer|null $unsigned_big_integer_nullable
- * @property int $unsigned_big_integer_not_nullable
+ * @property integer $unsigned_big_integer_not_nullable
  * @property float|null $float_nullable
  * @property float $float_not_nullable
  * @property float|null $double_nullable
  * @property float $double_not_nullable
  * @property string|null $decimal_nullable
  * @property string $decimal_not_nullable
- * @property int|null $boolean_nullable
+ * @property string|null $unsigned_decimal_nullable
- * @property int $boolean_not_nullable
+ * @property string $unsigned_decimal_not_nullable
+ * @property integer|null $boolean_nullable
+ * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -72,10 +76,10 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGenerateP
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property int|null $year_nullable
+ * @property integer|null $year_nullable
- * @property int $year_not_nullable
+ * @property integer $year_not_nullable
- * @property string|null $binary_nullable
+ * @property mixed|null $binary_nullable
- * @property string $binary_not_nullable
+ * @property mixed $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -145,6 +149,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGenerateP
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/DynamicRelations/Test.php

@@ -17,11 +17,19 @@ class Test extends AbstractModelsCommand
             '--write' => true,
         ]);
 
-        $errors = [
+        if (PHP_VERSION_ID >= 80000) {
-            'Error resolving relation model of Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DynamicRelations\Models\Dynamic:dynamicBelongsTo() : Attempt to read property "created_at" on null',
+            $errors = [
-            'Error resolving relation model of Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DynamicRelations\Models\Dynamic:dynamicHasMany() : Attempt to read property "created_at" on null',
+                'Error resolving relation model of Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DynamicRelations\Models\Dynamic:dynamicBelongsTo() : Attempt to read property "created_at" on null',
-            'Error resolving relation model of Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DynamicRelations\Models\Dynamic:dynamicHasOne() : Attempt to read property "created_at" on null',
+                'Error resolving relation model of Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DynamicRelations\Models\Dynamic:dynamicHasMany() : Attempt to read property "created_at" on null',
-        ];
+                'Error resolving relation model of Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DynamicRelations\Models\Dynamic:dynamicHasOne() : Attempt to read property "created_at" on null',
+            ];
+        } else {
+            $errors = [
+                "Error resolving relation model of Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DynamicRelations\Models\Dynamic:dynamicBelongsTo() : Trying to get property 'created_at' of non-object",
+                "Error resolving relation model of Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DynamicRelations\Models\Dynamic:dynamicHasMany() : Trying to get property 'created_at' of non-object",
+                "Error resolving relation model of Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DynamicRelations\Models\Dynamic:dynamicHasOne() : Trying to get property 'created_at' of non-object",
+            ];
+        }
 
         $this->assertSame(0, $tester->getStatusCode());
         $this->assertStringContainsString('Written new phpDocBlock to', $tester->getDisplay());

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

@@ -10,6 +10,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 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 int|null $regular_has_many_count
  * @method static \Illuminate\Database\Eloquent\Builder|Dynamic newModelQuery()

tests/Console/ModelsCommand/Factories/Test.php

@@ -8,12 +8,41 @@ use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
 use Closure;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Str;
 
 class Test extends AbstractModelsCommand
 {
-    public function testFactory(): void
+    public function test_8(): void
     {
+        if (!version_compare(Application::VERSION, '8.2', '>=') || !version_compare(Application::VERSION, '9', '<')) {
+            $this->markTestSkipped(
+                'This test only works in Laravel >= 8.2 and < 9'
+            );
+        }
+
+        Factory::guessFactoryNamesUsing(static::getFactoryNameResolver());
+
+        $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->assertStringNotContainsString('not found', $tester->getDisplay());
+        $this->assertMatchesMockedSnapshot();
+    }
+
+    public function test_9(): void
+    {
+        if (!version_compare(Application::VERSION, '9', '>=')) {
+            $this->markTestSkipped(
+                'This test only works in Laravel >= 9'
+            );
+        }
+
         Factory::guessFactoryNamesUsing(static::getFactoryNameResolver());
 
         $command = $this->app->make(ModelsCommand::class);

tests/Console/ModelsCommand/Factories/__snapshots__/Test__test_8__1.php

@@ -9,7 +9,9 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\CustomSpace\ModelWithCustomNamespaceFactory factory(mixed $count, mixed $state)
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithCustomNamespace
+ *
+ * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\CustomSpace\ModelWithCustomNamespaceFactory factory(...$parameters)
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithCustomNamespace newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithCustomNamespace newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithCustomNamespace query()
@@ -39,7 +41,9 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Factories\ModelWithFactoryFactory factory(mixed $count, mixed $state)
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithFactory
+ *
+ * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Factories\ModelWithFactoryFactory factory(...$parameters)
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithFactory newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithFactory newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithFactory query()
@@ -56,7 +60,9 @@ declare(strict_types=1);
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models;
 
 /**
- * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Factories\ModelWithNestedFactoryFactory factory(mixed $count, mixed $state)
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithNestedFactory
+ *
+ * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Factories\ModelWithNestedFactoryFactory factory(...$parameters)
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithNestedFactory newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithNestedFactory newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithNestedFactory query()
@@ -75,6 +81,8 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithoutFactory
+ *
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithoutFactory newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithoutFactory newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithoutFactory query()

tests/Console/ModelsCommand/Factories/__snapshots__/Test__test_9__1.php

@@ -0,0 +1,94 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models;
+
+use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\CustomSpace\ModelWithCustomNamespaceFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithCustomNamespace
+ *
+ * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\CustomSpace\ModelWithCustomNamespaceFactory factory($count = null, $state = [])
+ * @method static \Illuminate\Database\Eloquent\Builder|ModelWithCustomNamespace newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ModelWithCustomNamespace newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ModelWithCustomNamespace query()
+ * @mixin \Eloquent
+ */
+class ModelWithCustomNamespace extends Model
+{
+    use HasFactory;
+
+    /**
+     * Create a new factory instance for the model.
+     *
+     * @return \Illuminate\Database\Eloquent\Factories\Factory
+     */
+    protected static function newFactory()
+    {
+        return ModelWithCustomNamespaceFactory::new();
+    }
+}
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithFactory
+ *
+ * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Factories\ModelWithFactoryFactory factory($count = null, $state = [])
+ * @method static \Illuminate\Database\Eloquent\Builder|ModelWithFactory newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ModelWithFactory newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ModelWithFactory query()
+ * @mixin \Eloquent
+ */
+class ModelWithFactory extends Model
+{
+    use HasFactory;
+}
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models;
+
+/**
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithNestedFactory
+ *
+ * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Factories\ModelWithNestedFactoryFactory factory($count = null, $state = [])
+ * @method static \Illuminate\Database\Eloquent\Builder|ModelWithNestedFactory newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ModelWithNestedFactory newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ModelWithNestedFactory query()
+ * @mixin \Eloquent
+ */
+class ModelWithNestedFactory extends ModelWithFactory
+{
+}
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithoutFactory
+ *
+ * @method static \Illuminate\Database\Eloquent\Builder|ModelWithoutFactory newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ModelWithoutFactory newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ModelWithoutFactory query()
+ * @mixin \Eloquent
+ */
+class ModelWithoutFactory extends Model
+{
+    use HasFactory;
+}

tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/Enums/PostStatus.php

@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Enums;
-
-enum PostStatus
-{
-    case Published;
-
-    case Unpublished;
-
-    case Archived;
-}

tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/Models/Post.php

@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Models;
-
-use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Enums\PostStatus;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-
-class Post extends Model
-{
-    public function scopeHasStatus(Builder $query, ?PostStatus $status = PostStatus::Published)
-    {
-        //
-    }
-}

tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/Test.php

@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults;
-
-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/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php

@@ -1,166 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Models;
-
-use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Enums\PostStatus;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property int $id
- * @property string|null $char_nullable
- * @property string $char_not_nullable
- * @property string|null $string_nullable
- * @property string $string_not_nullable
- * @property string|null $text_nullable
- * @property string $text_not_nullable
- * @property string|null $medium_text_nullable
- * @property string $medium_text_not_nullable
- * @property string|null $long_text_nullable
- * @property string $long_text_not_nullable
- * @property int|null $integer_nullable
- * @property int $integer_not_nullable
- * @property int|null $tiny_integer_nullable
- * @property int $tiny_integer_not_nullable
- * @property int|null $small_integer_nullable
- * @property int $small_integer_not_nullable
- * @property int|null $medium_integer_nullable
- * @property int $medium_integer_not_nullable
- * @property int|null $big_integer_nullable
- * @property int $big_integer_not_nullable
- * @property int|null $unsigned_integer_nullable
- * @property int $unsigned_integer_not_nullable
- * @property int|null $unsigned_tiny_integer_nullable
- * @property int $unsigned_tiny_integer_not_nullable
- * @property int|null $unsigned_small_integer_nullable
- * @property int $unsigned_small_integer_not_nullable
- * @property int|null $unsigned_medium_integer_nullable
- * @property int $unsigned_medium_integer_not_nullable
- * @property int|null $unsigned_big_integer_nullable
- * @property int $unsigned_big_integer_not_nullable
- * @property float|null $float_nullable
- * @property float $float_not_nullable
- * @property float|null $double_nullable
- * @property float $double_not_nullable
- * @property string|null $decimal_nullable
- * @property string $decimal_not_nullable
- * @property int|null $boolean_nullable
- * @property int $boolean_not_nullable
- * @property string|null $enum_nullable
- * @property string $enum_not_nullable
- * @property string|null $json_nullable
- * @property string $json_not_nullable
- * @property string|null $jsonb_nullable
- * @property string $jsonb_not_nullable
- * @property string|null $date_nullable
- * @property string $date_not_nullable
- * @property string|null $datetime_nullable
- * @property string $datetime_not_nullable
- * @property string|null $datetimetz_nullable
- * @property string $datetimetz_not_nullable
- * @property string|null $time_nullable
- * @property string $time_not_nullable
- * @property string|null $timetz_nullable
- * @property string $timetz_not_nullable
- * @property string|null $timestamp_nullable
- * @property string $timestamp_not_nullable
- * @property string|null $timestamptz_nullable
- * @property string $timestamptz_not_nullable
- * @property int|null $year_nullable
- * @property int $year_not_nullable
- * @property string|null $binary_nullable
- * @property string $binary_not_nullable
- * @property string|null $uuid_nullable
- * @property string $uuid_not_nullable
- * @property string|null $ipaddress_nullable
- * @property string $ipaddress_not_nullable
- * @property string|null $macaddress_nullable
- * @property string $macaddress_not_nullable
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @method static Builder|Post hasStatus(?\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Enums\PostStatus $status = \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Enums\PostStatus::Published)
- * @method static Builder|Post newModelQuery()
- * @method static Builder|Post newQuery()
- * @method static Builder|Post query()
- * @method static Builder|Post whereBigIntegerNotNullable($value)
- * @method static Builder|Post whereBigIntegerNullable($value)
- * @method static Builder|Post whereBinaryNotNullable($value)
- * @method static Builder|Post whereBinaryNullable($value)
- * @method static Builder|Post whereBooleanNotNullable($value)
- * @method static Builder|Post whereBooleanNullable($value)
- * @method static Builder|Post whereCharNotNullable($value)
- * @method static Builder|Post whereCharNullable($value)
- * @method static Builder|Post whereCreatedAt($value)
- * @method static Builder|Post whereDateNotNullable($value)
- * @method static Builder|Post whereDateNullable($value)
- * @method static Builder|Post whereDatetimeNotNullable($value)
- * @method static Builder|Post whereDatetimeNullable($value)
- * @method static Builder|Post whereDatetimetzNotNullable($value)
- * @method static Builder|Post whereDatetimetzNullable($value)
- * @method static Builder|Post whereDecimalNotNullable($value)
- * @method static Builder|Post whereDecimalNullable($value)
- * @method static Builder|Post whereDoubleNotNullable($value)
- * @method static Builder|Post whereDoubleNullable($value)
- * @method static Builder|Post whereEnumNotNullable($value)
- * @method static Builder|Post whereEnumNullable($value)
- * @method static Builder|Post whereFloatNotNullable($value)
- * @method static Builder|Post whereFloatNullable($value)
- * @method static Builder|Post whereId($value)
- * @method static Builder|Post whereIntegerNotNullable($value)
- * @method static Builder|Post whereIntegerNullable($value)
- * @method static Builder|Post whereIpaddressNotNullable($value)
- * @method static Builder|Post whereIpaddressNullable($value)
- * @method static Builder|Post whereJsonNotNullable($value)
- * @method static Builder|Post whereJsonNullable($value)
- * @method static Builder|Post whereJsonbNotNullable($value)
- * @method static Builder|Post whereJsonbNullable($value)
- * @method static Builder|Post whereLongTextNotNullable($value)
- * @method static Builder|Post whereLongTextNullable($value)
- * @method static Builder|Post whereMacaddressNotNullable($value)
- * @method static Builder|Post whereMacaddressNullable($value)
- * @method static Builder|Post whereMediumIntegerNotNullable($value)
- * @method static Builder|Post whereMediumIntegerNullable($value)
- * @method static Builder|Post whereMediumTextNotNullable($value)
- * @method static Builder|Post whereMediumTextNullable($value)
- * @method static Builder|Post whereSmallIntegerNotNullable($value)
- * @method static Builder|Post whereSmallIntegerNullable($value)
- * @method static Builder|Post whereStringNotNullable($value)
- * @method static Builder|Post whereStringNullable($value)
- * @method static Builder|Post whereTextNotNullable($value)
- * @method static Builder|Post whereTextNullable($value)
- * @method static Builder|Post whereTimeNotNullable($value)
- * @method static Builder|Post whereTimeNullable($value)
- * @method static Builder|Post whereTimestampNotNullable($value)
- * @method static Builder|Post whereTimestampNullable($value)
- * @method static Builder|Post whereTimestamptzNotNullable($value)
- * @method static Builder|Post whereTimestamptzNullable($value)
- * @method static Builder|Post whereTimetzNotNullable($value)
- * @method static Builder|Post whereTimetzNullable($value)
- * @method static Builder|Post whereTinyIntegerNotNullable($value)
- * @method static Builder|Post whereTinyIntegerNullable($value)
- * @method static Builder|Post whereUnsignedBigIntegerNotNullable($value)
- * @method static Builder|Post whereUnsignedBigIntegerNullable($value)
- * @method static Builder|Post whereUnsignedIntegerNotNullable($value)
- * @method static Builder|Post whereUnsignedIntegerNullable($value)
- * @method static Builder|Post whereUnsignedMediumIntegerNotNullable($value)
- * @method static Builder|Post whereUnsignedMediumIntegerNullable($value)
- * @method static Builder|Post whereUnsignedSmallIntegerNotNullable($value)
- * @method static Builder|Post whereUnsignedSmallIntegerNullable($value)
- * @method static Builder|Post whereUnsignedTinyIntegerNotNullable($value)
- * @method static Builder|Post whereUnsignedTinyIntegerNullable($value)
- * @method static Builder|Post whereUpdatedAt($value)
- * @method static Builder|Post whereUuidNotNullable($value)
- * @method static Builder|Post whereUuidNullable($value)
- * @method static Builder|Post whereYearNotNullable($value)
- * @method static Builder|Post whereYearNullable($value)
- * @mixin \Eloquent
- */
-class Post extends Model
-{
-    public function scopeHasStatus(Builder $query, ?PostStatus $status = PostStatus::Published)
-    {
-        //
-    }
-}

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

@@ -7,7 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdoc\Models\Post
+ *
+ * @property integer $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -18,34 +20,36 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property int|null $integer_nullable
+ * @property integer|null $integer_nullable
- * @property int $integer_not_nullable
+ * @property integer $integer_not_nullable
- * @property int|null $tiny_integer_nullable
+ * @property integer|null $tiny_integer_nullable
- * @property int $tiny_integer_not_nullable
+ * @property integer $tiny_integer_not_nullable
- * @property int|null $small_integer_nullable
+ * @property integer|null $small_integer_nullable
- * @property int $small_integer_not_nullable
+ * @property integer $small_integer_not_nullable
- * @property int|null $medium_integer_nullable
+ * @property integer|null $medium_integer_nullable
- * @property int $medium_integer_not_nullable
+ * @property integer $medium_integer_not_nullable
- * @property int|null $big_integer_nullable
+ * @property integer|null $big_integer_nullable
- * @property int $big_integer_not_nullable
+ * @property integer $big_integer_not_nullable
- * @property int|null $unsigned_integer_nullable
+ * @property integer|null $unsigned_integer_nullable
- * @property int $unsigned_integer_not_nullable
+ * @property integer $unsigned_integer_not_nullable
- * @property int|null $unsigned_tiny_integer_nullable
+ * @property integer|null $unsigned_tiny_integer_nullable
- * @property int $unsigned_tiny_integer_not_nullable
+ * @property integer $unsigned_tiny_integer_not_nullable
- * @property int|null $unsigned_small_integer_nullable
+ * @property integer|null $unsigned_small_integer_nullable
- * @property int $unsigned_small_integer_not_nullable
+ * @property integer $unsigned_small_integer_not_nullable
- * @property int|null $unsigned_medium_integer_nullable
+ * @property integer|null $unsigned_medium_integer_nullable
- * @property int $unsigned_medium_integer_not_nullable
+ * @property integer $unsigned_medium_integer_not_nullable
- * @property int|null $unsigned_big_integer_nullable
+ * @property integer|null $unsigned_big_integer_nullable
- * @property int $unsigned_big_integer_not_nullable
+ * @property integer $unsigned_big_integer_not_nullable
  * @property float|null $float_nullable
  * @property float $float_not_nullable
  * @property float|null $double_nullable
  * @property float $double_not_nullable
  * @property string|null $decimal_nullable
  * @property string $decimal_not_nullable
- * @property int|null $boolean_nullable
+ * @property string|null $unsigned_decimal_nullable
- * @property int $boolean_not_nullable
+ * @property string $unsigned_decimal_not_nullable
+ * @property integer|null $boolean_nullable
+ * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -66,10 +70,10 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property int|null $year_nullable
+ * @property integer|null $year_nullable
- * @property int $year_not_nullable
+ * @property integer $year_not_nullable
- * @property string|null $binary_nullable
+ * @property mixed|null $binary_nullable
- * @property string $binary_not_nullable
+ * @property mixed $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -139,6 +143,8 @@ use Illuminate\Database\Eloquent\Model;
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)

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

@@ -7,7 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocCamel\Models\Post
+ *
+ * @property integer $id
  * @property string|null $charNullable
  * @property string $charNotNullable
  * @property string|null $stringNullable
@@ -18,34 +20,36 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $mediumTextNotNullable
  * @property string|null $longTextNullable
  * @property string $longTextNotNullable
- * @property int|null $integerNullable
+ * @property integer|null $integerNullable
- * @property int $integerNotNullable
+ * @property integer $integerNotNullable
- * @property int|null $tinyIntegerNullable
+ * @property integer|null $tinyIntegerNullable
- * @property int $tinyIntegerNotNullable
+ * @property integer $tinyIntegerNotNullable
- * @property int|null $smallIntegerNullable
+ * @property integer|null $smallIntegerNullable
- * @property int $smallIntegerNotNullable
+ * @property integer $smallIntegerNotNullable
- * @property int|null $mediumIntegerNullable
+ * @property integer|null $mediumIntegerNullable
- * @property int $mediumIntegerNotNullable
+ * @property integer $mediumIntegerNotNullable
- * @property int|null $bigIntegerNullable
+ * @property integer|null $bigIntegerNullable
- * @property int $bigIntegerNotNullable
+ * @property integer $bigIntegerNotNullable
- * @property int|null $unsignedIntegerNullable
+ * @property integer|null $unsignedIntegerNullable
- * @property int $unsignedIntegerNotNullable
+ * @property integer $unsignedIntegerNotNullable
- * @property int|null $unsignedTinyIntegerNullable
+ * @property integer|null $unsignedTinyIntegerNullable
- * @property int $unsignedTinyIntegerNotNullable
+ * @property integer $unsignedTinyIntegerNotNullable
- * @property int|null $unsignedSmallIntegerNullable
+ * @property integer|null $unsignedSmallIntegerNullable
- * @property int $unsignedSmallIntegerNotNullable
+ * @property integer $unsignedSmallIntegerNotNullable
- * @property int|null $unsignedMediumIntegerNullable
+ * @property integer|null $unsignedMediumIntegerNullable
- * @property int $unsignedMediumIntegerNotNullable
+ * @property integer $unsignedMediumIntegerNotNullable
- * @property int|null $unsignedBigIntegerNullable
+ * @property integer|null $unsignedBigIntegerNullable
- * @property int $unsignedBigIntegerNotNullable
+ * @property integer $unsignedBigIntegerNotNullable
  * @property float|null $floatNullable
  * @property float $floatNotNullable
  * @property float|null $doubleNullable
  * @property float $doubleNotNullable
  * @property string|null $decimalNullable
  * @property string $decimalNotNullable
- * @property int|null $booleanNullable
+ * @property string|null $unsignedDecimalNullable
- * @property int $booleanNotNullable
+ * @property string $unsignedDecimalNotNullable
+ * @property integer|null $booleanNullable
+ * @property integer $booleanNotNullable
  * @property string|null $enumNullable
  * @property string $enumNotNullable
  * @property string|null $jsonNullable
@@ -66,10 +70,10 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $timestampNotNullable
  * @property string|null $timestamptzNullable
  * @property string $timestamptzNotNullable
- * @property int|null $yearNullable
+ * @property integer|null $yearNullable
- * @property int $yearNotNullable
+ * @property integer $yearNotNullable
- * @property string|null $binaryNullable
+ * @property mixed|null $binaryNullable
- * @property string $binaryNotNullable
+ * @property mixed $binaryNotNullable
  * @property string|null $uuidNullable
  * @property string $uuidNotNullable
  * @property string|null $ipaddressNullable
@@ -139,6 +143,8 @@ use Illuminate\Database\Eloquent\Model;
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)

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

@@ -7,7 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocFinal\Models\Post
+ *
+ * @property integer $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -18,34 +20,36 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property int|null $integer_nullable
+ * @property integer|null $integer_nullable
- * @property int $integer_not_nullable
+ * @property integer $integer_not_nullable
- * @property int|null $tiny_integer_nullable
+ * @property integer|null $tiny_integer_nullable
- * @property int $tiny_integer_not_nullable
+ * @property integer $tiny_integer_not_nullable
- * @property int|null $small_integer_nullable
+ * @property integer|null $small_integer_nullable
- * @property int $small_integer_not_nullable
+ * @property integer $small_integer_not_nullable
- * @property int|null $medium_integer_nullable
+ * @property integer|null $medium_integer_nullable
- * @property int $medium_integer_not_nullable
+ * @property integer $medium_integer_not_nullable
- * @property int|null $big_integer_nullable
+ * @property integer|null $big_integer_nullable
- * @property int $big_integer_not_nullable
+ * @property integer $big_integer_not_nullable
- * @property int|null $unsigned_integer_nullable
+ * @property integer|null $unsigned_integer_nullable
- * @property int $unsigned_integer_not_nullable
+ * @property integer $unsigned_integer_not_nullable
- * @property int|null $unsigned_tiny_integer_nullable
+ * @property integer|null $unsigned_tiny_integer_nullable
- * @property int $unsigned_tiny_integer_not_nullable
+ * @property integer $unsigned_tiny_integer_not_nullable
- * @property int|null $unsigned_small_integer_nullable
+ * @property integer|null $unsigned_small_integer_nullable
- * @property int $unsigned_small_integer_not_nullable
+ * @property integer $unsigned_small_integer_not_nullable
- * @property int|null $unsigned_medium_integer_nullable
+ * @property integer|null $unsigned_medium_integer_nullable
- * @property int $unsigned_medium_integer_not_nullable
+ * @property integer $unsigned_medium_integer_not_nullable
- * @property int|null $unsigned_big_integer_nullable
+ * @property integer|null $unsigned_big_integer_nullable
- * @property int $unsigned_big_integer_not_nullable
+ * @property integer $unsigned_big_integer_not_nullable
  * @property float|null $float_nullable
  * @property float $float_not_nullable
  * @property float|null $double_nullable
  * @property float $double_not_nullable
  * @property string|null $decimal_nullable
  * @property string $decimal_not_nullable
- * @property int|null $boolean_nullable
+ * @property string|null $unsigned_decimal_nullable
- * @property int $boolean_not_nullable
+ * @property string $unsigned_decimal_not_nullable
+ * @property integer|null $boolean_nullable
+ * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -66,10 +70,10 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property int|null $year_nullable
+ * @property integer|null $year_nullable
- * @property int $year_not_nullable
+ * @property integer $year_not_nullable
- * @property string|null $binary_nullable
+ * @property mixed|null $binary_nullable
- * @property string $binary_not_nullable
+ * @property mixed $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -139,6 +143,8 @@ use Illuminate\Database\Eloquent\Model;
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)

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

@@ -13,7 +13,9 @@
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Models{
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Models\Post
+ *
+ * @property integer $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -24,34 +26,36 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property int|null $integer_nullable
+ * @property integer|null $integer_nullable
- * @property int $integer_not_nullable
+ * @property integer $integer_not_nullable
- * @property int|null $tiny_integer_nullable
+ * @property integer|null $tiny_integer_nullable
- * @property int $tiny_integer_not_nullable
+ * @property integer $tiny_integer_not_nullable
- * @property int|null $small_integer_nullable
+ * @property integer|null $small_integer_nullable
- * @property int $small_integer_not_nullable
+ * @property integer $small_integer_not_nullable
- * @property int|null $medium_integer_nullable
+ * @property integer|null $medium_integer_nullable
- * @property int $medium_integer_not_nullable
+ * @property integer $medium_integer_not_nullable
- * @property int|null $big_integer_nullable
+ * @property integer|null $big_integer_nullable
- * @property int $big_integer_not_nullable
+ * @property integer $big_integer_not_nullable
- * @property int|null $unsigned_integer_nullable
+ * @property integer|null $unsigned_integer_nullable
- * @property int $unsigned_integer_not_nullable
+ * @property integer $unsigned_integer_not_nullable
- * @property int|null $unsigned_tiny_integer_nullable
+ * @property integer|null $unsigned_tiny_integer_nullable
- * @property int $unsigned_tiny_integer_not_nullable
+ * @property integer $unsigned_tiny_integer_not_nullable
- * @property int|null $unsigned_small_integer_nullable
+ * @property integer|null $unsigned_small_integer_nullable
- * @property int $unsigned_small_integer_not_nullable
+ * @property integer $unsigned_small_integer_not_nullable
- * @property int|null $unsigned_medium_integer_nullable
+ * @property integer|null $unsigned_medium_integer_nullable
- * @property int $unsigned_medium_integer_not_nullable
+ * @property integer $unsigned_medium_integer_not_nullable
- * @property int|null $unsigned_big_integer_nullable
+ * @property integer|null $unsigned_big_integer_nullable
- * @property int $unsigned_big_integer_not_nullable
+ * @property integer $unsigned_big_integer_not_nullable
  * @property float|null $float_nullable
  * @property float $float_not_nullable
  * @property float|null $double_nullable
  * @property float $double_not_nullable
  * @property string|null $decimal_nullable
  * @property string $decimal_not_nullable
- * @property int|null $boolean_nullable
+ * @property string|null $unsigned_decimal_nullable
- * @property int $boolean_not_nullable
+ * @property string $unsigned_decimal_not_nullable
+ * @property integer|null $boolean_nullable
+ * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -72,10 +76,10 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property int|null $year_nullable
+ * @property integer|null $year_nullable
- * @property int $year_not_nullable
+ * @property integer $year_not_nullable
- * @property string|null $binary_nullable
+ * @property mixed|null $binary_nullable
- * @property string $binary_not_nullable
+ * @property mixed $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -148,6 +152,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereTinyIntegerNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereUnsignedBigIntegerNullable($value)
+ * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereUnsignedDecimalNotNullable($value)
+ * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereUnsignedDecimalNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereUnsignedIntegerNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereUnsignedMediumIntegerNotNullable($value)

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

@@ -8,7 +8,9 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExte
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilderWithFqn\Models\Post
+ *
+ * @property integer $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -19,34 +21,36 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property int|null $integer_nullable
+ * @property integer|null $integer_nullable
- * @property int $integer_not_nullable
+ * @property integer $integer_not_nullable
- * @property int|null $tiny_integer_nullable
+ * @property integer|null $tiny_integer_nullable
- * @property int $tiny_integer_not_nullable
+ * @property integer $tiny_integer_not_nullable
- * @property int|null $small_integer_nullable
+ * @property integer|null $small_integer_nullable
- * @property int $small_integer_not_nullable
+ * @property integer $small_integer_not_nullable
- * @property int|null $medium_integer_nullable
+ * @property integer|null $medium_integer_nullable
- * @property int $medium_integer_not_nullable
+ * @property integer $medium_integer_not_nullable
- * @property int|null $big_integer_nullable
+ * @property integer|null $big_integer_nullable
- * @property int $big_integer_not_nullable
+ * @property integer $big_integer_not_nullable
- * @property int|null $unsigned_integer_nullable
+ * @property integer|null $unsigned_integer_nullable
- * @property int $unsigned_integer_not_nullable
+ * @property integer $unsigned_integer_not_nullable
- * @property int|null $unsigned_tiny_integer_nullable
+ * @property integer|null $unsigned_tiny_integer_nullable
- * @property int $unsigned_tiny_integer_not_nullable
+ * @property integer $unsigned_tiny_integer_not_nullable
- * @property int|null $unsigned_small_integer_nullable
+ * @property integer|null $unsigned_small_integer_nullable
- * @property int $unsigned_small_integer_not_nullable
+ * @property integer $unsigned_small_integer_not_nullable
- * @property int|null $unsigned_medium_integer_nullable
+ * @property integer|null $unsigned_medium_integer_nullable
- * @property int $unsigned_medium_integer_not_nullable
+ * @property integer $unsigned_medium_integer_not_nullable
- * @property int|null $unsigned_big_integer_nullable
+ * @property integer|null $unsigned_big_integer_nullable
- * @property int $unsigned_big_integer_not_nullable
+ * @property integer $unsigned_big_integer_not_nullable
  * @property float|null $float_nullable
  * @property float $float_not_nullable
  * @property float|null $double_nullable
  * @property float $double_not_nullable
  * @property string|null $decimal_nullable
  * @property string $decimal_not_nullable
- * @property int|null $boolean_nullable
+ * @property string|null $unsigned_decimal_nullable
- * @property int $boolean_not_nullable
+ * @property string $unsigned_decimal_not_nullable
+ * @property integer|null $boolean_nullable
+ * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -67,10 +71,10 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property int|null $year_nullable
+ * @property integer|null $year_nullable
- * @property int $year_not_nullable
+ * @property integer $year_not_nullable
- * @property string|null $binary_nullable
+ * @property mixed|null $binary_nullable
- * @property string $binary_not_nullable
+ * @property mixed $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -143,6 +147,8 @@ use Illuminate\Database\Eloquent\Model;
  * @method static PostExternalQueryBuilder|Post whereTinyIntegerNullable($value)
  * @method static PostExternalQueryBuilder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static PostExternalQueryBuilder|Post whereUnsignedBigIntegerNullable($value)
+ * @method static PostExternalQueryBuilder|Post whereUnsignedDecimalNotNullable($value)
+ * @method static PostExternalQueryBuilder|Post whereUnsignedDecimalNullable($value)
  * @method static PostExternalQueryBuilder|Post whereUnsignedIntegerNotNullable($value)
  * @method static PostExternalQueryBuilder|Post whereUnsignedIntegerNullable($value)
  * @method static PostExternalQueryBuilder|Post whereUnsignedMediumIntegerNotNullable($value)

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

@@ -9,7 +9,9 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post
+ *
+ * @property integer $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -20,34 +22,36 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property int|null $integer_nullable
+ * @property integer|null $integer_nullable
- * @property int $integer_not_nullable
+ * @property integer $integer_not_nullable
- * @property int|null $tiny_integer_nullable
+ * @property integer|null $tiny_integer_nullable
- * @property int $tiny_integer_not_nullable
+ * @property integer $tiny_integer_not_nullable
- * @property int|null $small_integer_nullable
+ * @property integer|null $small_integer_nullable
- * @property int $small_integer_not_nullable
+ * @property integer $small_integer_not_nullable
- * @property int|null $medium_integer_nullable
+ * @property integer|null $medium_integer_nullable
- * @property int $medium_integer_not_nullable
+ * @property integer $medium_integer_not_nullable
- * @property int|null $big_integer_nullable
+ * @property integer|null $big_integer_nullable
- * @property int $big_integer_not_nullable
+ * @property integer $big_integer_not_nullable
- * @property int|null $unsigned_integer_nullable
+ * @property integer|null $unsigned_integer_nullable
- * @property int $unsigned_integer_not_nullable
+ * @property integer $unsigned_integer_not_nullable
- * @property int|null $unsigned_tiny_integer_nullable
+ * @property integer|null $unsigned_tiny_integer_nullable
- * @property int $unsigned_tiny_integer_not_nullable
+ * @property integer $unsigned_tiny_integer_not_nullable
- * @property int|null $unsigned_small_integer_nullable
+ * @property integer|null $unsigned_small_integer_nullable
- * @property int $unsigned_small_integer_not_nullable
+ * @property integer $unsigned_small_integer_not_nullable
- * @property int|null $unsigned_medium_integer_nullable
+ * @property integer|null $unsigned_medium_integer_nullable
- * @property int $unsigned_medium_integer_not_nullable
+ * @property integer $unsigned_medium_integer_not_nullable
- * @property int|null $unsigned_big_integer_nullable
+ * @property integer|null $unsigned_big_integer_nullable
- * @property int $unsigned_big_integer_not_nullable
+ * @property integer $unsigned_big_integer_not_nullable
  * @property float|null $float_nullable
  * @property float $float_not_nullable
  * @property float|null $double_nullable
  * @property float $double_not_nullable
  * @property string|null $decimal_nullable
  * @property string $decimal_not_nullable
- * @property int|null $boolean_nullable
+ * @property string|null $unsigned_decimal_nullable
- * @property int $boolean_not_nullable
+ * @property string $unsigned_decimal_not_nullable
+ * @property integer|null $boolean_nullable
+ * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -68,10 +72,10 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property int|null $year_nullable
+ * @property integer|null $year_nullable
- * @property int $year_not_nullable
+ * @property integer $year_not_nullable
- * @property string|null $binary_nullable
+ * @property mixed|null $binary_nullable
- * @property string $binary_not_nullable
+ * @property mixed $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -80,84 +84,86 @@ 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<int, \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()
  * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post null(string $unusedParam)
  * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post query()
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereBigIntegerNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereBigIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereBigIntegerNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereBigIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereBinaryNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereBinaryNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereBinaryNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereBinaryNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereBooleanNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereBooleanNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereBooleanNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereBooleanNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereCharNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereCharNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereCharNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereCharNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereCreatedAt(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDateNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDateNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDateNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDateNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDatetimeNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDatetimeNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDatetimeNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDatetimeNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDatetimetzNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDatetimetzNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDatetimetzNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDatetimetzNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDecimalNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDecimalNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDecimalNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDecimalNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDoubleNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDoubleNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDoubleNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereDoubleNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereEnumNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereEnumNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereEnumNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereEnumNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereFloatNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereFloatNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereFloatNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereFloatNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereId(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereIntegerNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereIntegerNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereIpaddressNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereIpaddressNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereIpaddressNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereIpaddressNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereJsonNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereJsonNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereJsonNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereJsonNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereJsonbNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereJsonbNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereJsonbNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereJsonbNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereLongTextNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereLongTextNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereLongTextNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereLongTextNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereMacaddressNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereMacaddressNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereMacaddressNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereMacaddressNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereMediumIntegerNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereMediumIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereMediumIntegerNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereMediumIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereMediumTextNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereMediumTextNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereMediumTextNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereMediumTextNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereSmallIntegerNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereSmallIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereSmallIntegerNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereSmallIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereStringNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereStringNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereStringNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereStringNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTextNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTextNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTextNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTextNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimeNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimeNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimeNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimeNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimestampNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimestampNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimestampNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimestampNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimestamptzNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimestamptzNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimestamptzNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimestamptzNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimetzNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimetzNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimetzNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTimetzNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTinyIntegerNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTinyIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTinyIntegerNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTinyIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedBigIntegerNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedBigIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedBigIntegerNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedBigIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedIntegerNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedDecimalNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedIntegerNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedDecimalNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedMediumIntegerNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedMediumIntegerNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedSmallIntegerNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedMediumIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedSmallIntegerNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedMediumIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedTinyIntegerNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedSmallIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedTinyIntegerNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedSmallIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUpdatedAt(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedTinyIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUuidNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedTinyIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUuidNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereYearNotNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUuidNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereYearNullable(mixed $value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUuidNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereYearNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereYearNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post withTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post withoutTrashed()
  * @mixin \Eloquent

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

@@ -15,7 +15,9 @@ use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Support\Carbon;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqn\Models\Post
+ *
+ * @property integer $id
  * @property string|null $char_nullable
  * @property CastType $char_not_nullable
  * @property string|null $string_nullable
@@ -26,34 +28,36 @@ use Illuminate\Support\Carbon;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property int|null $integer_nullable
+ * @property integer|null $integer_nullable
- * @property int $integer_not_nullable
+ * @property integer $integer_not_nullable
- * @property int|null $tiny_integer_nullable
+ * @property integer|null $tiny_integer_nullable
- * @property int $tiny_integer_not_nullable
+ * @property integer $tiny_integer_not_nullable
- * @property int|null $small_integer_nullable
+ * @property integer|null $small_integer_nullable
- * @property int $small_integer_not_nullable
+ * @property integer $small_integer_not_nullable
- * @property int|null $medium_integer_nullable
+ * @property integer|null $medium_integer_nullable
- * @property int $medium_integer_not_nullable
+ * @property integer $medium_integer_not_nullable
- * @property int|null $big_integer_nullable
+ * @property integer|null $big_integer_nullable
- * @property int $big_integer_not_nullable
+ * @property integer $big_integer_not_nullable
- * @property int|null $unsigned_integer_nullable
+ * @property integer|null $unsigned_integer_nullable
- * @property int $unsigned_integer_not_nullable
+ * @property integer $unsigned_integer_not_nullable
- * @property int|null $unsigned_tiny_integer_nullable
+ * @property integer|null $unsigned_tiny_integer_nullable
- * @property int $unsigned_tiny_integer_not_nullable
+ * @property integer $unsigned_tiny_integer_not_nullable
- * @property int|null $unsigned_small_integer_nullable
+ * @property integer|null $unsigned_small_integer_nullable
- * @property int $unsigned_small_integer_not_nullable
+ * @property integer $unsigned_small_integer_not_nullable
- * @property int|null $unsigned_medium_integer_nullable
+ * @property integer|null $unsigned_medium_integer_nullable
- * @property int $unsigned_medium_integer_not_nullable
+ * @property integer $unsigned_medium_integer_not_nullable
- * @property int|null $unsigned_big_integer_nullable
+ * @property integer|null $unsigned_big_integer_nullable
- * @property int $unsigned_big_integer_not_nullable
+ * @property integer $unsigned_big_integer_not_nullable
  * @property float|null $float_nullable
  * @property float $float_not_nullable
  * @property float|null $double_nullable
  * @property float $double_not_nullable
  * @property string|null $decimal_nullable
  * @property string $decimal_not_nullable
- * @property int|null $boolean_nullable
+ * @property string|null $unsigned_decimal_nullable
- * @property int $boolean_not_nullable
+ * @property string $unsigned_decimal_not_nullable
+ * @property integer|null $boolean_nullable
+ * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -74,10 +78,10 @@ use Illuminate\Support\Carbon;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property int|null $year_nullable
+ * @property integer|null $year_nullable
- * @property int $year_not_nullable
+ * @property integer $year_not_nullable
- * @property string|null $binary_nullable
+ * @property mixed|null $binary_nullable
- * @property string $binary_not_nullable
+ * @property mixed $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -151,6 +155,8 @@ use Illuminate\Support\Carbon;
  * @method static EloquentBuilder|Post whereTinyIntegerNullable($value)
  * @method static EloquentBuilder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static EloquentBuilder|Post whereUnsignedBigIntegerNullable($value)
+ * @method static EloquentBuilder|Post whereUnsignedDecimalNotNullable($value)
+ * @method static EloquentBuilder|Post whereUnsignedDecimalNullable($value)
  * @method static EloquentBuilder|Post whereUnsignedIntegerNotNullable($value)
  * @method static EloquentBuilder|Post whereUnsignedIntegerNullable($value)
  * @method static EloquentBuilder|Post whereUnsignedMediumIntegerNotNullable($value)

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

@@ -13,7 +13,9 @@
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Models{
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Models\Post
+ *
+ * @property integer $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -24,34 +26,36 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property int|null $integer_nullable
+ * @property integer|null $integer_nullable
- * @property int $integer_not_nullable
+ * @property integer $integer_not_nullable
- * @property int|null $tiny_integer_nullable
+ * @property integer|null $tiny_integer_nullable
- * @property int $tiny_integer_not_nullable
+ * @property integer $tiny_integer_not_nullable
- * @property int|null $small_integer_nullable
+ * @property integer|null $small_integer_nullable
- * @property int $small_integer_not_nullable
+ * @property integer $small_integer_not_nullable
- * @property int|null $medium_integer_nullable
+ * @property integer|null $medium_integer_nullable
- * @property int $medium_integer_not_nullable
+ * @property integer $medium_integer_not_nullable
- * @property int|null $big_integer_nullable
+ * @property integer|null $big_integer_nullable
- * @property int $big_integer_not_nullable
+ * @property integer $big_integer_not_nullable
- * @property int|null $unsigned_integer_nullable
+ * @property integer|null $unsigned_integer_nullable
- * @property int $unsigned_integer_not_nullable
+ * @property integer $unsigned_integer_not_nullable
- * @property int|null $unsigned_tiny_integer_nullable
+ * @property integer|null $unsigned_tiny_integer_nullable
- * @property int $unsigned_tiny_integer_not_nullable
+ * @property integer $unsigned_tiny_integer_not_nullable
- * @property int|null $unsigned_small_integer_nullable
+ * @property integer|null $unsigned_small_integer_nullable
- * @property int $unsigned_small_integer_not_nullable
+ * @property integer $unsigned_small_integer_not_nullable
- * @property int|null $unsigned_medium_integer_nullable
+ * @property integer|null $unsigned_medium_integer_nullable
- * @property int $unsigned_medium_integer_not_nullable
+ * @property integer $unsigned_medium_integer_not_nullable
- * @property int|null $unsigned_big_integer_nullable
+ * @property integer|null $unsigned_big_integer_nullable
- * @property int $unsigned_big_integer_not_nullable
+ * @property integer $unsigned_big_integer_not_nullable
  * @property float|null $float_nullable
  * @property float $float_not_nullable
  * @property float|null $double_nullable
  * @property float $double_not_nullable
  * @property string|null $decimal_nullable
  * @property string $decimal_not_nullable
- * @property int|null $boolean_nullable
+ * @property string|null $unsigned_decimal_nullable
- * @property int $boolean_not_nullable
+ * @property string $unsigned_decimal_not_nullable
+ * @property integer|null $boolean_nullable
+ * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -72,10 +76,10 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property int|null $year_nullable
+ * @property integer|null $year_nullable
- * @property int $year_not_nullable
+ * @property integer $year_not_nullable
- * @property string|null $binary_nullable
+ * @property mixed|null $binary_nullable
- * @property string $binary_not_nullable
+ * @property mixed $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -145,6 +149,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereTinyIntegerNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereUnsignedBigIntegerNullable($value)
+ * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereUnsignedDecimalNotNullable($value)
+ * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereUnsignedDecimalNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereUnsignedIntegerNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/GeneratePhpdocWithMixin/Models/FinalPost.php

@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property $someProp
- * @method someMethod(string $method)
- * @mixin IdeHelperPost
- */
-final class FinalPost extends Model
-{
-}

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

@@ -8,23 +8,7 @@ use Illuminate\Database\Eloquent\Model;
 
 /**
  * @property $someProp
- * @method void someMethod(string $method)
+ * @method someMethod(string $method)
- * @mixin IdeHelperFinalPost
- */
-final class FinalPost extends Model
-{
-}
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property $someProp
- * @method void someMethod(string $method)
  * @mixin IdeHelperPost
  */
 class Post extends Model
@@ -45,22 +29,11 @@ class Post extends Model
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models{
 /**
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models\Post
+ *
  * @property $someProp
- * @method void someMethod(string $method)
+ * @method someMethod(string $method)
- * @method static \Illuminate\Database\Eloquent\Builder|FinalPost newModelQuery()
+ * @property integer $id
- * @method static \Illuminate\Database\Eloquent\Builder|FinalPost newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|FinalPost query()
- * @mixin \Eloquent
- */
-	#[\AllowDynamicProperties]
-	final class IdeHelperFinalPost {}
-}
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models{
-/**
- * @property $someProp
- * @method void someMethod(string $method)
- * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -71,34 +44,36 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property int|null $integer_nullable
+ * @property integer|null $integer_nullable
- * @property int $integer_not_nullable
+ * @property integer $integer_not_nullable
- * @property int|null $tiny_integer_nullable
+ * @property integer|null $tiny_integer_nullable
- * @property int $tiny_integer_not_nullable
+ * @property integer $tiny_integer_not_nullable
- * @property int|null $small_integer_nullable
+ * @property integer|null $small_integer_nullable
- * @property int $small_integer_not_nullable
+ * @property integer $small_integer_not_nullable
- * @property int|null $medium_integer_nullable
+ * @property integer|null $medium_integer_nullable
- * @property int $medium_integer_not_nullable
+ * @property integer $medium_integer_not_nullable
- * @property int|null $big_integer_nullable
+ * @property integer|null $big_integer_nullable
- * @property int $big_integer_not_nullable
+ * @property integer $big_integer_not_nullable
- * @property int|null $unsigned_integer_nullable
+ * @property integer|null $unsigned_integer_nullable
- * @property int $unsigned_integer_not_nullable
+ * @property integer $unsigned_integer_not_nullable
- * @property int|null $unsigned_tiny_integer_nullable
+ * @property integer|null $unsigned_tiny_integer_nullable
- * @property int $unsigned_tiny_integer_not_nullable
+ * @property integer $unsigned_tiny_integer_not_nullable
- * @property int|null $unsigned_small_integer_nullable
+ * @property integer|null $unsigned_small_integer_nullable
- * @property int $unsigned_small_integer_not_nullable
+ * @property integer $unsigned_small_integer_not_nullable
- * @property int|null $unsigned_medium_integer_nullable
+ * @property integer|null $unsigned_medium_integer_nullable
- * @property int $unsigned_medium_integer_not_nullable
+ * @property integer $unsigned_medium_integer_not_nullable
- * @property int|null $unsigned_big_integer_nullable
+ * @property integer|null $unsigned_big_integer_nullable
- * @property int $unsigned_big_integer_not_nullable
+ * @property integer $unsigned_big_integer_not_nullable
  * @property float|null $float_nullable
  * @property float $float_not_nullable
  * @property float|null $double_nullable
  * @property float $double_not_nullable
  * @property string|null $decimal_nullable
  * @property string $decimal_not_nullable
- * @property int|null $boolean_nullable
+ * @property string|null $unsigned_decimal_nullable
- * @property int $boolean_not_nullable
+ * @property string $unsigned_decimal_not_nullable
+ * @property integer|null $boolean_nullable
+ * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -119,10 +94,10 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property int|null $year_nullable
+ * @property integer|null $year_nullable
- * @property int $year_not_nullable
+ * @property integer $year_not_nullable
- * @property string|null $binary_nullable
+ * @property mixed|null $binary_nullable
- * @property string $binary_not_nullable
+ * @property mixed $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -192,6 +167,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)
@@ -207,7 +184,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereYearNullable($value)
  * @mixin \Eloquent
  */
-	#[\AllowDynamicProperties]
 	class IdeHelperPost {}
 }
 

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

@@ -9,7 +9,9 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
- * @property int $id
+ * 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

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

@@ -8,7 +8,9 @@ use DateTime;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Getter\Models\Simple
+ *
+ * @property integer $id
  * @property-read int|null $attribute_return_type_int_or_null
  * @property-read array $attribute_returns_array
  * @property-read bool $attribute_returns_bool

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

@@ -7,6 +7,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Ignored\Models;
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Ignored\Models\NotIgnored
+ *
  * @method static \Illuminate\Database\Eloquent\Builder|NotIgnored newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|NotIgnored newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|NotIgnored query()

tests/Console/ModelsCommand/Interfaces/Models/User.php

@@ -19,11 +19,6 @@ class User extends Model implements Authenticatable
         // TODO: Implement getAuthIdentifier() method.
     }
 
-    public function getAuthPasswordName()
-    {
-        // TODO: Implement getAuthPasswordName() method.
-    }
-
     public function getAuthPassword()
     {
         // TODO: Implement getAuthPassword() method.

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

@@ -13,6 +13,8 @@
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Interfaces\Models{
 /**
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Interfaces\Models\User
+ *
  * @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|User newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|User query()

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

@@ -11,7 +11,7 @@ class CastableReturnsAnonymousCaster implements Castable
 {
     public static function castUsing(array $arguments)
     {
-        return new class () implements CastsAttributes {
+        return new class() implements CastsAttributes {
             /**
              * @inheritDoc
              * @return CastedProperty

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

@@ -11,7 +11,7 @@ class CastableWithoutReturnType implements Castable
 {
     public static function castUsing(array $arguments)
     {
-        return new class () implements CastsAttributes {
+        return new class() implements CastsAttributes {
             public function get($model, string $key, $value, array $attributes)
             {
                 return new CastedProperty();

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

@@ -10,7 +10,7 @@ class CustomCasterWithDocblockReturnFqn implements CastsAttributes
 {
     /**
      * @inheritDoc
-     * @return CastedProperty
+     * @return \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty
      */
     public function get($model, string $key, $value, array $attributes)
     {

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

@@ -23,6 +23,8 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Cas
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Models\CustomCast
+ *
  * @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_return_type
  * @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_return_docblock
  * @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_return_docblock_fqn

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

@@ -7,7 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\MagicWhere\Model
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\MagicWhere\Models\Post
+ *
+ * @property integer $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -18,34 +20,36 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property int|null $integer_nullable
+ * @property integer|null $integer_nullable
- * @property int $integer_not_nullable
+ * @property integer $integer_not_nullable
- * @property int|null $tiny_integer_nullable
+ * @property integer|null $tiny_integer_nullable
- * @property int $tiny_integer_not_nullable
+ * @property integer $tiny_integer_not_nullable
- * @property int|null $small_integer_nullable
+ * @property integer|null $small_integer_nullable
- * @property int $small_integer_not_nullable
+ * @property integer $small_integer_not_nullable
- * @property int|null $medium_integer_nullable
+ * @property integer|null $medium_integer_nullable
- * @property int $medium_integer_not_nullable
+ * @property integer $medium_integer_not_nullable
- * @property int|null $big_integer_nullable
+ * @property integer|null $big_integer_nullable
- * @property int $big_integer_not_nullable
+ * @property integer $big_integer_not_nullable
- * @property int|null $unsigned_integer_nullable
+ * @property integer|null $unsigned_integer_nullable
- * @property int $unsigned_integer_not_nullable
+ * @property integer $unsigned_integer_not_nullable
- * @property int|null $unsigned_tiny_integer_nullable
+ * @property integer|null $unsigned_tiny_integer_nullable
- * @property int $unsigned_tiny_integer_not_nullable
+ * @property integer $unsigned_tiny_integer_not_nullable
- * @property int|null $unsigned_small_integer_nullable
+ * @property integer|null $unsigned_small_integer_nullable
- * @property int $unsigned_small_integer_not_nullable
+ * @property integer $unsigned_small_integer_not_nullable
- * @property int|null $unsigned_medium_integer_nullable
+ * @property integer|null $unsigned_medium_integer_nullable
- * @property int $unsigned_medium_integer_not_nullable
+ * @property integer $unsigned_medium_integer_not_nullable
- * @property int|null $unsigned_big_integer_nullable
+ * @property integer|null $unsigned_big_integer_nullable
- * @property int $unsigned_big_integer_not_nullable
+ * @property integer $unsigned_big_integer_not_nullable
  * @property float|null $float_nullable
  * @property float $float_not_nullable
  * @property float|null $double_nullable
  * @property float $double_not_nullable
  * @property string|null $decimal_nullable
  * @property string $decimal_not_nullable
- * @property int|null $boolean_nullable
+ * @property string|null $unsigned_decimal_nullable
- * @property int $boolean_not_nullable
+ * @property string $unsigned_decimal_not_nullable
+ * @property integer|null $boolean_nullable
+ * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -66,10 +70,10 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property int|null $year_nullable
+ * @property integer|null $year_nullable
- * @property int $year_not_nullable
+ * @property integer $year_not_nullable
- * @property string|null $binary_nullable
+ * @property mixed|null $binary_nullable
- * @property string $binary_not_nullable
+ * @property mixed $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable

tests/Console/ModelsCommand/ModelHooks/Hooks/UnsetMethod.php

@@ -12,6 +12,6 @@ class UnsetMethod implements ModelHookInterface
 {
     public function run(ModelsCommand $command, Model $model): void
     {
-        $command->unsetMethod('newmodelquery');
+        $command->unsetMethod('query');
     }
 }

tests/Console/ModelsCommand/ModelHooks/Test.php

@@ -71,13 +71,13 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ModelHooks\Model
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * 
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ModelHooks\Models\Simple
  *
  * @property int $id
  * @property-read string $custom
  * @method static \Illuminate\Database\Eloquent\Builder|Simple custom($custom)
+ * @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
  */

tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php

@@ -7,7 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspec
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspection\Models\Simple
+ *
+ * @property integer $id
  * @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/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php

@@ -7,7 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspec
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspection\Models\Simple
+ *
+ * @property integer $id
  * @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/RelationCountProperties/__snapshots__/Test__test__1.php

@@ -8,7 +8,9 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\RelationCountProperties\Models\Post
+ *
+ * @property integer $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -19,34 +21,36 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property int|null $integer_nullable
+ * @property integer|null $integer_nullable
- * @property int $integer_not_nullable
+ * @property integer $integer_not_nullable
- * @property int|null $tiny_integer_nullable
+ * @property integer|null $tiny_integer_nullable
- * @property int $tiny_integer_not_nullable
+ * @property integer $tiny_integer_not_nullable
- * @property int|null $small_integer_nullable
+ * @property integer|null $small_integer_nullable
- * @property int $small_integer_not_nullable
+ * @property integer $small_integer_not_nullable
- * @property int|null $medium_integer_nullable
+ * @property integer|null $medium_integer_nullable
- * @property int $medium_integer_not_nullable
+ * @property integer $medium_integer_not_nullable
- * @property int|null $big_integer_nullable
+ * @property integer|null $big_integer_nullable
- * @property int $big_integer_not_nullable
+ * @property integer $big_integer_not_nullable
- * @property int|null $unsigned_integer_nullable
+ * @property integer|null $unsigned_integer_nullable
- * @property int $unsigned_integer_not_nullable
+ * @property integer $unsigned_integer_not_nullable
- * @property int|null $unsigned_tiny_integer_nullable
+ * @property integer|null $unsigned_tiny_integer_nullable
- * @property int $unsigned_tiny_integer_not_nullable
+ * @property integer $unsigned_tiny_integer_not_nullable
- * @property int|null $unsigned_small_integer_nullable
+ * @property integer|null $unsigned_small_integer_nullable
- * @property int $unsigned_small_integer_not_nullable
+ * @property integer $unsigned_small_integer_not_nullable
- * @property int|null $unsigned_medium_integer_nullable
+ * @property integer|null $unsigned_medium_integer_nullable
- * @property int $unsigned_medium_integer_not_nullable
+ * @property integer $unsigned_medium_integer_not_nullable
- * @property int|null $unsigned_big_integer_nullable
+ * @property integer|null $unsigned_big_integer_nullable
- * @property int $unsigned_big_integer_not_nullable
+ * @property integer $unsigned_big_integer_not_nullable
  * @property float|null $float_nullable
  * @property float $float_not_nullable
  * @property float|null $double_nullable
  * @property float $double_not_nullable
  * @property string|null $decimal_nullable
  * @property string $decimal_not_nullable
- * @property int|null $boolean_nullable
+ * @property string|null $unsigned_decimal_nullable
- * @property int $boolean_not_nullable
+ * @property string $unsigned_decimal_not_nullable
+ * @property integer|null $boolean_nullable
+ * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -67,10 +71,10 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property int|null $year_nullable
+ * @property integer|null $year_nullable
- * @property int $year_not_nullable
+ * @property integer $year_not_nullable
- * @property string|null $binary_nullable
+ * @property mixed|null $binary_nullable
- * @property string $binary_not_nullable
+ * @property mixed $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -141,6 +145,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/Relations/Models/CompositeBelongsToVariation.php

@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-class CompositeBelongsToVariation extends Model
-{
-    public $table = 'belongs_to_variations';
-
-    public function bothNonNullableWithForeignKeyConstraint(): BelongsTo
-    {
-        // Note, duplicating the keys here for simplicity.
-        return $this->belongsTo(
-            self::class,
-            ['not_null_column_with_foreign_key_constraint', 'not_null_column_with_foreign_key_constraint'],
-            ['not_null_column_with_foreign_key_constraint', 'not_null_column_with_foreign_key_constraint'],
-        );
-    }
-
-    public function nonNullableMixedWithoutForeignKeyConstraint(): BelongsTo
-    {
-        return $this->belongsTo(
-            self::class,
-            ['not_null_column_with_foreign_key_constraint', 'not_null_column_with_no_foreign_key_constraint'],
-            ['not_null_column_with_foreign_key_constraint', 'not_null_column_with_no_foreign_key_constraint'],
-        );
-    }
-
-    public function nullableMixedWithForeignKeyConstraint(): BelongsTo
-    {
-        return $this->belongsTo(
-            self::class,
-            ['nullable_column_with_no_foreign_key_constraint', 'not_null_column_with_foreign_key_constraint'],
-            ['nullable_column_with_no_foreign_key_constraint', 'not_null_column_with_foreign_key_constraint'],
-        );
-    }
-}

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

@@ -107,9 +107,4 @@ class Simple extends Model
     {
         return $this->testToAnyMorphedRelation(Simple::class);
     }
-
-    public function relationSampleToBadlyNamedNotManyRelation()
-    {
-        return $this->testToBadlyNamedNotManyRelation(Simple::class);
-    }
 }

tests/Console/ModelsCommand/Relations/Test.php

@@ -6,9 +6,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations;
 
 use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
-use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Types\SampleToAnyMorphedRelationType;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Types\SampleToAnyRelationType;
-use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Types\SampleToBadlyNamedNotManyRelationType;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Types\SampleToManyRelationType;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Types\SampleToOneRelationType;
 use Illuminate\Support\Facades\Config;
@@ -24,13 +22,11 @@ class Test extends AbstractModelsCommand
             'testToManyRelation' => SampleToManyRelationType::class,
             'testToAnyRelation' => SampleToAnyRelationType::class,
             'testToAnyMorphedRelation' => SampleToAnyMorphedRelationType::class,
-            'testToBadlyNamedNotManyRelation' => SampleToBadlyNamedNotManyRelationType::class,
         ]);
 
         Config::set('ide-helper.additional_relation_return_types', [
             'testToAnyRelation' => 'many',
             'testToAnyMorphedRelation' => 'morphTo',
-            'testToBadlyNamedNotManyRelation' => 'one',
         ]);
     }
 

tests/Console/ModelsCommand/Relations/Traits/HasTestRelations.php

@@ -6,7 +6,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Traits
 
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Types\SampleToAnyMorphedRelationType;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Types\SampleToAnyRelationType;
-use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Types\SampleToBadlyNamedNotManyRelationType;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Types\SampleToManyRelationType;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Types\SampleToOneRelationType;
 
@@ -35,10 +34,4 @@ trait HasTestRelations
         $instance = $this->newRelatedInstance($related);
         return new SampleToAnyMorphedRelationType($instance->newQuery(), $this);
     }
-
-    public function testToBadlyNamedNotManyRelation($related)
-    {
-        $instance = $this->newRelatedInstance($related);
-        return new SampleToBadlyNamedNotManyRelationType($instance->newQuery(), $this);
-    }
 }

tests/Console/ModelsCommand/Relations/Types/SampleToBadlyNamedNotManyRelationType.php

@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Types;
-
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\Concerns\SupportsDefaultModels;
-use Illuminate\Database\Eloquent\Relations\Relation;
-
-/**
- * Sample for custom relation
- *
- * the relation is a big fake and only for testing of the docblock generation
- *
- * @package Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations
- */
-class SampleToBadlyNamedNotManyRelationType extends Relation
-{
-    use SupportsDefaultModels;
-
-    public function addConstraints()
-    {
-        // Fake
-    }
-
-    public function addEagerConstraints(array $models)
-    {
-        // Fake
-    }
-
-    public function initRelation(array $models, $relation)
-    {
-        // Fake
-    }
-
-    public function match(array $models, Collection $results, $relation)
-    {
-        // Fake
-    }
-
-    public function getResults()
-    {
-        // Fake
-    }
-
-    protected function newRelatedInstanceFor(Model $parent)
-    {
-        // Fake
-    }
-}

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

@@ -8,11 +8,13 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\BelongsToVariation
- * @property int $not_null_column_with_foreign_key_constraint
+ *
- * @property int $not_null_column_with_no_foreign_key_constraint
+ * @property integer $id
- * @property int|null $nullable_column_with_foreign_key_constraint
+ * @property integer $not_null_column_with_foreign_key_constraint
- * @property int|null $nullable_column_with_no_foreign_key_constraint
+ * @property integer $not_null_column_with_no_foreign_key_constraint
+ * @property integer|null $nullable_column_with_foreign_key_constraint
+ * @property integer|null $nullable_column_with_no_foreign_key_constraint
  * @property-read BelongsToVariation $notNullColumnWithForeignKeyConstraint
  * @property-read BelongsToVariation|null $notNullColumnWithNoForeignKeyConstraint
  * @property-read BelongsToVariation|null $nullableColumnWithForeignKeyConstraint
@@ -55,66 +57,6 @@ declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-/**
- * @property int $id
- * @property int $not_null_column_with_foreign_key_constraint
- * @property int $not_null_column_with_no_foreign_key_constraint
- * @property int|null $nullable_column_with_foreign_key_constraint
- * @property int|null $nullable_column_with_no_foreign_key_constraint
- * @property-read CompositeBelongsToVariation $bothNonNullableWithForeignKeyConstraint
- * @property-read CompositeBelongsToVariation|null $nonNullableMixedWithoutForeignKeyConstraint
- * @property-read CompositeBelongsToVariation|null $nullableMixedWithForeignKeyConstraint
- * @method static \Illuminate\Database\Eloquent\Builder|CompositeBelongsToVariation newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|CompositeBelongsToVariation newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|CompositeBelongsToVariation query()
- * @method static \Illuminate\Database\Eloquent\Builder|CompositeBelongsToVariation whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompositeBelongsToVariation whereNotNullColumnWithForeignKeyConstraint($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompositeBelongsToVariation whereNotNullColumnWithNoForeignKeyConstraint($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompositeBelongsToVariation whereNullableColumnWithForeignKeyConstraint($value)
- * @method static \Illuminate\Database\Eloquent\Builder|CompositeBelongsToVariation whereNullableColumnWithNoForeignKeyConstraint($value)
- * @mixin \Eloquent
- */
-class CompositeBelongsToVariation extends Model
-{
-    public $table = 'belongs_to_variations';
-
-    public function bothNonNullableWithForeignKeyConstraint(): BelongsTo
-    {
-        // Note, duplicating the keys here for simplicity.
-        return $this->belongsTo(
-            self::class,
-            ['not_null_column_with_foreign_key_constraint', 'not_null_column_with_foreign_key_constraint'],
-            ['not_null_column_with_foreign_key_constraint', 'not_null_column_with_foreign_key_constraint'],
-        );
-    }
-
-    public function nonNullableMixedWithoutForeignKeyConstraint(): BelongsTo
-    {
-        return $this->belongsTo(
-            self::class,
-            ['not_null_column_with_foreign_key_constraint', 'not_null_column_with_no_foreign_key_constraint'],
-            ['not_null_column_with_foreign_key_constraint', 'not_null_column_with_no_foreign_key_constraint'],
-        );
-    }
-
-    public function nullableMixedWithForeignKeyConstraint(): BelongsTo
-    {
-        return $this->belongsTo(
-            self::class,
-            ['nullable_column_with_no_foreign_key_constraint', 'not_null_column_with_foreign_key_constraint'],
-            ['nullable_column_with_no_foreign_key_constraint', 'not_null_column_with_foreign_key_constraint'],
-        );
-    }
-}
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models;
-
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\ModelsOtherNamespace\AnotherModel;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Traits\HasTestRelations;
 use Illuminate\Database\Eloquent\Model;
@@ -128,7 +70,9 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\Simple
+ *
+ * @property integer $id
  * @property-read Simple|null $relationBelongsTo
  * @property-read AnotherModel|null $relationBelongsToInAnotherNamespace
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationBelongsToMany
@@ -153,7 +97,6 @@ use Illuminate\Database\Eloquent\Relations\MorphToMany;
  * @property-read Model|\Eloquent $relationSampleToAnyMorphedRelationType
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationSampleToAnyRelationType
  * @property-read int|null $relation_sample_to_any_relation_type_count
- * @property-read Simple $relationSampleToBadlyNamedNotManyRelation
  * @property-read Simple $relationSampleToManyRelationType
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery()
@@ -252,9 +195,4 @@ class Simple extends Model
     {
         return $this->testToAnyMorphedRelation(Simple::class);
     }
-
-    public function relationSampleToBadlyNamedNotManyRelation()
-    {
-        return $this->testToBadlyNamedNotManyRelation(Simple::class);
-    }
 }

tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testNoReset__1.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model;
  * Text of existing phpdoc
  *
  * @property string $foo
- * @property int $id
+ * @property integer $id
  * @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/ResetAndSmartReset/__snapshots__/Test__testReset__1.php

@@ -7,9 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ResetAndSmartRes
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Text of existing phpdoc
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ResetAndSmartReset\Models\Simple
  *
- * @property int $id
+ * @property integer $id
  * @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/ResetAndSmartReset/__snapshots__/Test__testSmartReset__1.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model;
 /**
  * Text of existing phpdoc
  *
- * @property int $id
+ * @property integer $id
  * @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/SimpleCasts/__snapshots__/Test__test__1.php

@@ -7,15 +7,17 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SimpleCasts\Mode
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int $cast_to_int
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SimpleCasts\Models\SimpleCast
- * @property int $cast_to_integer
+ *
+ * @property integer $cast_to_int
+ * @property integer $cast_to_integer
  * @property float $cast_to_real
  * @property float $cast_to_float
  * @property float $cast_to_double
  * @property string $cast_to_decimal
  * @property string $cast_to_string
- * @property bool $cast_to_bool
+ * @property boolean $cast_to_bool
- * @property bool $cast_to_boolean
+ * @property boolean $cast_to_boolean
  * @property object $cast_to_object
  * @property array $cast_to_array
  * @property array $cast_to_json
@@ -30,7 +32,7 @@ use Illuminate\Database\Eloquent\Model;
  * @property \Carbon\CarbonImmutable $cast_to_immutable_custom_datetime
  * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime
  * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime_serialization
- * @property int $cast_to_timestamp
+ * @property integer $cast_to_timestamp
  * @property mixed $cast_to_encrypted
  * @property array $cast_to_encrypted_array
  * @property \Illuminate\Support\Collection $cast_to_encrypted_collection

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

@@ -8,7 +8,9 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SoftDeletes\Models\Simple
+ *
+ * @property integer $id
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple onlyTrashed()

tests/Console/ModelsCommand/UnionTypes/Test.php

@@ -9,6 +9,15 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
 
 class Test extends AbstractModelsCommand
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (PHP_VERSION_ID < 80000) {
+            $this->markTestSkipped('This test requires PHP 8.0 or higher');
+        }
+    }
+
     public function test(): void
     {
         $command = $this->app->make(ModelsCommand::class);

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

@@ -9,6 +9,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 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 int|null $with_union_type_return_count

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

@@ -8,7 +8,9 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int $id
+ * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Variadic\Models\Simple
+ *
+ * @property integer $id
  * @method static Builder|Simple newModelQuery()
  * @method static Builder|Simple newQuery()
  * @method static Builder|Simple query()

tests/Console/ModelsCommand/migrations/____advanced_casts_table.php

@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class AdvancedCastsTable extends Migration
-{
-    public function up(): void
-    {
-        Schema::create('advanced_casts', static function (Blueprint $table) {
-            $table->string('cast_to_date_serialization');
-            $table->string('cast_to_datetime_serialization');
-            $table->string('cast_to_custom_datetime');
-            $table->string('cast_to_immutable_date');
-            $table->string('cast_to_immutable_custom_datetime');
-            $table->string('cast_to_immutable_datetime');
-            $table->string('cast_to_timestamp');
-            $table->string('cast_to_encrypted');
-            $table->string('cast_to_encrypted_array');
-            $table->string('cast_to_encrypted_collection');
-            $table->string('cast_to_encrypted_json');
-            $table->string('cast_to_encrypted_object');
-            $table->string('cast_to_as_collection');
-            $table->string('cast_to_as_array_object');
-        });
-    }
-}

tests/Console/ModelsCommand/migrations/____posts_table.php

@@ -67,6 +67,9 @@ class PostsTable extends Migration
             $table->decimal('decimal_nullable')->nullable();
             $table->decimal('decimal_not_nullable');
 
+            $table->unsignedDecimal('unsigned_decimal_nullable')->nullable();
+            $table->unsignedDecimal('unsigned_decimal_not_nullable');
+
             $table->boolean('boolean_nullable')->nullable();
             $table->boolean('boolean_not_nullable');
 

tests/MacroTest.php

@@ -5,10 +5,10 @@ declare(strict_types=1);
 namespace Barryvdh\LaravelIdeHelper\Tests;
 
 use Barryvdh\LaravelIdeHelper\Macro;
+use Barryvdh\Reflection\DocBlock;
+use Barryvdh\Reflection\DocBlock\Tag;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Routing\UrlGenerator;
-use phpDocumentor\Reflection\DocBlock;
-use phpDocumentor\Reflection\DocBlock\Tag;
 use ReflectionClass;
 use ReflectionFunction;
 use ReflectionFunctionAbstract;
@@ -62,7 +62,7 @@ class MacroTest extends TestCase
         );
 
         $this->assertNotNull($phpdoc);
-        $this->assertEmpty($phpdoc->getSummary());
+        $this->assertEmpty($phpdoc->getText());
         $this->assertEquals('@param int|null $a', $this->tagsToString($phpdoc, 'param'));
         $this->assertEquals('@return int', $this->tagsToString($phpdoc, 'return'));
         $this->assertTrue($phpdoc->hasTag('see'));
@@ -86,7 +86,7 @@ class MacroTest extends TestCase
         );
 
         $this->assertNotNull($phpdoc);
-        $this->assertStringContainsString('Test docblock', $phpdoc->getSummary());
+        $this->assertStringContainsString('Test docblock', $phpdoc->getText());
         $this->assertEquals('@param int|null $a', $this->tagsToString($phpdoc, 'param'));
         $this->assertEquals('@return int', $this->tagsToString($phpdoc, 'return'));
         $this->assertTrue($phpdoc->hasTag('see'));
@@ -110,7 +110,7 @@ class MacroTest extends TestCase
         );
 
         $this->assertNotNull($phpdoc);
-        $this->assertStringContainsString('Test docblock', $phpdoc->getSummary());
+        $this->assertStringContainsString('Test docblock', $phpdoc->getText());
         $this->assertEquals('@param int|null $a', $this->tagsToString($phpdoc, 'param'));
         $this->assertFalse($phpdoc->hasTag('return'));
         $this->assertTrue($phpdoc->hasTag('see'));
@@ -134,7 +134,7 @@ class MacroTest extends TestCase
         );
 
         $this->assertNotNull($phpdoc);
-        $this->assertStringContainsString('Test docblock', $phpdoc->getSummary());
+        $this->assertStringContainsString('Test docblock', $phpdoc->getText());
         $this->assertFalse($phpdoc->hasTag('param'));
         $this->assertEquals('@return int', $this->tagsToString($phpdoc, 'return'));
         $this->assertTrue($phpdoc->hasTag('see'));
@@ -159,7 +159,7 @@ class MacroTest extends TestCase
         );
 
         $this->assertNotNull($phpdoc);
-        $this->assertStringContainsString('Test docblock', $phpdoc->getSummary());
+        $this->assertStringContainsString('Test docblock', $phpdoc->getText());
         $this->assertEquals('@param \stdClass|null $a aaaaa', $this->tagsToString($phpdoc, 'param'));
         $this->assertEquals('@return int', $this->tagsToString($phpdoc, 'return'));
     }
@@ -183,13 +183,17 @@ class MacroTest extends TestCase
         );
 
         $this->assertNotNull($phpdoc);
-        $this->assertStringContainsString('Test docblock', $phpdoc->getSummary());
+        $this->assertStringContainsString('Test docblock', $phpdoc->getText());
         $this->assertEquals('@param mixed $a', $this->tagsToString($phpdoc, 'param'));
         $this->assertEquals('@return \stdClass|null rrrrrrr', $this->tagsToString($phpdoc, 'return'));
     }
 
     public function testInitPhpDocParamsWithUnionTypes(): void
     {
+        if (PHP_VERSION_ID < 80000) {
+            $this->markTestSkipped('This test requires PHP 8.0 or higher');
+        }
+
         $phpdoc = (new MacroMock())->getPhpDoc(eval(<<<'PHP'
             return new ReflectionFunction(
                 /**
@@ -202,7 +206,7 @@ class MacroTest extends TestCase
         PHP));
 
         $this->assertNotNull($phpdoc);
-        $this->assertStringContainsString('Test docblock', $phpdoc->getSummary());
+        $this->assertStringContainsString('Test docblock', $phpdoc->getText());
         $this->assertEquals('@param \Stringable|string|null $a', $this->tagsToString($phpdoc, 'param'));
         $this->assertEquals('@return \Stringable|string|null', $this->tagsToString($phpdoc, 'return'));
     }
@@ -212,7 +216,7 @@ class MacroTest extends TestCase
         $tags = $docBlock->getTagsByName($name);
         $tags = array_map(
             function (Tag $tag) {
-                return trim($tag->render());
+                return trim((string)$tag);
             },
             $tags
         );
@@ -227,7 +231,7 @@ class MacroTest extends TestCase
     {
         $reflectionMethod = new \ReflectionMethod(UrlGeneratorMacroClass::class, '__invoke');
 
-        $macro = new Macro($reflectionMethod, UrlGenerator::class, new ReflectionClass(UrlGenerator::class), 'macroName');
+        $macro = new Macro($reflectionMethod, UrlGenerator::class, new \ReflectionClass(UrlGenerator::class), 'macroName');
 
         $this->assertInstanceOf(Macro::class, $macro);
     }
@@ -239,16 +243,16 @@ class MacroTest extends TestCase
     {
         $reflectionMethod = new \ReflectionMethod(UrlGeneratorMacroClass::class, '__invoke');
 
-        $macro = new Macro($reflectionMethod, 'URL', new ReflectionClass(UrlGenerator::class), 'macroName');
+        $macro = new Macro($reflectionMethod, 'URL', new \ReflectionClass(UrlGenerator::class), 'macroName');
         $output = <<<'DOC'
 /**
- *
+ * 
  *
  * @param string $foo
  * @param int $bar
- * @return string
+ * @return string 
  * @see \Barryvdh\LaravelIdeHelper\Tests\UrlGeneratorMacroClass::__invoke()
- * @static
+ * @static 
  */
 DOC;
         $this->assertSame($output, $macro->getDocComment(''));
@@ -276,7 +280,7 @@ class MacroMock extends Macro
 
     public function getPhpDoc(ReflectionFunctionAbstract $method, ReflectionClass $class = null): DocBlock
     {
-        return (new Macro($method, '', $class ?? $method->getClosureScopeClass()))->phpdoc->getDocBlock();
+        return (new Macro($method, '', $class ?? $method->getClosureScopeClass()))->phpdoc;
     }
 }
 

tests/RealTimeFacadesTest.php

@@ -1,90 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests;
-
-use Barryvdh\LaravelIdeHelper\Generator;
-use Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider;
-use Illuminate\Foundation\AliasLoader;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\View;
-use PhpParser\Lexer\Emulative;
-use PhpParser\Node\Stmt\Class_;
-use PhpParser\Node\Stmt\Namespace_;
-use PhpParser\Parser\Php7;
-
-class RealTimeFacadesTest extends TestCase
-{
-    public function testRealTimeFacades()
-    {
-        // Add the views path to the view finder so the generator actually generates the file
-        View::addLocation(__DIR__ . '/../resources/views');
-
-        // Clear cached real-time facades
-        $cachedFacades = glob(storage_path('framework/cache/facade-*.php'));
-        foreach ($cachedFacades as $cachedFacade) {
-            unlink($cachedFacade);
-        }
-
-        // Copy stubs to storage path as if the real-time facades were cached by the framework
-        copy(
-            __DIR__ . '/stubs/facade-0e0385307adf5db34c7986ecbd11646061356ec8.php',
-            storage_path('framework/cache/facade-0e0385307adf5db34c7986ecbd11646061356ec8.php')
-        );
-        copy(
-            __DIR__ . '/stubs/facade-9431b04ec1494fc71a1bc848f020044aba2af7b1.php',
-            storage_path('framework/cache/facade-9431b04ec1494fc71a1bc848f020044aba2af7b1.php')
-        );
-
-        // new instance of the generator which we test
-        $generator = new Generator($this->app['config'], $this->app['view'], null, false);
-
-        // Clear aliases and macros to have a small output file
-        AliasLoader::getInstance()->setAliases([]);
-        Request::flushMacros();
-
-        // Generate the helper file and return the content
-        $content = $generator->generate();
-
-        $this->assertStringContainsString('namespace Facades\Illuminate\Foundation\Exceptions {', $content, 'Could not find Facades\Illuminate\Foundation\Exceptions namespace in the generated helper file.');
-        $this->assertStringContainsString('namespace Facades\App\Exceptions {', $content, 'Could not find Facades\App\Exceptions namespace in the generated helper file.');
-
-        $parsed = collect((new Php7(new Emulative()))->parse($content) ?: []);
-
-        // test the Facades\Illuminate\Foundation\Exceptions namespace in the generated helper file
-        $frameworkExceptionsNamespace = $parsed->first(function ($stmt) {
-            return ($stmt instanceof Namespace_) && $stmt->name->toString() === 'Facades\Illuminate\Foundation\Exceptions';
-        });
-        $this->assertNotNull($frameworkExceptionsNamespace, 'Could not find Facades\Illuminate\Foundation\Exceptions namespace');
-        $this->assertSame('Facades\Illuminate\Foundation\Exceptions', $frameworkExceptionsNamespace->name->toString());
-        $this->verifyNamespace($frameworkExceptionsNamespace, 'Illuminate\Foundation\Exceptions\Handler');
-
-        // test the Facades\App\Exceptions namespace in the generated helper file
-        $appExceptionsNamespace = $parsed->first(function ($stmt) {
-            return ($stmt instanceof Namespace_) && $stmt->name->toString() === 'Facades\App\Exceptions';
-        });
-        $this->assertNotNull($appExceptionsNamespace, 'Could not find Facades\App\Exceptions namespace');
-        $this->assertSame('Facades\App\Exceptions', $appExceptionsNamespace->name->toString());
-        $this->verifyNamespace($appExceptionsNamespace, 'App\Exceptions\Handler');
-    }
-
-    private function verifyNamespace(Namespace_ $namespace, $target)
-    {
-        $stmts = collect($namespace->stmts);
-
-        $this->assertInstanceOf(Class_::class, $stmts[0], 'Expected instance of Class_');
-
-        $statement = $stmts[0];
-        $this->assertArrayHasKey('comments', $statement->getAttributes());
-
-        $this->assertStringContainsString('@mixin \\' . $target, $statement->getAttributes()['comments'][0]->getText(), 'Mixin comment not found');
-        $this->assertSame(class_basename($target), $statement->name->toString(), 'Class name not found');
-        $this->assertSame($target, $statement->extends->toString(), 'Class extends not found');
-    }
-
-    protected function getPackageProviders($app)
-    {
-        return [IdeHelperServiceProvider::class];
-    }
-}

tests/stubs/facade-0e0385307adf5db34c7986ecbd11646061356ec8.php

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Facades\Illuminate\Foundation\Exceptions;
-
-use Illuminate\Support\Facades\Facade;
-
-/**
- * @see \Illuminate\Foundation\Exceptions\Handler
- */
-class Handler extends Facade
-{
-    /**
-     * Get the registered name of the component.
-     */
-    protected static function getFacadeAccessor(): string
-    {
-        return 'Illuminate\Foundation\Exceptions\Handler';
-    }
-}

tests/stubs/facade-9431b04ec1494fc71a1bc848f020044aba2af7b1.php

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Facades\App\Exceptions;
-
-use Illuminate\Support\Facades\Facade;
-
-/**
- * @see \App\Exceptions\Handler
- */
-class Handler extends Facade
-{
-    /**
-     * Get the registered name of the component.
-     */
-    protected static function getFacadeAccessor(): string
-    {
-        return 'App\Exceptions\Handler';
-    }
-}