Fix test

composer fix-style
Merge branch 'feat-meta-hints' of github.com:barryvdh/laravel-ide-helper into feat-meta-hints
2026-08-18 18:13:11 +00:00 · 2024-12-29 19:42:42 +01:00 · 2024-12-29 18:32:32 +00:00 · 2024-12-29 19:31:53 +01:00 · 2024-12-29 19:31:39 +01:00 · 2024-12-29 18:27:55 +00:00
81 changed files with 526 additions and 1399 deletions
@@ -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
@@ -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
@@ -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]>
@@ -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:
@@ -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
@@ -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
@@ -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
@@ -159,13 +54,10 @@ Fix empty/anonymous closure in meta command.
 - Fix type of hashed model property to `string`

 ### 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

@@ -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)
@@ -11,8 +11,7 @@
        "netbeans",
        "sublime",
        "codeintel",
-        "phpdoc",
-        "dev"
+        "phpdoc"
    ],
    "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/database": "^11.15 || ^12",
-        "illuminate/filesystem": "^11.15 || ^12",
-        "illuminate/support": "^11.15 || ^12"
+        "illuminate/console": "^11.15",
+        "illuminate/database": "^11.15",
+        "illuminate/filesystem": "^11.15",
+        "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/view": "^11.15 || ^12",
+        "illuminate/config": "^11.15",
+        "illuminate/view": "^11.15",
        "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^9.2 || ^10",
-        "phpunit/phpunit": "^10.5 || ^11.5.3",
+        "orchestra/testbench": "^9.2",
+        "phpunit/phpunit": "^10.5",
        "spatie/phpunit-snapshot-assertions": "^4 || ^5",
-        "vimeo/psalm": "^5.4",
-        "vlucas/phpdotenv": "^5"
+        "vimeo/psalm": "^5.4"
    },
    "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.4-dev"
        },
        "laravel": {
            "providers": [
@@ -123,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',
    ],

    /*
@@ -274,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
@@ -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');
@@ -72,7 +72,7 @@ function vsCodeGetConfigValue($value, $key, $configPaths)
                $key = collect(explode('.', $key));
                $key->pop();
                $key = $key->implode('.');
-                $value = [];
+                $value = 'array(...)';
            }

            $nextKey = $keysToFind->shift();
@@ -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(','),
-        ]);
-    });
@@ -1,71 +1,56 @@
 <?php

-function vsCodeGetTranslationsFromFile(Symfony\Component\Finder\SplFileInfo $file, $path, $namespace)
+function vsCodeGetTranslationsFromFile($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);
+    $key = pathinfo($file, PATHINFO_FILENAME);

    if ($namespace) {
-        $baseKey = "{$namespace}::{$baseKey}";
+        $key = "{$namespace}::{$key}";
    }

-    try {
-        $translations = require $filePath;
-    } catch (Throwable $e) {
-        return null;
-    }
+    $lang = collect(explode(DIRECTORY_SEPARATOR, str_replace($path, '', $file)))
+        ->filter()
+        ->first();

-    if (!is_array($translations)) {
-        return null;
-    }
-
-    $fileLines = Illuminate\Support\Facades\File::lines($filePath);
+    $fileLines = Illuminate\Support\Facades\File::lines($file);
    $lines = [];
    $inComment = false;

    foreach ($fileLines as $index => $line) {
        $trimmed = trim($line);
-        if (str_starts_with($trimmed, '/*')) {
+
+        if (substr($trimmed, 0, 2) === '/*') {
            $inComment = true;
+            continue;
        }
+
        if ($inComment) {
-            if (str_ends_with($trimmed, '*/')) {
-                $inComment = false;
+            if (substr($trimmed, -2) !== '*/') {
+                continue;
            }
+
+            $inComment = false;
+        }
+
+        if (substr($trimmed, 0, 2) === '//') {
            continue;
        }
-        if (str_starts_with($trimmed, '//')) {
-            continue;
-        }
+
        $lines[] = [$index + 1, $trimmed];
    }

    return [
-        'k' => $baseKey,
+        'k' => $key,
        'la' => $lang,
-        'vs' => collect(Illuminate\Support\Arr::dot($translations))
-        ->map(
-            fn ($value, $dotKey) => vsCodeTranslationValue(
-                $dotKey,
-                $value,
-                str_replace(base_path(DIRECTORY_SEPARATOR), '', $filePath),
-                $lines
+        'vs' => collect(Illuminate\Support\Arr::dot((Illuminate\Support\Arr::wrap(__($key, [], $lang)))))
+            ->map(
+                fn ($value, $key) => vsCodeTranslationValue(
+                    $key,
+                    $value,
+                    str_replace(base_path(DIRECTORY_SEPARATOR), '', $file),
+                    $lines
+                )
            )
-        )
            ->filter(),
    ];
 }
