feat: use generics of return type to determine resulting models (#1653 )

Check if macro is valid (#1655 )
* Check if macro is valid * composer fix-style --------- Co-authored-by: laravel-ide-helper <[email protected]>
2026-08-18 01:57:13 +00:00 · 2025-01-08 11:01:30 +01:00 · 2025-01-08 11:00:53 +01:00 · 2025-01-08 11:00:41 +01:00 · 2025-01-06 15:42:30 +00:00 · 2025-01-06 16:29:58 +01:00
51 changed files with 2307 additions and 610 deletions
@@ -13,6 +13,5 @@

 ### Checklist
 - [ ] Existing tests have been adapted and/or new tests have been added
- [ ] Add a CHANGELOG.md entry
 - [ ] Update the README.md
 - [ ] Code style has been fixed via `composer fix-style`
@@ -0,0 +1,4 @@
+template: |
+  ## What’s Changed
+
+  $CHANGES
@@ -0,0 +1,41 @@
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - master
+  # pull_request event is required only for autolabeler
+  pull_request:
+    # Only following types are handled by the action, but one can default to all as well
+    types: [opened, reopened, synchronize]
+  # pull_request_target event is required for autolabeler to support PRs from forks
+  # pull_request_target:
+  #   types: [opened, reopened, synchronize]
+
+permissions:
+  contents: read
+
+jobs:
+  update_release_draft:
+    permissions:
+      # write permission is required to create a github release
+      contents: write
+      # write permission is required for autolabeler
+      # otherwise, read permission is required at least
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      # (Optional) GitHub Enterprise requires GHE_HOST variable set
+      #- name: Set GHE_HOST
+      #  run: |
+      #    echo "GHE_HOST=${GITHUB_SERVER_URL##https:\/\/}" >> $GITHUB_ENV
+
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: release-drafter/release-drafter@v6
+        # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
+        # with:
+        #   config-name: my-config.yml
+        #   disable-autolabeler: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -0,0 +1,34 @@
+name: "Update Changelog"
+
+on:
+  release:
+    types: [released]
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+
+    permissions:
+      # Give the default GITHUB_TOKEN write permission to commit and push the 
+      # updated CHANGELOG back to the repository.
+      # https://github.blog/changelog/2023-02-02-github-actions-updating-the-default-github_token-permissions-to-read-only/
+      contents: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.release.target_commitish }}
+
+      - name: Update Changelog
+        uses: stefanzweifel/changelog-updater-action@v1
+        with:
+          latest-version: ${{ github.event.release.tag_name }}
+          release-notes: ${{ github.event.release.body }}
+
+      - name: Commit updated CHANGELOG
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          branch: ${{ github.event.release.target_commitish }}
+          commit_message: Update CHANGELOG
+          file_pattern: CHANGELOG.md
@@ -1,71 +1,187 @@
 # Changelog

-All notable changes to this project will be documented in this file.
+## v3.5.2 - 2025-01-06

-[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v3.2.0...master)
--------------
+### Fixes

-### Changed
-Add support for multiple pivot types when using the same accessor.
+Fix empty/anonymous closure in meta command.

