Skip to content

Commit 739f3bf

Browse files
committed
Merge branch 'version-var-rename' of github.com:pb30/laravel-ide-helper into pb30-version-var-rename
2 parents 0fa0403 + 70f9c41 commit 739f3bf

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
- Fix type of hashed model property to `string`
5555

5656
### Changed
57+
- Update view "version" variable name to avoid potential conflicts
5758

5859
- Add support for EloquentBuilder generics introduced in Laravel 11.15.
5960
- Drop support for Laravel versions earlier than 11.15.

resources/views/helper.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
/**
1616
* A helper file for Laravel, to provide autocomplete information to your IDE
17-
* Generated for Laravel <?= $version ?>.
17+
* Generated for Laravel <?= $laravel_version ?>.
1818
*
1919
* This file should not be included in your code, only analyzed by your IDE!
2020
*

src/Generator.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function generate()
8484
->with('namespaces_by_alias_ns', $this->getAliasesByAliasNamespace())
8585
->with('real_time_facades', $this->getRealTimeFacades())
8686
->with('helpers', $this->helpers)
87-
->with('version', $app->version())
87+
->with('laravel_version', $app->version())
8888
->with('include_fluent', $this->config->get('ide-helper.include_fluent', true))
8989
->with('factories', $this->config->get('ide-helper.include_factory_builders') ? Factories::all() : [])
9090
->render();

0 commit comments

Comments
 (0)