@@ -78,12 +63,13 @@ function vsCodeTranslationValue($key, $value, $file, $lines): ?array

    $lineNumber = 1;
    $keys = explode('.', $key);
+    $index = 0;
    $currentKey = array_shift($keys);

-    foreach ($lines as $line) {
+    foreach ($lines as $index => $line) {
        if (
-            strpos($line[1], '"' . $currentKey . '"') !== false ||
-            strpos($line[1], "'" . $currentKey . "'") !== false
+            strpos($line[1], '"' . $currentKey . '"', 0) !== false ||
+            strpos($line[1], "'" . $currentKey . "'", 0) !== false
        ) {
            $lineNumber = $line[0];
            $currentKey = array_shift($keys);
@@ -112,9 +98,9 @@ function vscodeCollectTranslations(string $path, ?string $namespace = null)
        return collect();
    }

-    return collect(Illuminate\Support\Facades\File::allFiles($realPath))
-        ->map(fn ($file) => vsCodeGetTranslationsFromFile($file, $path, $namespace))
-        ->filter();
+    return collect(Illuminate\Support\Facades\File::allFiles($realPath))->map(
+        fn ($file) => vsCodeGetTranslationsFromFile($file, $path, $namespace)
+    );
 }

 $loader = app('translator')->getLoader();
@@ -139,10 +125,6 @@ $namespaced = collect($namespaces)->flatMap(
 $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}";

@@ -29,7 +29,7 @@ $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; ?> {
+<?php echo trim($alias->getDocComment($s1)) . "\n{$s1}" . $alias->getClassType() ?> <?= $alias->getExtendsClass() ?> {
        <?php foreach ($alias->getMethods() as $method) : ?>
 <?= trim($method->getDocComment($s2)) . "\n{$s2}" ?>public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
        {<?php if ($method->getDeclaringClass() !== $method->getRoot()) : ?>
@@ -76,7 +76,7 @@ namespace <?= $namespace === '__root' ? '' : trim($namespace, '\\') ?> {

 <?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); ?> {
    /**
@@ -21,12 +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) : ?>
@@ -81,26 +75,15 @@ namespace PHPSTORM_META {

    <?php if (isset($expectedArgumentSets)): ?>
    <?php foreach ($expectedArgumentSets as $name => $argumentsList) : ?>
-    registerArgumentsSet('<?= $name ?>', <?php foreach ($argumentsList as $i => $arg) : ?><?php if ($i % 5 == 0) {
+    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) : ?>
+    <?php foreach ($expectedArguments as $function => $arguments) : ?>
+    <?php foreach ($arguments as $index => $argumentSet) : ?>
 expectedArguments(<?= $function ?>, <?= $index ?>, argumentsSet('<?= $argumentSet ?>'));
    <?php endforeach; ?>
    <?php endforeach; ?>
@@ -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->getTemplateNames()
+                        $this->getReturnTypeNormalizers($class)
                    );
                }
                $this->usedMethods[] = $magic;
@@ -418,8 +378,7 @@ class Alias
                                $method->name,
                                $this->interfaces,
                                $this->classAliases,
-                                $this->getReturnTypeNormalizers($reflection),
-                                $this->getTemplateNames(),
+                                $this->getReturnTypeNormalizers($reflection)
                            );
                        }
                        $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);
    }

    /**
@@ -12,8 +12,6 @@
 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;
@@ -70,16 +68,9 @@ class MetaCommand extends Command
    protected $configMethods = [
        '\config()',
        '\Illuminate\Config\Repository::get()',
+        '\Illuminate\Config\Repository::set()',
        '\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()',
+        '\Illuminate\Support\Facades\Config::set()',
    ];

    protected $templateCache = [];
@@ -144,8 +135,6 @@ class MetaCommand extends Command
            return gettype($value);
        });

-        $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,
@@ -154,8 +143,6 @@ class MetaCommand extends Command
            'configValues' => $configValues,
            'expectedArgumentSets' => $this->getExpectedArgumentSets(),
            'expectedArguments' => $this->getExpectedArguments(),
-            'userModel' => $defaultUserModel,
-            'userMethods' => $this->userMethods,
        ])->render();

        $filename = $this->option('filename');
@@ -192,125 +179,69 @@ class MetaCommand extends Command
     */
    protected function registerClassAutoloadExceptions(): callable
    {
-        $aliases = array_filter([...$this->getAbstracts(), 'config'], fn ($abstract) => !str_contains($abstract, '\\'));
-
-        $autoloader = function ($class) use ($aliases) {
-            // ignore aliases as they're meant to be resolved elsewhere
-            if (in_array($class, $aliases, true)) {
-                return;
-            }
-
+        $autoloader = function ($class) {
            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',
+            '\config()' => [
+                0 => 'configs',
            ],
-            [
-                'class' => ['\Illuminate\Support\Facades\Route', '\Illuminate\Support\Facades\Auth', 'Illuminate\Foundation\Auth\Access\Authorizable'],
-                'method' => ['can', 'cannot', 'cant'],
-                'argumentSet' => 'auth',
+            '\Illuminate\Config\Repository::get()' => [
+                0 => 'configs',
            ],
-            [
-                'class' => ['Illuminate\Contracts\Auth\Access\Authorizable'],
-                'method' => ['can'],
-                'argumentSet' => 'auth',
+            '\Illuminate\Config\Repository::set()' => [
+                0 => 'configs',
            ],
-            [
-                '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',
+            '\Illuminate\Support\Facades\Config::get()' => [
+                0 => 'configs',
            ],
-            [
-                'class' => ['\Illuminate\Support\Facades\Route', '\Illuminate\Routing\Router'],
-                'method' => ['middleware', 'withoutMiddleware'],
-                'argumentSet' => 'middleware',
+            '\Illuminate\Support\Facades\Config::set()' => [
+                0 => 'configs',
            ],
-            [
-                'method' => ['route', 'to_route', 'signedRoute'],
-                'argumentSet' => 'routes',
+            '\route()' => [
+                0 => 'routes',
            ],
-            [
-                'class' => [
-                    '\Illuminate\Support\Facades\Redirect',
-                    '\Illuminate\Support\Facades\URL',
-                    '\Illuminate\Routing\Redirector',
-                    '\Illuminate\Routing\UrlGenerator',
-                ],
-                'method' => ['route', 'signedRoute', 'temporarySignedRoute'],
-                'argumentSet' => 'routes',
+            '\Illuminate\Support\Facades\Route::get()' => [
+                0 => 'routes',
            ],
-            [
-                'method' => 'view',
-                'argumentSet' => 'views',
+            '\Illuminate\Routing\Router::get()' => [
+                0 => 'routes',
            ],
-            [
-                'class' => ['\Illuminate\Support\Facades\View', '\Illuminate\View\Factory'],
-                'method' => 'make',
-                'argumentSet' => 'views',
+            '\view()' => [
+                0 => 'views',
            ],
-            [
-                'method' => ['__', 'trans'],
-                'argumentSet' => 'translations',
+            '\Illuminate\Support\Facades\View::make()' => [
+                0 => 'views',
            ],
-            [
-                'class' => ['\Illuminate\Contracts\Translation\Translator'],
-                'method' => ['get'],
-                'argumentSet' => 'translations',
+            '\Illuminate\View\Factory::make()' => [
+                0 => 'views',
            ],
-            [
-                'method' => 'env',
-                'argumentSet' => 'env',
+            '\__()' => [
+                0 => 'translations',
            ],
-            [
-                'class' => '\Illuminate\Support\Env',
-                'method' => 'get',
-                'argumentSet' => 'env',
+            '\trans()' => [
+                0 => 'translations',
+            ],
+            '\Illuminate\Contracts\Translation\Translator::get()' => [
+                0 => 'translations',
            ],
        ];
    }
@@ -322,13 +253,7 @@ class MetaCommand extends Command
    {
        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());
-            }
-
+            $value = $this->files->requireOnce($file) ?: [];
            if (!$value instanceof Collection) {
                $value = collect($value);
            }
@@ -352,21 +277,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
     *
@@ -16,7 +16,6 @@ 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;
@@ -50,6 +49,7 @@ 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;
@@ -410,6 +410,9 @@ class ModelsCommand extends Command
            $params = [];

            switch ($type) {
+                case 'encrypted':
+                    $realType = 'mixed';
+                    break;
                case 'boolean':
                case 'bool':
                    $realType = 'bool';
@@ -417,7 +420,6 @@ class ModelsCommand extends Command
                case 'decimal':
                    $realType = 'numeric';
                    break;
-                case 'encrypted':
                case 'string':
                case 'hashed':
                    $realType = 'string';
@@ -451,7 +453,7 @@ class ModelsCommand extends Command
                    $realType = '\Illuminate\Support\Collection<array-key, mixed>';
                    break;
                case AsArrayObject::class:
-                    $realType = '\Illuminate\Database\Eloquent\Casts\ArrayObject<array-key, mixed>';
+                    $realType = '\ArrayObject<array-key, mixed>';
                    break;
                default:
                    // In case of an optional custom cast parameter , only evaluate
@@ -473,11 +475,7 @@ class ModelsCommand extends Command
            }

            if (Str::startsWith($type, AsCollection::class)) {
-                $realType = $this->getTypeInModel($model, $params[0] ?? null) ?: '\Illuminate\Support\Collection';
-                $relatedModel = $this->getTypeInModel($model, $params[1] ?? null);
-                if ($relatedModel) {
-                    $realType = $this->getCollectionTypeHint($realType, $relatedModel);
-                }
+                $realType = $this->getTypeInModel($model, $params[0] ?? null) ?? '\Illuminate\Support\Collection';
            }

            if (Str::startsWith($type, AsEnumCollection::class)) {
@@ -630,10 +628,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);
@@ -671,11 +665,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')) {
-                    $scopeUsingAttribute = !empty($reflection->getAttributes('Illuminate\Database\Eloquent\Attributes\Scope'));
-
+                } elseif (Str::startsWith($method, 'scope') && $method !== 'scopeQuery' && $method !== 'scope' && $method !== 'scopes') {
                    //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);
@@ -827,16 +819,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,
@@ -1188,7 +1174,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;
@@ -1409,7 +1395,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, []);
        }
@@ -1585,9 +1571,7 @@ class ModelsCommand extends Command
     */
    protected function getUsedClassNames(ReflectionClass $reflection): array
    {
-        $namespaceAliases = array_flip(array_map(function ($alias) {
-            return ltrim($alias, '\\');
-        }, (new ContextFactory())->createFromReflector($reflection)->getNamespaceAliases()));
+        $namespaceAliases = array_flip((new ContextFactory())->createFromReflector($reflection)->getNamespaceAliases());
        $namespaceAliases[$reflection->getName()] = $reflection->getShortName();

        return $namespaceAliases;
@@ -17,6 +17,10 @@ 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 +61,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->magic = array_merge($this->magic, $this->config->get('ide-helper.magic', []));
-        $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,
-        ]));
-
+        $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->interfaces = array_merge($this->interfaces, $this->config->get('ide-helper.interfaces'), []);
        // Make all interface classes absolute
        foreach ($this->interfaces as &$interface) {
            $interface = '\\' . ltrim($interface, '\\');
@@ -83,7 +83,7 @@ class Generator
            ->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('include_fluent', $this->config->get('ide-helper.include_fluent', true))
            ->with('factories', $this->config->get('ide-helper.include_factory_builders') ? Factories::all() : [])
            ->render();
@@ -115,24 +115,6 @@ class Generator
            ->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 +213,8 @@ class Generator
        foreach ($realTimeFacadeFiles as $file) {
            try {
                $name = $this->getFullyQualifiedClassNameInFile($file);
-                if ($name) {
-                    $facades[$name] = $name;
-                }
-            } catch (\Throwable $e) {
+                $facades[$name] = $name;
+            } catch (\Exception $e) {
                continue;
            }
        }
@@ -246,17 +226,26 @@ class Generator
    {
        $contents = file_get_contents($path);

-        // Match namespace
-        preg_match('/namespace\s+([^;]+);/', $contents, $namespaceMatch);
-        $namespace = isset($namespaceMatch[1]) ? $namespaceMatch[1] : '';
+        $parsers = new Php7(new Emulative());

-        // Match class name
-        preg_match('/class\s+([a-zA-Z0-9_]+)/', $contents, $classMatch);
-        $className = isset($classMatch[1]) ? $classMatch[1] : '';
+        $parsed = collect($parsers->parse($contents) ?: []);

-        // Combine namespace and class name
-        if ($namespace && $className) {
-            return $namespace . '\\' . $className;
+        $namespace = $parsed->first(function ($node) {
+            return $node instanceof Namespace_;
+        });
+
+        if ($namespace) {
+            $name = $namespace->name->toString();
+
+            $class = collect($namespace->stmts)->first(function ($node) {
+                return $node instanceof Class_;
+            });
+
+            if ($class) {
+                $name .= '\\' . $class->name->toString();
+            }
+
+            return $name;
        }
    }

@@ -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
@@ -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..
@@ -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);
+    }
+}
@@ -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
 {
@@ -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());
+    }
 }
@@ -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
@@ -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
@@ -51,4 +52,9 @@ abstract class AbstractModelsCommand extends TestCase
        // Don't override integer -> int for tests
        $config->set('ide-helper.type_overrides', []);
    }
+
+    protected function assertMatchesMockedSnapshot()
+    {
+        $this->assertMatchesSnapshot($this->mockFilesystemOutput, new SnapshotPhpDriver());
+    }
 }
@@ -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();
-    }
-}
@@ -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,
@@ -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 \Illuminate\Support\Collection<array-key, mixed> $cast_to_encrypted_collection
 * @property array<array-key, mixed> $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 \Illuminate\Support\Collection<int, AdvancedCastMap> $cast_to_as_collection_of
+ * @property \ArrayObject<array-key, mixed> $cast_to_as_array_object
 * @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,
@@ -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
@@ -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
@@ -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
@@ -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
@@ -9,6 +9,8 @@ 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
@@ -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()
@@ -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
@@ -10,6 +10,8 @@ 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
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Dynamic newModelQuery()
@@ -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()
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
-    }
-}
@@ -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();
-    }
-}
@@ -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);
-    }
-}
@@ -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
@@ -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
@@ -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
@@ -158,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
 */
