mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-15 00:44:40 +02:00
Code Issues Releases Wiki Activity

Use Laravel's class-based Str and Arr helpers

Browse Source 
Starting with version 5.9, the global funtions will be deprecated.

* https://laravel-news.com/laravel-5-8-deprecates-string-and-array-helpers
* https://github.com/laravel/framework/pull/26898
This commit is contained in:
Franz Liedke
2019-07-06 00:49:34 +02:00
parent 307b912019
commit 646bd40bca
78 changed files with 229 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Http/Middleware/SetLocale.php
View File

@@ -12,6 +12,7 @@
namespace Flarum\Http\Middleware;
use Flarum\Locale\LocaleManager;
use Illuminate\Support\Arr;
use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request;
use Psr\Http\Server\MiddlewareInterface as Middleware;
@@ -39,7 +40,7 @@ class SetLocale implements Middleware
if ($actor->exists) {
$locale = $actor->getPreference('locale');
} else {
$locale = array_get($request->getCookieParams(), 'locale');
$locale = Arr::get($request->getCookieParams(), 'locale');
}
if ($locale && $this->locales->hasLocale($locale)) {