Skip to content

Commit 4f0bfd8

Browse files
authored
Support Laravel < 6 for Illuminate\Support\Env usage (#750)
* Use Env::get instead of env It conflicts with other `env()` global functions (such as CakePHP), and most of them don't handle closures. * Support Laravel < 6 for Illuminate\Support\Env usage Fixed `env()` and `Illuminate\Support\Env` usage to support Laravel < 6
1 parent 9191396 commit 4f0bfd8

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

src/Mcamara/LaravelLocalization/LaravelLocalization.php

+16-6
Original file line numberDiff line numberDiff line change
@@ -1037,12 +1037,22 @@ protected function normalizeAttributes($attributes)
10371037
*/
10381038
protected function getForcedLocale()
10391039
{
1040-
return Env::get(static::ENV_ROUTE_KEY, function () {
1041-
$value = getenv(static::ENV_ROUTE_KEY);
1040+
if (version_compare($this->app->version(), '6') >= 0) {
1041+
return Env::get(static::ENV_ROUTE_KEY, function () {
1042+
$value = getenv(static::ENV_ROUTE_KEY);
10421043

1043-
if ($value !== false) {
1044-
return $value;
1045-
}
1046-
});
1044+
if ($value !== false) {
1045+
return $value;
1046+
}
1047+
});
1048+
} else {
1049+
return env(static::ENV_ROUTE_KEY, function () {
1050+
$value = getenv(static::ENV_ROUTE_KEY);
1051+
1052+
if ($value !== false) {
1053+
return $value;
1054+
}
1055+
});
1056+
}
10471057
}
10481058
}

0 commit comments

Comments
 (0)