@@ -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
@@ -164,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
 */
@@ -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
@@ -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
@@ -9,6 +9,8 @@ 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
@@ -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
@@ -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()
@@ -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()
@@ -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
@@ -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
@@ -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)->makePartial();
+        $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);
    }
 }
@@ -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
-{
-}
@@ -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
@@ -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()
@@ -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()
@@ -9,6 +9,8 @@ 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
@@ -73,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()
@@ -90,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()
@@ -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);
-    }
-}
@@ -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()
@@ -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
@@ -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,6 +132,8 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;

 /**
+ * 
+ *
 * @property int $id
 * @property-read Simple $relationBelongsTo
 * @property-read AnotherModel $relationBelongsToInAnotherNamespace
@@ -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,6 +132,8 @@ 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
@@ -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
@@ -31,7 +33,7 @@ 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 \Illuminate\Support\Collection<array-key, mixed> $cast_to_encrypted_collection
 * @property array<array-key, mixed> $cast_to_encrypted_json
@@ -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
 */
@@ -9,6 +9,8 @@ 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
@@ -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()
@@ -1,4 +1,6 @@
 /**
+ * 
+ *
 * @mixin \Eloquent
 * @mixin \Illuminate\Database\Eloquent\Builder
 * @mixin \Illuminate\Database\Query\Builder
@@ -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(''));
@@ -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
- * @static
+ * @return int 
+ * @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>
- * @static
+ * @return \Illuminate\Database\Eloquent\Builder<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>
- * @static
+ * @return \Illuminate\Database\Eloquent\Builder<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
@@ -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));
    }
 }
@@ -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));
    }
 }
@@ -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);
@@ -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',
+            ]
+        );
+    }
+}
Author	SHA1	Message	Date
Barry vd. Heuvel	6d19a48da4	Fix test	2024-12-29 19:42:42 +01:00
laravel-ide-helper	aed6c0c5b8	composer fix-style	2024-12-29 18:32:32 +00:00
Barry vd. Heuvel	5bbe750505	Merge branch 'feat-meta-hints' of github.com:barryvdh/laravel-ide-helper into feat-meta-hints	2024-12-29 19:31:53 +01:00
Barry vd. Heuvel	d5323b80d8	map to string	2024-12-29 19:31:39 +01:00
laravel-ide-helper	aa9b48185f	composer fix-style	2024-12-29 18:27:55 +00:00
Barry vd. Heuvel	b4a605a491	Merge branch 'feat-meta-hints' of github.com:barryvdh/laravel-ide-helper into feat-meta-hints	2024-12-29 19:27:12 +01:00
Barry vd. Heuvel	701cf67ba0	Add translations	2024-12-29 19:26:20 +01:00
laravel-ide-helper	68688b98fa	composer fix-style	2024-12-29 18:19:34 +00:00
Barry vd. Heuvel	1353c67516	Fix view instance	2024-12-29 19:19:01 +01:00
Barry vd. Heuvel	6b934aa43a	Use php-templates from vs-code	2024-12-29 19:16:23 +01:00
laravel-ide-helper	9f2a32f4d1	composer fix-style	2024-12-29 13:19:34 +00:00
Barry vd. Heuvel	61fd354706	Add phpstorm meta hints	2024-12-29 14:19:05 +01:00