Merge branch 'master' into feat-add-generator-test

.gitattributes

@@ -6,7 +6,9 @@
 /.gitattributes               export-ignore
 /.github                      export-ignore
 /.gitignore                   export-ignore
-/.php-cs-fixer*               export-ignore
+/.php-cs-fixer.cache          export-ignore
+/.php-cs-fixer.php            export-ignore
+/.php-cs-fixer.tests.cache    export-ignore
 /phpunit.xml.dist             export-ignore
 /psalm-baseline.xml           export-ignore
 /psalm.xml                    export-ignore

.github/workflows/composer-normalize.yml

@@ -23,6 +23,6 @@ jobs:
           composer global require ergebnis/composer-normalize
           composer normalize
 
-      - uses: stefanzweifel/git-auto-commit-action@v6
+      - uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: normalize composer.json

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

@@ -27,7 +27,7 @@ jobs:
       - run: composer fix-style
         continue-on-error: true
 
-      - uses: stefanzweifel/git-auto-commit-action@v6
+      - uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: composer fix-style
           commit_author: laravel-ide-helper <[email protected]>

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

@@ -20,7 +20,7 @@ jobs:
             fail-fast: false
             matrix:
                 php: [8.4, 8.3, 8.2]
-                laravel: [11.x, 12.x]
+                laravel: [^11.15]
 
         name: P${{ matrix.php }} - Laravel${{ matrix.laravel }}
         steps:

.github/workflows/run-tests.yml

@@ -20,18 +20,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04, windows-2019]
         php: [8.4, 8.3, 8.2]
-        laravel: [~11.15, 12.x]
+        laravel: [^11.15]
         stability: [prefer-lowest, prefer-stable]
-        include:
-          - os: windows-latest
-            php: 8.3
-            laravel: 12.x
-            stability: prefer-stable
     steps:
     - name: Set git to use LF
-      if: ${{ matrix.os == 'windows-latest' }}
+      if: ${{ matrix.os == 'windows-2019' }}
       run: |
         git config --global core.autocrlf false
         git config --global core.eol lf

.github/workflows/update-changelog.yaml

@@ -27,7 +27,7 @@ jobs:
           release-notes: ${{ github.event.release.body }}
 
       - name: Commit updated CHANGELOG
-        uses: stefanzweifel/git-auto-commit-action@v6
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           branch: ${{ github.event.release.target_commitish }}
           commit_message: Update CHANGELOG

CHANGELOG.md

@@ -1,110 +1,5 @@
 # Changelog
 
-## v3.5.5 - 2025-02-21
-
-### What's Changed
-
-* Fix for incorrect config item types in meta file by @eldair in https://github.com/barryvdh/laravel-ide-helper/pull/1662
-* Prevent generation of incorrect property annotation by @skyler544 in https://github.com/barryvdh/laravel-ide-helper/pull/1665
-* Fix MorphTo Model Doc Generation by @yparitcher in https://github.com/barryvdh/laravel-ide-helper/pull/1668
-* Laravel 12 support by @jonnott in https://github.com/barryvdh/laravel-ide-helper/pull/1672
-
-### New Contributors
-
-* @eldair made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1662
-* @skyler544 made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1665
-* @yparitcher made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1668
-* @jonnott made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1672
-
-**Full Changelog**: https://github.com/barryvdh/laravel-ide-helper/compare/v3.5.4...v3.5.5
-
-## v3.5.4 - 2025-01-14
-
-### What's Changed
-
-* Convert auth() helper to use Auth facade by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1656
-* Check if returnType from docblock is not null by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1658
-
-**Full Changelog**: https://github.com/barryvdh/laravel-ide-helper/compare/v3.5.3...v3.5.4
-
-## v3.5.3 - 2025-01-08
-
-### What's Changed
-
-* Catch meta, tweak auth by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1654
-* Check if macro is valid by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1655
-* feat: use generics of return type to determine resulting models by @Bloemendaal in https://github.com/barryvdh/laravel-ide-helper/pull/1653
-
-### New Contributors
-
-* @Bloemendaal made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1653
-
-**Full Changelog**: https://github.com/barryvdh/laravel-ide-helper/compare/v3.5.2...v3.5.3
-
-## v3.5.2 - 2025-01-06
-
-### Fixes
-
-Fix empty/anonymous closure in meta command.
-
-**Full Changelog**: https://github.com/barryvdh/laravel-ide-helper/compare/v3.5.1...v3.5.2
-
-## v3.5.1 - 2025-01-06
-
-### What's Changed
-
-* Remove duplicate config, fix ->can() by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1650
-
-**Full Changelog**: https://github.com/barryvdh/laravel-ide-helper/compare/v3.5.0...v3.5.1
-
-## v3.5.0 - 2025-01-06
-
-### What's Changed
-
-* Add phpstorm meta argument hints by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1640
-* Add meta override for user return types by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1642
-* Use forked ContextFactory by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1643
-* Remove php parser by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1644
-* Also add eloquent template tags from base class by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1645
-* Add more metadata by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1646
-* Fixed generating PHPDoc for methods with class templates by @chack1172 in https://github.com/barryvdh/laravel-ide-helper/pull/1647
-* Feat guess macro types by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1648
-* Allow adding custom Macroable classes. by @mathieutu in https://github.com/barryvdh/laravel-ide-helper/pull/1629
-* Add special `dev` to composer keywords by @jnoordsij in https://github.com/barryvdh/laravel-ide-helper/pull/1649
-
-### New Contributors
-
-* @chack1172 made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1647
-* @mathieutu made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1629
-* @jnoordsij made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1649
-
-**Full Changelog**: https://github.com/barryvdh/laravel-ide-helper/compare/v3.4.0...v3.5.0
-
-## v3.4.0 - 2024-12-29
-
-### What's Changed
-
-* fix: add @template TModel of static for Eloquent by @imzyf in https://github.com/barryvdh/laravel-ide-helper/pull/1631
-* Add templates to Eloquent by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1634
-* Update testsuite for Generator, simplify service provider and mock by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1635
-* Add option for only eloquent by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1636
-* Add weak generics for array type objects by @LauJosefsen in https://github.com/barryvdh/laravel-ide-helper/pull/1621
-* Make all "note" in README apply quote style by @hms5232 in https://github.com/barryvdh/laravel-ide-helper/pull/1590
-* Update README.md by @Mtillmann in https://github.com/barryvdh/laravel-ide-helper/pull/1587
-* Rename view var  by @barryvdh and @pb30 in https://github.com/barryvdh/laravel-ide-helper/pull/1637 and https://github.com/barryvdh/laravel-ide-helper/pull/1563
-* Format IDE helper by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1638
-* Add TLDR section, update options by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1639
-
-### New Contributors
-
-* @imzyf made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1631
-* @LauJosefsen made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1621
-* @hms5232 made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1590
-* @Mtillmann made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1587
-* @pb30 made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1563
-
-**Full Changelog**: https://github.com/barryvdh/laravel-ide-helper/compare/v3.3.0...v3.4.0
-
 ## v3.3.0 - 2024-12-18
 
 ### What's Changed
@@ -160,12 +55,8 @@ Fix empty/anonymous closure in meta command.
 
 ### Changed
 
-- Update view "version" variable name to avoid potential conflicts
-  
 - Add support for EloquentBuilder generics introduced in Laravel 11.15.
-  
 - Drop support for Laravel versions earlier than 11.15.
