diff --git a/CHANGELOG.md b/CHANGELOG.md index 231ae2a83..9697b1f52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. - Fix return value of query scopes from parent class [#1366 / sforward](https://github.com/barryvdh/laravel-ide-helper/pull/1366) ### Changed +- Update view "version" variable name to avoid potential conflicts ### Added - Add type to pivot when using a custom pivot class [#1518 / d3v2a](https://github.com/barryvdh/laravel-ide-helper/pull/1518) diff --git a/resources/views/helper.php b/resources/views/helper.php index 9479a7e2f..eaeaf727d 100644 --- a/resources/views/helper.php +++ b/resources/views/helper.php @@ -14,7 +14,7 @@ /** * A helper file for Laravel, to provide autocomplete information to your IDE - * Generated for Laravel <?= $version ?>. + * Generated for Laravel <?= $laravel_version ?>. * * This file should not be included in your code, only analyzed by your IDE! * diff --git a/src/Generator.php b/src/Generator.php index a509958d2..8c268352b 100644 --- a/src/Generator.php +++ b/src/Generator.php @@ -82,7 +82,7 @@ public function generate() ->with('namespaces_by_alias_ns', $this->getAliasesByAliasNamespace()) ->with('real_time_facades', $this->getRealTimeFacades()) ->with('helpers', $this->helpers) - ->with('version', $app->version()) + ->with('laravel_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();