-2024-10-18, 3.2.0
--------------
+**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
+
+* Feature: Add Config Option to Enforce Nullable Relationships by @jeramyhing in https://github.com/barryvdh/laravel-ide-helper/pull/1580
+* Improve replacement of return type for methods from Query\Builder by @pjio in https://github.com/barryvdh/laravel-ide-helper/pull/1575
+* Update CHANGELOG.md, fix typo(s) by @NicholasWilsonDEV in https://github.com/barryvdh/laravel-ide-helper/pull/1613
+* Fixed PHP 8.4 deprecation warning by @eusonlito in https://github.com/barryvdh/laravel-ide-helper/pull/1622
+* Fix PHP 8.4 deprecations by @JeppeKnockaert in https://github.com/barryvdh/laravel-ide-helper/pull/1618
+* Assign $output method parameter to $this->output on Generator by @eusonlito in https://github.com/barryvdh/laravel-ide-helper/pull/1623
+
+### New Contributors
+
+* @jeramyhing made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1580
+* @pjio made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1575
+* @NicholasWilsonDEV made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1613
+* @eusonlito made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1622
+
+**Full Changelog**: https://github.com/barryvdh/laravel-ide-helper/compare/v3.2.2...v3.3.0
+
+## v3.2.2 - 2024-10-29
+
+### What’s Changed
+
+* fix(pivot): only use unique classes in the pivot union (Fixes #1606) (#1607) @pataar
+* docs(pr): remove the changelog checklist item (#1608) @pataar
+* Create update-changelog.yaml (#1605) @barryvdh
+
+**Full Changelog**: https://github.com/barryvdh/laravel-ide-helper/compare/v3.2.1...v3.2.2
+
+## 3.2.1 - 2024-10-28
+
+### What's Changed
+
+* chore: Fix the description of unused option by @KentarouTakeda in https://github.com/barryvdh/laravel-ide-helper/pull/1600
+* feat(pivot): add support for multiple pivot types when using the same accessor by @pataar in https://github.com/barryvdh/laravel-ide-helper/pull/1597
+* Add support for `AsCollection::using` and `AsEnumCollection::of` casts by @uno-sw in https://github.com/barryvdh/laravel-ide-helper/pull/1577
+* Smarter reset by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1603
+* feat: use `numeric` type on fields with `decimal` casts by @ekisu in https://github.com/barryvdh/laravel-ide-helper/pull/1583
+
+### New Contributors
+
+* @uno-sw made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1577
+* @ekisu made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1583
+
+**Full Changelog**: https://github.com/barryvdh/laravel-ide-helper/compare/v3.2.0...v3.2.1
+
+## 3.2.0 - 2024-10-18

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

+- Introduce `enforce_nullable_relationships` configuration option to control how nullable Eloquent relationships are enforced during static analysis. This provides flexibility for scenarios where application logic ensures data integrity without relying on database constraints. [#1580 / jeramyhing](https://github.com/barryvdh/laravel-ide-helper/pull/1580)
+  
 - Add support for AsCollection::using and AsEnumCollection::of casts [#1577 / uno-sw](https://github.com/barryvdh/laravel-ide-helper/pull/1577)
+  

-2024-07-12, 3.1.0
------------------
+## 3.1.0 - 2024-07-12

 ### Fixed
+
 - Fix return value of query scopes from parent class [#1366 / sforward](https://github.com/barryvdh/laravel-ide-helper/pull/1366)
 - Add static to isBuiltin() check in ide-helper:models [#1541 / bram-pkg](https://github.com/barryvdh/laravel-ide-helper/pull/1541)
 - Fix for getSomethingAttribute functions which return a collection with type templating in the phpDoc. [#1567 / stefanScrumble](https://github.com/barryvdh/laravel-ide-helper/pull/1567)

 ### Added
- - Add type to pivot when using a custom pivot class [#1518 / d3v2a](https://github.com/barryvdh/laravel-ide-helper/pull/1518)
- - Add support in morphTo relationship for null values [#1547 / matysekmichal](https://github.com/barryvdh/laravel-ide-helper/pull/1547)
- - Add support for AsEnumCollection casts [#1557 / Braunson](https://github.com/barryvdh/laravel-ide-helper/pull/1557)
- - Support for Attribute class in attributes [#1567 / stefanScrumble](https://github.com/barryvdh/laravel-ide-helper/pull/1567)

-2024-03-01, 3.0.0
------------------
+- Add type to pivot when using a custom pivot class [#1518 / d3v2a](https://github.com/barryvdh/laravel-ide-helper/pull/1518)
+- Add support in morphTo relationship for null values [#1547 / matysekmichal](https://github.com/barryvdh/laravel-ide-helper/pull/1547)
+- Add support for AsEnumCollection casts [#1557 / Braunson](https://github.com/barryvdh/laravel-ide-helper/pull/1557)
+- Support for Attribute class in attributes [#1567 / stefanScrumble](https://github.com/barryvdh/laravel-ide-helper/pull/1567)
+
+## 3.0.0 - 2024-03-01

 ### Added
+
 - Support for Laravel 11 [#1520 / KentarouTakeda](https://github.com/barryvdh/laravel-ide-helper/pull/1520)

 ### Changed
+
 - Make `--reset` always keep the text and remove `--smart-reset`. Always skip the classname [#1523 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1523) & [#1525 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1525)
 - Use short types (`int` and `bool` instead of `integer` and `boolean`) [#1524 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1524)

 ### Removed
+
 - Support for Laravel 9 and use of doctrine/dbal [#1512 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1512)
  With this functionality gone, a few changes have been made:
  - support for custom datatypes has been dropped (config `custom_db_types`) unknown data types default to `string` now and to fix the type, add a proper cast in Eloquent
-  - You _might_ have top-level dependency on doctrine/dbal. This may have been in the past due to ide-helper, we suggest to check if you still need it and remove it otherwise
+  - You *might* have top-level dependency on doctrine/dbal. This may have been in the past due to ide-helper, we suggest to check if you still need it and remove it otherwise
  - Minimum PHP version, due to Laravel 10, is now PHP 8.1
+  

-2024-02-15, 2.15.1
------------------
+## 2024-02-15, 2.15.1

 ### Fixed
+
 - Fix final class keyword in wrong position [#1517 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1517)

 ### Changed

 ### Added

-2024-02-14, 2.15.0
------------------
+## 2024-02-14, 2.15.0
+
 ### Fixed
+
 - Fix case issue in `ModelsCommand::unsetMethod()` [#1453 / leo108](https://github.com/barryvdh/laravel-ide-helper/pull/1453)
 - Fix non-facade classes will result in no autocomplete [#841 / netpok](https://github.com/barryvdh/laravel-ide-helper/pull/841)
 - Skip swoole, otherwise fatal error [#1477 / TimoFrenzel](https://github.com/barryvdh/laravel-ide-helper/pull/1477)
@@ -75,10 +191,12 @@ Add support for multiple pivot types when using the same accessor.
 - Fix #1300 relation_return_type must take precedence if it is defined [#1394 / menthol](https://github.com/barryvdh/laravel-ide-helper/pull/1394)

 ### Changed
+
 - Disable inspections of helper files [#1486 / eidng8](https://github.com/barryvdh/laravel-ide-helper/pull/1486)
 - Removed support for Laravel 8 and therefore for PHP < 8.0 [#1504 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1504)

 ### Added
+
 - Add support for enum default arguments using enum cases. [#1464 / d8vjork](https://github.com/barryvdh/laravel-ide-helper/pull/1464)
 - Add support for real-time facades in the helper file. [#1455 / filipac](https://github.com/barryvdh/laravel-ide-helper/pull/1455)
 - Add support for relations with composite keys. [#1479 / calebdw](https://github.com/barryvdh/laravel-ide-helper/pull/1479)
@@ -88,25 +206,27 @@ Add support for multiple pivot types when using the same accessor.
 - Support the BINARY(...) database field type [#1434 / Sfonxs](https://github.com/barryvdh/laravel-ide-helper/pull/1434)
 - Add AllowDynamicProperties Attribute to cooperate with php8.2 deprecation [#1428 / GeoSot](https://github.com/barryvdh/laravel-ide-helper/pull/1428)

-2024-02-05, 2.14.0
------------------
+## 2024-02-05, 2.14.0

 ### Changed
+
 - Official support for Lumen has been dropped [#1425 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1425)
 - Refactor resolving of null information for custom casted attribute types [#1330 / wimski](https://github.com/barryvdh/laravel-ide-helper/pull/1330)

 ### Fixed
+
 - Catch exceptions when loading aliases [#1465 / dongm2ez](https://github.com/barryvdh/laravel-ide-helper/pull/1465)

 ### Added
+
 - Add support for nikic/php-parser 5 (next to 4) [#1502 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1502)
 - Add support for `immutable_date:*` and `immutable_datetime:*` casts. [#1380 / thekonz](https://github.com/barryvdh/laravel-ide-helper/pull/1380)
 - Add support for attribute accessors marked as protected. [#1339 / pindab0ter](https://github.com/barryvdh/laravel-ide-helper/pull/1339)

-2023-02-04, 2.13.0
------------------
+## 2023-02-04, 2.13.0

 ### Fixed
+
 - Fix return type of methods provided by `SoftDeletes` [#1345 / KentarouTakeda](https://github.com/barryvdh/laravel-ide-helper/pull/1345)
 - Handle PHP 8.1 deprecation warnings when passing `null` to `new \ReflectionClass` [#1351 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1351)
 - Fix issue where \Eloquent is not included when using write_mixin [#1352 / Jefemy](https://github.com/barryvdh/laravel-ide-helper/pull/1352)
@@ -115,176 +235,208 @@ Add support for multiple pivot types when using the same accessor.
 - Fix Castable class if failed to detect it from return types [#1388 / kwarcu](https://github.com/barryvdh/laravel-ide-helper/pull/1388)

 ### Added
+
 - Added Laravel 10 support [#1407 / lptn](https://github.com/barryvdh/laravel-ide-helper/pull/1407)
 - Add support for custom casts that implement `CastsInboundAttributes` [#1329 / sforward](https://github.com/barryvdh/laravel-ide-helper/pull/1329)
 - Add option `use_generics_annotations` for collection type hints [#1298 / tanerkay](https://github.com/barryvdh/laravel-ide-helper/pull/1298)

-2022-03-06, 2.12.3
------------------
+## 2022-03-06, 2.12.3

 ### Fixed
+
 - Fix date and datetime handling for attributes that set a serialization format option for the Carbon instance [#1324 / FLeudts](https://github.com/barryvdh/laravel-ide-helper/pull/1324)
 - Fix composer conflict with composer/pcre version 2/3. [#1327 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1327)

-2022-02-08, 2.12.2
------------------
-### Fixed
- Remove composer dependecy, use copy of ClassMapGenerator [#1313 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1313)
+## 2022-02-08, 2.12.2

-2022-01-24, 2.12.1
------------------
 ### Fixed
+
+- Remove composer dependency, use copy of ClassMapGenerator [#1313 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1313)
+
+## 2022-01-24, 2.12.1
+
+### Fixed
+
 - Properly handle `Castable`s without return type. [#1306 / binotaliu](https://github.com/barryvdh/laravel-ide-helper/pull/1306)

-2022-01-23, 2.12.0
------------------
+## 2022-01-23, 2.12.0
+
 ### Added
+
 - Add support for custom casts that using `Castable` [#1287 / binotaliu](https://github.com/barryvdh/laravel-ide-helper/pull/1287)
 - Added Laravel 9 support [#1297 / rcerljenko](https://github.com/barryvdh/laravel-ide-helper/pull/1297)
 - Added option `additional_relation_return_types` for custom relations that don't fit the typical naming scheme

-2022-01-03, 2.11.0
------------------
+## 2022-01-03, 2.11.0
+
 ### Added
- Add support for Laravel 8.77 Attributes [\#1289 / SimonJnsson](https://github.com/barryvdh/laravel-ide-helper/pull/1289)
+
+- Add support for Laravel 8.77 Attributes [#1289 / SimonJnsson](https://github.com/barryvdh/laravel-ide-helper/pull/1289)
 - Add support for cast types `decimal:*`, `encrypted:*`, `immutable_date`, `immutable_datetime`, `custom_datetime`, and `immutable_custom_datetime` [#1262 / miken32](https://github.com/barryvdh/laravel-ide-helper/pull/1262)
- Add support of variadic parameters in `ide-helper:models` [\#1234 / shaffe-fr](https://github.com/barryvdh/laravel-ide-helper/pull/1234)
- Add support of custom casts without properties [\#1267 / sparclex](https://github.com/barryvdh/laravel-ide-helper/pull/1267)
+- Add support of variadic parameters in `ide-helper:models` [#1234 / shaffe-fr](https://github.com/barryvdh/laravel-ide-helper/pull/1234)
+- Add support of custom casts without properties [#1267 / sparclex](https://github.com/barryvdh/laravel-ide-helper/pull/1267)

 ### Fixed
- Fix recursively searching for `HasFactory` and `Macroable` traits [\#1216 / daniel-de-wit](https://github.com/barryvdh/laravel-ide-helper/pull/1216)
- Use platformName to determine db type when casting boolean types [\#1212 / stockalexander](https://github.com/barryvdh/laravel-ide-helper/pull/1212)
+
+- Fix recursively searching for `HasFactory` and `Macroable` traits [#1216 / daniel-de-wit](https://github.com/barryvdh/laravel-ide-helper/pull/1216)
+- Use platformName to determine db type when casting boolean types [#1212 / stockalexander](https://github.com/barryvdh/laravel-ide-helper/pull/1212)

 ### Changed
- Move default models helper filename to config [\#1241 / wimski](https://github.com/barryvdh/laravel-ide-helper/pull/1241)

-2021-06-18, 2.10.1
------------------
+- Move default models helper filename to config [#1241 / wimski](https://github.com/barryvdh/laravel-ide-helper/pull/1241)
+
+## 2021-06-18, 2.10.1
+
 ### Added
- Added Type registration according to [Custom Mapping Types documentation](https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/types.html#custom-mapping-types) [\#1228 / wimski](https://github.com/barryvdh/laravel-ide-helper/pull/1241)
+
+- Added Type registration according to [Custom Mapping Types documentation](https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/types.html#custom-mapping-types) [#1228 / wimski](https://github.com/barryvdh/laravel-ide-helper/pull/1241)

 ### Fixed
- Fixing issue where configured custom_db_types could cause a DBAL exception to be thrown while running `ide-helper:models` [\#1228 / wimski](https://github.com/barryvdh/laravel-ide-helper/pull/1241)

-2021-04-09, 2.10.0
------------------
+- Fixing issue where configured custom_db_types could cause a DBAL exception to be thrown while running `ide-helper:models` [#1228 / wimski](https://github.com/barryvdh/laravel-ide-helper/pull/1241)
+
+## 2021-04-09, 2.10.0
+
 ### Added
- Allowing Methods to be set or unset in ModelHooks [\#1198 / jenga201](https://github.com/barryvdh/laravel-ide-helper/pull/1198)\
+
+- Allowing Methods to be set or unset in ModelHooks [#1198 / jenga201](https://github.com/barryvdh/laravel-ide-helper/pull/1198)
  Note: the visibility of `\Barryvdh\LaravelIdeHelper\Console\ModelsCommand::setMethod` has been changed to **public**!

 ### Fixed
- Fixing issue where incorrect autoloader unregistered [\#1210 / tezhm](https://github.com/barryvdh/laravel-ide-helper/pull/1210)

-2021-04-02, 2.9.3
-----------------
+- Fixing issue where incorrect autoloader unregistered [#1210 / tezhm](https://github.com/barryvdh/laravel-ide-helper/pull/1210)
+
+## 2021-04-02, 2.9.3
+
 ### Fixed
- Support both customized namespace factories as well as default resolvable ones [\#1201 / wimski](https://github.com/barryvdh/laravel-ide-helper/pull/1201)

-2021-04-01, 2.9.2
-----------------
+- Support both customized namespace factories as well as default resolvable ones [#1201 / wimski](https://github.com/barryvdh/laravel-ide-helper/pull/1201)
+
+## 2021-04-01, 2.9.2
+
 ### Added
- Model hooks for adding custom information from external sources to model classes through the ModelsCommand [\#945 / wimski](https://github.com/barryvdh/laravel-ide-helper/pull/945)
+
+- Model hooks for adding custom information from external sources to model classes through the ModelsCommand [#945 / wimski](https://github.com/barryvdh/laravel-ide-helper/pull/945)

 ### Fixed
- Fix ide-helper:models exception if model doesn't have factory [\#1196 / ahmed-aliraqi](https://github.com/barryvdh/laravel-ide-helper/pull/1196)
- Running tests triggering post_migrate hooks [\#1193 / netpok](https://github.com/barryvdh/laravel-ide-helper/pull/1193)
- Array_merge error when config is cached prior to package install [\#1184 / netpok](https://github.com/barryvdh/laravel-ide-helper/pull/1184)

-2021-03-15, 2.9.1
-----------------
+- Fix ide-helper:models exception if model doesn't have factory [#1196 / ahmed-aliraqi](https://github.com/barryvdh/laravel-ide-helper/pull/1196)
+- Running tests triggering post_migrate hooks [#1193 / netpok](https://github.com/barryvdh/laravel-ide-helper/pull/1193)
+- Array_merge error when config is cached prior to package install [#1184 / netpok](https://github.com/barryvdh/laravel-ide-helper/pull/1184)
+
+## 2021-03-15, 2.9.1
+
 ### Added
- Generate PHPDoc for Laravel 8.x factories [\#1074 / ahmed-aliraqi](https://github.com/barryvdh/laravel-ide-helper/pull/1074)
- Add a comment to a property like table columns [\#1168 / biiiiiigmonster](https://github.com/barryvdh/laravel-ide-helper/pull/1168)
- Added `post_migrate` hook to run commands after a migration [\#1163 / netpok](https://github.com/barryvdh/laravel-ide-helper/pull/1163)
- Allow for PhpDoc for macros with union types [\#1148 / riesjart](https://github.com/barryvdh/laravel-ide-helper/pull/1148)
+
+- Generate PHPDoc for Laravel 8.x factories [#1074 / ahmed-aliraqi](https://github.com/barryvdh/laravel-ide-helper/pull/1074)
+- Add a comment to a property like table columns [#1168 / biiiiiigmonster](https://github.com/barryvdh/laravel-ide-helper/pull/1168)
+- Added `post_migrate` hook to run commands after a migration [#1163 / netpok](https://github.com/barryvdh/laravel-ide-helper/pull/1163)
+- Allow for PhpDoc for macros with union types [#1148 / riesjart](https://github.com/barryvdh/laravel-ide-helper/pull/1148)

 ### Fixed
- Error when generating helper for invokable classes [\#1124 / standaniels](https://github.com/barryvdh/laravel-ide-helper/pull/1124)
- Fix broken ReflectionUnionTypes [\#1132 / def-studio](https://github.com/barryvdh/laravel-ide-helper/pull/1132)
- Relative class names are not converted to fully-qualified class names [\#1005 / SavKS](https://github.com/barryvdh/laravel-ide-helper/pull/1005)

-2020-12-30, 2.9.0
-----------------
-### Changed
- Dropped support for Laravel 6 and Laravel 7, as well as support for PHP 7.2 and added support for doctrine/dbal:^3 [\#1114 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1114)
+- Error when generating helper for invokable classes [#1124 / standaniels](https://github.com/barryvdh/laravel-ide-helper/pull/1124)
+- Fix broken ReflectionUnionTypes [#1132 / def-studio](https://github.com/barryvdh/laravel-ide-helper/pull/1132)
+- Relative class names are not converted to fully-qualified class names [#1005 / SavKS](https://github.com/barryvdh/laravel-ide-helper/pull/1005)

-### Fixed
- `Macro::initPhpDoc()` will save original docblock if present [\#1116 / LastDragon-ru](https://github.com/barryvdh/laravel-ide-helper/pull/1116)
- `Alias` will grab macros from `\Illuminate\Database\Eloquent\Builder` too [\#1118 / LastDragon-ru](https://github.com/barryvdh/laravel-ide-helper/pull/1118)
-
-2020-12-08, 2.8.2
-----------------
-### Added
- Fix phpdoc generate for custom cast with parameter [\#986 / artelkr](https://github.com/barryvdh/laravel-ide-helper/pull/986)
- Created a possibility to add custom relation type [\#987 / efinder2](https://github.com/barryvdh/laravel-ide-helper/pull/987)
- Added `@see` with macro/mixin definition location to PhpDoc [\#1054 / riesjart](https://github.com/barryvdh/laravel-ide-helper/pull/1054)
- Initial compatibility for PHP8 [\#1106 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1106)
+## 2020-12-30, 2.9.0

 ### Changed
- Implement DeferrableProvider [\#914 / kon-shou](https://github.com/barryvdh/laravel-ide-helper/pull/914)
+
+- Dropped support for Laravel 6 and Laravel 7, as well as support for PHP 7.2 and added support for doctrine/dbal:^3 [#1114 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1114)

 ### Fixed
- Compatibility with Lumen [\#1043 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1043)
- Allow model_locations to have glob patterns [\#1059 / saackearl](https://github.com/barryvdh/laravel-ide-helper/pull/1059)
- Error when generating helper for macroable classes which are not facades and contain a "fake" method [\#1066 / domkrm] (https://github.com/barryvdh/laravel-ide-helper/pull/1066)
- Casts with a return type of `static` or `$this` now resolve to an instance of the cast [\#1103 / riesjart](https://github.com/barryvdh/laravel-ide-helper/pull/1103)
+
+- `Macro::initPhpDoc()` will save original docblock if present [#1116 / LastDragon-ru](https://github.com/barryvdh/laravel-ide-helper/pull/1116)
+- `Alias` will grab macros from `\Illuminate\Database\Eloquent\Builder` too [#1118 / LastDragon-ru](https://github.com/barryvdh/laravel-ide-helper/pull/1118)
+
+## 2020-12-08, 2.8.2
+
+### Added
+
+- Fix phpdoc generate for custom cast with parameter [#986 / artelkr](https://github.com/barryvdh/laravel-ide-helper/pull/986)
+- Created a possibility to add custom relation type [#987 / efinder2](https://github.com/barryvdh/laravel-ide-helper/pull/987)
+- Added `@see` with macro/mixin definition location to PhpDoc [#1054 / riesjart](https://github.com/barryvdh/laravel-ide-helper/pull/1054)
+- Initial compatibility for PHP8 [#1106 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1106)
+
+### Changed
+
+- Implement DeferrableProvider [#914 / kon-shou](https://github.com/barryvdh/laravel-ide-helper/pull/914)
+
+### Fixed
+
+- Compatibility with Lumen [#1043 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1043)
+- Allow model_locations to have glob patterns [#1059 / saackearl](https://github.com/barryvdh/laravel-ide-helper/pull/1059)
+- Error when generating helper for macroable classes which are not facades and contain a "fake" method [#1066 / domkrm] (https://github.com/barryvdh/laravel-ide-helper/pull/1066)
+- Casts with a return type of `static` or `$this` now resolve to an instance of the cast [#1103 / riesjart](https://github.com/barryvdh/laravel-ide-helper/pull/1103)

 ### Removed
- Removed format and broken generateJsonHelper [\#1053 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1053)

-2020-09-07, 2.8.1
-----------------
-### Added
- Support Laravel 8 [\#1022 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1022)
- Add option to force usage of FQN [\#1031 / edvordo](https://github.com/barryvdh/laravel-ide-helper/pull/1031)
- Add support for macros of all macroable classes [\#1006 / domkrm](https://github.com/barryvdh/laravel-ide-helper/pull/1006)
+- Removed format and broken generateJsonHelper [#1053 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1053)
+
+## 2020-09-07, 2.8.1

-2020-08-11, 2.8.0
-----------------
 ### Added
- Add static return type to builder methods [\#924 / dmason30](https://github.com/barryvdh/laravel-ide-helper/pull/924)
- Add `optonal` to meta generator for PhpStorm [\#932 / halaei](https://github.com/barryvdh/laravel-ide-helper/pull/932)
- Decimal columns as string in Models [\#948 / fgibaux](https://github.com/barryvdh/laravel-ide-helper/pull/948)
- Simplify full namespaces for already included resources [\#954 / LANGERGabriel](https://github.com/barryvdh/laravel-ide-helper/pull/954)
- Make writing relation count properties optional [\#969 / AegirLeet](https://github.com/barryvdh/laravel-ide-helper/pull/969)
- Add more methods able to resolve container instances [\#996 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/996)
+
+- Support Laravel 8 [#1022 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1022)
+- Add option to force usage of FQN [#1031 / edvordo](https://github.com/barryvdh/laravel-ide-helper/pull/1031)
+- Add support for macros of all macroable classes [#1006 / domkrm](https://github.com/barryvdh/laravel-ide-helper/pull/1006)
+
+## 2020-08-11, 2.8.0
+
+### Added
+
+- Add static return type to builder methods [#924 / dmason30](https://github.com/barryvdh/laravel-ide-helper/pull/924)
+- Add `optional` to meta generator for PhpStorm [#932 / halaei](https://github.com/barryvdh/laravel-ide-helper/pull/932)
+- Decimal columns as string in Models [#948 / fgibaux](https://github.com/barryvdh/laravel-ide-helper/pull/948)
+- Simplify full namespaces for already included resources [#954 / LANGERGabriel](https://github.com/barryvdh/laravel-ide-helper/pull/954)
+- Make writing relation count properties optional [#969 / AegirLeet](https://github.com/barryvdh/laravel-ide-helper/pull/969)
+- Add more methods able to resolve container instances [#996 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/996)

 ### Fixed
- Test `auth` is bound before detect Auth driver [\#946 / zhwei](https://github.com/barryvdh/laravel-ide-helper/pull/946)
- Fix inline doc-block for final models [\#944 / Gummibeer](https://github.com/barryvdh/laravel-ide-helper/pull/955)

-2020-04-22, 2.7.0
-----------------
+- Test `auth` is bound before detect Auth driver [#946 / zhwei](https://github.com/barryvdh/laravel-ide-helper/pull/946)
+- Fix inline doc-block for final models [#944 / Gummibeer](https://github.com/barryvdh/laravel-ide-helper/pull/955)
+
+## 2020-04-22, 2.7.0
+
 ### Added
- Add `ignored_models` as config option [\#890 / pataar](https://github.com/barryvdh/laravel-ide-helper/pull/890)
- Infer return type from reflection if no phpdoc given [\#906 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/906)
- Add custom collection support for get and all methods [\#903 / dmason30](https://github.com/barryvdh/laravel-ide-helper/pull/903)
- if a model implements interfaces, include them in the stub [\#920 / mr-feek](https://github.com/barryvdh/laravel-ide-helper/pull/920)
- Generate noinspections PHPStorm tags [\#905 / mzglinski](https://github.com/barryvdh/laravel-ide-helper/pull/905)
- Added support for Laravel 7 custom casts [\#913 / belamov](https://github.com/barryvdh/laravel-ide-helper/pull/913)
- Ability to use patterns for model_locations [\#921 / 4n70w4](https://github.com/barryvdh/laravel-ide-helper/pull/921)
+
+- Add `ignored_models` as config option [#890 / pataar](https://github.com/barryvdh/laravel-ide-helper/pull/890)
+- Infer return type from reflection if no phpdoc given [#906 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/906)
+- Add custom collection support for get and all methods [#903 / dmason30](https://github.com/barryvdh/laravel-ide-helper/pull/903)
+- if a model implements interfaces, include them in the stub [#920 / mr-feek](https://github.com/barryvdh/laravel-ide-helper/pull/920)
+- Generate noinspections PHPStorm tags [#905 / mzglinski](https://github.com/barryvdh/laravel-ide-helper/pull/905)
+- Added support for Laravel 7 custom casts [#913 / belamov](https://github.com/barryvdh/laravel-ide-helper/pull/913)
+- Ability to use patterns for model_locations [#921 / 4n70w4](https://github.com/barryvdh/laravel-ide-helper/pull/921)

 ### Fixed
- MorphToMany relations with query not working [\#894 / UksusoFF](https://github.com/barryvdh/laravel-ide-helper/pull/894)
- Fix camelCase duplicated properties generator [\#881 / bop10](https://github.com/barryvdh/laravel-ide-helper/pull/881)
- Prevent generation of invalid code for certain parameter default values [\#901 / loilo](https://github.com/barryvdh/laravel-ide-helper/pull/901)
- Make hasOne and morphOne nullable [\#864 / leo108](https://github.com/barryvdh/laravel-ide-helper/pull/864)
- Remove unnecessary and wrong definition of SoftDelete methods [\#918 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/918)
- Unregister meta command custom autoloader when it is no longer needed [\#919 / mr-feek](https://github.com/barryvdh/laravel-ide-helper/pull/919)

-2020-02-25, 2.6.7
-----------------
+- MorphToMany relations with query not working [#894 / UksusoFF](https://github.com/barryvdh/laravel-ide-helper/pull/894)
+- Fix camelCase duplicated properties generator [#881 / bop10](https://github.com/barryvdh/laravel-ide-helper/pull/881)
+- Prevent generation of invalid code for certain parameter default values [#901 / loilo](https://github.com/barryvdh/laravel-ide-helper/pull/901)
+- Make hasOne and morphOne nullable [#864 / leo108](https://github.com/barryvdh/laravel-ide-helper/pull/864)
+- Remove unnecessary and wrong definition of SoftDelete methods [#918 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/918)
+- Unregister meta command custom autoloader when it is no longer needed [#919 / mr-feek](https://github.com/barryvdh/laravel-ide-helper/pull/919)
+
+## 2020-02-25, 2.6.7
+
 ### Added
+
 - Support for Laravel 7 [commit by barryvdh](https://github.com/barryvdh/laravel-ide-helper/commit/edd69c5e0508972c81f1f7173236de2459c45814)

-2019-12-02, 2.6.6
-----------------
+## 2019-12-02, 2.6.6
+
 ### Added
- Add splat operator (...) support [\#860 / ngmy](https://github.com/barryvdh/laravel-ide-helper/pull/860)
- Add support for custom date class via Date::use() [\#859 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/859)
+
+- Add splat operator (...) support [#860 / ngmy](https://github.com/barryvdh/laravel-ide-helper/pull/860)
+- Add support for custom date class via Date::use() [#859 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/859)

 ### Fixed
- Prevent undefined property errors [\#877 / matt-allan](https://github.com/barryvdh/laravel-ide-helper/pull/877)

----
+- Prevent undefined property errors [#877 / matt-allan](https://github.com/barryvdh/laravel-ide-helper/pull/877)
+
+
+---
+
 Missing an older changelog? Feel free to submit a PR!
@@ -33,42 +33,27 @@ Require this package with composer using the following command:
 composer require --dev barryvdh/laravel-ide-helper
 ```

-> [!NOTE]  
-> If you encounter version conflicts with doctrine/dbal, please try:
-> `composer require --dev barryvdh/laravel-ide-helper --with-all-dependencies`
- 
-This package makes use of [Laravels package auto-discovery mechanism](https://medium.com/@taylorotwell/package-auto-discovery-in-laravel-5-5-ea9e3ab20518), which means if you don't install dev dependencies in production, it also won't be loaded.
-
-If for some reason you want manually control this:
- add the package to the `extra.laravel.dont-discover` key in `composer.json`, e.g.
-  ```json
-  "extra": {
-    "laravel": {
-      "dont-discover": [
-        "barryvdh/laravel-ide-helper"
-      ]
-    }
-  }
-  ```
- Add the following class to the `providers` array in `config/app.php`:
-  ```php
-  Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
-  ```
-  If you want to manually load it only in non-production environments, instead you can add this to your `AppServiceProvider` with the `register()` method:
-  ```php
-  public function register()
-  {
-      if ($this->app->isLocal()) {
-          $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
-      }
-      // ...
-  }
-  ```
-
-> Note: Avoid caching the configuration in your development environment, it may cause issues after installing this package; respectively clear the cache beforehand via `php artisan cache:clear` if you encounter problems when running the commands

 ## Usage

+### TL;DR
+
+Run this to generate autocompletion for Facades. This creates _ide_helper.php
+
+```
+php artisan ide-helper:generate
+```
+
+Run this to add phpdocs for your models. Add -RW to Reset existing phpdocs and Write to the models directly.
+```
+php artisan ide-helper:models -RW
+```
+
+If you don't want the full _ide_helper.php file, you can run add `--write-eloquent-helper` to the model command to generate small version, which is required for the `@mixin \Eloquent` to be able to add the QueryBuilder methods.
+
+If you don't want to add all the phpdocs to your Models directly, you can use `--nowrite` to create a seperate file. The  `--write-mixin` option can be used to only add a `@mixin` to your models, but add the generated phpdocs in a seperate file. This avoids having the results marked as duplicate.
+
+
 _Check out [this Laracasts video](https://laracasts.com/series/how-to-be-awesome-in-phpstorm/episodes/15) for a quick introduction/explanation!_

 - `php artisan ide-helper:generate` - [PHPDoc generation for Laravel Facades ](#automatic-phpdoc-generation-for-laravel-facades)
@@ -76,7 +61,7 @@ _Check out [this Laracasts video](https://laracasts.com/series/how-to-be-awesome
 - `php artisan ide-helper:meta` - [PhpStorm Meta file](#phpstorm-meta-for-container-instances)


-Note: You do need CodeComplice for Sublime Text: https://github.com/spectacles/CodeComplice
+> Note: You do need CodeComplice for Sublime Text: https://github.com/spectacles/CodeComplice

 ### Automatic PHPDoc generation for Laravel Facades

@@ -86,8 +71,6 @@ You can now re-generate the docs yourself (for future updates)
 php artisan ide-helper:generate
 ```

-Note: `bootstrap/compiled.php` has to be cleared first, so run `php artisan clear-compiled` before generating.
-
 This will generate the file `_ide_helper.php` which is expected to be additionally parsed by your IDE for autocomplete. You can use the config `filename` to change its name.

 You can configure your `composer.json` to do this each time you update your dependencies:
@@ -115,7 +98,7 @@ You can use an in-memory SQLite driver by adding the `-M` option.

 If you use [real-time facades](https://laravel.com/docs/master/facades#real-time-facades) in your app, those will also be included in the generated file using a `@mixin` annotation and extending the original class underneath the facade. 

-**Note**: this feature uses the generated real-time facades files in the `storage/framework/cache` folder. Those files are generated on-demand as you use the real-time facade, so if the framework has not generated that first, it will not be included in the helper file. Run the route/command/code first and then regenerate the helper file and this time the real-time facade will be included in it.
+> **Note**: this feature uses the generated real-time facades files in the `storage/framework/cache` folder. Those files are generated on-demand as you use the real-time facade, so if the framework has not generated that first, it will not be included in the helper file. Run the route/command/code first and then regenerate the helper file and this time the real-time facade will be included in it.

 You can choose to include helper files. This is not enabled by default, but you can override it with the `--helpers (-H)` option.
 The `Illuminate/Support/helpers.php` is already set up, but you can add/remove your own files in the config file.
@@ -132,6 +115,8 @@ Str::macro('concat', function(string $str1, string $str2) : string {
 });
 ```

+You can add any custom Macroable traits to detect in the `macroable_traits` config option.
+
 ### Automatic PHPDocs for models

 If you don't want to write your properties yourself, you can use the command `php artisan ide-helper:models` to generate
@@ -149,6 +134,8 @@ The class name will be different from the model, avoiding the IDE duplicate anno

 > Please make sure to back up your models, before writing the info.

+> You need the _ide_helper.php file to add the QueryBuilder methods. You can add --write-eloquent-helper/-E to generate a minimal version. If this file does not exist, you will be prompted for it.
+
 Writing to the models should keep the existing comments and only append new properties/methods. It will not update changed properties/methods.

 With the `--reset (-R)` option, the whole existing PHPDoc is replaced, including any comments that have been made.
@@ -382,7 +369,7 @@ app(App\SomeClass::class);
 ```

 > Note: You might need to restart PhpStorm and make sure `.phpstorm.meta.php` is indexed.
->
+
 > Note: When you receive a FatalException: class not found, check your config
 > (for example, remove S3 as cloud driver when you don't have S3 configured. Remove Redis ServiceProvider when you don't use it).

@@ -11,7 +11,8 @@
        "netbeans",
        "sublime",
        "codeintel",
-        "phpdoc"
+        "phpdoc",
+        "dev"
    ],
    "authors": [
        {
@@ -22,14 +23,12 @@
    "require": {
        "php": "^8.2",
        "ext-json": "*",
-        "barryvdh/reflection-docblock": "^2.1.2",
+        "barryvdh/reflection-docblock": "^2.3",
        "composer/class-map-generator": "^1.0",
        "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"
+        "illuminate/support": "^11.15"
    },
    "require-dev": {
        "ext-pdo_sqlite": "*",
@@ -40,7 +39,8 @@
        "orchestra/testbench": "^9.2",
        "phpunit/phpunit": "^10.5",
        "spatie/phpunit-snapshot-assertions": "^4 || ^5",
-        "vimeo/psalm": "^5.4"
+        "vimeo/psalm": "^5.4",
+        "vlucas/phpdotenv": "^5"
    },
    "suggest": {
        "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9|^10|^11)."
@@ -65,7 +65,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "3.2-dev"
+            "dev-master": "3.5-dev"
        },
        "laravel": {
            "providers": [
@@ -299,6 +299,29 @@ return [
    */
    'additional_relation_return_types' => [],

+    /*
+    |--------------------------------------------------------------------------
+    | Enforce nullable Eloquent relationships on not null columns
+    |--------------------------------------------------------------------------
+    |
+    | When set to true (default), this option enforces nullable Eloquent relationships.
+    | However, in cases where the application logic ensures the presence of related
+    | records it may be desirable to set this option to false to avoid unwanted null warnings.
+    |
+    | Default: true
+    | A not null column with no foreign key constraint will have a "nullable" relationship.
+    |  * @property int $not_null_column_with_no_foreign_key_constraint
+    |  * @property-read BelongsToVariation|null $notNullColumnWithNoForeignKeyConstraint
+    |
+    | Option: false
+    | A not null column with no foreign key constraint will have a "not nullable" relationship.
+    |  * @property int $not_null_column_with_no_foreign_key_constraint
+    |  * @property-read BelongsToVariation $notNullColumnWithNoForeignKeyConstraint
+    |
+    */
+
+    'enforce_nullable_relationships' => true,
+
    /*
    |--------------------------------------------------------------------------
    | Run artisan commands after migrations to generate model helpers
@@ -311,4 +334,18 @@ return [
        // 'ide-helper:models --nowrite',
    ],

+    /*
+    |--------------------------------------------------------------------------
+    | Macroable Traits
+    |--------------------------------------------------------------------------
+    |
+    | Define which traits should be considered capable of adding Macro.
+    | You can add any custom trait that behaves like the original Laravel one.
+    |
+    */
+    'macroable_traits' => [
+        Filament\Support\Concerns\Macroable::class,
+        Spatie\Macroable\Macroable::class,
+    ],
+
 ];
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Taylor Otwell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
@@ -0,0 +1,5 @@
+The templates here are based on the official VS Code extension by Laravel https://github.com/laravel/vs-code-extension
+
+Modifications:
+ - return instead of echo
+ - do not serialize to JSON
@@ -0,0 +1,43 @@
+<?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');
@@ -0,0 +1,131 @@
+<?php
+
+$local = collect(glob(config_path('/*.php')))
+    ->merge(glob(config_path('**/*.php')))
+    ->map(fn ($path) => [
+        (string) Illuminate\Support\Str::of($path)
+            ->replace([config_path('/'), '.php'], '')
+            ->replace('/', '.'),
+        $path,
+    ]);
+
+$vendor = collect(glob(base_path('vendor/**/**/config/*.php')))->map(fn (
+    $path
+) => [
+    (string) Illuminate\Support\Str::of($path)
+        ->afterLast('/config/')
+        ->replace('.php', '')
+        ->replace('/', '.'),
+    $path,
+]);
+
+$configPaths = $local
+    ->merge($vendor)
+    ->groupBy(0)
+    ->map(fn ($items) => $items->pluck(1));
+
+$cachedContents = [];
+$cachedParsed = [];
+
+function vsCodeGetConfigValue($value, $key, $configPaths)
+{
+    $parts = explode('.', $key);
+    $toFind = $key;
+    $found = null;
+
+    while (count($parts) > 0) {
+        array_pop($parts);
+        $toFind = implode('.', $parts);
+
+        if ($configPaths->has($toFind)) {
+            $found = $toFind;
+            break;
+        }
+    }
+
+    if ($found === null) {
+        return null;
+    }
+
+    $file = null;
+    $line = null;
+
+    if ($found === $key) {
+        $file = $configPaths->get($found)[0];
+    } else {
+        foreach ($configPaths->get($found) as $path) {
+            $cachedContents[$path] ??= file_get_contents($path);
+            $cachedParsed[$path] ??= token_get_all($cachedContents[$path]);
+
+            $keysToFind = Illuminate\Support\Str::of($key)
+                ->replaceFirst($found, '')
+                ->ltrim('.')
+                ->explode('.');
+
+            if (is_numeric($keysToFind->last())) {
+                $index = $keysToFind->pop();
+
+                if ($index !== '0') {
+                    return null;
+                }
+
+                $key = collect(explode('.', $key));
+                $key->pop();
+                $key = $key->implode('.');
+                $value = 'array(...)';
+            }
+
+            $nextKey = $keysToFind->shift();
+            $expectedDepth = 1;
+
+            $depth = 0;
+
+            foreach ($cachedParsed[$path] as $token) {
+                if ($token === '[') {
+                    $depth++;
+                }
+
+                if ($token === ']') {
+                    $depth--;
+                }
+
+                if (!is_array($token)) {
+                    continue;
+                }
+
+                $str = trim($token[1], '"\'');
+
+                if (
+                    $str === $nextKey &&
+                    $depth === $expectedDepth &&
+                    $token[0] === T_CONSTANT_ENCAPSED_STRING
+                ) {
+                    $nextKey = $keysToFind->shift();
+                    $expectedDepth++;
+
+                    if ($nextKey === null) {
+                        $file = $path;
+                        $line = $token[2];
+                        break;
+                    }
+                }
+            }
+
+            if ($file) {
+                break;
+            }
+        }
+    }
+
+    return [
+        'name' => $key,
+        'value' => $value,
+        'file' => $file === null ? null : str_replace(base_path('/'), '', $file),
+        'line' => $line,
+    ];
+}
+
+return collect(Illuminate\Support\Arr::dot(config()->all()))
+    ->map(fn ($value, $key) => vsCodeGetConfigValue($value, $key, $configPaths))
+    ->filter()
+    ->values();
@@ -0,0 +1,64 @@
+<?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(','),
+        ]);
+    });
@@ -0,0 +1,46 @@
+<?php
+
+function vsCodeGetRouterReflection(Illuminate\Routing\Route $route)
+{
+    if ($route->getActionName() === 'Closure') {
+        return new ReflectionFunction($route->getAction()['uses']);
+    }
+
+    if (!str_contains($route->getActionName(), '@')) {
+        return new ReflectionClass($route->getActionName());
+    }
+
+    try {
+        return new ReflectionMethod($route->getControllerClass(), $route->getActionMethod());
+    } catch (Throwable $e) {
+        $namespace = app(Illuminate\Routing\UrlGenerator::class)->getRootControllerNamespace()
+            ?? (app()->getNamespace() . 'Http\Controllers');
+
+        return new ReflectionMethod(
+            $namespace . '\\' . ltrim($route->getControllerClass(), '\\'),
+            $route->getActionMethod(),
+        );
+    }
+}
+
+return collect(app('router')->getRoutes()->getRoutes())
+    ->map(function (Illuminate\Routing\Route $route) {
+        try {
+            $reflection = vsCodeGetRouterReflection($route);
+        } catch (Throwable $e) {
+            $reflection = null;
+        }
+
+        return [
+            'method' => collect($route->methods())->filter(function ($method) {
+                return $method !== 'HEAD';
+            })->implode('|'),
+            'uri' => $route->uri(),
+            'name' => $route->getName(),
+            'action' => $route->getActionName(),
+            'parameters' => $route->parameterNames(),
+            'filename' => $reflection ? $reflection->getFileName() : null,
+            'line' => $reflection ? $reflection->getStartLine() : null,
+        ];
+    })
+;
@@ -0,0 +1,143 @@
+<?php
+
+function vsCodeGetTranslationsFromFile($file, $path, $namespace)
+{
+    $key = pathinfo($file, PATHINFO_FILENAME);
+
+    if ($namespace) {
+        $key = "{$namespace}::{$key}";
+    }
+
+    $lang = collect(explode(DIRECTORY_SEPARATOR, str_replace($path, '', $file)))
+        ->filter()
+        ->first();
+
+    $fileLines = Illuminate\Support\Facades\File::lines($file);
+    $lines = [];
+    $inComment = false;
+
+    foreach ($fileLines as $index => $line) {
+        $trimmed = trim($line);
+
+        if (substr($trimmed, 0, 2) === '/*') {
+            $inComment = true;
+            continue;
+        }
+
+        if ($inComment) {
+            if (substr($trimmed, -2) !== '*/') {
+                continue;
+            }
+
+            $inComment = false;
+        }
+
+        if (substr($trimmed, 0, 2) === '//') {
+            continue;
+        }
+
+        $lines[] = [$index + 1, $trimmed];
+    }
+
+    return [
+        'k' => $key,
+        'la' => $lang,
+        '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(),
+    ];
+}
+
+function vsCodeTranslationValue($key, $value, $file, $lines): ?array
+{
+    if (is_array($value)) {
+        return null;
+    }
+
+    $lineNumber = 1;
+    $keys = explode('.', $key);
+    $index = 0;
+    $currentKey = array_shift($keys);
+
+    foreach ($lines as $index => $line) {
+        if (
+            strpos($line[1], '"' . $currentKey . '"', 0) !== false ||
+            strpos($line[1], "'" . $currentKey . "'", 0) !== false
+        ) {
+            $lineNumber = $line[0];
+            $currentKey = array_shift($keys);
+        }
+
+        if ($currentKey === null) {
+            break;
+        }
+    }
+
+    return [
+        'v' => $value,
+        'p' => $file,
+        'li' => $lineNumber,
+        'pa' => preg_match_all("/\:([A-Za-z0-9_]+)/", $value, $matches)
+            ? $matches[1]
+            : [],
+    ];
+}
+
+function vscodeCollectTranslations(string $path, ?string $namespace = null)
+{
+    $realPath = realpath($path);
+
+    if (!is_dir($realPath)) {
+        return collect();
+    }
+
+    return collect(Illuminate\Support\Facades\File::allFiles($realPath))->map(
+        fn ($file) => vsCodeGetTranslationsFromFile($file, $path, $namespace)
+    );
+}
+
+$loader = app('translator')->getLoader();
+$namespaces = $loader->namespaces();
+
+$reflection = new ReflectionClass($loader);
+$property = $reflection->hasProperty('paths')
+    ? $reflection->getProperty('paths')
+    : $reflection->getProperty('path');
+$property->setAccessible(true);
+
+$paths = Illuminate\Support\Arr::wrap($property->getValue($loader));
+
+$default = collect($paths)->flatMap(
+    fn ($path) => vscodeCollectTranslations($path)
+);
+
+$namespaced = collect($namespaces)->flatMap(
+    fn ($path, $namespace) => vscodeCollectTranslations($path, $namespace)
+);
+
+$final = [];
+
+foreach ($default->merge($namespaced) as $value) {
+    foreach ($value['vs'] as $key => $v) {
+        $dotKey = "{$value['k']}.{$key}";
+
+        if (!isset($final[$dotKey])) {
+            $final[$dotKey] = [];
+        }
+
+        $final[$dotKey][$value['la']] = $v;
+
+        if ($value['la'] === Illuminate\Support\Facades\App::currentLocale()) {
+            $final[$dotKey]['default'] = $v;
+        }
+    }
+}
+
+return collect($final);
@@ -0,0 +1,61 @@
+<?php
+
+function vsCodeFindBladeFiles($path)
+{
+    $paths = [];
+
+    if (!is_dir($path)) {
+        return $paths;
+    }
+
+    foreach (
+        Symfony\Component\Finder\Finder::create()
+            ->files()
+            ->name('*.blade.php')
+            ->in($path) as $file
+    ) {
+        $paths[] = [
+            'path' => str_replace(base_path(DIRECTORY_SEPARATOR), '', $file->getRealPath()),
+            'isVendor' => str_contains($file->getRealPath(), base_path('vendor')),
+            'key' => Illuminate\Support\Str::of($file->getRealPath())
+                ->replace(realpath($path), '')
+                ->replace('.blade.php', '')
+                ->ltrim(DIRECTORY_SEPARATOR)
+                ->replace(DIRECTORY_SEPARATOR, '.'),
+        ];
+    }
+
+    return $paths;
+}
+$paths = collect(
+    app('view')
+        ->getFinder()
+        ->getPaths()
+)->flatMap(function ($path) {
+    return vsCodeFindBladeFiles($path);
+});
+
+$hints = collect(
+    app('view')
+        ->getFinder()
+        ->getHints()
+)->flatMap(function ($paths, $key) {
+    return collect($paths)->flatMap(function ($path) use ($key) {
+        return collect(vsCodeFindBladeFiles($path))->map(function ($value) use (
+            $key
+        ) {
+            return array_merge($value, ['key' => "{$key}::{$value['key']}"]);
+        });
+    });
+});
+
+[$local, $vendor] = $paths
+    ->merge($hints)
+    ->values()
+    ->partition(function ($v) {
+        return !$v['isVendor'];
+    });
+
+return $local
+    ->sortBy('key', SORT_NATURAL)
+    ->merge($vendor->sortBy('key', SORT_NATURAL));
@@ -1,8 +1,8 @@
 <?= '<?php' ?>
 <?php
 /**
- * @var \Barryvdh\LaravelIdeHelper\Alias[][] $namespaces_by_alias_ns
- * @var \Barryvdh\LaravelIdeHelper\Alias[][] $namespaces_by_extends_ns
+ * @var Barryvdh\LaravelIdeHelper\Alias[][] $namespaces_by_alias_ns
+ * @var Barryvdh\LaravelIdeHelper\Alias[][] $namespaces_by_extends_ns
 * @var bool $include_fluent
 * @var string $helpers
 */
@@ -14,31 +14,34 @@

 /**
 * A helper file for Laravel, to provide autocomplete information to your IDE
- * Generated for Laravel <?= $version ?>.
+ * Generated for Laravel <?= app()->version() ?>.
 *
 * This file should not be included in your code, only analyzed by your IDE!
 *
 * @author Barry vd. Heuvel <[email protected]>
 * @see https://github.com/barryvdh/laravel-ide-helper
 */
-
+<?php
+$s1 = '    ';
+$s2 = $s1 . $s1;
+$s3 = $s1 . $s2;
+?>
 <?php foreach ($namespaces_by_extends_ns as $namespace => $aliases) : ?>
-namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> {
+namespace <?= $namespace === '__root' ? '' : trim($namespace, '\\') ?> {
    <?php foreach ($aliases as $alias) : ?>
-        <?= trim($alias->getDocComment('    ')) ?>
-        <?= $alias->getClassType() ?> <?= $alias->getExtendsClass() ?> {
+<?php echo trim($alias->getDocComment($s1)) . "\n{$s1}" . $alias->getClassType() ?> <?= $alias->getExtendsClass() ?> {
        <?php foreach ($alias->getMethods() as $method) : ?>
-            <?= trim($method->getDocComment('        ')) ?>
-        public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
+<?= trim($method->getDocComment($s2)) . "\n{$s2}" ?>public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
        {<?php if ($method->getDeclaringClass() !== $method->getRoot()) : ?>
-            //Method inherited from <?= $method->getDeclaringClass() ?>
-         <?php endif; ?>
+<?= "\n" . $s3?>//Method inherited from <?= $method->getDeclaringClass() ?>
+ <?php endif; ?>

-            <?php if ($method->isInstanceCall()) : ?>
-            /** @var <?=$method->getRoot()?> $instance */
-            <?php endif?>
-            <?= $method->shouldReturn() ? 'return ' : '' ?><?= $method->getRootMethodCall() ?>;
+<?php if ($method->isInstanceCall()) : ?>
+<?= $s3 ?>/** @var <?=$method->getRoot()?> $instance */
+<?php endif?>
+<?= $s3 . ($method->shouldReturn() ? 'return ' : '') ?><?= $method->getRootMethodCall() ?>;
        }
+
        <?php endforeach; ?>
    }
    <?php endforeach; ?>
@@ -47,24 +50,28 @@ namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> {
 <?php endforeach; ?>

 <?php foreach ($namespaces_by_alias_ns as $namespace => $aliases) : ?>
-namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> {
-    <?php foreach ($aliases as $alias) : ?>
-        <?= $alias->getClassType() ?> <?= $alias->getShortName() ?> extends <?= $alias->getExtends() ?> {<?php if ($alias->getExtendsNamespace() == '\Illuminate\Database\Eloquent') : ?>
-            <?php foreach ($alias->getMethods() as $method) : ?>
-                <?= trim($method->getDocComment('            ')) ?>
-            public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
-            {<?php if ($method->getDeclaringClass() !== $method->getRoot()) : ?>
-                //Method inherited from <?= $method->getDeclaringClass() ?>
-             <?php endif; ?>
+namespace <?= $namespace === '__root' ? '' : trim($namespace, '\\') ?> {
+<?php foreach ($aliases as $alias) : ?>
+<?php if ($alias->getExtendsNamespace() === '\Illuminate\Database\Eloquent') : ?>
+<?= "\n" . $alias->getPhpDocTemplates($s1) . "\n" ?>
+<?php endif?>
+<?= $s1 . $alias->getClassType() ?> <?= $alias->getShortName() ?> extends <?= $alias->getExtends() ?> {<?php if ($alias->getExtendsNamespace() === '\Illuminate\Database\Eloquent') : ?>
+<?php foreach ($alias->getMethods() as $method) : ?>
+<?= $s2 . trim($method->getDocComment($s2)) . "\n" ?>
+<?= $s2 ?>public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
+<?= $s2?>{<?php if ($method->getDeclaringClass() !== $method->getRoot()) : ?>
+<?= $s2 ?>//Method inherited from <?= $method->getDeclaringClass() ?>
+<?php endif; ?>

-                <?php if ($method->isInstanceCall()) : ?>
-                /** @var <?=$method->getRoot()?> $instance */
-                <?php endif?>
-                <?= $method->shouldReturn() ? 'return ' : '' ?><?= $method->getRootMethodCall() ?>;
-            }
-            <?php endforeach; ?>
-        <?php endif; ?>}
-    <?php endforeach; ?>
+<?php if ($method->isInstanceCall()) : ?>
+<?= $s3 ?>/** @var <?=$method->getRoot()?> $instance */
+<?php endif?>
+<?= $s3 . ($method->shouldReturn() ? 'return ' : '') ?><?= $method->getRootMethodCall() ?>;
+<?= $s2 ?>}
+
+<?php endforeach; ?>
+<?php endif; ?>}
+<?php endforeach; ?>
 }

 <?php endforeach; ?>
@@ -21,6 +21,20 @@ namespace PHPSTORM_META {
    ]));
 <?php endforeach; ?>

+<?php foreach ($userMethods as $method) : ?>
+    override(<?= $method ?>, map([
+        '' => \<?= $userModel ?>::class,
+    ]));
+<?php endforeach; ?>
+
+<?php foreach ($configMethods as $method) : ?>
+    override(<?= $method ?>, map([
+    <?php foreach ($configValues as $name => $value) : ?>
+        '<?= $name ?>' => '<?= $value ?>',
+    <?php endforeach; ?>
+    ]));
+<?php endforeach; ?>
+
 <?php if (count($factories)) : ?>
    override(\factory(0), map([
        '' => '@FactoryBuilder',
@@ -65,4 +79,31 @@ namespace PHPSTORM_META {
    override(\tap(0), type(0));
    override(\optional(0), type(0));

+    <?php if (isset($expectedArgumentSets)): ?>
+    <?php foreach ($expectedArgumentSets as $name => $argumentsList) : ?>
+    registerArgumentsSet('<?= $name ?>', <?php foreach ($argumentsList as $i => $arg) : ?><?php if($i % 5 == 0) {
+        echo "\n";
+    } ?><?= var_export($arg, true); ?>,<?php endforeach; ?>);
+    <?php endforeach; ?>
+    <?php endif ?>
+
+    <?php if (isset($expectedArguments)) : ?>
+    <?php foreach ($expectedArguments as $arguments) : ?>
+    <?php
+        $classes = isset($arguments['class']) ? (array) $arguments['class'] : [null];
+        $index = $arguments['index'] ?? 0;
+        $argumentSet = $arguments['argumentSet'];
+        $functions = [];
+        foreach ($classes as $class) {
+            foreach ((array) $arguments['method'] as $method) {
+                $functions[] = '\\' . ($class ? ltrim($class, '\\') . '::' : '') . $method . '()';
+            }
+        }
+        ?>
+    <?php foreach ($functions as $function) : ?>
+expectedArguments(<?= $function ?>, <?= $index ?>, argumentsSet('<?= $argumentSet ?>'));
+    <?php endforeach; ?>
+    <?php endforeach; ?>
+    <?php endif; ?>
+
 }
@@ -13,11 +13,14 @@ 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 ReflectionClass;
 use Throwable;
@@ -43,9 +46,14 @@ class Alias
    protected $phpdoc = null;
    protected $classAliases = [];

+    protected $isMacroable = false;
+
    /** @var ConfigRepository  */
    protected $config;

+    /** @var string[] */
+    protected $templateNames;
+
    /**
     * @param ConfigRepository $config
     * @param string           $alias
@@ -54,12 +62,13 @@ class Alias
     * @param array            $magicMethods
     * @param array            $interfaces
     */
-    public function __construct($config, $alias, $facade, $magicMethods = [], $interfaces = [])
+    public function __construct($config, $alias, $facade, $magicMethods = [], $interfaces = [], $isMacroable = false)
    {
        $this->alias = $alias;
        $this->magicMethods = $magicMethods;
        $this->interfaces = $interfaces;
        $this->config = $config;
+        $this->isMacroable = $isMacroable;

        // Make the class absolute
        $facade = '\\' . ltrim($facade, '\\');
@@ -80,7 +89,12 @@ class Alias
        $this->detectExtendsNamespace();

        if (!empty($this->namespace)) {
-            $this->classAliases = (new UsesResolver())->loadFromClass($this->root);
+            try {
+                $this->classAliases = (new ContextFactory())->createFromReflector(new ReflectionClass($this->root))->getNamespaceAliases();
+            } catch (Throwable $e) {
+                $this->classAliases = [];
+            }
+

            //Create a DocBlock and serializer instance
            $this->phpdoc = new DocBlock(new ReflectionClass($alias), new Context($this->namespace, $this->classAliases));
@@ -333,7 +347,16 @@ class Alias

            if (!in_array($magic, $this->usedMethods)) {
                if ($class !== $this->root) {
-                    $this->methods[] = new Method($method, $this->alias, $class, $magic, $this->interfaces, $this->classAliases);
+                    $this->methods[] = new Method(
+                        $method,
+                        $this->alias,
+                        $class,
+                        $magic,
+                        $this->interfaces,
+                        $this->classAliases,
+                        $this->getReturnTypeNormalizers($class),
+                        $this->getTemplateNames()
+                    );
                }
                $this->usedMethods[] = $magic;
            }
@@ -363,7 +386,9 @@ class Alias
                                $reflection,
                                $method->name,
                                $this->interfaces,
-                                $this->classAliases
+                                $this->classAliases,
+                                $this->getReturnTypeNormalizers($reflection),
+                                $this->getTemplateNames(),
                            );
                        }
                        $this->usedMethods[] = $method->name;
@@ -373,20 +398,26 @@ class Alias

            // Check if the class is macroable
            // (Eloquent\Builder is also macroable but doesn't use Macroable trait)
-            $traits = collect($reflection->getTraitNames());
-            if ($traits->contains('Illuminate\Support\Traits\Macroable') || $class === EloquentBuilder::class) {
+            if ($this->isMacroable || $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(
-                            $this->getMacroFunction($macro_func),
+                            $method,
                            $this->alias,
                            $reflection,
                            $macro_name,
                            $this->interfaces,
-                            $this->classAliases
+                            $this->classAliases,
+                            $this->getReturnTypeNormalizers($reflection)
                        );
                        $this->usedMethods[] = $macro_name;
                    }
@@ -395,6 +426,21 @@ class Alias
        }
    }

+    /**
+     * @param ReflectionClass $class
+     * @return array<string, string>
+     */
+    protected function getReturnTypeNormalizers($class)
+    {
+        if ($this->alias === 'Eloquent' && in_array($class->getName(), [EloquentBuilder::class, QueryBuilder::class])) {
+            return [
+                '$this' => '\\' . EloquentBuilder::class . ($this->config->get('ide-helper.use_generics_annotations') ? '<static>' : '|static'),
+            ];
+        }
+
+        return [];
+    }
+
    /**
     * @param $macro_func
     *
@@ -442,6 +488,67 @@ class Alias
        return $serializer->getDocComment($this->phpdoc);
    }

+    /**
+     * @param $prefix
+     * @return string
+     */
+    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 */
+                foreach ($templates as $template) {
+                    $templateNames[] = $template->getTemplateName();
+                }
+            }
+        }
+        $this->templateNames = $templateNames;
+    }
+
    /**
     * Removes method tags from the doc comment that already appear as functions inside the class.
     * This prevents duplicate function errors in the IDE.
@@ -14,7 +14,9 @@ namespace Barryvdh\LaravelIdeHelper\Console;
 use Barryvdh\LaravelIdeHelper\Eloquent;
 use Barryvdh\LaravelIdeHelper\Generator;
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Config\Repository;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\View\Factory;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;

@@ -45,7 +47,7 @@ class GeneratorCommand extends Command
    /** @var Filesystem */
    protected $files;

-    /** @var \Illuminate\View\Factory */
+    /** @var Factory */
    protected $view;

    protected $onlyExtend;
@@ -55,14 +57,12 @@ class GeneratorCommand extends Command
     *
     * @param \Illuminate\Config\Repository $config
     * @param Filesystem $files
-     * @param \Illuminate\View\Factory $view
+     * @param Factory $view
     */
    public function __construct(
-        /*ConfigRepository */
-        $config,
+        Repository $config,
        Filesystem $files,
-        /* Illuminate\View\Factory */
-        $view
+        Factory $view
    ) {
        $this->config = $config;
        $this->files = $files;
@@ -113,7 +113,12 @@ class GeneratorCommand extends Command
        }

        $generator = new Generator($this->config, $this->view, $this->getOutput(), $helpers);
-        $content = $generator->generate();
+        if ($this->option('eloquent')) {
+            $content = $generator->generateEloquent();
+        } else {
+            $content = $generator->generate();
+        }
+
        $written = $this->files->put($filename, $content);

        if ($written !== false) {
@@ -169,6 +174,7 @@ class GeneratorCommand extends Command
            ['write_mixins', 'W', InputOption::VALUE_OPTIONAL, 'Write mixins to Laravel Model?', $writeMixins],
            ['helpers', 'H', InputOption::VALUE_NONE, 'Include the helper files'],
            ['memory', 'M', InputOption::VALUE_NONE, 'Use sqlite memory driver'],
+            ['eloquent', 'E', InputOption::VALUE_NONE, 'Only write Eloquent methods'],
        ];
    }
 }
@@ -12,7 +12,13 @@
 namespace Barryvdh\LaravelIdeHelper\Console;

 use Barryvdh\LaravelIdeHelper\Factories;
+use Dotenv\Parser\Entry;
+use Dotenv\Parser\Parser;
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Config\Repository;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Collection;
 use RuntimeException;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -41,34 +47,54 @@ class MetaCommand extends Command
    /** @var \Illuminate\Contracts\Filesystem\Filesystem */
    protected $files;

-    /** @var \Illuminate\Contracts\View\Factory */
+    /** @var Factory */
    protected $view;

-    /** @var \Illuminate\Contracts\Config\Repository */
+    /** @var Repository */
    protected $config;

    protected $methods = [
-      'new \Illuminate\Contracts\Container\Container',
-      '\Illuminate\Container\Container::makeWith(0)',
-      '\Illuminate\Contracts\Container\Container::get(0)',
-      '\Illuminate\Contracts\Container\Container::make(0)',
-      '\Illuminate\Contracts\Container\Container::makeWith(0)',
-      '\App::get(0)',
-      '\App::make(0)',
-      '\App::makeWith(0)',
-      '\app(0)',
-      '\resolve(0)',
-      '\Psr\Container\ContainerInterface::get(0)',
+        'new \Illuminate\Contracts\Container\Container',
+        '\Illuminate\Container\Container::makeWith(0)',
+        '\Illuminate\Contracts\Container\Container::get(0)',
+        '\Illuminate\Contracts\Container\Container::make(0)',
+        '\Illuminate\Contracts\Container\Container::makeWith(0)',
+        '\App::get(0)',
+        '\App::make(0)',
+        '\App::makeWith(0)',
+        '\app(0)',
+        '\resolve(0)',
+        '\Psr\Container\ContainerInterface::get(0)',
    ];

+    protected $configMethods = [
+        '\config()',
+        '\Illuminate\Config\Repository::get()',
+        '\Illuminate\Support\Facades\Config::get()',
+    ];
+
+    protected $userMethods = [
+        '\auth()->user()',
+        '\Illuminate\Contracts\Auth\Guard::user()',
+        '\Illuminate\Support\Facades\Auth::user()',
+        '\request()->user()',
+        '\Illuminate\Http\Request::user()',
+        '\Illuminate\Support\Facades\Request::user()',
+    ];
+
+    protected $templateCache = [];
+
    /**
     *
-     * @param \Illuminate\Contracts\Filesystem\Filesystem $files
-     * @param \Illuminate\Contracts\View\Factory $view
-     * @param \Illuminate\Contracts\Config\Repository $config
+     * @param Filesystem $files
+     * @param Factory $view
+     * @param Repository $config
     */
-    public function __construct($files, $view, $config)
-    {
+    public function __construct(
+        Filesystem $files,
+        Factory $view,
+        Repository $config
+    ) {
        $this->files = $files;
        $this->view = $view;
        $this->config = $config;
@@ -102,7 +128,7 @@ class MetaCommand extends Command
                }

                $reflectionClass = new \ReflectionClass($concrete);
-                if (is_object($concrete) && !$reflectionClass->isAnonymous()) {
+                if (is_object($concrete) && !$reflectionClass->isAnonymous() && $abstract !== get_class($concrete)) {
                    $bindings[$abstract] = get_class($concrete);
                }
            } catch (\Throwable $e) {
@@ -114,10 +140,22 @@ class MetaCommand extends Command

        $this->unregisterClassAutoloadExceptions($ourAutoloader);

-        $content = $this->view->make('meta', [
-          'bindings' => $bindings,
-          'methods' => $this->methods,
-          'factories' => $factories,
+        $configValues = $this->loadTemplate('configs')->pluck('value', 'name')->map(function ($value, $key) {
+            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,
+            'factories' => $factories,
+            'configMethods' => $this->configMethods,
+            'configValues' => $configValues,
+            'expectedArgumentSets' => $this->getExpectedArgumentSets(),
+            'expectedArguments' => $this->getExpectedArguments(),
+            'userModel' => $defaultUserModel,
+            'userMethods' => $this->userMethods,
        ])->render();

        $filename = $this->option('filename');
@@ -161,6 +199,136 @@ class MetaCommand extends Command
        return $autoloader;
    }

+    protected function getExpectedArgumentSets()
+    {
+        return [
+            'auth' => $this->loadTemplate('auth')->keys()->filter()->toArray(),
+            'configs' => $this->loadTemplate('configs')->pluck('name')->filter()->toArray(),
+            'middleware' => $this->loadTemplate('middleware')->keys()->filter()->toArray(),
+            'routes' => $this->loadTemplate('routes')->pluck('name')->filter()->toArray(),
+            'views' => $this->loadTemplate('views')->pluck('key')->filter()->map(function ($value) {
+                return (string) $value;
+            })->toArray(),
+            'translations' => $this->loadTemplate('translations')->filter()->keys()->toArray(),
+            'env' => $this->getEnv(),
+        ];
+    }
+
+    protected function getExpectedArguments()
+    {
+        return [
+            [
+                'class' => '\Illuminate\Support\Facades\Gate',
+                'method' => [
+                    'has',
+                    'allows',
+                    'denies',
+                    'check',
+                    'any',
+                    'none',
+                    'authorize',
+                    'inspect',
+                ],
+                'argumentSet' => 'auth',
+            ],
+            [
+                'class' => ['\Illuminate\Support\Facades\Route', '\Illuminate\Support\Facades\Auth', 'Illuminate\Foundation\Auth\Access\Authorizable'],
+                'method' => ['can', 'cannot', 'cant'],
+                'argumentSet' => 'auth',
+            ],
+            [
+                'class' => ['Illuminate\Contracts\Auth\Access\Authorizable'],
+                'method' => ['can'],
+                'argumentSet' => 'auth',
+            ],
+            [
+                'class' => ['\Illuminate\Config\Repository', '\Illuminate\Support\Facades\Config'],
+                'method' => [
+//                    'get',    // config() and Config::Get() are added with return type hints already
+                    'getMany',
+                    'set',
+                    'string',
+                    'integer',
+                    'boolean',
+                    'float',
+                    'array',
+                    'prepend',
+                    'push',
+                ],
+                'argumentSet' => 'configs',
+            ],
+            [
+                'class' => ['\Illuminate\Support\Facades\Route', '\Illuminate\Routing\Router'],
+                'method' => ['middleware', 'withoutMiddleware'],
+                'argumentSet' => 'middleware',
+            ],
+            [
+                'method' => ['route', 'to_route', 'signedRoute'],
+                'argumentSet' => 'routes',
+            ],
+            [
+                'class' => [
+                    '\Illuminate\Support\Facades\Redirect',
+                    '\Illuminate\Support\Facades\URL',
+                    '\Illuminate\Routing\Redirector',
+                    '\Illuminate\Routing\UrlGenerator',
+                ],
+                'method' => ['route', 'signedRoute', 'temporarySignedRoute'],
+                'argumentSet' => 'routes',
+            ],
+            [
+                'method' => 'view',
+                'argumentSet' => 'views',
+            ],
+            [
+                'class' => ['\Illuminate\Support\Facades\View', '\Illuminate\View\Factory'],
+                'method' => 'make',
+                'argumentSet' => 'views',
+            ],
+            [
+                'method' => ['__', 'trans'],
+                'argumentSet' => 'translations',
+            ],
+            [
+                'class' => ['\Illuminate\Contracts\Translation\Translator'],
+                'method' => ['get'],
+                'argumentSet' => 'translations',
+            ],
+            [
+                'method' => 'env',
+                'argumentSet' => 'env',
+            ],
+            [
+                'class' => '\Illuminate\Support\Env',
+                'method' => 'get',
+                'argumentSet' => 'env',
+            ],
+        ];
+    }
+
+    /**
+     * @return Collection
+     */
+    protected function loadTemplate($name)
+    {
+        if (!isset($this->templateCache[$name])) {
+            $file =  __DIR__ . '/../../php-templates/' . basename($name) . '.php';
+            try {
+                $value = $this->files->requireOnce($file) ?: [];
+            } catch (\Throwable $e) {
+                $value = [];
+                $this->warn('Cannot load template for ' . $name . ': ' . $e->getMessage());
+            }
+
+            if (!$value instanceof Collection) {
+                $value = collect($value);
+            }
+            $this->templateCache[$name] = $value;
+        }
+
+        return $this->templateCache[$name];
+    }
+
    /**
     * Get the console command options.
     *
@@ -175,6 +343,21 @@ 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
     *
@@ -12,13 +12,16 @@
 namespace Barryvdh\LaravelIdeHelper\Console;

 use Barryvdh\LaravelIdeHelper\Contracts\ModelHookInterface;
+use Barryvdh\LaravelIdeHelper\Generator;
 use Barryvdh\LaravelIdeHelper\Parsers\PhpDocReturnTypeParser;
 use Barryvdh\Reflection\DocBlock;
 use Barryvdh\Reflection\DocBlock\Context;
+use Barryvdh\Reflection\DocBlock\ContextFactory;
 use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
 use Barryvdh\Reflection\DocBlock\Tag;
 use Composer\ClassMapGenerator\ClassMapGenerator;
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Database\Eloquent\Castable;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Contracts\Database\Eloquent\CastsInboundAttributes;
@@ -46,7 +49,7 @@ use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
-use phpDocumentor\Reflection\Types\ContextFactory;
+use Illuminate\View\Factory as ViewFactory;
 use ReflectionClass;
 use ReflectionNamedType;
 use ReflectionObject;
@@ -82,6 +85,14 @@ class ModelsCommand extends Command
     */
    protected $files;

+    /**
+     * @var Repository
+     */
+    protected $config;
+
+    /** @var ViewFactory */
+    protected $view;
+
    /**
     * The console command name.
     *
@@ -131,10 +142,12 @@ class ModelsCommand extends Command
    /**
     * @param Filesystem $files
     */
-    public function __construct(Filesystem $files)
+    public function __construct(Filesystem $files, Repository $config, ViewFactory $view)
    {
-        parent::__construct();
+        $this->config = $config;
        $this->files = $files;
+        $this->view = $view;
+        parent::__construct();
    }

    /**
@@ -187,6 +200,27 @@ class ModelsCommand extends Command
                $this->error("Failed to write model information to $filename");
            }
        }
+
+        $helperFilename = $this->config->get('ide-helper.filename');
+        $writeHelper = $this->option('write-eloquent-helper');
+
+        if (!$writeHelper && !$this->files->exists($helperFilename) && ($this->write || $this->write_mixin)) {
+            if ($this->confirm("{$helperFilename} does not exist.
+            Do you want to generate a minimal helper to generate the Eloquent methods?")) {
+                $writeHelper = true;
+            }
+        }
+
+        if ($writeHelper) {
+            $generator = new Generator($this->config, $this->view, $this->getOutput());
+            $content = $generator->generateEloquent();
+            $written = $this->files->put($helperFilename, $content);
+            if ($written !== false) {
+                $this->info("Eloquent helper was written to $helperFilename");
+            } else {
+                $this->error("Failed to write eloquent helper to $helperFilename");
+            }
+        }
    }


@@ -217,6 +251,9 @@ class ModelsCommand extends Command
            ['write-mixin', 'M', InputOption::VALUE_NONE,
                "Write models to {$this->filename} and adds @mixin to each model, avoiding IDE duplicate declaration warnings",
            ],
+            ['write-eloquent-helper', 'E', InputOption::VALUE_NONE,
+                'Write Eloquent helper file to _ide_helper.php',
+            ],
            ['nowrite', 'N', InputOption::VALUE_NONE, 'Don\'t write to Model file'],
            ['reset', 'R', InputOption::VALUE_NONE, 'Remove the original phpdocs instead of appending'],
            ['smart-reset', 'r', InputOption::VALUE_NONE, 'Retained for compatibility, while it no longer has any effect'],
@@ -381,13 +418,15 @@ class ModelsCommand extends Command
                    $realType = 'bool';
                    break;
                case 'decimal':
+                    $realType = 'numeric';
+                    break;
                case 'string':
                case 'hashed':
                    $realType = 'string';
                    break;
                case 'array':
                case 'json':
-                    $realType = 'array';
+                    $realType = 'array<array-key, mixed>';
                    break;
                case 'object':
                    $realType = 'object';
@@ -411,10 +450,10 @@ class ModelsCommand extends Command
                    $realType = '\Carbon\CarbonImmutable';
                    break;
                case 'collection':
-                    $realType = '\Illuminate\Support\Collection';
+                    $realType = '\Illuminate\Support\Collection<array-key, mixed>';
                    break;
                case AsArrayObject::class:
-                    $realType = '\ArrayObject';
+                    $realType = '\ArrayObject<array-key, mixed>';
                    break;
                default:
                    // In case of an optional custom cast parameter , only evaluate
@@ -718,7 +757,7 @@ class ModelsCommand extends Command
                                    $relationReturnType === 'many' ||
                                    (
                                        !$relationReturnType &&
-                                        strpos(get_class($relationObj), 'Many') !== false
+                                        str_contains(get_class($relationObj), 'Many')
                                    )
                                ) {
                                    if ($relationObj instanceof BelongsToMany) {
@@ -727,16 +766,22 @@ class ModelsCommand extends Command
                                            $pivot = $this->getClassNameInDestinationFile($model, $pivot);

                                            if ($existingPivot = ($this->properties[$relationObj->getPivotAccessor()] ?? null)) {
-                                                // If the pivot is already set, we need to append the type to it
-                                                $pivot .= '|' . $existingPivot['type'];
+                                                $existingClasses = explode('|', $existingPivot['type']);
+
+                                                if (!in_array($pivot, $existingClasses)) {
+                                                    array_unshift($existingClasses, $pivot);
+                                                }
                                            } else {
-                                                // pivots are not always set
-                                                $pivot .= '|null';
+                                                // No existing pivot property, so we need to add a null type
+                                                $existingClasses = [$pivot, 'null'];
                                            }

+                                            // create a union type of all pivot classes
+                                            $unionType = implode('|', $existingClasses);
+
                                            $this->setProperty(
                                                $relationObj->getPivotAccessor(),
-                                                $pivot,
+                                                $unionType,
                                                true,
                                                false
                                            );
@@ -774,10 +819,14 @@ class ModelsCommand extends Command
                                        $relation === 'morphTo'
                                    )
                                ) {
+                                    $matches = [];
+                                    $returnType = $this->getReturnTypeFromDocBlock($reflection);
+                                    preg_match('/MorphTo<(.+?)(?:,|>)/i', $returnType, $matches);
+
                                    // Model isn't specified because relation is polymorphic
                                    $this->setProperty(
                                        $method,
-                                        $this->getClassNameInDestinationFile($model, Model::class) . '|\Eloquent',
+                                        $matches[1] ?? $this->getClassNameInDestinationFile($model, Model::class) . '|\Eloquent',
                                        true,
                                        null,
                                        $comment,
@@ -828,13 +877,15 @@ class ModelsCommand extends Command
        $fkProp = $reflectionObj->getProperty('foreignKey');
        $fkProp->setAccessible(true);

+        $enforceNullableRelation = $this->laravel['config']->get('ide-helper.enforce_nullable_relationships', true);
+
        foreach (Arr::wrap($fkProp->getValue($relationObj)) as $foreignKey) {
            if (isset($this->nullableColumns[$foreignKey])) {
                return true;
            }

            if (!in_array($foreignKey, $this->foreignKeyConstraintsColumns, true)) {
-                return true;
+                return $enforceNullableRelation;
            }
        }

@@ -945,13 +996,19 @@ class ModelsCommand extends Command
            $reflection->getParentClass()->getInterfaceNames()
        );

+        $phpdoc = new DocBlock($reflection, new Context($namespace));
        if ($this->reset) {
-            $phpdoc = new DocBlock('', new Context($namespace));
            $phpdoc->setText(
                (new DocBlock($reflection, new Context($namespace)))->getText()
            );
-        } else {
-            $phpdoc = new DocBlock($reflection, new Context($namespace));
+            foreach ($phpdoc->getTags() as $tag) {
+                if (
+                    in_array($tag->getName(), ['property', 'property-read', 'property-write', 'method', 'mixin'])
+                    || ($tag->getName() === 'noinspection' && in_array($tag->getContent(), ['PhpUnnecessaryFullyQualifiedNameInspection', 'PhpFullyQualifiedNameUsageInspection']))
+                ) {
+                    $phpdoc->deleteTag($tag);
+                }
+            }
        }

        $properties = [];
@@ -1285,10 +1342,11 @@ class ModelsCommand extends Command
     * Get method return type based on it DocBlock comment
     *
     * @param \ReflectionMethod $reflection
+     * @param ?\Reflector $reflectorForContext
     *
     * @return null|string
     */
-    protected function getReturnTypeFromDocBlock(\ReflectionMethod $reflection, \Reflector $reflectorForContext = null)
+    protected function getReturnTypeFromDocBlock(\ReflectionMethod $reflection, ?\Reflector $reflectorForContext = null)
    {
        $phpDocContext = (new ContextFactory())->createFromReflector($reflectorForContext ?? $reflection);
        $context = new Context(
@@ -1517,7 +1575,9 @@ class ModelsCommand extends Command
     */
    protected function getUsedClassNames(ReflectionClass $reflection): array
    {
-        $namespaceAliases = array_flip((new ContextFactory())->createFromReflector($reflection)->getNamespaceAliases());
+        $namespaceAliases = array_flip(array_map(function ($alias) {
+            return ltrim($alias, '\\');
+        }, (new ContextFactory())->createFromReflector($reflection)->getNamespaceAliases()));
        $namespaceAliases[$reflection->getName()] = $reflection->getShortName();

        return $namespaceAliases;
@@ -11,15 +11,12 @@

 namespace Barryvdh\LaravelIdeHelper;

+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Facade;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Macroable;
-use PhpParser\Lexer\Emulative;
-use PhpParser\Node\Stmt\Class_;
-use PhpParser\Node\Stmt\Namespace_;
-use PhpParser\Parser\Php7;
 use ReflectionClass;
 use Symfony\Component\Console\Output\OutputInterface;

@@ -38,11 +35,12 @@ class Generator
    protected $magic = [];
    protected $interfaces = [];
    protected $helpers;
+    protected array $macroableTraits = [];

    /**
     * @param \Illuminate\Config\Repository $config
     * @param \Illuminate\View\Factory $view
-     * @param OutputInterface $output
+     * @param ?OutputInterface $output
     * @param string $helpers
     */
    public function __construct(
@@ -50,11 +48,12 @@ class Generator
        $config,
        /* Illuminate\View\Factory */
        $view,
-        OutputInterface $output = null,
+        ?OutputInterface $output = null,
        $helpers = ''
    ) {
        $this->config = $config;
        $this->view = $view;
+        $this->output = $output;

        // Find the drivers to add to the extra/interfaces
        $this->detectDrivers();
@@ -77,17 +76,42 @@ class Generator
    public function generate()
    {
        $app = app();
-        return $this->view->make('helper')
+        return $this->view->make('ide-helper::helper')
            ->with('namespaces_by_extends_ns', $this->getAliasesByExtendsNamespace())
            ->with('namespaces_by_alias_ns', $this->getAliasesByAliasNamespace())
            ->with('real_time_facades', $this->getRealTimeFacades())
            ->with('helpers', $this->helpers)
-            ->with('version', $app->version())
            ->with('include_fluent', $this->config->get('ide-helper.include_fluent', true))
            ->with('factories', $this->config->get('ide-helper.include_factory_builders') ? Factories::all() : [])
            ->render();
    }

+    public function generateEloquent()
+    {
+        $name = 'Eloquent';
+        $facade = Model::class;
+        $magicMethods = array_key_exists($name, $this->magic) ? $this->magic[$name] : [];
+        $alias = new Alias($this->config, $name, $facade, $magicMethods, $this->interfaces);
+        if (!$alias->isValid()) {
+            throw new \RuntimeException('Cannot generate Eloquent helper');
+        }
+
+        //Add extra methods, from other classes (magic static calls)
+        if (array_key_exists($name, $this->extra)) {
+            $alias->addClass($this->extra[$name]);
+        }
+
+        $app = app();
+        return $this->view->make('ide-helper::helper')
+            ->with('namespaces_by_extends_ns', [])
+            ->with('namespaces_by_alias_ns', ['__root' => [$alias]])
+            ->with('real_time_facades', [])
+            ->with('helpers', '')
+            ->with('include_fluent', false)
+            ->with('factories', [])
+            ->render();
+    }
+
    protected function detectDrivers()
    {
        $defaultUserModel = config('auth.providers.users.model', config('auth.model', 'App\User'));
@@ -186,8 +210,10 @@ class Generator
        foreach ($realTimeFacadeFiles as $file) {
            try {
                $name = $this->getFullyQualifiedClassNameInFile($file);
-                $facades[$name] = $name;
-            } catch (\Exception $e) {
+                if ($name) {
+                    $facades[$name] = $name;
+                }
+            } catch (\Throwable $e) {
                continue;
            }
        }
@@ -199,26 +225,17 @@ class Generator
    {
        $contents = file_get_contents($path);

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

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

-        $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;
+        // Combine namespace and class name
+        if ($namespace && $className) {
+            return $namespace . '\\' . $className;
        }
    }

@@ -325,7 +342,7 @@ class Generator
                continue;
            }

-            $aliases[] = new Alias($this->config, $class, $class, [], $this->interfaces);
+            $aliases[] = new Alias($this->config, $class, $class, [], $this->interfaces, true);
        }
    }

@@ -347,8 +364,18 @@ class Generator
            ->filter(function ($class) {
                $traits = class_uses_recursive($class);

-                // Filter only classes with the macroable trait
-                return isset($traits[Macroable::class]);
+                if (isset($traits[Macroable::class])) {
+                    return true;
+                }
+
+                // Filter only classes with a macroable trait
+                foreach ($this->config->get('ide-helper.macroable_traits', []) as $trait) {
+                    if (isset($traits[$trait])) {
+                        return true;
+                    }
+                }
+
+                return false;
            })
            ->filter(function ($class) use ($aliases) {
                $class = Str::start($class, '\\');
@@ -20,10 +20,6 @@ use Illuminate\Console\Events\CommandFinished;
 use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Database\Events\MigrationsEnded;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\View\Engines\EngineResolver;
-use Illuminate\View\Engines\PhpEngine;
-use Illuminate\View\Factory;
-use Illuminate\View\FileViewFinder;

 class IdeHelperServiceProvider extends ServiceProvider implements DeferrableProvider
 {
@@ -64,41 +60,14 @@ class IdeHelperServiceProvider extends ServiceProvider implements DeferrableProv
    {
        $configPath = __DIR__ . '/../config/ide-helper.php';
        $this->mergeConfigFrom($configPath, 'ide-helper');
-        $localViewFactory = $this->createLocalViewFactory();
-
-        $this->app->singleton(
-            'command.ide-helper.generate',
-            function ($app) use ($localViewFactory) {
-                return new GeneratorCommand($app['config'], $app['files'], $localViewFactory);
-            }
-        );
-
-        $this->app->singleton(
-            'command.ide-helper.models',
-            function ($app) {
-                return new ModelsCommand($app['files']);
-            }
-        );
-
-        $this->app->singleton(
-            'command.ide-helper.meta',
-            function ($app) use ($localViewFactory) {
-                return new MetaCommand($app['files'], $localViewFactory, $app['config']);
-            }
-        );
-
-        $this->app->singleton(
-            'command.ide-helper.eloquent',
-            function ($app) {
-                return new EloquentCommand($app['files']);
-            }
-        );

        $this->commands(
-            'command.ide-helper.generate',
-            'command.ide-helper.models',
-            'command.ide-helper.meta',
-            'command.ide-helper.eloquent'
+            [
+                GeneratorCommand::class,
+                ModelsCommand::class,
+                MetaCommand::class,
+                EloquentCommand::class,
+             ]
        );
    }

@@ -109,22 +78,11 @@ class IdeHelperServiceProvider extends ServiceProvider implements DeferrableProv
     */
    public function provides()
    {
-        return ['command.ide-helper.generate', 'command.ide-helper.models'];
-    }
-
-    /**
-     * @return Factory
-     */
-    private function createLocalViewFactory()
-    {
-        $resolver = new EngineResolver();
-        $resolver->register('php', function () {
-            return new PhpEngine($this->app['files']);
-        });
-        $finder = new FileViewFinder($this->app['files'], [__DIR__ . '/../resources/views']);
-        $factory = new Factory($resolver, $finder, $this->app['events']);
-        $factory->addExtension('php', 'php');
-
-        return $factory;
+        return [
+            GeneratorCommand::class,
+            ModelsCommand::class,
+            MetaCommand::class,
+            EloquentCommand::class,
+        ];
    }
 }
@@ -5,10 +5,15 @@ namespace Barryvdh\LaravelIdeHelper;
 use Barryvdh\Reflection\DocBlock;
 use Barryvdh\Reflection\DocBlock\Tag;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Support\Collection;

 class Macro extends Method
 {
+    protected $macroDefaults = [
+        \Illuminate\Http\Client\Factory::class => PendingRequest::class,
+    ];
+
    /**
     * Macro constructor.
     *
@@ -18,6 +23,7 @@ class Macro extends Method
     * @param null                $methodName
     * @param array               $interfaces
     * @param array               $classAliases
+     * @param array               $returnTypeNormalizers
     */
    public function __construct(
        $method,
@@ -25,9 +31,10 @@ class Macro extends Method
        $class,
        $methodName = null,
        $interfaces = [],
-        $classAliases = []
+        $classAliases = [],
+        $returnTypeNormalizers = []
    ) {
-        parent::__construct($method, $alias, $class, $methodName, $interfaces, $classAliases);
+        parent::__construct($method, $alias, $class, $methodName, $interfaces, $classAliases, $returnTypeNormalizers);
    }

    /**
@@ -75,6 +82,12 @@ class Macro extends Method

            $this->phpdoc->appendTag(Tag::createInstance("@return {$type}"));
        }
+
+        $class = ltrim($this->declaringClassName, '\\');
+        if (!$this->phpdoc->hasTag('return') && isset($this->macroDefaults[$class])) {
+            $type = $this->macroDefaults[$class];
+            $this->phpdoc->appendTag(Tag::createInstance("@return {$type}"));
+        }
    }

    protected function concatReflectionTypes(?\ReflectionType $type): string
@@ -17,8 +17,6 @@ use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
 use Barryvdh\Reflection\DocBlock\Tag;
 use Barryvdh\Reflection\DocBlock\Tag\ParamTag;
 use Barryvdh\Reflection\DocBlock\Tag\ReturnTag;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Str;

 class Method
 {
@@ -39,6 +37,10 @@ class Method
    protected $return = null;
    protected $root;
    protected $classAliases;
+    protected $returnTypeNormalizers;
+
+    /** @var string[] */
+    protected $templateNames = [];

    /**
     * @param \ReflectionMethod|\ReflectionFunctionAbstract $method
@@ -47,14 +49,18 @@ class Method
     * @param string|null $methodName
     * @param array $interfaces
     * @param array $classAliases
+     * @param array $returnTypeNormalizers
+     * @param string[] $templateNames
     */
-    public function __construct($method, $alias, $class, $methodName = null, $interfaces = [], array $classAliases = [])
+    public function __construct($method, $alias, $class, $methodName = null, $interfaces = [], array $classAliases = [], array $returnTypeNormalizers = [], array $templateNames = [])
    {
        $this->method = $method;
        $this->interfaces = $interfaces;
        $this->classAliases = $classAliases;
+        $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
@@ -83,7 +89,7 @@ class Method
     */
    protected function initPhpDoc($method)
    {
-        $this->phpdoc = new DocBlock($method, new Context($this->namespace, $this->classAliases));
+        $this->phpdoc = new DocBlock($method, new Context($this->namespace, $this->classAliases, generics: $this->templateNames));
    }

    /**
@@ -180,6 +186,25 @@ class Method
        return $implode ? implode(', ', $this->params) : $this->params;
    }

+    /**
+     * @param DocBlock|null $phpdoc
+     * @return ReturnTag|null
+     */
+    public function getReturnTag($phpdoc = null)
+    {
+        if ($phpdoc === null) {
+            $phpdoc = $this->phpdoc;
+        }
+
+        $returnTags = $phpdoc->getTagsByName('return');
+
+        if (count($returnTags) === 0) {
+            return null;
+        }
+
+        return reset($returnTags);
+    }
+
    /**
     * Get the parameters for this method including default values
     *
@@ -248,25 +273,31 @@ class Method
    }

    /**
-     * Normalize the return tag (make full namespace, replace interfaces)
+     * Normalize the return tag (make full namespace, replace interfaces, resolve $this)
     *
     * @param DocBlock $phpdoc
     */
    protected function normalizeReturn(DocBlock $phpdoc)
    {
        //Get the return type and adjust them for better autocomplete
-        $returnTags = $phpdoc->getTagsByName('return');
+        $tag = $this->getReturnTag($phpdoc);

-        if (count($returnTags) === 0) {
+        if ($tag === null) {
            $this->return = null;
            return;
        }

-        /** @var ReturnTag $tag */
-        $tag = reset($returnTags);
        // Get the expanded type
        $returnValue = $tag->getType();

+        if (array_key_exists($returnValue, $this->returnTypeNormalizers)) {
+            $returnValue = $this->returnTypeNormalizers[$returnValue];
+        }
+
+        if ($returnValue === '$this') {
+            $returnValue = $this->root;
+        }
+
        // Replace the interfaces
        foreach ($this->interfaces as $interface => $real) {
            $returnValue = str_replace($interface, $real, $returnValue);
@@ -275,12 +306,6 @@ class Method
        // Set the changed content
        $tag->setContent($returnValue . ' ' . $tag->getDescription());
        $this->return = $returnValue;
-
-        if ($tag->getType() === '$this') {
-            Str::contains($this->root, Builder::class)
-                ? $tag->setType($this->root . '|static')
-                : $tag->setType($this->root);
-        }
    }

    /**
@@ -366,7 +391,7 @@ class Method
        }
        if ($method) {
            $namespace = $method->getDeclaringClass()->getNamespaceName();
-            $phpdoc = new DocBlock($method, new Context($namespace, $this->classAliases));
+            $phpdoc = new DocBlock($method, new Context($namespace, $this->classAliases, generics: $this->templateNames));

            if (strpos($phpdoc->getText(), '{@inheritdoc}') !== false) {
                //Not at the end yet, try another parent/interface..
@@ -1,124 +0,0 @@
-<?php
-
-/**
- * Laravel IDE Helper Generator
- *
- * @author    Barry vd. Heuvel <[email protected]>
- * @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);
-    }
-}
@@ -7,7 +7,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests;
 use Barryvdh\LaravelIdeHelper\Alias;
 use Barryvdh\LaravelIdeHelper\Macro;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Arr;

 /**
@@ -16,31 +15,6 @@ use Illuminate\Support\Arr;
 */
 class AliasTest extends TestCase
 {
-    /**
-     * @covers ::detectMethods
-     */
-    public function testDetectMethodsMacroableMacros(): void
-    {
-        // Mock
-        $macro = __FUNCTION__;
-        $alias = new AliasMock();
-
-        // Macros
-        Builder::macro(
-            $macro,
-            function () {
-                // empty
-            }
-        );
-
-        // Prepare
-        $alias->setClasses([Builder::class]);
-        $alias->detectMethods();
-
-        // Test
-        $this->assertNotNull($this->getAliasMacro($alias, Builder::class, $macro));
-    }
-
    /**
     * @covers ::detectMethods
     */
@@ -50,7 +24,7 @@ class AliasTest extends TestCase
        $macro = __FUNCTION__;
        $alias = new AliasMock();

-        // Macros
+        // Macrosx
        EloquentBuilder::macro(
            $macro,
            function () {
@@ -66,6 +40,21 @@ 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(
@@ -82,6 +71,7 @@ class AliasTest extends TestCase
 /**
 * @internal
 * @noinspection PhpMultipleClassesDeclarationsInOneFile
+ * @template TValue
 */
 class AliasMock extends Alias
 {
@@ -2,7 +2,7 @@

 declare(strict_types=1);

-namespace Barryvdh\LaravelIdeHelper\Tests\Console;
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\EloquentCommand;

 use Barryvdh\LaravelIdeHelper\Console\EloquentCommand;
 use Barryvdh\LaravelIdeHelper\Tests\TestCase;
@@ -23,7 +23,7 @@ class EloquentCommandTest extends TestCase
        }

        $actualContent = null;
-        $mockFilesystem = Mockery::mock(Filesystem::class);
+        $mockFilesystem = Mockery::mock(Filesystem::class)->makePartial();
        $mockFilesystem
            ->shouldReceive('get')
            // We don't care about actual args (filename)
@@ -0,0 +1,35 @@
+<?php
+
+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
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->mockFilesystem();
+    }
+
+    /**
+     * Get package providers.
+     *
+     * @param  \Illuminate\Foundation\Application  $app
+     *
+     * @return array
+     */
+    protected function getPackageProviders($app)
+    {
+        return [IdeHelperServiceProvider::class];
+    }
+
+    protected function assertMatchesMockedSnapshot()
+    {
+        $this->assertMatchesSnapshot($this->mockFilesystemOutput, new SnapshotPhpDriver());
+    }
+}
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\GeneratorCommand\GenerateEloquentOnly;
+
+use Barryvdh\LaravelIdeHelper\Console\GeneratorCommand;
+use Barryvdh\LaravelIdeHelper\Tests\Console\GeneratorCommand\AbstractGeneratorCommand;
+
+class Test extends AbstractGeneratorCommand
+{
+    public function testGenerator(): void
+    {
+        $command = $this->app->make(GeneratorCommand::class);
+
+        $tester = $this->runCommand($command, [
+            '--eloquent' => true,
+        ]);
+
+        $this->assertSame(0, $tester->getStatusCode());
+        $this->assertStringContainsString('A new helper file was written to _ide_helper.php', $tester->getDisplay());
+        $this->assertStringNotContainsString('public static function configure($basePath = null)', $this->mockFilesystemOutput);
+        $this->assertStringContainsString('class Eloquent extends \Illuminate\Database\Eloquent\Model', $this->mockFilesystemOutput);
+    }
+}
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\GeneratorCommand\GenerateIdeHelper;
+
+use Barryvdh\LaravelIdeHelper\Console\GeneratorCommand;
+use Barryvdh\LaravelIdeHelper\Tests\Console\GeneratorCommand\AbstractGeneratorCommand;
+
+class Test extends AbstractGeneratorCommand
+{
+    public function testGenerator(): void
+    {
+        $command = $this->app->make(GeneratorCommand::class);
+
+        $tester = $this->runCommand($command);
+
+        $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);
+    }
+
+    public function testFilename(): void
+    {
+        $command = $this->app->make(GeneratorCommand::class);
+
+        $tester = $this->runCommand($command, [
+            'filename' => 'foo.php',
+        ]);
+
+        $this->assertSame(0, $tester->getStatusCode());
+        $this->assertStringContainsString('A new helper file was written to foo.php', $tester->getDisplay());
+    }
+}
@@ -12,17 +12,22 @@ use stdClass;

 class MetaCommandTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->mockFilesystem();
+    }
+
    public function testCommand(): void
    {
-        $this->mockFilesystem();
-
        /** @var Filesystem|MockInterface $mockFileSystem */
        $mockFileSystem = $this->app->make(Filesystem::class);
-        $this->instance('files', $mockFileSystem);
+        $this->instance(Filesystem::class, $mockFileSystem);

        $mockFileSystem
            ->shouldReceive('getRequire')
-            ->andReturnUsing(function ($__path, $__data) {
+            ->andReturnUsing(function ($__path, $__data = []) {
                return (static function () use ($__path, $__data) {
                    extract($__data, EXTR_SKIP);

@@ -49,15 +54,13 @@ class MetaCommandTest extends TestCase
            return new stdClass();
        });

-        $this->mockFilesystem();
-
        /** @var Filesystem|MockInterface $mockFileSystem */
        $mockFileSystem = $this->app->make(Filesystem::class);
-        $this->instance('files', $mockFileSystem);
+        $this->instance(Filesystem::class, $mockFileSystem);

        $mockFileSystem
            ->shouldReceive('getRequire')
-            ->andReturnUsing(function ($__path, $__data) {
+            ->andReturnUsing(function ($__path, $__data = []) {
                return (static function () use ($__path, $__data) {
                    extract($__data, EXTR_SKIP);

@@ -22,13 +22,13 @@ use Illuminate\Database\Eloquent\Model;
 * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime
 * @property int $cast_to_timestamp
 * @property mixed $cast_to_encrypted
- * @property array $cast_to_encrypted_array
- * @property \Illuminate\Support\Collection $cast_to_encrypted_collection
- * @property array $cast_to_encrypted_json
+ * @property 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 \ArrayObject $cast_to_as_array_object
+ * @property \ArrayObject<array-key, mixed> $cast_to_as_array_object
 * @property AdvancedCastCollection $cast_to_as_collection_using
 * @property \Illuminate\Support\Collection<int, AdvancedCastEnum> $cast_to_as_enum_collection_of
 * @method static \Illuminate\Database\Eloquent\Builder<static>|AdvancedCast newModelQuery()
@@ -19,6 +19,8 @@ class Test extends AbstractModelsCommand

        $this->assertSame(0, $tester->getStatusCode());
        $this->assertStringContainsString('Written new phpDocBlock to', $tester->getDisplay());
+        $this->assertStringContainsString('Do you want to generate a minimal helper to generate the Eloquent methods?', $tester->getDisplay());
+
        $this->assertMatchesMockedSnapshot();
    }
 }
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocWithEloquentHelper\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Post extends Model
+{
+}
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocWithEloquentHelper;
+
+use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
+use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
+
+class Test extends AbstractModelsCommand
+{
+    public function test(): void
+    {
+        $command = $this->app->make(ModelsCommand::class);
+
+        $tester = $this->runCommand($command, [
+            '--write' => true,
+            '--write-eloquent-helper' => true,
+        ]);
+
+        $this->assertSame(0, $tester->getStatusCode());
+        $this->assertStringContainsString('Written new phpDocBlock to', $tester->getDisplay());
+        $this->assertStringNotContainsString('Do you want to generate a minimal helper to generate the Eloquent methods?', $tester->getDisplay());
+        $this->assertStringContainsString('Eloquent helper was written to _ide_helper.php', $tester->getDisplay());
+
+        //        $this->assertMatchesMockedSnapshot();
+    }
+}
@@ -0,0 +1,161 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocWithEloquentHelper\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * 
+ *
+ * @property int $id
+ * @property string|null $char_nullable
+ * @property string $char_not_nullable
+ * @property string|null $string_nullable
+ * @property string $string_not_nullable
+ * @property string|null $text_nullable
+ * @property string $text_not_nullable
+ * @property string|null $medium_text_nullable
+ * @property string $medium_text_not_nullable
+ * @property string|null $long_text_nullable
+ * @property string $long_text_not_nullable
+ * @property int|null $integer_nullable
+ * @property int $integer_not_nullable
+ * @property int|null $tiny_integer_nullable
+ * @property int $tiny_integer_not_nullable
+ * @property int|null $small_integer_nullable
+ * @property int $small_integer_not_nullable
+ * @property int|null $medium_integer_nullable
+ * @property int $medium_integer_not_nullable
+ * @property int|null $big_integer_nullable
+ * @property int $big_integer_not_nullable
+ * @property int|null $unsigned_integer_nullable
+ * @property int $unsigned_integer_not_nullable
+ * @property int|null $unsigned_tiny_integer_nullable
+ * @property int $unsigned_tiny_integer_not_nullable
+ * @property int|null $unsigned_small_integer_nullable
+ * @property int $unsigned_small_integer_not_nullable
+ * @property int|null $unsigned_medium_integer_nullable
+ * @property int $unsigned_medium_integer_not_nullable
+ * @property int|null $unsigned_big_integer_nullable
+ * @property int $unsigned_big_integer_not_nullable
+ * @property float|null $float_nullable
+ * @property float $float_not_nullable
+ * @property float|null $double_nullable
+ * @property float $double_not_nullable
+ * @property string|null $decimal_nullable
+ * @property string $decimal_not_nullable
+ * @property int|null $boolean_nullable
+ * @property int $boolean_not_nullable
+ * @property string|null $enum_nullable
+ * @property string $enum_not_nullable
+ * @property string|null $json_nullable
+ * @property string $json_not_nullable
+ * @property string|null $jsonb_nullable
+ * @property string $jsonb_not_nullable
+ * @property string|null $date_nullable
+ * @property string $date_not_nullable
+ * @property string|null $datetime_nullable
+ * @property string $datetime_not_nullable
+ * @property string|null $datetimetz_nullable
+ * @property string $datetimetz_not_nullable
+ * @property string|null $time_nullable
+ * @property string $time_not_nullable
+ * @property string|null $timetz_nullable
+ * @property string $timetz_not_nullable
+ * @property string|null $timestamp_nullable
+ * @property string $timestamp_not_nullable
+ * @property string|null $timestamptz_nullable
+ * @property string $timestamptz_not_nullable
+ * @property int|null $year_nullable
+ * @property int $year_not_nullable
+ * @property string|null $binary_nullable
+ * @property string $binary_not_nullable
+ * @property string|null $uuid_nullable
+ * @property string $uuid_not_nullable
+ * @property string|null $ipaddress_nullable
+ * @property string $ipaddress_not_nullable
+ * @property string|null $macaddress_nullable
+ * @property string $macaddress_not_nullable
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post query()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereBigIntegerNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereBigIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereBinaryNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereBinaryNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereBooleanNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereBooleanNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereCharNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereCharNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDateNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDateNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDatetimeNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDatetimeNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDatetimetzNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDatetimetzNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDecimalNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDecimalNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDoubleNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereDoubleNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereEnumNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereEnumNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereFloatNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereFloatNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereIntegerNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereIpaddressNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereIpaddressNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereJsonNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereJsonNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereJsonbNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereJsonbNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereLongTextNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereLongTextNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereMacaddressNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereMacaddressNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereMediumIntegerNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereMediumIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereMediumTextNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereMediumTextNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereSmallIntegerNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereSmallIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereStringNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereStringNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTextNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTextNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimeNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimeNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimestampNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimestampNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimestamptzNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimestamptzNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimetzNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTimetzNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTinyIntegerNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereTinyIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedBigIntegerNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedBigIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedIntegerNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedMediumIntegerNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedMediumIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedSmallIntegerNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedSmallIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedTinyIntegerNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUnsignedTinyIntegerNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUuidNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereUuidNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereYearNotNullable($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Post whereYearNullable($value)
+ * @mixin \Eloquent
+ */
+class Post extends Model
+{
+}
@@ -36,7 +36,7 @@ class Test extends AbstractModelsCommand
    {
        $actualContent = null;

-        $mockFilesystem = Mockery::mock(Filesystem::class);
+        $mockFilesystem = Mockery::mock(Filesystem::class)->makePartial();
        $mockFilesystem
            ->shouldReceive('get')
            ->andReturn(file_get_contents(__DIR__ . '/Models/Simple.php'))
@@ -33,6 +33,12 @@ class ModelWithPivot extends Model
            ->using(CustomPivot::class);
    }

+    public function relationCustomPivotUsingSameAccessorAndClass()
+    {
+        return $this->belongsToMany(ModelwithPivot::class)
+            ->using(CustomPivot::class);
+    }
+
    public function relationWithDifferentCustomPivotUsingSameAccessor()
    {
        return $this->belongsToMany(ModelwithPivot::class)
@@ -14,6 +14,8 @@ use Illuminate\Database\Eloquent\Model;
 * @property-read DifferentCustomPivot|CustomPivot|null $pivot
 * @property-read \Illuminate\Database\Eloquent\Collection<int, ModelWithPivot> $relationCustomPivotUsingSameAccessor
 * @property-read int|null $relation_custom_pivot_using_same_accessor_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, ModelWithPivot> $relationCustomPivotUsingSameAccessorAndClass
+ * @property-read int|null $relation_custom_pivot_using_same_accessor_and_class_count
 * @property-read CustomPivot|null $customAccessor
 * @property-read \Illuminate\Database\Eloquent\Collection<int, ModelWithPivot> $relationWithCustomPivot
 * @property-read int|null $relation_with_custom_pivot_count
@@ -52,6 +54,12 @@ class ModelWithPivot extends Model
            ->using(CustomPivot::class);
    }

+    public function relationCustomPivotUsingSameAccessorAndClass()
+    {
+        return $this->belongsToMany(ModelwithPivot::class)
+            ->using(CustomPivot::class);
+    }
+
    public function relationWithDifferentCustomPivotUsingSameAccessor()
    {
        return $this->belongsToMany(ModelwithPivot::class)
@@ -46,4 +46,23 @@ class Test extends AbstractModelsCommand
        $this->assertStringContainsString('Written new phpDocBlock to', $tester->getDisplay());
        $this->assertMatchesMockedSnapshot();
    }
+
+    public function testRelationNotNullable(): void
+    {
+        // Disable enforcing nullable relationships
+        Config::set('ide-helper.enforce_nullable_relationships', false);
+
+        $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();
+
+        // Re-enable default enforcing nullable relationships
+        Config::set('ide-helper.enforce_nullable_relationships', true);
+    }
 }
@@ -0,0 +1,266 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+/**
+ * 
+ *
+ * @property int $id
+ * @property int $not_null_column_with_foreign_key_constraint
+ * @property int $not_null_column_with_no_foreign_key_constraint
+ * @property int|null $nullable_column_with_foreign_key_constraint
+ * @property int|null $nullable_column_with_no_foreign_key_constraint
+ * @property-read BelongsToVariation $notNullColumnWithForeignKeyConstraint
+ * @property-read BelongsToVariation $notNullColumnWithNoForeignKeyConstraint
+ * @property-read BelongsToVariation|null $nullableColumnWithForeignKeyConstraint
+ * @property-read BelongsToVariation|null $nullableColumnWithNoForeignKeyConstraint
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BelongsToVariation newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BelongsToVariation newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BelongsToVariation query()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BelongsToVariation whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BelongsToVariation whereNotNullColumnWithForeignKeyConstraint($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BelongsToVariation whereNotNullColumnWithNoForeignKeyConstraint($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BelongsToVariation whereNullableColumnWithForeignKeyConstraint($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|BelongsToVariation whereNullableColumnWithNoForeignKeyConstraint($value)
+ * @mixin \Eloquent
+ */
+class BelongsToVariation extends Model
+{
+    public function notNullColumnWithForeignKeyConstraint(): BelongsTo
+    {
+        return $this->belongsTo(self::class, 'not_null_column_with_foreign_key_constraint');
+    }
+
+    public function notNullColumnWithNoForeignKeyConstraint(): BelongsTo
+    {
+        return $this->belongsTo(self::class, 'not_null_column_with_no_foreign_key_constraint');
+    }
+
+    public function nullableColumnWithForeignKeyConstraint(): BelongsTo
+    {
+        return $this->belongsTo(self::class, 'nullable_column_with_foreign_key_constraint');
+    }
+
+    public function nullableColumnWithNoForeignKeyConstraint(): BelongsTo
+    {
+        return $this->belongsTo(self::class, 'nullable_column_with_no_foreign_key_constraint');
+    }
+}
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+/**
+ * 
+ *
+ * @property int $id
+ * @property int $not_null_column_with_foreign_key_constraint
+ * @property int $not_null_column_with_no_foreign_key_constraint
+ * @property int|null $nullable_column_with_foreign_key_constraint
+ * @property int|null $nullable_column_with_no_foreign_key_constraint
+ * @property-read CompositeBelongsToVariation $bothNonNullableWithForeignKeyConstraint
+ * @property-read CompositeBelongsToVariation $nonNullableMixedWithoutForeignKeyConstraint
+ * @property-read CompositeBelongsToVariation|null $nullableMixedWithForeignKeyConstraint
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|CompositeBelongsToVariation newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|CompositeBelongsToVariation newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|CompositeBelongsToVariation query()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|CompositeBelongsToVariation whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|CompositeBelongsToVariation whereNotNullColumnWithForeignKeyConstraint($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|CompositeBelongsToVariation whereNotNullColumnWithNoForeignKeyConstraint($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|CompositeBelongsToVariation whereNullableColumnWithForeignKeyConstraint($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|CompositeBelongsToVariation whereNullableColumnWithNoForeignKeyConstraint($value)
+ * @mixin \Eloquent
+ */
+class CompositeBelongsToVariation extends Model
+{
+    public $table = 'belongs_to_variations';
+
+    public function bothNonNullableWithForeignKeyConstraint(): BelongsTo
+    {
+        // Note, duplicating the keys here for simplicity.
+        return $this->belongsTo(
+            self::class,
+            ['not_null_column_with_foreign_key_constraint', 'not_null_column_with_foreign_key_constraint'],
+            ['not_null_column_with_foreign_key_constraint', 'not_null_column_with_foreign_key_constraint'],
+        );
+    }
+
+    public function nonNullableMixedWithoutForeignKeyConstraint(): BelongsTo
+    {
+        return $this->belongsTo(
+            self::class,
+            ['not_null_column_with_foreign_key_constraint', 'not_null_column_with_no_foreign_key_constraint'],
+            ['not_null_column_with_foreign_key_constraint', 'not_null_column_with_no_foreign_key_constraint'],
+        );
+    }
+
+    public function nullableMixedWithForeignKeyConstraint(): BelongsTo
+    {
+        return $this->belongsTo(
+            self::class,
+            ['nullable_column_with_no_foreign_key_constraint', 'not_null_column_with_foreign_key_constraint'],
+            ['nullable_column_with_no_foreign_key_constraint', 'not_null_column_with_foreign_key_constraint'],
+        );
+    }
+}
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models;
+
+use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\ModelsOtherNamespace\AnotherModel;
+use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Traits\HasTestRelations;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Database\Eloquent\Relations\MorphToMany;
+
+/**
+ * 
+ *
+ * @property int $id
+ * @property-read Simple $relationBelongsTo
+ * @property-read AnotherModel $relationBelongsToInAnotherNamespace
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationBelongsToMany
+ * @property-read int|null $relation_belongs_to_many_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationBelongsToManyWithSub
+ * @property-read int|null $relation_belongs_to_many_with_sub_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationBelongsToManyWithSubAnother
+ * @property-read int|null $relation_belongs_to_many_with_sub_another_count
+ * @property-read AnotherModel $relationBelongsToSameNameAsColumn
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationHasMany
+ * @property-read int|null $relation_has_many_count
+ * @property-read Simple|null $relationHasOne
+ * @property-read Simple $relationHasOneWithDefault
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationMorphMany
+ * @property-read int|null $relation_morph_many_count
+ * @property-read Simple|null $relationMorphOne
+ * @property-read Model|\Eloquent $relationMorphTo
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationMorphedByMany
+ * @property-read int|null $relation_morphed_by_many_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationSampleRelationType
+ * @property-read int|null $relation_sample_relation_type_count
+ * @property-read Model|\Eloquent $relationSampleToAnyMorphedRelationType
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationSampleToAnyRelationType
+ * @property-read int|null $relation_sample_to_any_relation_type_count
+ * @property-read Simple $relationSampleToBadlyNamedNotManyRelation
+ * @property-read Simple $relationSampleToManyRelationType
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple query()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple whereId($value)
+ * @mixin \Eloquent
+ */
+class Simple extends Model
+{
+    use HasTestRelations;
+
+    // Regular relations
+    public function relationHasMany(): HasMany
+    {
+        return $this->hasMany(Simple::class);
+    }
+
+    public function relationHasOne(): HasOne
+    {
+        return $this->hasOne(Simple::class);
+    }
+
+    public function relationHasOneWithDefault(): HasOne
+    {
+        return $this->hasOne(Simple::class)->withDefault();
+    }
+
+    public function relationBelongsTo(): BelongsTo
+    {
+        return $this->belongsTo(Simple::class);
+    }
+
+    public function relationBelongsToMany(): BelongsToMany
+    {
+        return $this->belongsToMany(Simple::class);
+    }
+
+    public function relationBelongsToManyWithSub(): BelongsToMany
+    {
+        return $this->belongsToMany(Simple::class)->where('foo', 'bar');
+    }
+
+    public function relationBelongsToManyWithSubAnother(): BelongsToMany
+    {
+        return $this->relationBelongsToManyWithSub()->where('foo', 'bar');
+    }
+
+    public function relationMorphTo(): MorphTo
+    {
+        return $this->morphTo();
+    }
+
+    public function relationMorphOne(): MorphOne
+    {
+        return $this->morphOne(Simple::class, 'relationMorphTo');
+    }
+
+    public function relationMorphMany(): MorphMany
+    {
+        return $this->morphMany(Simple::class, 'relationMorphTo');
+    }
+
+    public function relationMorphedByMany(): MorphToMany
+    {
+        return $this->morphedByMany(Simple::class, 'foo');
+    }
+
+    // Custom relations
+
+    public function relationBelongsToInAnotherNamespace(): BelongsTo
+    {
+        return $this->belongsTo(AnotherModel::class);
+    }
+
+    public function relationBelongsToSameNameAsColumn(): BelongsTo
+    {
+        return $this->belongsTo(AnotherModel::class, __FUNCTION__);
+    }
+
+    public function relationSampleToManyRelationType()
+    {
+        return $this->testToOneRelation(Simple::class);
+    }
+
+    public function relationSampleRelationType()
+    {
+        return $this->testToManyRelation(Simple::class);
+    }
+
+    public function relationSampleToAnyRelationType()
+    {
+        return $this->testToAnyRelation(Simple::class);
+    }
+
+    public function relationSampleToAnyMorphedRelationType()
+    {
+        return $this->testToAnyMorphedRelation(Simple::class);
+    }
+
+    public function relationSampleToBadlyNamedNotManyRelation()
+    {
+        return $this->testToBadlyNamedNotManyRelation(Simple::class);
+    }
+}
@@ -9,7 +9,13 @@ use Illuminate\Database\Eloquent\Model;
 /**
 * Text of existing phpdoc
 *
+ * @implements \ArrayAccess
+ * @noinspection PhpUnreachableStatementInspection
+ * @noinspection PhpUnnecessaryFullyQualifiedNameInspection
 * @property string $foo
+ * @property-read string $bar
+ * @method fooBar()
+ * @mixin \Eloquent
 */
 class Simple extends Model
 {
@@ -9,7 +9,12 @@ use Illuminate\Database\Eloquent\Model;
 /**
 * Text of existing phpdoc
 *
+ * @implements \ArrayAccess
+ * @noinspection PhpUnreachableStatementInspection
+ * @noinspection PhpUnnecessaryFullyQualifiedNameInspection
 * @property string $foo
+ * @property-read string $bar
+ * @method fooBar()
 * @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 Illuminate\Database\Eloquent\Model;
 /**
 * Text of existing phpdoc
 *
+ * @implements \ArrayAccess
+ * @noinspection PhpUnreachableStatementInspection
 * @property int $id
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Simple newQuery()
@@ -14,14 +14,14 @@ use Illuminate\Database\Eloquent\Model;
 * @property float $cast_to_real
 * @property float $cast_to_float
 * @property float $cast_to_double
- * @property string $cast_to_decimal
+ * @property numeric $cast_to_decimal
 * @property string $cast_to_string
 * @property bool $cast_to_bool
 * @property bool $cast_to_boolean
 * @property object $cast_to_object
- * @property array $cast_to_array
- * @property array $cast_to_json
- * @property \Illuminate\Support\Collection $cast_to_collection
+ * @property array<array-key, mixed> $cast_to_array
+ * @property array<array-key, mixed> $cast_to_json
+ * @property \Illuminate\Support\Collection<array-key, mixed> $cast_to_collection
 * @property \Illuminate\Support\Carbon $cast_to_date
 * @property \Illuminate\Support\Carbon $cast_to_datetime
 * @property \Illuminate\Support\Carbon $cast_to_date_serialization
@@ -34,9 +34,9 @@ use Illuminate\Database\Eloquent\Model;
 * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime_serialization
 * @property int $cast_to_timestamp
 * @property mixed $cast_to_encrypted
- * @property array $cast_to_encrypted_array
- * @property \Illuminate\Support\Collection $cast_to_encrypted_collection
- * @property array $cast_to_encrypted_json
+ * @property 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
 * @method static \Illuminate\Database\Eloquent\Builder<static>|SimpleCast newModelQuery()
 * @method static \Illuminate\Database\Eloquent\Builder<static>|SimpleCast newQuery()
@@ -55,7 +55,7 @@ class MacroTest extends TestCase
    {
        $phpdoc = (new MacroMock())->getPhpDoc(
            new ReflectionFunction(
-                function (int $a = null): int {
+                function (?int $a = null): int {
                    return 0;
                }
            )
@@ -79,7 +79,7 @@ class MacroTest extends TestCase
                /**
                 * Test docblock.
                 */
-                function (int $a = null): int {
+                function (?int $a = null): int {
                    return 0;
                }
            )
@@ -103,7 +103,7 @@ class MacroTest extends TestCase
                /**
                 * Test docblock.
                 */
-                function (int $a = null) {
+                function (?int $a = null) {
                    return 0;
                }
            )
@@ -274,7 +274,7 @@ class MacroMock extends Macro
        // no need to call parent
    }

-    public function getPhpDoc(ReflectionFunctionAbstract $method, ReflectionClass $class = null): DocBlock
+    public function getPhpDoc(ReflectionFunctionAbstract $method, ?ReflectionClass $class = null): DocBlock
    {
        return (new Macro($method, '', $class ?? $method->getClosureScopeClass()))->phpdoc;
    }
@@ -5,7 +5,8 @@ declare(strict_types=1);
 namespace Barryvdh\LaravelIdeHelper\Tests;

 use Barryvdh\LaravelIdeHelper\Method;
-use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Query\Builder as QueryBuilder;
 use PHPUnit\Framework\TestCase;

 class MethodTest extends TestCase
@@ -54,11 +55,11 @@ DOC;
    }

    /**
-     * Test the output of a class
+     * Test the output of Illuminate\Database\Eloquent\Builder
     */
    public function testEloquentBuilderOutput()
    {
-        $reflectionClass = new \ReflectionClass(Builder::class);
+        $reflectionClass = new \ReflectionClass(EloquentBuilder::class);
        $reflectionMethod = $reflectionClass->getMethod('upsert');

        $method = new Method($reflectionMethod, 'Builder', $reflectionClass);
@@ -76,12 +77,75 @@ DOC;
 DOC;
        $this->assertSame($output, $method->getDocComment(''));
        $this->assertSame('upsert', $method->getName());
-        $this->assertSame('\\' . Builder::class, $method->getDeclaringClass());
+        $this->assertSame('\\' . EloquentBuilder::class, $method->getDeclaringClass());
        $this->assertSame('$values, $uniqueBy, $update', $method->getParams(true));
        $this->assertSame(['$values', '$uniqueBy', '$update'], $method->getParams(false));
        $this->assertSame('$values, $uniqueBy, $update = null', $method->getParamsWithDefault(true));
        $this->assertSame(['$values', '$uniqueBy', '$update = null'], $method->getParamsWithDefault(false));
        $this->assertTrue($method->shouldReturn());
+        $this->assertSame('int', rtrim($method->getReturnTag()->getType()));
+    }
+
+    /**
+     * Test normalized return type of Illuminate\Database\Eloquent\Builder
+     */
+    public function testEloquentBuilderNormalizedReturnType()
+    {
+        $reflectionClass = new \ReflectionClass(EloquentBuilder::class);
+        $reflectionMethod = $reflectionClass->getMethod('where');
+
+        $method = new Method($reflectionMethod, 'Builder', $reflectionClass, null, [], [], ['$this' => '\\' . EloquentBuilder::class . '<static>']);
+
+        $output =  <<<'DOC'
+/**
+ * Add a basic where clause to the query.
+ *
+ * @param (\Closure(static): mixed)|string|array|\Illuminate\Contracts\Database\Query\Expression $column
+ * @param mixed $operator
+ * @param mixed $value
+ * @param string $boolean
+ * @return \Illuminate\Database\Eloquent\Builder<static> 
+ * @static 
+ */
+DOC;
+        $this->assertSame($output, $method->getDocComment(''));
+        $this->assertSame('where', $method->getName());
+        $this->assertSame('\\' . EloquentBuilder::class, $method->getDeclaringClass());
+        $this->assertSame(['$column', '$operator', '$value', '$boolean'], $method->getParams(false));
+        $this->assertSame(['$column', '$operator = null', '$value = null', "\$boolean = 'and'"], $method->getParamsWithDefault(false));
+        $this->assertTrue($method->shouldReturn());
+        $this->assertSame('\Illuminate\Database\Eloquent\Builder<static>', rtrim($method->getReturnTag()->getType()));
+    }
+
+    /**
+     * Test normalized return type of Illuminate\Database\Query\Builder
+     */
+    public function testQueryBuilderNormalizedReturnType()
+    {
+        $reflectionClass = new \ReflectionClass(QueryBuilder::class);
+        $reflectionMethod = $reflectionClass->getMethod('whereNull');
+
+        $method = new Method($reflectionMethod, 'Builder', $reflectionClass, null, [], [], ['$this' => '\\' . EloquentBuilder::class . '<static>']);
+
+        $output =  <<<'DOC'
+/**
+ * Add a "where null" clause to the query.
+ *
+ * @param string|array|\Illuminate\Contracts\Database\Query\Expression $columns
+ * @param string $boolean
+ * @param bool $not
+ * @return \Illuminate\Database\Eloquent\Builder<static> 
+ * @static 
+ */
+DOC;
+
+        $this->assertSame($output, $method->getDocComment(''));
+        $this->assertSame('whereNull', $method->getName());
+        $this->assertSame('\\' . QueryBuilder::class, $method->getDeclaringClass());
+        $this->assertSame(['$columns', '$boolean', '$not'], $method->getParams(false));
+        $this->assertSame(['$columns', "\$boolean = 'and'", '$not = false'], $method->getParamsWithDefault(false));
+        $this->assertTrue($method->shouldReturn());
+        $this->assertSame('\Illuminate\Database\Eloquent\Builder<static>', rtrim($method->getReturnTag()->getType()));
    }

    /**
@@ -129,6 +193,29 @@ 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
@@ -57,13 +57,7 @@ abstract class TestCase extends BaseTestCase

    protected function mockFilesystem()
    {
-        $mockFilesystem = Mockery::mock(Filesystem::class);
-
-        $mockFilesystem
-            ->shouldReceive('get')
-            ->andReturnUsing(function ($file) {
-                return file_get_contents($file);
-            });
+        $mockFilesystem = Mockery::mock(Filesystem::class)->makePartial();

        $mockFilesystem
            ->shouldReceive('put')
@@ -1,56 +0,0 @@
-<?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
Casper Bloemendaal	271682a2a6	feat: use generics of return type to determine resulting models (#1653 )	2025-01-08 11:01:30 +01:00
Barry vd. Heuvelandlaravel-ide-helper	bb1caed698	Check if macro is valid (#1655 ) * Check if macro is valid * composer fix-style --------- Co-authored-by: laravel-ide-helper <[email protected]>	2025-01-08 11:00:53 +01:00
Barry vd. Heuvelandlaravel-ide-helper	55268cd47a	Catch meta, tweak auth (#1654 ) * Catch meta, tweak auth * composer fix-style * Catch meta, tweak auth --------- Co-authored-by: laravel-ide-helper <[email protected]>	2025-01-08 11:00:41 +01:00
barryvdh	088968c3fc	Update CHANGELOG	2025-01-06 15:42:30 +00:00
Barry vd. Heuvel	655e057626	Fix empty closure	2025-01-06 16:29:58 +01:00
barryvdh	c8d85a0d34	Update CHANGELOG	2025-01-06 14:09:45 +00:00
Barry vd. Heuvel	4c656cc71d	Remove duplicate config, fix ->can() (#1650 )	2025-01-06 15:08:47 +01:00
barryvdh	0fe9774dfb	Update CHANGELOG	2025-01-06 13:53:52 +00:00
Jesper Noordsij	030f6f1f35	Add special 'dev' to composer keywords (#1649 )	2025-01-03 15:21:18 +01:00
laravel-ide-helper	154300fb06	composer fix-style	2025-01-01 12:17:43 +00:00
Mathieu TUDISCOandBarry vd. Heuvel	05d9c3cd65	Allow adding custom Macroable classes. (#1629 ) * Allow adding custom Macroable classes. * Remove duplication, tweak config * Remove test --------- Co-authored-by: Barry vd. Heuvel <[email protected]>	2025-01-01 13:17:20 +01:00
Barry vd. Heuvelandlaravel-ide-helper	beda399e7e	Feat guess macro types (#1648 ) * Add default class for HttpClient macro * composer fix-style --------- Co-authored-by: laravel-ide-helper <[email protected]>	2025-01-01 10:44:43 +01:00
Nereo Berardozzi	0bbca8f5e2	Fixed generating PHPDoc for methods with class templates (#1647 ) * Fixed generating PHPDoc for methods with class templates * Fix style * Use getter for alias template names * Fixed missing class in static analysis	2024-12-31 17:18:28 +01:00
Barry vd. Heuvelandlaravel-ide-helper	f8381565ad	Add more metadata (#1646 ) * Add more metadata * composer fix-style * Parse .env * composer fix-style * Check if .env exists --------- Co-authored-by: laravel-ide-helper <[email protected]>	2024-12-30 15:06:36 +01:00
Barry vd. Heuvel	cffcd07e98	Also add eloquent template tags from base class (#1645 )	2024-12-30 12:58:28 +01:00
Barry vd. Heuvelandlaravel-ide-helper	9c6380da4a	Remove php parser (#1644 ) * Remove php parser * composer fix-style --------- Co-authored-by: laravel-ide-helper <[email protected]>	2024-12-30 12:42:35 +01:00
Barry vd. Heuvelandlaravel-ide-helper	e509790805	Use forked ContextFactory (#1643 ) * Use forked ContextFactory * composer fix-style * Trim slashes --------- Co-authored-by: laravel-ide-helper <[email protected]>	2024-12-30 12:03:45 +01:00
Barry vd. Heuvelandlaravel-ide-helper	791ba555f4	Add meta override for user return types (#1642 ) * Add meta override for user return types * composer fix-style --------- Co-authored-by: laravel-ide-helper <[email protected]>	2024-12-30 10:31:30 +01:00
Barry vd. Heuvel	c324438731	Bump to 3.5	2024-12-29 19:44:30 +01:00
Barry vd. Heuvelandlaravel-ide-helper	4e4da0825a	Add phpstorm meta argument hints (#1640 ) * Add phpstorm meta hints * composer fix-style * Use php-templates from vs-code * Fix view instance * composer fix-style * Add translations * composer fix-style * map to string * composer fix-style * Fix test --------- Co-authored-by: laravel-ide-helper <[email protected]>	2024-12-29 19:44:08 +01:00
barryvdh	66ea6aa57b	Update CHANGELOG	2024-12-29 13:26:59 +00:00
Barry vd. Heuvel	2a41415f01	Add TLDR section, update options (#1639 )	2024-12-29 13:10:58 +01:00
Barry vd. Heuvelandlaravel-ide-helper	a7fc73e8e4	Format IDE helper (#1638 ) * Format IDE helper * composer fix-style * Format IDE helper * composer fix-style --------- Co-authored-by: laravel-ide-helper <[email protected]>	2024-12-29 12:56:55 +01:00
Barry vd. Heuvelandpb30	f343efa140	Pb30 version var rename (#1637 ) * Update view "version" variable name to avoid potential conflicts * Remove version --------- Co-authored-by: pb30 <[email protected]>	2024-12-29 12:11:06 +01:00
Barry vd. Heuvel	0fa0403e57	Check if alias is valid	2024-12-29 12:03:42 +01:00
Barry vd. Heuvel	97e3b5eaa0	Bump to 3.4	2024-12-29 11:57:30 +01:00
Martin Tillmann	99554aef3c	Update README.md (#1587 ) Added Laravel 11 path to readme to make installation easier for newer installs	2024-12-29 11:52:58 +01:00
hms5232	0b2eeb4627	Make all "note" in README apply quote style (#1590 ) Now, those "note" stand out in text sea	2024-12-29 11:52:24 +01:00
Lau Ernebjerg Josefsen	4ad74ba241	Add weak generics for array type objects (#1621 )	2024-12-29 11:52:05 +01:00
Barry vd. Heuvelandlaravel-ide-helper	347483be03	Add option for only eloquent (#1636 ) * Add option for only eloquent * composer fix-style * Add snapshot * Add option to models command * composer fix-style * Fix namespace --------- Co-authored-by: laravel-ide-helper <[email protected]>	2024-12-29 11:51:09 +01:00
Barry vd. Heuvelandlaravel-ide-helper	14fdb572bb	Update testsuite for Generator, simplify service provider and mock (#1635 ) * Add templates to Eloquent * Test generator, update constructor * composer fix-style * Add filename test * UPdate test --------- Co-authored-by: laravel-ide-helper <[email protected]>	2024-12-28 19:56:36 +01:00
Barry vd. Heuvel	c33eacdefc	Add templates to Eloquent (#1634 )	2024-12-28 11:17:17 +01:00
Yifans_ZandYifan Zhao	a25b947851	fix: add @template TModel of static for Eloquent (#1631 ) * fix: add @template TModel of static for Eloquent * fix: use `===` instead of `==` --------- Co-authored-by: Yifan Zhao <[email protected]>	2024-12-26 12:51:40 +01:00
barryvdh	59eb26742b	Update CHANGELOG	2024-12-18 08:36:48 +00:00
Lito	b7675670f7	Assign $output method parameter to $this->output on Generator (#1623 ) The `$output` method parameter is not being assigned to the `$this->output` class variable.	2024-12-18 09:24:19 +01:00
Jeppe Knockaertandlaravel-ide-helper	edb56754d1	Fix PHP 8.4 deprecations (#1618 ) * Replace implicitly nullable parameters for PHP 8.4 * composer fix-style --------- Co-authored-by: laravel-ide-helper <[email protected]>	2024-12-14 11:06:34 +01:00
laravel-ide-helper	4d2728c4f0	composer fix-style	2024-12-09 15:03:45 +00:00
Lito	5da09fad67	Fixed PHP 8.4 deprecation warning (#1622 ) * Fixed PHP 8.4 deprecation warning * Fix PHP 8.4 deprecation warning	2024-12-09 16:03:20 +01:00
Bob Conan	788e72e7dd	Updated CHANGELOG.md, fix typo(s) (#1613 )	2024-11-13 22:38:24 +01:00
Carl-Philipp Jungandlaravel-ide-helper	e3ec773374	Improve replacement of return type for methods from Query\Builder (#1575 ) * Add return type `\|static` to Query\Builder methods (#1574) * Replace return type Query\Builder with Eloquent\Builder (#1574) * Replace return type Query\Builder only for facade Eloquent (#1574) * Add special return type replacement for Macros of \Eloquent * Restrict special return type to methods from Eloquent\Builder and Query\Builder * Do not overwrite return type in normalizeReturn() with conditional call of setType() * Use generic return type for builder methods in \Eloquent * composer fix-style --------- Co-authored-by: laravel-ide-helper <[email protected]>	2024-10-31 15:47:27 +01:00
Barry vd. Heuvel	64588afe8b	Update snapshots	2024-10-31 15:39:02 +01:00
Jeramy Hing	472c1bad5d	Feature: Add Config Option to Enforce Nullable Relationships (#1580 ) * feat: add config option for nullable relationships Introduce enforce_nullable_relationships configuration to control nullable Eloquent relationships. * refactor: update logic for nullable relationships Update isRelationNullable method to respect new config option. * test: add tests for nullable relationship config - Verify behavior of enforce_nullable_relationships configuration option. - Create snapshot to reflect enforce_nullable_relationships set to false. * docs: improve documented context and usage * docs: update CHANGELOG with enforce_nullable_relationships option	2024-10-30 22:35:58 +01:00
barryvdh	90e7c5ac47	Update CHANGELOG	2024-10-29 14:05:10 +00:00
Pieter Willekensandlaravel-ide-helper	07e3bd8796	fix(pivot): only use unique classes in the pivot union (Fixes #1606 ) (#1607 ) * fix(pivot): only use unique classes in the pivot union (Fixes #1606) * composer fix-style --------- Co-authored-by: laravel-ide-helper <[email protected]>	2024-10-29 15:00:16 +01:00
Pieter Willekens	7c2fa01d36	docs(pr): remove the changelog checklist item (#1608 )	2024-10-29 10:37:06 +01:00
Barry vd. Heuvel	75b05a9f74	Create release-drafter.yml	2024-10-28 15:17:58 +01:00
Barry vd. Heuvel	71aa6a6cf3	Create update-changelog.yaml (#1605 ) * Create update-changelog.yaml * Create release-drafter.yml	2024-10-28 15:16:33 +01:00
Barry vd. Heuvel	be806dc316	Update CHANGELOG.md	2024-10-28 15:11:38 +01:00
Ramon DantasandBarry vd. Heuvel	800e2347a6	feat: use `numeric` type on fields with `decimal` casts (#1583 ) * feat: use `numeric` type on fields with `decimal` casts * docs: update CHANGELOG.md --------- Co-authored-by: Barry vd. Heuvel <[email protected]>	2024-10-28 12:32:31 +01:00
Barry vd. Heuvel	7549f58a30	Smarter reset (#1603 ) * Smarter reset * Changelog * Fix phpdocs	2024-10-28 12:21:53 +01:00