-  
 
 ### Added
 

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 later. For older version, use the 2.x releases.
+The 3.x branch supports Laravel 10 and 11. For older version, use the 2.x releases.
 
 - [Installation](#installation)
 - [Usage](#usage)
@@ -33,27 +33,42 @@ Require this package with composer using the following command:
 composer require --dev barryvdh/laravel-ide-helper
 ```
 
+> [!NOTE]  
+> If you encounter version conflicts with doctrine/dbal, please try:
+> `composer require --dev barryvdh/laravel-ide-helper --with-all-dependencies`
+ 
+This package makes use of [Laravels package auto-discovery mechanism](https://medium.com/@taylorotwell/package-auto-discovery-in-laravel-5-5-ea9e3ab20518), which means if you don't install dev dependencies in production, it also won't be loaded.
+
+If for some reason you want manually control this:
+- add the package to the `extra.laravel.dont-discover` key in `composer.json`, e.g.
+  ```json
+  "extra": {
+    "laravel": {
+      "dont-discover": [
+        "barryvdh/laravel-ide-helper"
+      ]
+    }
+  }
+  ```
+- Add the following class to the `providers` array in `config/app.php`:
+  ```php
+  Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
+  ```
+  If you want to manually load it only in non-production environments, instead you can add this to your `AppServiceProvider` with the `register()` method:
+  ```php
+  public function register()
+  {
+      if ($this->app->isLocal()) {
+          $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
+      }
+      // ...
+  }
+  ```
+
+> Note: Avoid caching the configuration in your development environment, it may cause issues after installing this package; respectively clear the cache beforehand via `php artisan cache:clear` if you encounter problems when running the commands
 
 ## Usage
 
-### TL;DR
-
-Run this to generate autocompletion for Facades. This creates _ide_helper.php
-
-```
-php artisan ide-helper:generate
-```
-
-Run this to add phpdocs for your models. Add -RW to Reset existing phpdocs and Write to the models directly.
-```
-php artisan ide-helper:models -RW
-```
-
-If you don't want the full _ide_helper.php file, you can run add `--write-eloquent-helper` to the model command to generate small version, which is required for the `@mixin \Eloquent` to be able to add the QueryBuilder methods.
-
-If you don't want to add all the phpdocs to your Models directly, you can use `--nowrite` to create a seperate file. The  `--write-mixin` option can be used to only add a `@mixin` to your models, but add the generated phpdocs in a seperate file. This avoids having the results marked as duplicate.
-
-
 _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)
@@ -61,7 +76,7 @@ _Check out [this Laracasts video](https://laracasts.com/series/how-to-be-awesome
 - `php artisan ide-helper:meta` - [PhpStorm Meta file](#phpstorm-meta-for-container-instances)
 
 
-> Note: You do need CodeComplice for Sublime Text: https://github.com/spectacles/CodeComplice
+Note: You do need CodeComplice for Sublime Text: https://github.com/spectacles/CodeComplice
 
 ### Automatic PHPDoc generation for Laravel Facades
 
@@ -71,6 +86,8 @@ You can now re-generate the docs yourself (for future updates)
 php artisan ide-helper:generate
 ```
 
+Note: `bootstrap/compiled.php` has to be cleared first, so run `php artisan clear-compiled` before generating.
+
 This will generate the file `_ide_helper.php` which is expected to be additionally parsed by your IDE for autocomplete. You can use the config `filename` to change its name.
 
 You can configure your `composer.json` to do this each time you update your dependencies:
@@ -98,7 +115,7 @@ 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.
+**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.
@@ -132,8 +149,6 @@ 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.
 
-> You need the _ide_helper.php file to add the QueryBuilder methods. You can add --write-eloquent-helper/-E to generate a minimal version. If this file does not exist, you will be prompted for it.
-
 Writing to the models should keep the existing comments and only append new properties/methods. It will not update changed properties/methods.
 
 With the `--reset (-R)` option, the whole existing PHPDoc is replaced, including any comments that have been made.
@@ -210,11 +225,11 @@ Eloquent allows calling `where<Attribute>` on your models, e.g. `Post::whereTitl
 
 If for some reason it's undesired to have them generated (one for each column), you can disable this via config `write_model_magic_where` and setting it to `false`.
 
-#### Magic `*_count` and `*_exists` properties
+#### Magic `*_count` properties
 
-You may use the [`::withCount`](https://laravel.com/docs/master/eloquent-relationships#counting-related-models) and [`::withExists`](https://laravel.com/docs/master/eloquent-relationships#other-aggregate-functions) methodsto count the number results from a relationship without actually loading them. Those results are then placed in attributes following the `<columname>_count` and `<columname>_exists` convention.
+You may use the [`::withCount`](https://laravel.com/docs/master/eloquent-relationships#counting-related-models) method to count the number results from a relationship without actually loading them. Those results are then placed in attributes following the `<columname>_count` convention.
 
-By default, these attributes are generated in the phpdoc. You can turn them off by setting the config `write_model_relation_count_properties` and `write_model_relation_exists_properties` to `false`.
+By default, these attributes are generated in the phpdoc. You can turn them off by setting the config `write_model_relation_count_properties` to `false`.
 
 #### Generics annotations
 
@@ -367,7 +382,7 @@ app(App\SomeClass::class);
 ```
 
 > Note: You might need to restart PhpStorm and make sure `.phpstorm.meta.php` is indexed.
-
+>
 > Note: When you receive a FatalException: class not found, check your config
 > (for example, remove S3 as cloud driver when you don't have S3 configured. Remove Redis ServiceProvider when you don't use it).
 

composer.json

@@ -11,8 +11,7 @@
         "netbeans",
         "sublime",
         "codeintel",
-        "phpdoc",
+        "phpdoc"
-        "dev"
     ],
     "authors": [
         {
@@ -23,24 +22,25 @@
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "barryvdh/reflection-docblock": "^2.4",
+        "barryvdh/reflection-docblock": "^2.2",
         "composer/class-map-generator": "^1.0",
-        "illuminate/console": "^11.15 || ^12",
+        "illuminate/console": "^11.15",
-        "illuminate/database": "^11.15 || ^12",
+        "illuminate/database": "^11.15",
-        "illuminate/filesystem": "^11.15 || ^12",
+        "illuminate/filesystem": "^11.15",
-        "illuminate/support": "^11.15 || ^12"
+        "illuminate/support": "^11.15",
+        "nikic/php-parser": "^4.18 || ^5",
+        "phpdocumentor/type-resolver": "^1.1.0"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
         "friendsofphp/php-cs-fixer": "^3",
-        "illuminate/config": "^11.15 || ^12",
+        "illuminate/config": "^11.15",
-        "illuminate/view": "^11.15 || ^12",
+        "illuminate/view": "^11.15",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^9.2 || ^10",
+        "orchestra/testbench": "^9.2",
-        "phpunit/phpunit": "^10.5 || ^11.5.3",
+        "phpunit/phpunit": "^10.5",
         "spatie/phpunit-snapshot-assertions": "^4 || ^5",
-        "vimeo/psalm": "^5.4",
+        "vimeo/psalm": "^5.4"
-        "vlucas/phpdotenv": "^5"
     },
     "suggest": {
         "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9|^10|^11)."
@@ -65,7 +65,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.5-dev"
+            "dev-master": "3.2-dev"
         },
         "laravel": {
             "providers": [

config/ide-helper.php

@@ -85,16 +85,14 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Write model relation count and exists properties
+    | Write model relation count properties
     |--------------------------------------------------------------------------
     |
-    | Set to false to disable writing of relation count and exists properties
+    | Set to false to disable writing of relation count properties to model DocBlocks.
-    | to model DocBlocks.
     |
     */
 
     'write_model_relation_count_properties' => true,
-    'write_model_relation_exists_properties' => false,
 
     /*
     |--------------------------------------------------------------------------
@@ -125,7 +123,6 @@ return [
 
     'helper_files' => [
         base_path() . '/vendor/laravel/framework/src/Illuminate/Support/helpers.php',
-        base_path() . '/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php',
     ],
 
     /*
@@ -276,20 +273,6 @@ return [
     */
     'use_generics_annotations' => true,
 
-    /*
-    |--------------------------------------------------------------------------
-    | Default return types for macros
-    |--------------------------------------------------------------------------
-    |
-    | Define default return types for macros without explicit return types.
-    | e.g. `\Illuminate\Database\Query\Builder::class => 'static'`,
-    |      `\Illuminate\Support\Str::class => 'string'`
-    |
-    */
-    'macro_default_return_types' => [
-        Illuminate\Http\Client\Factory::class => Illuminate\Http\Client\PendingRequest::class,
-    ],
-
     /*
     |--------------------------------------------------------------------------
     | Additional relation types

php-templates/LICENSE.md

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) Taylor Otwell
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

php-templates/README.md

@@ -1,5 +0,0 @@
-The templates here are based on the official VS Code extension by Laravel https://github.com/laravel/vs-code-extension
-
-Modifications:
- - return instead of echo
- - do not serialize to JSON

php-templates/auth.php

@@ -1,43 +0,0 @@
-<?php
-
-return collect(Illuminate\Support\Facades\Gate::abilities())
-    ->map(function ($policy, $key) {
-        $reflection = new ReflectionFunction($policy);
-
-        $policyClass = null;
-
-        $closureThis = $reflection->getClosureThis();
-        if ($closureThis && get_class($closureThis) === Illuminate\Auth\Access\Gate::class) {
-            $vars = $reflection->getClosureUsedVariables();
-
-            if (isset($vars['callback'])) {
-                [$policyClass, $method] = explode('@', $vars['callback']);
-
-                $reflection = new ReflectionMethod($policyClass, $method);
-            }
-        }
-        return [
-            'key' => $key,
-            'uri' => $reflection->getFileName(),
-            'policy_class' => $policyClass,
-            'lineNumber' => $reflection->getStartLine(),
-        ];
-    })
-    ->merge(
-        collect(Illuminate\Support\Facades\Gate::policies())->flatMap(function ($policy, $model) {
-            $methods = (new ReflectionClass($policy))->getMethods();
-
-            return collect($methods)->map(function (ReflectionMethod $method) use ($policy) {
-                return [
-                    'key' => $method->getName(),
-                    'uri' => $method->getFileName(),
-                    'policy_class' => $policy,
-                    'lineNumber' => $method->getStartLine(),
-                ];
-            })->filter(function ($ability) {
-                return !in_array($ability['key'], ['allow', 'deny']);
-            });
-        }),
-    )
-    ->values()
-    ->groupBy('key');

php-templates/configs.php

@@ -1,131 +0,0 @@
-<?php
-
-$local = collect(glob(config_path('/*.php')))
-    ->merge(glob(config_path('**/*.php')))
-    ->map(fn ($path) => [
-        (string) Illuminate\Support\Str::of($path)
-            ->replace([config_path('/'), '.php'], '')
-            ->replace('/', '.'),
-        $path,
-    ]);
-
-$vendor = collect(glob(base_path('vendor/**/**/config/*.php')))->map(fn (
-    $path
-) => [
-    (string) Illuminate\Support\Str::of($path)
-        ->afterLast('/config/')
-        ->replace('.php', '')
-        ->replace('/', '.'),
-    $path,
-]);
-
-$configPaths = $local
-    ->merge($vendor)
-    ->groupBy(0)
-    ->map(fn ($items) => $items->pluck(1));
-
-$cachedContents = [];
-$cachedParsed = [];
-
-function vsCodeGetConfigValue($value, $key, $configPaths)
-{
-    $parts = explode('.', $key);
-    $toFind = $key;
-    $found = null;
-
-    while (count($parts) > 0) {
-        array_pop($parts);
-        $toFind = implode('.', $parts);
-
-        if ($configPaths->has($toFind)) {
-            $found = $toFind;
-            break;
-        }
-    }
-
-    if ($found === null) {
-        return null;
-    }
-
-    $file = null;
-    $line = null;
-
-    if ($found === $key) {
-        $file = $configPaths->get($found)[0];
-    } else {
-        foreach ($configPaths->get($found) as $path) {
-            $cachedContents[$path] ??= file_get_contents($path);
-            $cachedParsed[$path] ??= token_get_all($cachedContents[$path]);
-
-            $keysToFind = Illuminate\Support\Str::of($key)
-                ->replaceFirst($found, '')
-                ->ltrim('.')
-                ->explode('.');
-
-            if (is_numeric($keysToFind->last())) {
-                $index = $keysToFind->pop();
-
-                if ($index !== '0') {
-                    return null;
-                }
-
-                $key = collect(explode('.', $key));
-                $key->pop();
-                $key = $key->implode('.');
-                $value = [];
-            }
-
-            $nextKey = $keysToFind->shift();
-            $expectedDepth = 1;
-
-            $depth = 0;
-
-            foreach ($cachedParsed[$path] as $token) {
-                if ($token === '[') {
-                    $depth++;
-                }
-
-                if ($token === ']') {
-                    $depth--;
-                }
-
-                if (!is_array($token)) {
-                    continue;
-                }
-
-                $str = trim($token[1], '"\'');
-
-                if (
-                    $str === $nextKey &&
-                    $depth === $expectedDepth &&
-                    $token[0] === T_CONSTANT_ENCAPSED_STRING
-                ) {
-                    $nextKey = $keysToFind->shift();
-                    $expectedDepth++;
-
-                    if ($nextKey === null) {
-                        $file = $path;
-                        $line = $token[2];
-                        break;
-                    }
-                }
-            }
-
-            if ($file) {
-                break;
-            }
-        }
-    }
-
-    return [
-        'name' => $key,
-        'value' => $value,
-        'file' => $file === null ? null : str_replace(base_path('/'), '', $file),
-        'line' => $line,
-    ];
-}
-
-return collect(Illuminate\Support\Arr::dot(config()->all()))
-    ->map(fn ($value, $key) => vsCodeGetConfigValue($value, $key, $configPaths))
-    ->filter()
-    ->values();

php-templates/middleware.php

@@ -1,64 +0,0 @@
-<?php
-
-return collect(app("Illuminate\Contracts\Http\Kernel")->getMiddlewareGroups())
-    ->merge(app("Illuminate\Contracts\Http\Kernel")->getRouteMiddleware())
-    ->map(function ($middleware, $key) {
-        $result = [
-            'class' => null,
-            'uri' => null,
-            'startLine' => null,
-            'parameters' => null,
-            'groups' => [],
-        ];
-
-        if (is_array($middleware)) {
-            $result['groups'] = collect($middleware)->map(function ($m) {
-                if (!class_exists($m)) {
-                    return [
-                        'class' => $m,
-                        'uri' => null,
-                        'startLine' => null,
-                    ];
-                }
-
-                $reflected = new ReflectionClass($m);
-                $reflectedMethod = $reflected->getMethod('handle');
-
-                return [
-                    'class' => $m,
-                    'uri' => $reflected->getFileName(),
-                    'startLine' =>
-                        $reflectedMethod->getFileName() === $reflected->getFileName()
-                            ? $reflectedMethod->getStartLine()
-                            : null,
-                ];
-            })->all();
-
-            return $result;
-        }
-
-        $reflected = new ReflectionClass($middleware);
-        $reflectedMethod = $reflected->getMethod('handle');
-
-        $result = array_merge($result, [
-            'class' => $middleware,
-            'uri' => $reflected->getFileName(),
-            'startLine' => $reflectedMethod->getStartLine(),
-        ]);
-
-        $parameters = collect($reflectedMethod->getParameters())
-            ->filter(function ($rc) {
-                return $rc->getName() !== 'request' && $rc->getName() !== 'next';
-            })
-            ->map(function ($rc) {
-                return $rc->getName() . ($rc->isVariadic() ? '...' : '');
-            });
-
-        if ($parameters->isEmpty()) {
-            return $result;
-        }
-
-        return array_merge($result, [
-            'parameters' => $parameters->implode(','),
-        ]);
-    });

php-templates/routes.php

@@ -1,46 +0,0 @@
-<?php
-
-function vsCodeGetRouterReflection(Illuminate\Routing\Route $route)
-{
-    if ($route->getActionName() === 'Closure') {
-        return new ReflectionFunction($route->getAction()['uses']);
-    }
-
-    if (!str_contains($route->getActionName(), '@')) {
-        return new ReflectionClass($route->getActionName());
-    }
-
-    try {
-        return new ReflectionMethod($route->getControllerClass(), $route->getActionMethod());
-    } catch (Throwable $e) {
-        $namespace = app(Illuminate\Routing\UrlGenerator::class)->getRootControllerNamespace()
-            ?? (app()->getNamespace() . 'Http\Controllers');
-
-        return new ReflectionMethod(
-            $namespace . '\\' . ltrim($route->getControllerClass(), '\\'),
-            $route->getActionMethod(),
-        );
-    }
-}
-
-return collect(app('router')->getRoutes()->getRoutes())
-    ->map(function (Illuminate\Routing\Route $route) {
-        try {
-            $reflection = vsCodeGetRouterReflection($route);
-        } catch (Throwable $e) {
-            $reflection = null;
-        }
-
-        return [
-            'method' => collect($route->methods())->filter(function ($method) {
-                return $method !== 'HEAD';
-            })->implode('|'),
-            'uri' => $route->uri(),
-            'name' => $route->getName(),
-            'action' => $route->getActionName(),
-            'parameters' => $route->parameterNames(),
-            'filename' => $reflection ? $reflection->getFileName() : null,
-            'line' => $reflection ? $reflection->getStartLine() : null,
-        ];
-    })
-;

php-templates/translations.php

@@ -1,161 +0,0 @@
-<?php
-
-function vsCodeGetTranslationsFromFile(Symfony\Component\Finder\SplFileInfo $file, $path, $namespace)
-{
-    if ($file->getExtension() !== 'php') {
-        return null;
-    }
-
-    $filePath = $file->getRealPath();
-
-    $relativePath = trim(str_replace($path, '', $file->getPath()), DIRECTORY_SEPARATOR);
-    $lang = explode(DIRECTORY_SEPARATOR, $relativePath)[0] ?? null;
-
-    if (!$lang) {
-        return null;
-    }
-
-    $keyPath = str_replace($path . DIRECTORY_SEPARATOR . $lang . DIRECTORY_SEPARATOR, '', $filePath);
-    $keyWithSlashes = str_replace('.php', '', $keyPath);
-    $baseKey = str_replace(DIRECTORY_SEPARATOR, '.', $keyWithSlashes);
-
-    if ($namespace) {
-        $baseKey = "{$namespace}::{$baseKey}";
-    }
-
-    try {
-        $translations = require $filePath;
-    } catch (Throwable $e) {
-        return null;
-    }
-
-    if (!is_array($translations)) {
-        return null;
-    }
-
-    $fileLines = Illuminate\Support\Facades\File::lines($filePath);
-    $lines = [];
-    $inComment = false;
-
-    foreach ($fileLines as $index => $line) {
-        $trimmed = trim($line);
-        if (str_starts_with($trimmed, '/*')) {
-            $inComment = true;
-        }
-        if ($inComment) {
-            if (str_ends_with($trimmed, '*/')) {
-                $inComment = false;
-            }
-            continue;
-        }
-        if (str_starts_with($trimmed, '//')) {
-            continue;
-        }
-        $lines[] = [$index + 1, $trimmed];
-    }
-
-    return [
-        'k' => $baseKey,
-        'la' => $lang,
-        'vs' => collect(Illuminate\Support\Arr::dot($translations))
-        ->map(
-            fn ($value, $dotKey) => vsCodeTranslationValue(
-                $dotKey,
-                $value,
-                str_replace(base_path(DIRECTORY_SEPARATOR), '', $filePath),
-                $lines
-            )
-        )
-            ->filter(),
-    ];
-}
-
-function vsCodeTranslationValue($key, $value, $file, $lines): ?array
-{
-    if (is_array($value)) {
-        return null;
-    }
-
-    $lineNumber = 1;
-    $keys = explode('.', $key);
-    $currentKey = array_shift($keys);
-
-    foreach ($lines as $line) {
-        if (
-            strpos($line[1], '"' . $currentKey . '"') !== false ||
-            strpos($line[1], "'" . $currentKey . "'") !== false
-        ) {
-            $lineNumber = $line[0];
-            $currentKey = array_shift($keys);
-        }
-
-        if ($currentKey === null) {
-            break;
-        }
-    }
-
-    return [
-        'v' => $value,
-        'p' => $file,
-        'li' => $lineNumber,
-        'pa' => preg_match_all("/\:([A-Za-z0-9_]+)/", $value, $matches)
-            ? $matches[1]
-            : [],
-    ];
-}
-
-function vscodeCollectTranslations(string $path, ?string $namespace = null)
-{
-    $realPath = realpath($path);
-
-    if (!is_dir($realPath)) {
-        return collect();
-    }
-
-    return collect(Illuminate\Support\Facades\File::allFiles($realPath))
-        ->map(fn ($file) => vsCodeGetTranslationsFromFile($file, $path, $namespace))
-        ->filter();
-}
-
-$loader = app('translator')->getLoader();
-$namespaces = $loader->namespaces();
-
-$reflection = new ReflectionClass($loader);
-$property = $reflection->hasProperty('paths')
-    ? $reflection->getProperty('paths')
-    : $reflection->getProperty('path');
-$property->setAccessible(true);
-
-$paths = Illuminate\Support\Arr::wrap($property->getValue($loader));
-
-$default = collect($paths)->flatMap(
-    fn ($path) => vscodeCollectTranslations($path)
-);
-
-$namespaced = collect($namespaces)->flatMap(
-    fn ($path, $namespace) => vscodeCollectTranslations($path, $namespace)
-);
-
-$final = [];
-
-foreach ($default->merge($namespaced) as $value) {
-    if (!isset($value['vs']) || !is_iterable($value['vs'])) {
-        continue;
-    }
-
-    foreach ($value['vs'] as $key => $v) {
-        $dotKey = "{$value['k']}.{$key}";
-
-        if (!isset($final[$dotKey])) {
-            $final[$dotKey] = [];
-        }
-
-        $final[$dotKey][$value['la']] = $v;
-
-        if ($value['la'] === Illuminate\Support\Facades\App::currentLocale()) {
-            $final[$dotKey]['default'] = $v;
-        }
-    }
-}
-
-return collect($final);

php-templates/views.php

@@ -1,61 +0,0 @@
-<?php
-
-function vsCodeFindBladeFiles($path)
-{
-    $paths = [];
-
-    if (!is_dir($path)) {
-        return $paths;
-    }
-
-    foreach (
-        Symfony\Component\Finder\Finder::create()
-            ->files()
-            ->name('*.blade.php')
-            ->in($path) as $file
-    ) {
-        $paths[] = [
-            'path' => str_replace(base_path(DIRECTORY_SEPARATOR), '', $file->getRealPath()),
-            'isVendor' => str_contains($file->getRealPath(), base_path('vendor')),
-            'key' => Illuminate\Support\Str::of($file->getRealPath())
-                ->replace(realpath($path), '')
-                ->replace('.blade.php', '')
-                ->ltrim(DIRECTORY_SEPARATOR)
-                ->replace(DIRECTORY_SEPARATOR, '.'),
-        ];
-    }
-
-    return $paths;
-}
-$paths = collect(
-    app('view')
-        ->getFinder()
-        ->getPaths()
-)->flatMap(function ($path) {
-    return vsCodeFindBladeFiles($path);
-});
-
-$hints = collect(
-    app('view')
-        ->getFinder()
-        ->getHints()
-)->flatMap(function ($paths, $key) {
-    return collect($paths)->flatMap(function ($path) use ($key) {
-        return collect(vsCodeFindBladeFiles($path))->map(function ($value) use (
-            $key
-        ) {
-            return array_merge($value, ['key' => "{$key}::{$value['key']}"]);
-        });
-    });
-});
-
-[$local, $vendor] = $paths
-    ->merge($hints)
-    ->values()
-    ->partition(function ($v) {
-        return !$v['isVendor'];
-    });
-
-return $local
-    ->sortBy('key', SORT_NATURAL)
-    ->merge($vendor->sortBy('key', SORT_NATURAL));

resources/views/helper.php

@@ -14,34 +14,31 @@
 
 /**
  * A helper file for Laravel, to provide autocomplete information to your IDE
- * Generated for Laravel <?= app()->version() ?>.
+ * Generated for Laravel <?= $version ?>.
  *
  * This file should not be included in your code, only analyzed by your IDE!
  *
  * @author Barry vd. Heuvel <[email protected]>
  * @see https://github.com/barryvdh/laravel-ide-helper
  */
-<?php
+
-$s1 = '    ';
-$s2 = $s1 . $s1;
-$s3 = $s1 . $s2;
-?>
 <?php foreach ($namespaces_by_extends_ns as $namespace => $aliases) : ?>
 namespace <?= $namespace === '__root' ? '' : trim($namespace, '\\') ?> {
     <?php foreach ($aliases as $alias) : ?>
-<?php echo trim($alias->getDocComment($s1)) . "\n{$s1}" . $alias->getClassType() ?> <?= $alias->getExtendsClass() ?><?php if ($alias->shouldExtendParentClass()): ?> extends <?= $alias->getParentClass() ?><?php endif; ?> {
+        <?= trim($alias->getDocComment('    ')) ?>
+        <?= $alias->getClassType() ?> <?= $alias->getExtendsClass() ?> {
         <?php foreach ($alias->getMethods() as $method) : ?>
-<?= trim($method->getDocComment($s2)) . "\n{$s2}" ?>public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
+            <?= trim($method->getDocComment('        ')) ?>
+        public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
         {<?php if ($method->getDeclaringClass() !== $method->getRoot()) : ?>
-<?= "\n" . $s3?>//Method inherited from <?= $method->getDeclaringClass() ?>
+            //Method inherited from <?= $method->getDeclaringClass() ?>
- <?php endif; ?>
+         <?php endif; ?>
 
-<?php if ($method->isInstanceCall()) : ?>
+            <?php if ($method->isInstanceCall()) : ?>
-<?= $s3 ?>/** @var <?=$method->getRoot()?> $instance */
+            /** @var <?=$method->getRoot()?> $instance */
-<?php endif?>
+            <?php endif?>
-<?= $s3 . ($method->shouldReturn() ? 'return ' : '') ?><?= $method->getRootMethodCall() ?>;
+            <?= $method->shouldReturn() ? 'return ' : '' ?><?= $method->getRootMethodCall() ?>;
         }
-
         <?php endforeach; ?>
     }
     <?php endforeach; ?>
@@ -51,32 +48,31 @@ namespace <?= $namespace === '__root' ? '' : trim($namespace, '\\') ?> {
 
 <?php foreach ($namespaces_by_alias_ns as $namespace => $aliases) : ?>
 namespace <?= $namespace === '__root' ? '' : trim($namespace, '\\') ?> {
-<?php foreach ($aliases as $alias) : ?>
+    <?php foreach ($aliases as $alias) : ?>
-<?php if ($alias->getExtendsNamespace() === '\Illuminate\Database\Eloquent') : ?>
+        <?php if ($alias->getExtendsNamespace() === '\Illuminate\Database\Eloquent') : ?>
-<?= "\n" . $alias->getPhpDocTemplates($s1) . "\n" ?>
+        <?= $alias->getPhpDocTemplates('            ') ?>
-<?php endif?>
+        <?php endif?>
-<?= $s1 . $alias->getClassType() ?> <?= $alias->getShortName() ?> extends <?= $alias->getExtends() ?> {<?php if ($alias->getExtendsNamespace() === '\Illuminate\Database\Eloquent') : ?>
+        <?= $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) : ?>
-<?= $s2 . trim($method->getDocComment($s2)) . "\n" ?>
+                <?= trim($method->getDocComment('            ')) ?>
-<?= $s2 ?>public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
+            public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
-<?= $s2?>{<?php if ($method->getDeclaringClass() !== $method->getRoot()) : ?>
+            {<?php if ($method->getDeclaringClass() !== $method->getRoot()) : ?>
-<?= $s2 ?>//Method inherited from <?= $method->getDeclaringClass() ?>
+                //Method inherited from <?= $method->getDeclaringClass() ?>
-<?php endif; ?>
+             <?php endif; ?>
 
-<?php if ($method->isInstanceCall()) : ?>
+                <?php if ($method->isInstanceCall()) : ?>
-<?= $s3 ?>/** @var <?=$method->getRoot()?> $instance */
+                /** @var <?=$method->getRoot()?> $instance */
-<?php endif?>
+                <?php endif?>
-<?= $s3 . ($method->shouldReturn() ? 'return ' : '') ?><?= $method->getRootMethodCall() ?>;
+                <?= $method->shouldReturn() ? 'return ' : '' ?><?= $method->getRootMethodCall() ?>;
-<?= $s2 ?>}
+            }
-
+            <?php endforeach; ?>
-<?php endforeach; ?>
+        <?php endif; ?>}
-<?php endif; ?>}
+    <?php endforeach; ?>
-<?php endforeach; ?>
 }
 
 <?php endforeach; ?>
 
-<?php foreach ($real_time_facades as $name): ?>
+<?php foreach($real_time_facades as $name): ?>
 <?php $nested = explode('\\', str_replace('\\' . class_basename($name), '', $name)); ?>
 namespace <?php echo implode('\\', $nested); ?> {
     /**

resources/views/meta.php

@@ -21,20 +21,6 @@ namespace PHPSTORM_META {
     ]));
 <?php endforeach; ?>
 
-<?php foreach ($userMethods as $method) : ?>
-    override(<?= $method ?>, map([
-        '' => \<?= $userModel ?>::class,
-    ]));
-<?php endforeach; ?>
-
-<?php foreach ($configMethods as $method) : ?>
-    override(<?= $method ?>, map([
-    <?php foreach ($configValues as $name => $value) : ?>
-        '<?= $name ?>' => '<?= $value ?>',
-    <?php endforeach; ?>
-    ]));
-<?php endforeach; ?>
-
 <?php if (count($factories)) : ?>
     override(\factory(0), map([
         '' => '@FactoryBuilder',
@@ -79,31 +65,4 @@ namespace PHPSTORM_META {
     override(\tap(0), type(0));
     override(\optional(0), type(0));
 
-    <?php if (isset($expectedArgumentSets)): ?>
-    <?php foreach ($expectedArgumentSets as $name => $argumentsList) : ?>
-    registerArgumentsSet('<?= $name ?>', <?php foreach ($argumentsList as $i => $arg) : ?><?php if ($i % 5 == 0) {
-        echo "\n";
-    } ?><?= var_export($arg, true); ?>,<?php endforeach; ?>);
-    <?php endforeach; ?>
-    <?php endif ?>
-
-    <?php if (isset($expectedArguments)) : ?>
-    <?php foreach ($expectedArguments as $arguments) : ?>
-    <?php
-        $classes = isset($arguments['class']) ? (array) $arguments['class'] : [null];
-        $index = $arguments['index'] ?? 0;
-        $argumentSet = $arguments['argumentSet'];
-        $functions = [];
-        foreach ($classes as $class) {
-            foreach ((array) $arguments['method'] as $method) {
-                $functions[] = '\\' . ($class ? ltrim($class, '\\') . '::' : '') . $method . '()';
-            }
-        }
-        ?>
-    <?php foreach ($functions as $function) : ?>
-expectedArguments(<?= $function ?>, <?= $index ?>, argumentsSet('<?= $argumentSet ?>'));
-    <?php endforeach; ?>
-    <?php endforeach; ?>
-    <?php endif; ?>
-
 }

src/Alias.php

@@ -13,16 +13,13 @@ namespace Barryvdh\LaravelIdeHelper;
 
 use Barryvdh\Reflection\DocBlock;
 use Barryvdh\Reflection\DocBlock\Context;
-use Barryvdh\Reflection\DocBlock\ContextFactory;
 use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
 use Barryvdh\Reflection\DocBlock\Tag\MethodTag;
-use Barryvdh\Reflection\DocBlock\Tag\TemplateTag;
 use Closure;
 use Illuminate\Config\Repository as ConfigRepository;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Support\Facades\Facade;
-use Illuminate\Support\Traits\Macroable;
 use ReflectionClass;
 use Throwable;
 
@@ -37,7 +34,6 @@ class Alias
     protected $classType = 'class';
     protected $short;
     protected $namespace = '__root';
-    protected $parentClass;
     protected $root = null;
     protected $classes = [];
     protected $methods = [];
@@ -51,9 +47,6 @@ class Alias
     /** @var ConfigRepository  */
     protected $config;
 
-    /** @var string[] */
-    protected $templateNames;
-
     /**
      * @param ConfigRepository $config
      * @param string           $alias
@@ -86,11 +79,10 @@ class Alias
         $this->detectNamespace();
         $this->detectClassType();
         $this->detectExtendsNamespace();
-        $this->detectParentClass();
 
         if (!empty($this->namespace)) {
             try {
-                $this->classAliases = (new ContextFactory())->createFromReflector(new ReflectionClass($this->root))->getNamespaceAliases();
+                $this->classAliases = (new UsesResolver())->loadFromClass($this->root);
             } catch (Throwable $e) {
                 $this->classAliases = [];
             }
@@ -171,25 +163,6 @@ class Alias
         return $this->extendsNamespace;
     }
 
-    /**
-     * Get the parent class of the class which this alias extends
-     *
-     * @return null|string
-     */
-    public function getParentClass()
-    {
-        return $this->parentClass;
-    }
-
-    /**
-     * Check if this class should extend the parent class
-     */
-    public function shouldExtendParentClass()
-    {
-        return $this->parentClass
-            && $this->getExtendsNamespace() !== '\\Illuminate\\Support\\Facades';
-    }
-
     /**
      * Get the Alias by which this class is called
      *
@@ -287,18 +260,6 @@ class Alias
         }
     }
 
-    /**
-     * Detect the parent class
-     */
-    protected function detectParentClass()
-    {
-        $reflection = new ReflectionClass($this->root);
-
-        $parentClass = $reflection->getParentClass();
-
-        $this->parentClass = $parentClass ? '\\' . $parentClass->getName() : null;
-    }
-
     /**
      * Detect the class type
      */
@@ -385,8 +346,7 @@ class Alias
                         $magic,
                         $this->interfaces,
                         $this->classAliases,
-                        $this->getReturnTypeNormalizers($class),
+                        $this->getReturnTypeNormalizers($class)
-                        $this->getTemplateNames()
                     );
                 }
                 $this->usedMethods[] = $magic;
@@ -418,8 +378,7 @@ class Alias
                                 $method->name,
                                 $this->interfaces,
                                 $this->classAliases,
-                                $this->getReturnTypeNormalizers($reflection),
+                                $this->getReturnTypeNormalizers($reflection)
-                                $this->getTemplateNames(),
                             );
                         }
                         $this->usedMethods[] = $method->name;
@@ -429,20 +388,15 @@ class Alias
 
             // Check if the class is macroable
             // (Eloquent\Builder is also macroable but doesn't use Macroable trait)
-            if ($class === EloquentBuilder::class || in_array(Macroable::class, $reflection->getTraitNames())) {
+            $traits = collect($reflection->getTraitNames());
+            if ($traits->contains('Illuminate\Support\Traits\Macroable') || $class === EloquentBuilder::class) {
                 $properties = $reflection->getStaticProperties();
                 $macros = isset($properties['macros']) ? $properties['macros'] : [];
                 foreach ($macros as $macro_name => $macro_func) {
                     if (!in_array($macro_name, $this->usedMethods)) {
-                        try {
-                            $method = $this->getMacroFunction($macro_func);
-                        } catch (Throwable $e) {
-                            // Invalid method, skip
-                            continue;
-                        }
                         // Add macros
                         $this->methods[] = new Macro(
-                            $method,
+                            $this->getMacroFunction($macro_func),
                             $this->alias,
                             $reflection,
                             $macro_name,
@@ -522,62 +476,30 @@ class Alias
     /**
      * @param $prefix
      * @return string
+     * @throws \ReflectionException
      */
     public function getPhpDocTemplates($prefix = "\t\t")
     {
         $templateDoc = new DocBlock('');
         $serializer = new DocBlockSerializer(1, $prefix);
 
-        foreach ($this->getTemplateNames() as $templateName) {
-            $template = new TemplateTag('template', $templateName);
-            $template->setBound('static');
-            $template->setDocBlock($templateDoc);
-            $templateDoc->appendTag($template);
-        }
-
-        return $serializer->getDocComment($templateDoc);
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getTemplateNames()
-    {
-        if (!isset($this->templateNames)) {
-            $this->detectTemplateNames();
-        }
-        return $this->templateNames;
-    }
-
-    /**
-     * @return void
-     * @throws \ReflectionException
-     */
-    protected function detectTemplateNames()
-    {
-        $templateNames = [];
         foreach ($this->classes as $class) {
             $reflection = new ReflectionClass($class);
             $traits = collect($reflection->getTraitNames());
 
-            $phpdoc = new DocBlock($reflection);
-            $templates = $phpdoc->getTagsByName('template');
-            /** @var TemplateTag $template */
-            foreach ($templates as $template) {
-                $templateNames[] = $template->getTemplateName();
-            }
-
             foreach ($traits as $trait) {
                 $phpdoc = new DocBlock(new ReflectionClass($trait));
                 $templates = $phpdoc->getTagsByName('template');
 
-                /** @var TemplateTag $template */
+                /** @var DocBlock\Tag\TemplateTag $template */
                 foreach ($templates as $template) {
-                    $templateNames[] = $template->getTemplateName();
+                    $template->setBound('static');
+                    $template->setDocBlock($templateDoc);
+                    $templateDoc->appendTag($template);
                 }
             }
         }
-        $this->templateNames = $templateNames;
+        return $serializer->getDocComment($templateDoc);
     }
 
     /**

src/Console/GeneratorCommand.php

@@ -113,12 +113,7 @@ class GeneratorCommand extends Command
         }
 
         $generator = new Generator($this->config, $this->view, $this->getOutput(), $helpers);
-        if ($this->option('eloquent')) {
+        $content = $generator->generate();
-            $content = $generator->generateEloquent();
-        } else {
-            $content = $generator->generate();
-        }
-
         $written = $this->files->put($filename, $content);
 
         if ($written !== false) {
@@ -174,7 +169,6 @@ class GeneratorCommand extends Command
             ['write_mixins', 'W', InputOption::VALUE_OPTIONAL, 'Write mixins to Laravel Model?', $writeMixins],
             ['helpers', 'H', InputOption::VALUE_NONE, 'Include the helper files'],
             ['memory', 'M', InputOption::VALUE_NONE, 'Use sqlite memory driver'],
-            ['eloquent', 'E', InputOption::VALUE_NONE, 'Only write Eloquent methods'],
         ];
     }
 }

src/Console/MetaCommand.php

@@ -12,13 +12,10 @@
 namespace Barryvdh\LaravelIdeHelper\Console;
 
 use Barryvdh\LaravelIdeHelper\Factories;
-use Dotenv\Parser\Entry;
-use Dotenv\Parser\Parser;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Support\Collection;
 use RuntimeException;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -54,36 +51,19 @@ class MetaCommand extends Command
     protected $config;
 
     protected $methods = [
-        'new \Illuminate\Contracts\Container\Container',
+      'new \Illuminate\Contracts\Container\Container',
-        '\Illuminate\Container\Container::makeWith(0)',
+      '\Illuminate\Container\Container::makeWith(0)',
-        '\Illuminate\Contracts\Container\Container::get(0)',
+      '\Illuminate\Contracts\Container\Container::get(0)',
-        '\Illuminate\Contracts\Container\Container::make(0)',
+      '\Illuminate\Contracts\Container\Container::make(0)',
-        '\Illuminate\Contracts\Container\Container::makeWith(0)',
+      '\Illuminate\Contracts\Container\Container::makeWith(0)',
-        '\App::get(0)',
+      '\App::get(0)',
-        '\App::make(0)',
+      '\App::make(0)',
-        '\App::makeWith(0)',
+      '\App::makeWith(0)',
-        '\app(0)',
+      '\app(0)',
-        '\resolve(0)',
+      '\resolve(0)',
-        '\Psr\Container\ContainerInterface::get(0)',
+      '\Psr\Container\ContainerInterface::get(0)',
     ];
 
-    protected $configMethods = [
-        '\config()',
-        '\Illuminate\Config\Repository::get()',
-        '\Illuminate\Support\Facades\Config::get()',
-    ];
-
-    protected $userMethods = [
-        '\auth()->user()',
-        '\Illuminate\Contracts\Auth\Guard::user()',
-        '\Illuminate\Support\Facades\Auth::user()',
-        '\request()->user()',
-        '\Illuminate\Http\Request::user()',
-        '\Illuminate\Support\Facades\Request::user()',
-    ];
-
-    protected $templateCache = [];
-
     /**
      *
      * @param Filesystem $files
@@ -128,7 +108,7 @@ class MetaCommand extends Command
                 }
 
                 $reflectionClass = new \ReflectionClass($concrete);
-                if (is_object($concrete) && !$reflectionClass->isAnonymous() && $abstract !== get_class($concrete)) {
+                if (is_object($concrete) && !$reflectionClass->isAnonymous()) {
                     $bindings[$abstract] = get_class($concrete);
                 }
             } catch (\Throwable $e) {
@@ -140,22 +120,10 @@ class MetaCommand extends Command
 
         $this->unregisterClassAutoloadExceptions($ourAutoloader);
 
-        $configValues = $this->loadTemplate('configs')->pluck('value', 'name')->map(function ($value, $key) {
+        $content = $this->view->make('meta', [
-            return gettype($value);
+          'bindings' => $bindings,
-        });
+          'methods' => $this->methods,
-
+          'factories' => $factories,
-        $defaultUserModel = $this->config->get('auth.providers.users.model', $this->config->get('auth.model', 'App\User'));
-
-        $content = $this->view->make('ide-helper::meta', [
-            'bindings' => $bindings,
-            'methods' => $this->methods,
-            'factories' => $factories,
-            'configMethods' => $this->configMethods,
-            'configValues' => $configValues,
-            'expectedArgumentSets' => $this->getExpectedArgumentSets(),
-            'expectedArguments' => $this->getExpectedArguments(),
-            'userModel' => $defaultUserModel,
-            'userMethods' => $this->userMethods,
         ])->render();
 
         $filename = $this->option('filename');
@@ -192,152 +160,13 @@ class MetaCommand extends Command
      */
     protected function registerClassAutoloadExceptions(): callable
     {
-        $aliases = array_filter([...$this->getAbstracts(), 'config'], fn ($abstract) => !str_contains($abstract, '\\'));
+        $autoloader = function ($class) {
-
-        $autoloader = function ($class) use ($aliases) {
-            // ignore aliases as they're meant to be resolved elsewhere
-            if (in_array($class, $aliases, true)) {
-                return;
-            }
-
             throw new \ReflectionException("Class '$class' not found.");
         };
-
         spl_autoload_register($autoloader);
-
         return $autoloader;
     }
 
-    protected function getExpectedArgumentSets()
-    {
-        return [
-            'auth' => $this->loadTemplate('auth')->keys()->filter()->toArray(),
-            'configs' => $this->loadTemplate('configs')->pluck('name')->filter()->toArray(),
-            'middleware' => $this->loadTemplate('middleware')->keys()->filter()->toArray(),
-            'routes' => $this->loadTemplate('routes')->pluck('name')->filter()->toArray(),
-            'views' => $this->loadTemplate('views')->pluck('key')->filter()->map(function ($value) {
-                return (string) $value;
-            })->toArray(),
-            'translations' => $this->loadTemplate('translations')->filter()->keys()->toArray(),
-            'env' => $this->getEnv(),
-        ];
-    }
-
-    protected function getExpectedArguments()
-    {
-        return [
-            [
-                'class' => '\Illuminate\Support\Facades\Gate',
-                'method' => [
-                    'has',
-                    'allows',
-                    'denies',
-                    'check',
-                    'any',
-                    'none',
-                    'authorize',
-                    'inspect',
-                ],
-                'argumentSet' => 'auth',
-            ],
-            [
-                'class' => ['\Illuminate\Support\Facades\Route', '\Illuminate\Support\Facades\Auth', 'Illuminate\Foundation\Auth\Access\Authorizable'],
-                'method' => ['can', 'cannot', 'cant'],
-                'argumentSet' => 'auth',
-            ],
-            [
-                'class' => ['Illuminate\Contracts\Auth\Access\Authorizable'],
-                'method' => ['can'],
-                'argumentSet' => 'auth',
-            ],
-            [
-                'class' => ['\Illuminate\Config\Repository', '\Illuminate\Support\Facades\Config'],
-                'method' => [
-//                    'get',    // config() and Config::Get() are added with return type hints already
-                    'getMany',
-                    'set',
-                    'string',
-                    'integer',
-                    'boolean',
-                    'float',
-                    'array',
-                    'prepend',
-                    'push',
-                ],
-                'argumentSet' => 'configs',
-            ],
-            [
-                'class' => ['\Illuminate\Support\Facades\Route', '\Illuminate\Routing\Router'],
-                'method' => ['middleware', 'withoutMiddleware'],
-                'argumentSet' => 'middleware',
-            ],
-            [
-                'method' => ['route', 'to_route', 'signedRoute'],
-                'argumentSet' => 'routes',
-            ],
-            [
-                'class' => [
-                    '\Illuminate\Support\Facades\Redirect',
-                    '\Illuminate\Support\Facades\URL',
-                    '\Illuminate\Routing\Redirector',
-                    '\Illuminate\Routing\UrlGenerator',
-                ],
-                'method' => ['route', 'signedRoute', 'temporarySignedRoute'],
-                'argumentSet' => 'routes',
-            ],
-            [
-                'method' => 'view',
-                'argumentSet' => 'views',
-            ],
-            [
-                'class' => ['\Illuminate\Support\Facades\View', '\Illuminate\View\Factory'],
-                'method' => 'make',
-                'argumentSet' => 'views',
-            ],
-            [
-                'method' => ['__', 'trans'],
-                'argumentSet' => 'translations',
-            ],
-            [
-                'class' => ['\Illuminate\Contracts\Translation\Translator'],
-                'method' => ['get'],
-                'argumentSet' => 'translations',
-            ],
-            [
-                'method' => 'env',
-                'argumentSet' => 'env',
-            ],
-            [
-                'class' => '\Illuminate\Support\Env',
-                'method' => 'get',
-                'argumentSet' => 'env',
-            ],
-        ];
-    }
-
-    /**
-     * @return Collection
-     */
-    protected function loadTemplate($name)
-    {
-        if (!isset($this->templateCache[$name])) {
-            $file =  __DIR__ . '/../../php-templates/' . basename($name) . '.php';
-            try {
-                $value = $this->files->requireOnce($file) ?: [];
-            } catch (\Throwable $e) {
-                $value = [];
-                $this->warn('Cannot load template for ' . $name . ': ' . $e->getMessage());
-            }
-
-            if (!$value instanceof Collection) {
-                $value = collect($value);
-            }
-            $this->templateCache[$name] = $value;
-        }
-
-        return $this->templateCache[$name];
-    }
-
     /**
      * Get the console command options.
      *
@@ -352,21 +181,6 @@ class MetaCommand extends Command
         ];
     }
 
-    protected function getEnv()
-    {
-        $envPath = base_path('.env');
-        if (!file_exists($envPath)) {
-            return [];
-        }
-
-        $parser = new Parser();
-        $entries = $parser->parse(file_get_contents($envPath));
-
-        return collect($entries)->map(function (Entry $entry) {
-            return $entry->getName();
-        });
-    }
-
     /**
      * Remove our custom autoloader that we pushed onto the autoload stack
      *

src/Console/ModelsCommand.php

@@ -12,16 +12,13 @@
 namespace Barryvdh\LaravelIdeHelper\Console;
 
 use Barryvdh\LaravelIdeHelper\Contracts\ModelHookInterface;
-use Barryvdh\LaravelIdeHelper\Generator;
 use Barryvdh\LaravelIdeHelper\Parsers\PhpDocReturnTypeParser;
 use Barryvdh\Reflection\DocBlock;
 use Barryvdh\Reflection\DocBlock\Context;
-use Barryvdh\Reflection\DocBlock\ContextFactory;
 use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
 use Barryvdh\Reflection\DocBlock\Tag;
 use Composer\ClassMapGenerator\ClassMapGenerator;
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Database\Eloquent\Castable;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Contracts\Database\Eloquent\CastsInboundAttributes;
@@ -49,7 +46,7 @@ use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
-use Illuminate\View\Factory as ViewFactory;
+use phpDocumentor\Reflection\Types\ContextFactory;
 use ReflectionClass;
 use ReflectionNamedType;
 use ReflectionObject;
@@ -85,14 +82,6 @@ class ModelsCommand extends Command
      */
     protected $files;
 
-    /**
-     * @var Repository
-     */
-    protected $config;
-
-    /** @var ViewFactory */
-    protected $view;
-
     /**
      * The console command name.
      *
@@ -114,7 +103,6 @@ class ModelsCommand extends Command
 
     protected $write_model_magic_where;
     protected $write_model_relation_count_properties;
-    protected $write_model_relation_exists_properties;
     protected $properties = [];
     protected $methods = [];
     protected $write = false;
@@ -143,12 +131,10 @@ class ModelsCommand extends Command
     /**
      * @param Filesystem $files
      */
-    public function __construct(Filesystem $files, Repository $config, ViewFactory $view)
+    public function __construct(Filesystem $files)
     {
-        $this->config = $config;
-        $this->files = $files;
-        $this->view = $view;
         parent::__construct();
+        $this->files = $files;
     }
 
     /**
@@ -174,8 +160,6 @@ class ModelsCommand extends Command
         $this->write_model_external_builder_methods = $this->laravel['config']->get('ide-helper.write_model_external_builder_methods', true);
         $this->write_model_relation_count_properties =
             $this->laravel['config']->get('ide-helper.write_model_relation_count_properties', true);
-        $this->write_model_relation_exists_properties =
-            $this->laravel['config']->get('ide-helper.write_model_relation_exists_properties', false);
 
         $this->write = $this->write_mixin ? true : $this->write;
         //If filename is default and Write is not specified, ask what to do
@@ -203,27 +187,6 @@ class ModelsCommand extends Command
                 $this->error("Failed to write model information to $filename");
             }
         }
-
-        $helperFilename = $this->config->get('ide-helper.filename');
-        $writeHelper = $this->option('write-eloquent-helper');
-
-        if (!$writeHelper && !$this->files->exists($helperFilename) && ($this->write || $this->write_mixin)) {
-            if ($this->confirm("{$helperFilename} does not exist.
-            Do you want to generate a minimal helper to generate the Eloquent methods?")) {
-                $writeHelper = true;
-            }
-        }
-
-        if ($writeHelper) {
-            $generator = new Generator($this->config, $this->view, $this->getOutput());
-            $content = $generator->generateEloquent();
-            $written = $this->files->put($helperFilename, $content);
-            if ($written !== false) {
-                $this->info("Eloquent helper was written to $helperFilename");
-            } else {
-                $this->error("Failed to write eloquent helper to $helperFilename");
-            }
-        }
     }
 
 
@@ -254,9 +217,6 @@ class ModelsCommand extends Command
             ['write-mixin', 'M', InputOption::VALUE_NONE,
                 "Write models to {$this->filename} and adds @mixin to each model, avoiding IDE duplicate declaration warnings",
             ],
-            ['write-eloquent-helper', 'E', InputOption::VALUE_NONE,
-                'Write Eloquent helper file to _ide_helper.php',
-            ],
             ['nowrite', 'N', InputOption::VALUE_NONE, 'Don\'t write to Model file'],
             ['reset', 'R', InputOption::VALUE_NONE, 'Remove the original phpdocs instead of appending'],
             ['smart-reset', 'r', InputOption::VALUE_NONE, 'Retained for compatibility, while it no longer has any effect'],
@@ -413,6 +373,9 @@ class ModelsCommand extends Command
             $params = [];
 
             switch ($type) {
+                case 'encrypted':
+                    $realType = 'mixed';
+                    break;
                 case 'boolean':
                 case 'bool':
                     $realType = 'bool';
@@ -420,14 +383,13 @@ class ModelsCommand extends Command
                 case 'decimal':
                     $realType = 'numeric';
                     break;
-                case 'encrypted':
                 case 'string':
                 case 'hashed':
                     $realType = 'string';
                     break;
                 case 'array':
                 case 'json':
-                    $realType = 'array<array-key, mixed>';
+                    $realType = 'array';
                     break;
                 case 'object':
                     $realType = 'object';
@@ -451,10 +413,10 @@ class ModelsCommand extends Command
                     $realType = '\Carbon\CarbonImmutable';
                     break;
                 case 'collection':
-                    $realType = '\Illuminate\Support\Collection<array-key, mixed>';
+                    $realType = '\Illuminate\Support\Collection';
                     break;
                 case AsArrayObject::class:
-                    $realType = '\Illuminate\Database\Eloquent\Casts\ArrayObject<array-key, mixed>';
+                    $realType = '\ArrayObject';
                     break;
                 default:
                     // In case of an optional custom cast parameter , only evaluate
@@ -476,11 +438,7 @@ class ModelsCommand extends Command
             }
 
             if (Str::startsWith($type, AsCollection::class)) {
-                $realType = $this->getTypeInModel($model, $params[0] ?? null) ?: '\Illuminate\Support\Collection';
+                $realType = $this->getTypeInModel($model, $params[0] ?? null) ?? '\Illuminate\Support\Collection';
-                $relatedModel = $this->getTypeInModel($model, $params[1] ?? null);
-                if ($relatedModel) {
-                    $realType = $this->getCollectionTypeHint($realType, $relatedModel);
-                }
             }
 
             if (Str::startsWith($type, AsEnumCollection::class)) {
@@ -633,10 +591,6 @@ class ModelsCommand extends Command
                     )
                 );
             });
-            // https://github.com/barryvdh/laravel-ide-helper/issues/1664
-            $reflections = array_filter($reflections, function (\ReflectionMethod $methodReflection) {
-                return !($methodReflection->getName() === 'getUseFactoryAttribute');
-            });
             sort($reflections);
             foreach ($reflections as $reflection) {
                 $type = $this->getReturnTypeFromReflection($reflection);
@@ -674,11 +628,9 @@ class ModelsCommand extends Command
                         $comment = $this->getCommentFromDocBlock($reflection);
                         $this->setProperty($name, null, null, true, $comment);
                     }
-                } elseif (!empty($reflection->getAttributes('Illuminate\Database\Eloquent\Attributes\Scope')) || (Str::startsWith($method, 'scope') && $method !== 'scopeQuery' && $method !== 'scope' && $method !== 'scopes')) {
+                } elseif (Str::startsWith($method, 'scope') && $method !== 'scopeQuery' && $method !== 'scope' && $method !== 'scopes') {
-                    $scopeUsingAttribute = !empty($reflection->getAttributes('Illuminate\Database\Eloquent\Attributes\Scope'));
-
                     //Magic scope<name>Attribute
-                    $name = $scopeUsingAttribute ? $method : Str::camel(substr($method, 5));
+                    $name = Str::camel(substr($method, 5));
                     if (!empty($name)) {
                         $comment = $this->getCommentFromDocBlock($reflection);
                         $args = $this->getParameters($reflection);
@@ -823,15 +775,6 @@ class ModelsCommand extends Command
                                             // What kind of comments should be added to the relation count here?
                                         );
                                     }
-                                    if ($this->write_model_relation_exists_properties) {
-                                        $this->setProperty(
-                                            Str::snake($method) . '_exists',
-                                            'bool|null',
-                                            true,
-                                            false
-                                            // What kind of comments should be added to the relation count here?
-                                        );
-                                    }
                                 } elseif (
                                     $relationReturnType === 'morphTo' ||
                                     (
@@ -839,16 +782,10 @@ class ModelsCommand extends Command
                                         $relation === 'morphTo'
                                     )
                                 ) {
-                                    $matches = [];
-                                    $returnType = $this->getReturnTypeFromDocBlock($reflection);
-                                    if ($returnType !== null) {
-                                        preg_match('/MorphTo<(?:contravariant\s+)?(.+?)(?:,|>)/i', $returnType, $matches);
-                                    }
-
                                     // Model isn't specified because relation is polymorphic
                                     $this->setProperty(
                                         $method,
-                                        $matches[1] ?? $this->getClassNameInDestinationFile($model, Model::class) . '|\Eloquent',
+                                        $this->getClassNameInDestinationFile($model, Model::class) . '|\Eloquent',
                                         true,
                                         null,
                                         $comment,
@@ -1200,7 +1137,7 @@ class ModelsCommand extends Command
                     $default = '[]';
                 } elseif (is_null($default)) {
                     $default = 'null';
-                } elseif (is_int($default) || is_float($default)) {
+                } elseif (is_int($default)) {
                     //$default = $default;
                 } elseif ($default instanceof \UnitEnum) {
                     $default = '\\' . get_class($default) . '::' . $default->name;
@@ -1421,7 +1358,7 @@ class ModelsCommand extends Command
         if (in_array('Illuminate\\Database\\Eloquent\\SoftDeletes', $traits)) {
             $modelName = $this->getClassNameInDestinationFile($model, get_class($model));
             $builder = $this->getClassNameInDestinationFile($model, \Illuminate\Database\Eloquent\Builder::class);
-            $this->setMethod('withTrashed', $builder . '<static>|' . $modelName, ['bool $withTrashed = true']);
+            $this->setMethod('withTrashed', $builder . '<static>|' . $modelName, []);
             $this->setMethod('withoutTrashed', $builder . '<static>|' . $modelName, []);
             $this->setMethod('onlyTrashed', $builder . '<static>|' . $modelName, []);
         }
@@ -1597,9 +1534,7 @@ class ModelsCommand extends Command
      */
     protected function getUsedClassNames(ReflectionClass $reflection): array
     {
-        $namespaceAliases = array_flip(array_map(function ($alias) {
+        $namespaceAliases = array_flip((new ContextFactory())->createFromReflector($reflection)->getNamespaceAliases());
-            return ltrim($alias, '\\');
-        }, (new ContextFactory())->createFromReflector($reflection)->getNamespaceAliases()));
         $namespaceAliases[$reflection->getName()] = $reflection->getShortName();
 
         return $namespaceAliases;

src/Generator.php

@@ -11,12 +11,15 @@
 
 namespace Barryvdh\LaravelIdeHelper;
 
-use Illuminate\Database\Eloquent\Model;
 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;
 
@@ -57,13 +60,9 @@ class Generator
         // Find the drivers to add to the extra/interfaces
         $this->detectDrivers();
 
-        $this->extra = array_merge($this->extra, $this->config->get('ide-helper.extra', []));
+        $this->extra = array_merge($this->extra, $this->config->get('ide-helper.extra'), []);
-        $this->magic = array_merge($this->magic, $this->config->get('ide-helper.magic', []));
+        $this->magic = array_merge($this->magic, $this->config->get('ide-helper.magic'), []);
-        $this->interfaces = array_merge($this->interfaces, $this->config->get('ide-helper.interfaces', []));
+        $this->interfaces = array_merge($this->interfaces, $this->config->get('ide-helper.interfaces'), []);
-        Macro::setDefaultReturnTypes($this->config->get('ide-helper.macro_default_return_types', [
-            \Illuminate\Http\Client\Factory::class => \Illuminate\Http\Client\PendingRequest::class,
-        ]));
-
         // Make all interface classes absolute
         foreach ($this->interfaces as &$interface) {
             $interface = '\\' . ltrim($interface, '\\');
@@ -79,60 +78,17 @@ class Generator
     public function generate()
     {
         $app = app();
-        return $this->view->make('ide-helper::helper')
+        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->detectHelpers())
+            ->with('helpers', $this->helpers)
+            ->with('version', $app->version())
             ->with('include_fluent', $this->config->get('ide-helper.include_fluent', true))
             ->with('factories', $this->config->get('ide-helper.include_factory_builders') ? Factories::all() : [])
             ->render();
     }
 
-    public function generateEloquent()
-    {
-        $name = 'Eloquent';
-        $facade = Model::class;
-        $magicMethods = array_key_exists($name, $this->magic) ? $this->magic[$name] : [];
-        $alias = new Alias($this->config, $name, $facade, $magicMethods, $this->interfaces);
-        if (!$alias->isValid()) {
-            throw new \RuntimeException('Cannot generate Eloquent helper');
-        }
-
-        //Add extra methods, from other classes (magic static calls)
-        if (array_key_exists($name, $this->extra)) {
-            $alias->addClass($this->extra[$name]);
-        }
-
-        $app = app();
-        return $this->view->make('ide-helper::helper')
-            ->with('namespaces_by_extends_ns', [])
-            ->with('namespaces_by_alias_ns', ['__root' => [$alias]])
-            ->with('real_time_facades', [])
-            ->with('helpers', '')
-            ->with('include_fluent', false)
-            ->with('factories', [])
-            ->render();
-    }
-
-    protected function detectHelpers()
-    {
-        $helpers = $this->helpers;
-
-        $replacements = [
-            '($guard is null ? \Illuminate\Contracts\Auth\Factory : \Illuminate\Contracts\Auth\StatefulGuard)' => '\\Auth',
-        ];
-        foreach ($replacements as $search => $replace) {
-            $helpers = Str::replace(
-                "@return {$search}",
-                "@return $replace|$search",
-                $helpers
-            );
-        }
-
-        return $helpers;
-    }
-
     protected function detectDrivers()
     {
         $defaultUserModel = config('auth.providers.users.model', config('auth.model', 'App\User'));
@@ -231,10 +187,8 @@ class Generator
         foreach ($realTimeFacadeFiles as $file) {
             try {
                 $name = $this->getFullyQualifiedClassNameInFile($file);
-                if ($name) {
+                $facades[$name] = $name;
-                    $facades[$name] = $name;
+            } catch (\Exception $e) {
-                }
-            } catch (\Throwable $e) {
                 continue;
             }
         }
@@ -246,17 +200,26 @@ class Generator
     {
         $contents = file_get_contents($path);
 
-        // Match namespace
+        $parsers = new Php7(new Emulative());
-        preg_match('/namespace\s+([^;]+);/', $contents, $namespaceMatch);
-        $namespace = isset($namespaceMatch[1]) ? $namespaceMatch[1] : '';
 
-        // Match class name
+        $parsed = collect($parsers->parse($contents) ?: []);
-        preg_match('/class\s+([a-zA-Z0-9_]+)/', $contents, $classMatch);
-        $className = isset($classMatch[1]) ? $classMatch[1] : '';
 
-        // Combine namespace and class name
+        $namespace = $parsed->first(function ($node) {
-        if ($namespace && $className) {
+            return $node instanceof Namespace_;
-            return $namespace . '\\' . $className;
+        });
+
+        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;
         }
     }
 

src/IdeHelperServiceProvider.php

@@ -20,6 +20,10 @@ use Illuminate\Console\Events\CommandFinished;
 use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Database\Events\MigrationsEnded;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\View\Engines\EngineResolver;
+use Illuminate\View\Engines\PhpEngine;
+use Illuminate\View\Factory;
+use Illuminate\View\FileViewFinder;
 
 class IdeHelperServiceProvider extends ServiceProvider implements DeferrableProvider
 {
@@ -61,6 +65,12 @@ class IdeHelperServiceProvider extends ServiceProvider implements DeferrableProv
         $configPath = __DIR__ . '/../config/ide-helper.php';
         $this->mergeConfigFrom($configPath, 'ide-helper');
 
+        $this->app->when([GeneratorCommand::class, MetaCommand::class])
+            ->needs(\Illuminate\Contracts\View\Factory::class)
+            ->give(function () {
+                return $this->createLocalViewFactory();
+            });
+
         $this->commands(
             [
                 GeneratorCommand::class,
@@ -85,4 +95,20 @@ class IdeHelperServiceProvider extends ServiceProvider implements DeferrableProv
             EloquentCommand::class,
         ];
     }
+
+    /**
+     * @return Factory
+     */
+    private function createLocalViewFactory()
+    {
+        $resolver = new EngineResolver();
+        $resolver->register('php', function () {
+            return new PhpEngine($this->app['files']);
+        });
+        $finder = new FileViewFinder($this->app['files'], [__DIR__ . '/../resources/views']);
+        $factory = new Factory($resolver, $finder, $this->app['events']);
+        $factory->addExtension('php', 'php');
+
+        return $factory;
+    }
 }

src/Macro.php

@@ -9,8 +9,6 @@ use Illuminate\Support\Collection;
 
 class Macro extends Method
 {
-    protected static $macroDefaults = [];
-
     /**
      * Macro constructor.
      *
@@ -34,10 +32,6 @@ class Macro extends Method
         parent::__construct($method, $alias, $class, $methodName, $interfaces, $classAliases, $returnTypeNormalizers);
     }
 
-    public static function setDefaultReturnTypes(array $map = [])
-    {
-        static::$macroDefaults = array_merge(static::$macroDefaults, $map);
-    }
     /**
      * @param \ReflectionFunctionAbstract $method
      */
@@ -83,12 +77,6 @@ class Macro extends Method
 
             $this->phpdoc->appendTag(Tag::createInstance("@return {$type}"));
         }
-
-        $class = ltrim($this->declaringClassName, '\\');
-        if (!$this->phpdoc->hasTag('return') && isset(static::$macroDefaults[$class])) {
-            $type = static::$macroDefaults[$class];
-            $this->phpdoc->appendTag(Tag::createInstance("@return {$type}"));
-        }
     }
 
     protected function concatReflectionTypes(?\ReflectionType $type): string

src/Method.php

@@ -39,9 +39,6 @@ class Method
     protected $classAliases;
     protected $returnTypeNormalizers;
 
-    /** @var string[] */
-    protected $templateNames = [];
-
     /**
      * @param \ReflectionMethod|\ReflectionFunctionAbstract $method
      * @param string $alias
@@ -50,9 +47,8 @@ class Method
      * @param array $interfaces
      * @param array $classAliases
      * @param array $returnTypeNormalizers
-     * @param string[] $templateNames
      */
-    public function __construct($method, $alias, $class, $methodName = null, $interfaces = [], array $classAliases = [], array $returnTypeNormalizers = [], array $templateNames = [])
+    public function __construct($method, $alias, $class, $methodName = null, $interfaces = [], array $classAliases = [], array $returnTypeNormalizers = [])
     {
         $this->method = $method;
         $this->interfaces = $interfaces;
@@ -60,7 +56,6 @@ class Method
         $this->returnTypeNormalizers = $returnTypeNormalizers;
         $this->name = $methodName ?: $method->name;
         $this->real_name = $method->isClosure() ? $this->name : $method->name;
-        $this->templateNames = $templateNames;
         $this->initClassDefinedProperties($method, $class);
 
         //Reference the 'real' function in the declaring class
@@ -89,7 +84,7 @@ class Method
      */
     protected function initPhpDoc($method)
     {
-        $this->phpdoc = new DocBlock($method, new Context($this->namespace, $this->classAliases, generics: $this->templateNames));
+        $this->phpdoc = new DocBlock($method, new Context($this->namespace, $this->classAliases));
     }
 
     /**
@@ -391,7 +386,7 @@ class Method
         }
         if ($method) {
             $namespace = $method->getDeclaringClass()->getNamespaceName();
-            $phpdoc = new DocBlock($method, new Context($namespace, $this->classAliases, generics: $this->templateNames));
+            $phpdoc = new DocBlock($method, new Context($namespace, $this->classAliases));
 
             if (strpos($phpdoc->getText(), '{@inheritdoc}') !== false) {
                 //Not at the end yet, try another parent/interface..

src/UsesResolver.php

@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * Laravel IDE Helper Generator
+ *
+ * @author    Barry vd. Heuvel <barryvdh@gmail.com>
+ * @copyright 2014 Barry vd. Heuvel / Fruitcake Studio (http://www.fruitcakestudio.nl)
+ * @license   http://www.opensource.org/licenses/mit-license.php MIT
+ * @link      https://github.com/barryvdh/laravel-ide-helper
+ */
+
+namespace Barryvdh\LaravelIdeHelper;
+
+use PhpParser\Node\Stmt\GroupUse;
+use PhpParser\Node\Stmt\Namespace_;
+use PhpParser\Node\Stmt\Use_;
+use PhpParser\Node\Stmt\UseUse;
+use PhpParser\ParserFactory;
+
+class UsesResolver
+{
+    /**
+     * @param string $classFQN
+     * @return array
+     */
+    public function loadFromClass(string $classFQN): array
+    {
+        return $this->loadFromFile(
+            $classFQN,
+            (new \ReflectionClass($classFQN))->getFileName()
+        );
+    }
+
+    /**
+     * @param string $classFQN
+     * @param string $filename
+     * @return array
+     */
+    public function loadFromFile(string $classFQN, string $filename): array
+    {
+        return $this->loadFromCode(
+            $classFQN,
+            file_get_contents(
+                $filename
+            )
+        );
+    }
+
+    /**
+     * @param string $classFQN
+     * @param string $code
+     * @return array
+     */
+    public function loadFromCode(string $classFQN, string $code): array
+    {
+        $classFQN = ltrim($classFQN, '\\');
+
+        $namespace = rtrim(
+            preg_replace(
+                '/([^\\\\]+)$/',
+                '',
+                $classFQN
+            ),
+            '\\'
+        );
+
+        $parser = (new ParserFactory())->createForHostVersion();
+        $namespaceData = null;
+
+        foreach ($parser->parse($code) as $node) {
+            if ($node instanceof Namespace_ && $node->name->toCodeString() === $namespace) {
+                $namespaceData = $node;
+                break;
+            }
+        }
+
+        if ($namespaceData === null) {
+            return [];
+        }
+
+        /** @var Namespace_ $namespaceData */
+
+        $aliases = [];
+
+        foreach ($namespaceData->stmts as $stmt) {
+            if ($stmt instanceof Use_) {
+                if ($stmt->type !== Use_::TYPE_NORMAL) {
+                    continue;
+                }
+
+                foreach ($stmt->uses as $use) {
+                    /** @var UseUse $use */
+
+                    $alias = $use->alias ?
+                        $use->alias->name :
+                        self::classBasename($use->name->toCodeString());
+
+                    $aliases[$alias] = '\\' . $use->name->toCodeString();
+                }
+            } elseif ($stmt instanceof GroupUse) {
+                foreach ($stmt->uses as $use) {
+                    /** @var UseUse $use */
+
+                    $alias = $use->alias ?
+                        $use->alias->name :
+                        self::classBasename($use->name->toCodeString());
+
+                    $aliases[$alias] = '\\' . $stmt->prefix->toCodeString() . '\\' . $use->name->toCodeString();
+                }
+            }
+        }
+
+        return $aliases;
+    }
+
+    /**
+     * @param string $classFQN
+     * @return string
+     */
+    protected static function classBasename(string $classFQN): string
+    {
+        return preg_replace('/^.*\\\\([^\\\\]+)$/', '$1', $classFQN);
+    }
+}

tests/AliasTest.php

@@ -66,21 +66,6 @@ class AliasTest extends TestCase
         $this->assertNotNull($this->getAliasMacro($alias, EloquentBuilder::class, $macro));
     }
 
-    /**
-     * @covers ::detectTemplateNames
-     */
-    public function testTemplateNamesAreDetected(): void
-    {
-        // Mock
-        $alias = new AliasMock();
-
-        // Prepare
-        $alias->setClasses([EloquentBuilder::class]);
-
-        // Test
-        $this->assertSame(['TModel', 'TValue'], $alias->getTemplateNames());
-    }
-
     protected function getAliasMacro(Alias $alias, string $class, string $method): ?Macro
     {
         return Arr::first(
@@ -97,7 +82,6 @@ class AliasTest extends TestCase
 /**
  * @internal
  * @noinspection PhpMultipleClassesDeclarationsInOneFile
- * @template TValue
  */
 class AliasMock extends Alias
 {

tests/Console/EloquentCommandTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\EloquentCommand;
+namespace Barryvdh\LaravelIdeHelper\Tests\Console;
 
 use Barryvdh\LaravelIdeHelper\Console\EloquentCommand;
 use Barryvdh\LaravelIdeHelper\Tests\TestCase;
@@ -23,7 +23,7 @@ class EloquentCommandTest extends TestCase
         }
 
         $actualContent = null;
-        $mockFilesystem = Mockery::mock(Filesystem::class)->makePartial();
+        $mockFilesystem = Mockery::mock(Filesystem::class);
         $mockFilesystem
             ->shouldReceive('get')
             // We don't care about actual args (filename)

tests/Console/GeneratorCommand/AbstractGeneratorCommand.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\GeneratorCommand;
 
 use Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider;
+use Barryvdh\LaravelIdeHelper\Tests\SnapshotPhpDriver;
 use Barryvdh\LaravelIdeHelper\Tests\TestCase;
 
 abstract class AbstractGeneratorCommand extends TestCase
@@ -26,4 +27,9 @@ abstract class AbstractGeneratorCommand extends TestCase
     {
         return [IdeHelperServiceProvider::class];
     }
+
+    protected function assertMatchesMockedSnapshot()
+    {
+        $this->assertMatchesSnapshot($this->mockFilesystemOutput, new SnapshotPhpDriver());
+    }
 }

tests/Console/GeneratorCommand/GenerateEloquentOnly/Test.php

@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\GeneratorCommand\GenerateEloquentOnly;
-
-use Barryvdh\LaravelIdeHelper\Console\GeneratorCommand;
-use Barryvdh\LaravelIdeHelper\Tests\Console\GeneratorCommand\AbstractGeneratorCommand;
-
-class Test extends AbstractGeneratorCommand
-{
-    public function testGenerator(): void
-    {
-        $command = $this->app->make(GeneratorCommand::class);
-
-        $tester = $this->runCommand($command, [
-            '--eloquent' => true,
-        ]);
-
-        $this->assertSame(0, $tester->getStatusCode());
-        $this->assertStringContainsString('A new helper file was written to _ide_helper.php', $tester->getDisplay());
-        $this->assertStringNotContainsString('public static function configure($basePath = null)', $this->mockFilesystemOutput);
-        $this->assertStringContainsString('class Eloquent extends \Illuminate\Database\Eloquent\Model', $this->mockFilesystemOutput);
-    }
-}

tests/Console/GeneratorCommand/GenerateIdeHelper/Test.php

@@ -6,30 +6,18 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\GeneratorCommand\GenerateIdeHe
 
 use Barryvdh\LaravelIdeHelper\Console\GeneratorCommand;
 use Barryvdh\LaravelIdeHelper\Tests\Console\GeneratorCommand\AbstractGeneratorCommand;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\DB;
 
 class Test extends AbstractGeneratorCommand
 {
     public function testGenerator(): void
     {
-        Arr::macro('arr_custom_macro', function () {
-        });
-        DB::macro('db_custom_macro', function () {
-        });
-        $this->app['config']->set('ide-helper.macro_default_return_types', [Arr::class => 'Custom_Fake_Class']);
-
         $command = $this->app->make(GeneratorCommand::class);
 
         $tester = $this->runCommand($command);
 
         $this->assertSame(0, $tester->getStatusCode());
-
         $this->assertStringContainsString('A new helper file was written to _ide_helper.php', $tester->getDisplay());
         $this->assertStringContainsString('public static function configure($basePath = null)', $this->mockFilesystemOutput);
-        $this->assertStringContainsString('* @return \Custom_Fake_Class', $this->mockFilesystemOutput);
-        $this->assertStringContainsString('public static function arr_custom_macro()', $this->mockFilesystemOutput);
-        $this->assertStringContainsString('public static function db_custom_macro()', $this->mockFilesystemOutput);
     }
 
     public function testFilename(): void

tests/Console/MetaCommand/MetaCommandTest.php

@@ -27,7 +27,7 @@ class MetaCommandTest extends TestCase
 
         $mockFileSystem
             ->shouldReceive('getRequire')
-            ->andReturnUsing(function ($__path, $__data = []) {
+            ->andReturnUsing(function ($__path, $__data) {
                 return (static function () use ($__path, $__data) {
                     extract($__data, EXTR_SKIP);
 
@@ -60,7 +60,7 @@ class MetaCommandTest extends TestCase
 
         $mockFileSystem
             ->shouldReceive('getRequire')
-            ->andReturnUsing(function ($__path, $__data = []) {
+            ->andReturnUsing(function ($__path, $__data) {
                 return (static function () use ($__path, $__data) {
                     extract($__data, EXTR_SKIP);
 

tests/Console/ModelsCommand/AbstractModelsCommand.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand;
 
 use Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider;
+use Barryvdh\LaravelIdeHelper\Tests\SnapshotPhpDriver;
 use Barryvdh\LaravelIdeHelper\Tests\TestCase;
 
 abstract class AbstractModelsCommand extends TestCase
@@ -50,7 +51,10 @@ abstract class AbstractModelsCommand extends TestCase
 
         // Don't override integer -> int for tests
         $config->set('ide-helper.type_overrides', []);
+    }
 
-        $config->set('ide-helper.write_model_relation_exists_properties', true);
+    protected function assertMatchesMockedSnapshot()
+    {
+        $this->assertMatchesSnapshot($this->mockFilesystemOutput, new SnapshotPhpDriver());
     }
 }

tests/Console/ModelsCommand/AdvancedCasts/Collections/AdvancedCastMap.php

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Collections;
-
-use Illuminate\Contracts\Support\Arrayable;
-use JsonSerializable;
-
-class AdvancedCastMap implements Arrayable, JsonSerializable
-{
-    public function toArray(): array
-    {
-        return [];
-    }
-
-    public function jsonSerialize(): array
-    {
-        return $this->toArray();
-    }
-}

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

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Models;
 
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Collections\AdvancedCastCollection;
-use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Collections\AdvancedCastMap;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Enums\AdvancedCastEnum;
 use Illuminate\Database\Eloquent\Casts\AsArrayObject;
 use Illuminate\Database\Eloquent\Casts\AsCollection;
@@ -30,9 +29,7 @@ class AdvancedCast extends Model
             'cast_to_encrypted_json' => 'encrypted:json',
             'cast_to_encrypted_object' => 'encrypted:object',
             'cast_to_as_collection' => AsCollection::class,
-            'cast_to_as_collection_of' => AsCollection::class . ':,' . AdvancedCastMap::class, // since 12.10
             'cast_to_as_collection_using' => AsCollection::using(AdvancedCastCollection::class),
-            'cast_to_as_collection_using_and_map' => AsCollection::class . ':' . AdvancedCastCollection::class . ',' . AdvancedCastMap::class, // since 12.10
             'cast_to_as_enum_collection' => AsEnumCollection::class,
             'cast_to_as_enum_collection_of' => AsEnumCollection::of(AdvancedCastEnum::class),
             'cast_to_as_array_object' => AsArrayObject::class,

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

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Models;
 
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Collections\AdvancedCastCollection;
-use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Collections\AdvancedCastMap;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Enums\AdvancedCastEnum;
 use Illuminate\Database\Eloquent\Casts\AsArrayObject;
 use Illuminate\Database\Eloquent\Casts\AsCollection;
@@ -13,6 +12,8 @@ use Illuminate\Database\Eloquent\Casts\AsEnumCollection;
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property \Illuminate\Support\Carbon $cast_to_date_serialization
  * @property \Illuminate\Support\Carbon $cast_to_datetime_serialization
  * @property \Illuminate\Support\Carbon $cast_to_custom_datetime
@@ -20,17 +21,15 @@ use Illuminate\Database\Eloquent\Model;
  * @property \Carbon\CarbonImmutable $cast_to_immutable_custom_datetime
  * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime
  * @property int $cast_to_timestamp
- * @property string $cast_to_encrypted
+ * @property mixed $cast_to_encrypted
- * @property array<array-key, mixed> $cast_to_encrypted_array
+ * @property array $cast_to_encrypted_array
- * @property \Illuminate\Support\Collection<array-key, mixed> $cast_to_encrypted_collection
+ * @property \Illuminate\Support\Collection $cast_to_encrypted_collection
- * @property array<array-key, mixed> $cast_to_encrypted_json
+ * @property array $cast_to_encrypted_json
  * @property object $cast_to_encrypted_object
  * @property \Illuminate\Support\Collection $cast_to_as_collection
  * @property \Illuminate\Support\Collection $cast_to_as_enum_collection
- * @property \Illuminate\Database\Eloquent\Casts\ArrayObject<array-key, mixed> $cast_to_as_array_object
+ * @property \ArrayObject $cast_to_as_array_object
- * @property \Illuminate\Support\Collection<int, AdvancedCastMap> $cast_to_as_collection_of
  * @property AdvancedCastCollection $cast_to_as_collection_using
- * @property AdvancedCastCollection<int, AdvancedCastMap> $cast_to_as_collection_using_and_map
  * @property \Illuminate\Support\Collection<int, AdvancedCastEnum> $cast_to_as_enum_collection_of
  * @method static \Illuminate\Database\Eloquent\Builder<static>|AdvancedCast newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|AdvancedCast newQuery()
@@ -70,9 +69,7 @@ class AdvancedCast extends Model
             'cast_to_encrypted_json' => 'encrypted:json',
             'cast_to_encrypted_object' => 'encrypted:object',
             'cast_to_as_collection' => AsCollection::class,
-            'cast_to_as_collection_of' => AsCollection::class . ':,' . AdvancedCastMap::class, // since 12.10
             'cast_to_as_collection_using' => AsCollection::using(AdvancedCastCollection::class),
-            'cast_to_as_collection_using_and_map' => AsCollection::class . ':' . AdvancedCastCollection::class . ',' . AdvancedCastMap::class, // since 12.10
             'cast_to_as_enum_collection' => AsEnumCollection::class,
             'cast_to_as_enum_collection_of' => AsEnumCollection::of(AdvancedCastEnum::class),
             'cast_to_as_array_object' => AsArrayObject::class,

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

@@ -7,6 +7,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AllowGlobDirecto
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable

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

@@ -7,6 +7,8 @@ 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
  * @property array<int, string> $cast_to_json some-description
  * @property \Illuminate\Support\Collection<int, string> $cast_to_collection some-description

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

@@ -8,6 +8,8 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $name
  * @property string|null $name_read
@@ -83,6 +85,8 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property int $id
  * @property int $diverging_type_hinted_get_and_set
  * @property string|null $name

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

@@ -10,6 +10,8 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
+ * 
+ *
  * @property int $id
  * @property string $both_same_name I'm a getter
  * @property string $both_without_getter_comment
@@ -21,7 +23,6 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
  * @property-read string $not_comment
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationHasMany HasMany relations.
  * @property-read int|null $relation_has_many_count
- * @property-read bool|null $relation_has_many_exists
  * @property-read Simple|null $relationHasOne Others relations.
  * @property-read Model|\Eloquent $relationMorphTo MorphTo relations.
  * @property-write mixed $first_name Set the user's first name.

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

@@ -9,10 +9,11 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
+ * 
+ *
  * @property int $id
  * @property-read SimpleCollection<int, Simple> $relationHasMany
  * @property-read int|null $relation_has_many_count
- * @property-read bool|null $relation_has_many_exists
  * @method static SimpleCollection<int, static> all($columns = ['*'])
  * @method static SimpleCollection<int, static> get($columns = ['*'])
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newModelQuery()

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;
 
 /**
+ * 
+ *
  * @property \Carbon\CarbonImmutable|null $created_at
  * @property \Carbon\CarbonImmutable|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder<static>|CustomDate newModelQuery()

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

@@ -13,6 +13,8 @@
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGeneratePhpdocWithExternalEloquentBuilder\Models{
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable

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

@@ -10,9 +10,10 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
 /**
+ * 
+ *
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Dynamic> $regularHasMany
  * @property-read int|null $regular_has_many_count
- * @property-read bool|null $regular_has_many_exists
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Dynamic newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Dynamic newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Dynamic query()

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

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

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

@@ -9,6 +9,8 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable

tests/Console/ModelsCommand/GenerateBasicPhpdoc/Test.php

@@ -19,8 +19,6 @@ class Test extends AbstractModelsCommand
 
         $this->assertSame(0, $tester->getStatusCode());
         $this->assertStringContainsString('Written new phpDocBlock to', $tester->getDisplay());
-        $this->assertStringContainsString('Do you want to generate a minimal helper to generate the Eloquent methods?', $tester->getDisplay());
-
         $this->assertMatchesMockedSnapshot();
     }
 }

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

@@ -7,6 +7,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable

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

@@ -7,6 +7,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $charNullable
  * @property string $charNotNullable

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

@@ -7,6 +7,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable

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

@@ -1,11 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocWithEloquentHelper\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Post extends Model
-{
-}

tests/Console/ModelsCommand/GenerateBasicPhpdocWithEloquentHelper/Test.php

@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocWithEloquentHelper;
-
-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,
-            '--write-eloquent-helper' => true,
-        ]);
-
-        $this->assertSame(0, $tester->getStatusCode());
-        $this->assertStringContainsString('Written new phpDocBlock to', $tester->getDisplay());
-        $this->assertStringNotContainsString('Do you want to generate a minimal helper to generate the Eloquent methods?', $tester->getDisplay());
-        $this->assertStringContainsString('Eloquent helper was written to _ide_helper.php', $tester->getDisplay());
-
-        //        $this->assertMatchesMockedSnapshot();
-    }
-}

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

@@ -1,161 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocWithEloquentHelper\Models;
-
-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 \Illuminate\Database\Eloquent\Builder<static>|Post newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post query()
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereBigIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereBigIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereBinaryNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereBinaryNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereBooleanNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereBooleanNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereCharNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereCharNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDateNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDateNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDatetimeNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDatetimeNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDatetimetzNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDatetimetzNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDecimalNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDecimalNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDoubleNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDoubleNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereEnumNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereEnumNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereFloatNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereFloatNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereIpaddressNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereIpaddressNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereJsonNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereJsonNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereJsonbNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereJsonbNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereLongTextNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereLongTextNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereMacaddressNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereMacaddressNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereMediumIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereMediumIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereMediumTextNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereMediumTextNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereSmallIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereSmallIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereStringNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereStringNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTextNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTextNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimeNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimeNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimestampNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimestampNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimestamptzNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimestamptzNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimetzNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimetzNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTinyIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTinyIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedBigIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedBigIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedMediumIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedMediumIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedSmallIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedSmallIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedTinyIntegerNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedTinyIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUuidNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUuidNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereYearNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereYearNullable($value)
- * @mixin \Eloquent
- */
-class Post extends Model
-{
-}

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

@@ -67,6 +67,8 @@ class WithCollection extends Model
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\Models{
 /**
+ * 
+ *
  * @property-read \Illuminate\Support\Collection<int, string> $collection
  * @property-read \Illuminate\Support\Collection<\Illuminate\Support\Collection, \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\CollectionModel<\Illuminate\Support\Collection, \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\CollectionModel<int, \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\NonModel>>> $collection_with_nested_template
  * @property-read \Illuminate\Support\Collection<int, \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\NonModel> $collection_with_non_model_template

tests/Console/ModelsCommand/GeneratePhpDocWithTypedScopeParameter/Models/Comment.php

@@ -1,251 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpDocWithTypedScopeParameter\Models;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-
-class Comment extends Model
-{
-    /**
-     * @comment Scope with required boolean parameter
-     */
-    protected function scopeTyped01(Builder $query, bool $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional boolean parameter and default true
-     */
-    protected function scopeTyped02(Builder $query, bool $value = true)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional boolean parameter and default false
-     */
-    protected function scopeTyped03(Builder $query, bool $value = false)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with required string parameter
-     */
-    protected function scopeTyped04(Builder $query, string $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional string parameter and default value
-     */
-    protected function scopeTyped05(Builder $query, string $value = 'dummy123')
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with required integer parameter
-     */
-    protected function scopeTyped06(Builder $query, int $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional integer parameter and default positive value
-     */
-    protected function scopeTyped07(Builder $query, int $value = 123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional integer parameter and default negative value
-     */
-    protected function scopeTyped08(Builder $query, int $value = -123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with required float parameter
-     */
-    protected function scopeTyped09(Builder $query, float $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional float parameter and default positive integer value
-     */
-    protected function scopeTyped10(Builder $query, float $value = 123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional float parameter and default negative integer value
-     */
-    protected function scopeTyped11(Builder $query, float $value = -123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional float parameter and default positive float value
-     */
-    protected function scopeTyped12(Builder $query, float $value = 1.23)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional float parameter and default negative float value
-     */
-    protected function scopeTyped13(Builder $query, float $value = -1.23)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with required nullable boolean parameter
-     */
-    protected function scopeTyped14(Builder $query, ?bool $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable boolean parameter and default true
-     */
-    protected function scopeTyped15(Builder $query, ?bool $value = true)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable boolean parameter and default false
-     */
-    protected function scopeTyped16(Builder $query, ?bool $value = false)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable boolean parameter and default null
-     */
-    protected function scopeTyped17(Builder $query, ?bool $value = null)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with required nullable string parameter
-     */
-    protected function scopeTyped18(Builder $query, ?string $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable string parameter and default value
-     */
-    protected function scopeTyped19(Builder $query, ?string $value = 'dummy123')
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable string parameter and default null
-     */
-    protected function scopeTyped20(Builder $query, ?string $value = null)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with required nullable integer parameter
-     */
-    protected function scopeTyped21(Builder $query, ?int $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable integer parameter and default positive value
-     */
-    protected function scopeTyped22(Builder $query, ?int $value = 123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable integer parameter and default negative value
-     */
-    protected function scopeTyped23(Builder $query, ?int $value = -123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable integer parameter and default null
-     */
-    protected function scopeTyped24(Builder $query, ?int $value = null)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with required float nullable parameter
-     */
-    protected function scopeTyped25(Builder $query, ?float $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable float parameter and default positive integer value
-     */
-    protected function scopeTyped26(Builder $query, ?float $value = 123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable float parameter and default negative integer value
-     */
-    protected function scopeTyped27(Builder $query, ?float $value = -123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional float parameter and default positive float value
-     */
-    protected function scopeTyped28(Builder $query, ?float $value = 1.23)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional float parameter and default negative float value
-     */
-    protected function scopeTyped29(Builder $query, ?float $value = -1.23)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional float parameter and default null
-     */
-    protected function scopeTyped30(Builder $query, ?float $value = null)
-    {
-        $query->where('type', $value);
-    }
-}

tests/Console/ModelsCommand/GeneratePhpDocWithTypedScopeParameter/Test.php

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

@@ -1,287 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpDocWithTypedScopeParameter\Models;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @method static Builder<static>|Comment newModelQuery()
- * @method static Builder<static>|Comment newQuery()
- * @method static Builder<static>|Comment query()
- * @method static Builder<static>|Comment typed01(bool $value) Scope with required boolean parameter
- * @method static Builder<static>|Comment typed02(bool $value = true) Scope with optional boolean parameter and default true
- * @method static Builder<static>|Comment typed03(bool $value = false) Scope with optional boolean parameter and default false
- * @method static Builder<static>|Comment typed04(string $value) Scope with required string parameter
- * @method static Builder<static>|Comment typed05(string $value = 'dummy123') Scope with optional string parameter and default value
- * @method static Builder<static>|Comment typed06(int $value) Scope with required integer parameter
- * @method static Builder<static>|Comment typed07(int $value = 123) Scope with optional integer parameter and default positive value
- * @method static Builder<static>|Comment typed08(int $value = -123) Scope with optional integer parameter and default negative value
- * @method static Builder<static>|Comment typed09(float $value) Scope with required float parameter
- * @method static Builder<static>|Comment typed10(float $value = 123) Scope with optional float parameter and default positive integer value
- * @method static Builder<static>|Comment typed11(float $value = -123) Scope with optional float parameter and default negative integer value
- * @method static Builder<static>|Comment typed12(float $value = 1.23) Scope with optional float parameter and default positive float value
- * @method static Builder<static>|Comment typed13(float $value = -1.23) Scope with optional float parameter and default negative float value
- * @method static Builder<static>|Comment typed14(?bool $value) Scope with required nullable boolean parameter
- * @method static Builder<static>|Comment typed15(?bool $value = true) Scope with optional nullable boolean parameter and default true
- * @method static Builder<static>|Comment typed16(?bool $value = false) Scope with optional nullable boolean parameter and default false
- * @method static Builder<static>|Comment typed17(?bool $value = null) Scope with optional nullable boolean parameter and default null
- * @method static Builder<static>|Comment typed18(?string $value) Scope with required nullable string parameter
- * @method static Builder<static>|Comment typed19(?string $value = 'dummy123') Scope with optional nullable string parameter and default value
- * @method static Builder<static>|Comment typed20(?string $value = null) Scope with optional nullable string parameter and default null
- * @method static Builder<static>|Comment typed21(?int $value) Scope with required nullable integer parameter
- * @method static Builder<static>|Comment typed22(?int $value = 123) Scope with optional nullable integer parameter and default positive value
- * @method static Builder<static>|Comment typed23(?int $value = -123) Scope with optional nullable integer parameter and default negative value
- * @method static Builder<static>|Comment typed24(?int $value = null) Scope with optional nullable integer parameter and default null
- * @method static Builder<static>|Comment typed25(?float $value) Scope with required float nullable parameter
- * @method static Builder<static>|Comment typed26(?float $value = 123) Scope with optional nullable float parameter and default positive integer value
- * @method static Builder<static>|Comment typed27(?float $value = -123) Scope with optional nullable float parameter and default negative integer value
- * @method static Builder<static>|Comment typed28(?float $value = 1.23) Scope with optional float parameter and default positive float value
- * @method static Builder<static>|Comment typed29(?float $value = -1.23) Scope with optional float parameter and default negative float value
- * @method static Builder<static>|Comment typed30(?float $value = null) Scope with optional float parameter and default null
- * @mixin \Eloquent
- */
-class Comment extends Model
-{
-    /**
-     * @comment Scope with required boolean parameter
-     */
-    protected function scopeTyped01(Builder $query, bool $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional boolean parameter and default true
-     */
-    protected function scopeTyped02(Builder $query, bool $value = true)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional boolean parameter and default false
-     */
-    protected function scopeTyped03(Builder $query, bool $value = false)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with required string parameter
-     */
-    protected function scopeTyped04(Builder $query, string $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional string parameter and default value
-     */
-    protected function scopeTyped05(Builder $query, string $value = 'dummy123')
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with required integer parameter
-     */
-    protected function scopeTyped06(Builder $query, int $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional integer parameter and default positive value
-     */
-    protected function scopeTyped07(Builder $query, int $value = 123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional integer parameter and default negative value
-     */
-    protected function scopeTyped08(Builder $query, int $value = -123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with required float parameter
-     */
-    protected function scopeTyped09(Builder $query, float $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional float parameter and default positive integer value
-     */
-    protected function scopeTyped10(Builder $query, float $value = 123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional float parameter and default negative integer value
-     */
-    protected function scopeTyped11(Builder $query, float $value = -123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional float parameter and default positive float value
-     */
-    protected function scopeTyped12(Builder $query, float $value = 1.23)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional float parameter and default negative float value
-     */
-    protected function scopeTyped13(Builder $query, float $value = -1.23)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with required nullable boolean parameter
-     */
-    protected function scopeTyped14(Builder $query, ?bool $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable boolean parameter and default true
-     */
-    protected function scopeTyped15(Builder $query, ?bool $value = true)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable boolean parameter and default false
-     */
-    protected function scopeTyped16(Builder $query, ?bool $value = false)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable boolean parameter and default null
-     */
-    protected function scopeTyped17(Builder $query, ?bool $value = null)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with required nullable string parameter
-     */
-    protected function scopeTyped18(Builder $query, ?string $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable string parameter and default value
-     */
-    protected function scopeTyped19(Builder $query, ?string $value = 'dummy123')
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable string parameter and default null
-     */
-    protected function scopeTyped20(Builder $query, ?string $value = null)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with required nullable integer parameter
-     */
-    protected function scopeTyped21(Builder $query, ?int $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable integer parameter and default positive value
-     */
-    protected function scopeTyped22(Builder $query, ?int $value = 123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable integer parameter and default negative value
-     */
-    protected function scopeTyped23(Builder $query, ?int $value = -123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable integer parameter and default null
-     */
-    protected function scopeTyped24(Builder $query, ?int $value = null)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with required float nullable parameter
-     */
-    protected function scopeTyped25(Builder $query, ?float $value)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable float parameter and default positive integer value
-     */
-    protected function scopeTyped26(Builder $query, ?float $value = 123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional nullable float parameter and default negative integer value
-     */
-    protected function scopeTyped27(Builder $query, ?float $value = -123)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional float parameter and default positive float value
-     */
-    protected function scopeTyped28(Builder $query, ?float $value = 1.23)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional float parameter and default negative float value
-     */
-    protected function scopeTyped29(Builder $query, ?float $value = -1.23)
-    {
-        $query->where('type', $value);
-    }
-
-    /**
-     * @comment Scope with optional float parameter and default null
-     */
-    protected function scopeTyped30(Builder $query, ?float $value = null)
-    {
-        $query->where('type', $value);
-    }
-}

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

@@ -13,6 +13,8 @@
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Models{
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable

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

@@ -8,6 +8,8 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExte
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable

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

@@ -9,6 +9,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
@@ -82,7 +84,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @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 int|null $posts_count
- * @property-read bool|null $posts_exists
  * @method static \Illuminate\Database\Eloquent\Builder<static>|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post null(string $unusedParam)
@@ -159,7 +160,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static \Illuminate\Database\Eloquent\Builder<static>|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUuidNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereYearNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereYearNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post withTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post withoutTrashed()
  * @mixin \Eloquent
  */

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

@@ -15,6 +15,8 @@ use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Support\Carbon;
 
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $char_nullable
  * @property CastType $char_not_nullable
@@ -88,7 +90,6 @@ use Illuminate\Support\Carbon;
  * @property Carbon|null $updated_at
  * @property-read Collection<int, Post> $posts
  * @property-read int|null $posts_count
- * @property-read bool|null $posts_exists
  * @method static EloquentBuilder<static>|Post newModelQuery()
  * @method static EloquentBuilder<static>|Post newQuery()
  * @method static EloquentBuilder<static>|Post null(string $unusedParam)
@@ -165,7 +166,7 @@ use Illuminate\Support\Carbon;
  * @method static EloquentBuilder<static>|Post whereUuidNullable($value)
  * @method static EloquentBuilder<static>|Post whereYearNotNullable($value)
  * @method static EloquentBuilder<static>|Post whereYearNullable($value)
- * @method static EloquentBuilder<static>|Post withTrashed(bool $withTrashed = true)
+ * @method static EloquentBuilder<static>|Post withTrashed()
  * @method static EloquentBuilder<static>|Post withoutTrashed()
  * @mixin Eloquent
  */

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

@@ -13,6 +13,8 @@
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Models{
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable

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

@@ -45,6 +45,8 @@ class Post extends Model
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models{
 /**
+ * 
+ *
  * @property $someProp
  * @method someMethod(string $method)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|FinalPost newModelQuery()
@@ -58,6 +60,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models{
 /**
+ * 
+ *
  * @property $someProp
  * @method someMethod(string $method)
  * @property int $id

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

@@ -9,13 +9,13 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
+ * 
+ *
  * @property int $id
  * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $regularBelongsToMany
  * @property-read int|null $regular_belongs_to_many_count
- * @property-read bool|null $regular_belongs_to_many_exists
  * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $regularHasMany
  * @property-read int|null $regular_has_many_count
- * @property-read bool|null $regular_has_many_exists
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple query()

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

@@ -8,6 +8,8 @@ use DateTime;
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property int $id
  * @property-read int|null $attribute_return_type_int_or_null
  * @property-read array $attribute_returns_array

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;
 
 /**
+ * 
+ *
  * @method static \Illuminate\Database\Eloquent\Builder<static>|NotIgnored newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|NotIgnored newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|NotIgnored query()

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

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

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

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

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

@@ -7,6 +7,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\MagicWhere\Model
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable

tests/Console/ModelsCommand/ModelHooks/Test.php

@@ -9,6 +9,8 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ModelHooks\Hooks\CustomMethod;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ModelHooks\Hooks\CustomProperty;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ModelHooks\Hooks\UnsetMethod;
+use Illuminate\Filesystem\Filesystem;
+use Mockery;
 
 class Test extends AbstractModelsCommand
 {
@@ -32,6 +34,24 @@ class Test extends AbstractModelsCommand
 
     public function test(): void
     {
+        $actualContent = null;
+
+        $mockFilesystem = Mockery::mock(Filesystem::class);
+        $mockFilesystem
+            ->shouldReceive('get')
+            ->andReturn(file_get_contents(__DIR__ . '/Models/Simple.php'))
+            ->once();
+        $mockFilesystem
+            ->shouldReceive('put')
+            ->with(
+                Mockery::any(),
+                Mockery::capture($actualContent)
+            )
+            ->andReturn(1) // Simulate we wrote _something_ to the file
+            ->once();
+
+        $this->instance(Filesystem::class, $mockFilesystem);
+
         $command = $this->app->make(ModelsCommand::class);
 
         $tester = $this->runCommand($command, [
@@ -40,6 +60,33 @@ class Test extends AbstractModelsCommand
 
         $this->assertSame(0, $tester->getStatusCode());
         $this->assertStringContainsString('Written new phpDocBlock to', $tester->getDisplay());
-        $this->assertMatchesMockedSnapshot();
+
+        $expectedContent = <<<'PHP'
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ModelHooks\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * 
+ *
+ * @property int $id
+ * @property-read string $custom
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple custom($custom)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple query()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple whereId($value)
+ * @mixin \Eloquent
+ */
+class Simple extends Model
+{
+}
+
+PHP;
+
+        $this->assertSame($expectedContent, $actualContent);
     }
 }

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

@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ModelHooks\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @property int $id
- * @property-read string $custom
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple custom($custom)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple query()
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple whereId($value)
- * @mixin \Eloquent
- */
-class Simple extends Model
-{
-}

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

@@ -8,6 +8,8 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
+ * 
+ *
  * @property string $relation_morph_to_type
  * @property int $relation_morph_to_id
  * @property string|null $nullable_relation_morph_to_type

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

@@ -7,6 +7,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspec
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property int $id
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newQuery()

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

@@ -7,6 +7,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspec
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property int $id
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newQuery()

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

@@ -9,24 +9,21 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Pivot\Models\Pivots\Di
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property-read DifferentCustomPivot|CustomPivot|null $pivot
  * @property-read \Illuminate\Database\Eloquent\Collection<int, ModelWithPivot> $relationCustomPivotUsingSameAccessor
  * @property-read int|null $relation_custom_pivot_using_same_accessor_count
- * @property-read bool|null $relation_custom_pivot_using_same_accessor_exists
  * @property-read \Illuminate\Database\Eloquent\Collection<int, ModelWithPivot> $relationCustomPivotUsingSameAccessorAndClass
  * @property-read int|null $relation_custom_pivot_using_same_accessor_and_class_count
- * @property-read bool|null $relation_custom_pivot_using_same_accessor_and_class_exists
  * @property-read CustomPivot|null $customAccessor
  * @property-read \Illuminate\Database\Eloquent\Collection<int, ModelWithPivot> $relationWithCustomPivot
  * @property-read int|null $relation_with_custom_pivot_count
- * @property-read bool|null $relation_with_custom_pivot_exists
  * @property-read DifferentCustomPivot|null $differentCustomAccessor
  * @property-read \Illuminate\Database\Eloquent\Collection<int, ModelWithPivot> $relationWithDifferentCustomPivot
  * @property-read int|null $relation_with_different_custom_pivot_count
- * @property-read bool|null $relation_with_different_custom_pivot_exists
  * @property-read \Illuminate\Database\Eloquent\Collection<int, ModelWithPivot> $relationWithDifferentCustomPivotUsingSameAccessor
  * @property-read int|null $relation_with_different_custom_pivot_using_same_accessor_count
- * @property-read bool|null $relation_with_different_custom_pivot_using_same_accessor_exists
  * @method static \Illuminate\Database\Eloquent\Builder<static>|ModelWithPivot newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|ModelWithPivot newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|ModelWithPivot query()
@@ -78,6 +75,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Pivot\Models\Piv
 use Illuminate\Database\Eloquent\Relations\Pivot;
 
 /**
+ * 
+ *
  * @method static \Illuminate\Database\Eloquent\Builder<static>|CustomPivot newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|CustomPivot newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|CustomPivot query()
@@ -95,6 +94,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Pivot\Models\Piv
 use Illuminate\Database\Eloquent\Relations\Pivot;
 
 /**
+ * 
+ *
  * @method static \Illuminate\Database\Eloquent\Builder<static>|DifferentCustomPivot newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|DifferentCustomPivot newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|DifferentCustomPivot query()

tests/Console/ModelsCommand/QueryScopes/Models/Comment.php

@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\QueryScopes\Models;
-
-use Illuminate\Database\Eloquent\Attributes\Scope;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-
-class Comment extends Model
-{
-    /**
-     * @comment Scope using the 'Scope' attribute
-     * @param Builder $query
-     * @return void
-     */
-    #[Scope]
-    protected function local(Builder $query): void
-    {
-        $query->where('ip_address', '127.0.0.1');
-    }
-
-    /**
-     * @comment Scope using the 'scope' prefix
-     * @param Builder $query
-     * @return void
-     */
-    protected function scopeSystem(Builder $query): void
-    {
-        $query->where('system', true);
-    }
-}

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

@@ -4,48 +4,9 @@ declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\QueryScopes\Models;
 
-use Illuminate\Database\Eloquent\Attributes\Scope;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @method static Builder<static>|Comment local() Scope using the 'Scope' attribute
- * @method static Builder<static>|Comment newModelQuery()
- * @method static Builder<static>|Comment newQuery()
- * @method static Builder<static>|Comment query()
- * @method static Builder<static>|Comment system() Scope using the 'scope' prefix
- * @mixin \Eloquent
- */
-class Comment extends Model
-{
-    /**
-     * @comment Scope using the 'Scope' attribute
-     * @param Builder $query
-     * @return void
-     */
-    #[Scope]
-    protected function local(Builder $query): void
-    {
-        $query->where('ip_address', '127.0.0.1');
-    }
-
-    /**
-     * @comment Scope using the 'scope' prefix
-     * @param Builder $query
-     * @return void
-     */
-    protected function scopeSystem(Builder $query): void
-    {
-        $query->where('system', true);
-    }
-}
-<?php
-
-declare(strict_types=1);
-
-namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\QueryScopes\Models;
-
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
@@ -211,6 +172,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\QueryScopes\Mode
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @method static \Illuminate\Database\Eloquent\Builder<static>|PostParent active()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|PostParent newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|PostParent newQuery()

tests/Console/ModelsCommand/RelationCountProperties/Test.php

@@ -14,7 +14,6 @@ class Test extends AbstractModelsCommand
         parent::getEnvironmentSetUp($app);
 
         $app['config']->set('ide-helper.write_model_relation_count_properties', false);
-        $app['config']->set('ide-helper.write_model_relation_exists_properties', false);
     }
 
     public function test(): void

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

@@ -8,6 +8,8 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
+ * 
+ *
  * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable

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

@@ -8,6 +8,8 @@ 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
@@ -59,6 +61,8 @@ 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
@@ -128,39 +132,33 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 
 /**
+ * 
+ *
  * @property int $id
  * @property-read Simple $relationBelongsTo
  * @property-read AnotherModel $relationBelongsToInAnotherNamespace
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationBelongsToMany
  * @property-read int|null $relation_belongs_to_many_count
- * @property-read bool|null $relation_belongs_to_many_exists
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationBelongsToManyWithSub
  * @property-read int|null $relation_belongs_to_many_with_sub_count
- * @property-read bool|null $relation_belongs_to_many_with_sub_exists
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationBelongsToManyWithSubAnother
  * @property-read int|null $relation_belongs_to_many_with_sub_another_count
- * @property-read bool|null $relation_belongs_to_many_with_sub_another_exists
  * @property-read AnotherModel $relationBelongsToSameNameAsColumn
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationHasMany
  * @property-read int|null $relation_has_many_count
- * @property-read bool|null $relation_has_many_exists
  * @property-read Simple|null $relationHasOne
  * @property-read Simple $relationHasOneWithDefault
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationMorphMany
  * @property-read int|null $relation_morph_many_count
- * @property-read bool|null $relation_morph_many_exists
  * @property-read Simple|null $relationMorphOne
  * @property-read Model|\Eloquent $relationMorphTo
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationMorphedByMany
  * @property-read int|null $relation_morphed_by_many_count
- * @property-read bool|null $relation_morphed_by_many_exists
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationSampleRelationType
  * @property-read int|null $relation_sample_relation_type_count
- * @property-read bool|null $relation_sample_relation_type_exists
  * @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 bool|null $relation_sample_to_any_relation_type_exists
  * @property-read Simple $relationSampleToBadlyNamedNotManyRelation
  * @property-read Simple $relationSampleToManyRelationType
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newModelQuery()

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

@@ -8,6 +8,8 @@ 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
@@ -59,6 +61,8 @@ 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
@@ -128,39 +132,33 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 
 /**
+ * 
+ *
  * @property int $id
  * @property-read Simple|null $relationBelongsTo
  * @property-read AnotherModel|null $relationBelongsToInAnotherNamespace
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationBelongsToMany
  * @property-read int|null $relation_belongs_to_many_count
- * @property-read bool|null $relation_belongs_to_many_exists
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationBelongsToManyWithSub
  * @property-read int|null $relation_belongs_to_many_with_sub_count
- * @property-read bool|null $relation_belongs_to_many_with_sub_exists
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationBelongsToManyWithSubAnother
  * @property-read int|null $relation_belongs_to_many_with_sub_another_count
- * @property-read bool|null $relation_belongs_to_many_with_sub_another_exists
  * @property-read AnotherModel|null $relationBelongsToSameNameAsColumn
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationHasMany
  * @property-read int|null $relation_has_many_count
- * @property-read bool|null $relation_has_many_exists
  * @property-read Simple|null $relationHasOne
  * @property-read Simple $relationHasOneWithDefault
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationMorphMany
  * @property-read int|null $relation_morph_many_count
- * @property-read bool|null $relation_morph_many_exists
  * @property-read Simple|null $relationMorphOne
  * @property-read Model|\Eloquent $relationMorphTo
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationMorphedByMany
  * @property-read int|null $relation_morphed_by_many_count
- * @property-read bool|null $relation_morphed_by_many_exists
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationSampleRelationType
  * @property-read int|null $relation_sample_relation_type_count
- * @property-read bool|null $relation_sample_relation_type_exists
  * @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 bool|null $relation_sample_to_any_relation_type_exists
  * @property-read Simple $relationSampleToBadlyNamedNotManyRelation
  * @property-read Simple $relationSampleToManyRelationType
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newModelQuery()

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

@@ -7,6 +7,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SimpleCasts\Mode
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property int $cast_to_int
  * @property int $cast_to_integer
  * @property float $cast_to_real
@@ -17,9 +19,9 @@ use Illuminate\Database\Eloquent\Model;
  * @property bool $cast_to_bool
  * @property bool $cast_to_boolean
  * @property object $cast_to_object
- * @property array<array-key, mixed> $cast_to_array
+ * @property array $cast_to_array
- * @property array<array-key, mixed> $cast_to_json
+ * @property array $cast_to_json
- * @property \Illuminate\Support\Collection<array-key, mixed> $cast_to_collection
+ * @property \Illuminate\Support\Collection $cast_to_collection
  * @property \Illuminate\Support\Carbon $cast_to_date
  * @property \Illuminate\Support\Carbon $cast_to_datetime
  * @property \Illuminate\Support\Carbon $cast_to_date_serialization
@@ -31,10 +33,10 @@ use Illuminate\Database\Eloquent\Model;
  * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime
  * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime_serialization
  * @property int $cast_to_timestamp
- * @property string $cast_to_encrypted
+ * @property mixed $cast_to_encrypted
- * @property array<array-key, mixed> $cast_to_encrypted_array
+ * @property array $cast_to_encrypted_array
- * @property \Illuminate\Support\Collection<array-key, mixed> $cast_to_encrypted_collection
+ * @property \Illuminate\Support\Collection $cast_to_encrypted_collection
- * @property array<array-key, mixed> $cast_to_encrypted_json
+ * @property array $cast_to_encrypted_json
  * @property object $cast_to_encrypted_object
  * @method static \Illuminate\Database\Eloquent\Builder<static>|SimpleCast newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|SimpleCast newQuery()

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

@@ -8,13 +8,15 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
+ * 
+ *
  * @property int $id
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple query()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple withTrashed(bool $withTrashed = true)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple withTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple withoutTrashed()
  * @mixin \Eloquent
  */

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

@@ -9,10 +9,11 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Query\Builder;
 
 /**
+ * 
+ *
  * @property-read string|int|null $foo
  * @property-read \Illuminate\Database\Eloquent\Collection<int, UnionTypeModel> $withUnionTypeReturn
  * @property-read int|null $with_union_type_return_count
- * @property-read bool|null $with_union_type_return_exists
  * @method static \Illuminate\Database\Eloquent\Builder<static>|UnionTypeModel newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|UnionTypeModel newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|UnionTypeModel query()

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

@@ -8,6 +8,8 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * 
+ *
  * @property int $id
  * @method static Builder<static>|Simple newModelQuery()
  * @method static Builder<static>|Simple newQuery()

tests/Console/__snapshots__/EloquentCommandTest__testCommand__1.txt

@@ -1,4 +1,6 @@
 /**
+ * 
+ *
  * @mixin \Eloquent
  * @mixin \Illuminate\Database\Eloquent\Builder
  * @mixin \Illuminate\Database\Query\Builder

tests/MacroTest.php

@@ -242,11 +242,13 @@ class MacroTest extends TestCase
         $macro = new Macro($reflectionMethod, 'URL', new ReflectionClass(UrlGenerator::class), 'macroName');
         $output = <<<'DOC'
 /**
+ * 
+ *
  * @param string $foo
  * @param int $bar
- * @return string
+ * @return string 
  * @see \Barryvdh\LaravelIdeHelper\Tests\UrlGeneratorMacroClass::__invoke()
- * @static
+ * @static 
  */
 DOC;
         $this->assertSame($output, $macro->getDocComment(''));

tests/MethodTest.php

@@ -36,10 +36,12 @@ class MethodTest extends TestCase
 
         $output = <<<'DOC'
 /**
+ * 
+ *
  * @param string $last
  * @param string $first
  * @param string $middle
- * @static
+ * @static 
  */
 DOC;
         $this->assertSame($output, $method->getDocComment(''));
@@ -69,8 +71,8 @@ DOC;
  * @param array $values
  * @param array|string $uniqueBy
  * @param array|null $update
- * @return int
+ * @return int 
- * @static
+ * @static 
  */
 DOC;
         $this->assertSame($output, $method->getDocComment(''));
@@ -102,8 +104,8 @@ DOC;
  * @param mixed $operator
  * @param mixed $value
  * @param string $boolean
- * @return \Illuminate\Database\Eloquent\Builder<static>
+ * @return \Illuminate\Database\Eloquent\Builder<static> 
- * @static
+ * @static 
  */
 DOC;
         $this->assertSame($output, $method->getDocComment(''));
@@ -132,8 +134,8 @@ DOC;
  * @param string|array|\Illuminate\Contracts\Database\Query\Expression $columns
  * @param string $boolean
  * @param bool $not
- * @return \Illuminate\Database\Eloquent\Builder<static>
+ * @return \Illuminate\Database\Eloquent\Builder<static> 
- * @static
+ * @static 
  */
 DOC;
 
@@ -175,8 +177,10 @@ DOC;
 
         $output = <<<'DOC'
 /**
- * @return \Illuminate\Foundation\Application
+ * 
- * @static
+ *
+ * @return \Illuminate\Foundation\Application 
+ * @static 
  */
 DOC;
 
@@ -189,29 +193,6 @@ DOC;
         $this->assertSame([], $method->getParamsWithDefault(false));
         $this->assertTrue($method->shouldReturn());
     }
-
-    public function testEloquentBuilderWithTemplates()
-    {
-        $reflectionClass = new \ReflectionClass(EloquentBuilder::class);
-        $reflectionMethod = $reflectionClass->getMethod('firstOr');
-
-        $method = new Method($reflectionMethod, 'Builder', $reflectionClass, null, [], [], [], ['TModel']);
-
-        $output =  <<<'DOC'
-/**
- * Execute the query and get the first result or call a callback.
- *
- * @template TValue
- * @param (\Closure(): TValue)|list<string> $columns
- * @param (\Closure(): TValue)|null $callback
- * @return TModel|TValue
- * @static
- */
-DOC;
-        $this->assertSame($output, $method->getDocComment(''));
-        $this->assertSame('firstOr', $method->getName());
-        $this->assertSame('\\' . EloquentBuilder::class, $method->getDeclaringClass());
-    }
 }
 
 class ExampleClass

tests/SnapshotPhpDriver.php

@@ -11,7 +11,7 @@ class SnapshotPhpDriver implements Driver
 {
     public function serialize($data): string
     {
-        return str_replace(["\r\n", "\r"], "\n", (string) $data);
+        return (string) $data;
     }
 
     public function extension(): string
@@ -21,6 +21,6 @@ class SnapshotPhpDriver implements Driver
 
     public function match($expected, $actual)
     {
-        Assert::assertSame(str_replace(["\r\n", "\r"], "\n", $expected), $this->serialize($actual));
+        Assert::assertSame($expected, $this->serialize($actual));
     }
 }

tests/SnapshotTxtDriver.php

@@ -11,7 +11,7 @@ class SnapshotTxtDriver implements Driver
 {
     public function serialize($data): string
     {
-        return str_replace(["\r\n", "\r"], "\n", (string) $data);
+        return (string) $data;
     }
 
     public function extension(): string
@@ -21,6 +21,6 @@ class SnapshotTxtDriver implements Driver
 
     public function match($expected, $actual)
     {
-        Assert::assertSame(str_replace(["\r\n", "\r"], "\n", $expected), $this->serialize($actual));
+        Assert::assertSame($expected, $this->serialize($actual));
     }
 }

tests/TestCase.php

@@ -55,11 +55,6 @@ abstract class TestCase extends BaseTestCase
         $this->assertMatchesSnapshot($actualContent, new SnapshotTxtDriver());
     }
 
-    protected function assertMatchesMockedSnapshot()
-    {
-        $this->assertMatchesSnapshot($this->mockFilesystemOutput, new SnapshotPhpDriver());
-    }
-
     protected function mockFilesystem()
     {
         $mockFilesystem = Mockery::mock(Filesystem::class)->makePartial();
@@ -71,7 +66,6 @@ abstract class TestCase extends BaseTestCase
                 Mockery::any()
             )
             ->andReturnUsing(function ($path, $contents) {
-                $contents = str_replace(["\r\n", "\r"], "\n", $contents);
                 $this->mockFilesystemOutput .= $contents;
 
                 return strlen($contents);

tests/UsesResolverTest.php

@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests;
+
+use Barryvdh\LaravelIdeHelper\UsesResolver;
+use PHPUnit\Framework\TestCase;
+
+class UsesResolverTest extends TestCase
+{
+    /**
+     * Test that we can correctly load uses from supplied code
+     */
+    public function testLoadFromCode()
+    {
+        $usesResolver = new UsesResolver();
+
+        $code = <<<'DOC'
+<?php
+namespace Barryvdh\LaravelIdeHelper\Tests;
+
+use Barryvdh\LaravelIdeHelper\UsesResolver as MyUsesResolver;
+use PHPUnit\Framework\TestCase;
+
+class UsesResolverTest extends TestCase
+{
+    //
+}
+DOC;
+
+        $this->assertEquals(
+            $usesResolver->loadFromCode('Barryvdh\\LaravelIdeHelper\\Tests\\UsesResolverTest', $code),
+            [
+                'MyUsesResolver' => '\\Barryvdh\\LaravelIdeHelper\\UsesResolver',
+                'TestCase' => '\\PHPUnit\Framework\TestCase',
+            ]
+        );
+    }
+
+    /**
+     * Test that we can correctly load uses from a class
+     */
+    public function testLoadFromClass()
+    {
+        $usesResolver = new UsesResolver();
+
+        $this->assertEquals(
+            $usesResolver->loadFromClass(self::class),
+            [
+                'UsesResolver' => '\\Barryvdh\\LaravelIdeHelper\\UsesResolver',
+                'TestCase' => '\\PHPUnit\Framework\TestCase',
+            ]
+        );
+    }
+}