Skip to content

Commit 70f9c41

Browse files
committed
Update view "version" variable name to avoid potential conflicts
1 parent 6338abb commit 70f9c41

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
99
- Fix return value of query scopes from parent class [#1366 / sforward](https://github.com/barryvdh/laravel-ide-helper/pull/1366)
1010

1111
### Changed
12+
- Update view "version" variable name to avoid potential conflicts
1213

1314
### Added
1415
- Add type to pivot when using a custom pivot class [#1518 / d3v2a](https://github.com/barryvdh/laravel-ide-helper/pull/1518)

resources/views/helper.php

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function generate()
8282
->with('namespaces_by_alias_ns', $this->getAliasesByAliasNamespace())
8383
->with('real_time_facades', $this->getRealTimeFacades())
8484
->with('helpers', $this->helpers)
85-
->with('version', $app->version())
85+
->with('laravel_version', $app->version())
8686
->with('include_fluent', $this->config->get('ide-helper.include_fluent', true))
8787
->with('factories', $this->config->get('ide-helper.include_factory_builders') ? Factories::all() : [])
8888
->render();

0 commit comments

Comments
 (0)