mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-21 08:41:17 +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 039973c5f8
commit 32e84d651c
78 changed files with 229 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/core/src/Http/AccessToken.php
View File

@@ -14,6 +14,7 @@ namespace Flarum\Http;
use Carbon\Carbon;
use Flarum\Database\AbstractModel;
use Flarum\User\User;
use Illuminate\Support\Str;
/**
* @property string $token
@@ -47,7 +48,7 @@ class AccessToken extends AbstractModel
{
$token = new static;
$token->token = str_random(40);
$token->token = Str::random(40);
$token->user_id = $userId;
$token->created_at = Carbon::now();
$token->last_activity_at = Carbon::now();

5
framework/core/src/Http/CookieFactory.php
View File

@@ -13,6 +13,7 @@ namespace Flarum\Http;
use Dflydev\FigCookies\SetCookie;
use Flarum\Foundation\Application;
use Illuminate\Support\Arr;
class CookieFactory
{
@@ -54,9 +55,9 @@ class CookieFactory
// Get the cookie settings from the config or use the default values
$this->prefix = $app->config('cookie.name', 'flarum');
$this->path = $app->config('cookie.path', array_get($url, 'path') ?: '/');
$this->path = $app->config('cookie.path', Arr::get($url, 'path') ?: '/');
$this->domain = $app->config('cookie.domain');
$this->secure = $app->config('cookie.secure', array_get($url, 'scheme') === 'https');
$this->secure = $app->config('cookie.secure', Arr::get($url, 'scheme') === 'https');
}
/**

3
framework/core/src/Http/Middleware/AuthenticateWithHeader.php
View File

@@ -14,6 +14,7 @@ namespace Flarum\Http\Middleware;
use Flarum\Api\ApiKey;
use Flarum\Http\AccessToken;
use Flarum\User\User;
use Illuminate\Support\Str;
use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request;
use Psr\Http\Server\MiddlewareInterface as Middleware;
@@ -29,7 +30,7 @@ class AuthenticateWithHeader implements Middleware
$parts = explode(';', $headerLine);
if (isset($parts[0]) && starts_with($parts[0], self::TOKEN_PREFIX)) {
if (isset($parts[0]) && Str::startsWith($parts[0], self::TOKEN_PREFIX)) {
$id = substr($parts[0], strlen(self::TOKEN_PREFIX));
if ($key = ApiKey::where('key', $id)->first()) {

3
framework/core/src/Http/Middleware/ParseJsonBody.php
View File

@@ -11,6 +11,7 @@
namespace Flarum\Http\Middleware;
use Illuminate\Support\Str;
use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request;
use Psr\Http\Server\MiddlewareInterface as Middleware;
@@ -20,7 +21,7 @@ class ParseJsonBody implements Middleware
{
public function process(Request $request, Handler $handler): Response
{
if (str_contains($request->getHeaderLine('content-type'), 'json')) {
if (Str::contains($request->getHeaderLine('content-type'), 'json')) {
$input = json_decode($request->getBody(), true);
$request = $request->withParsedBody($input ?: []);

3
framework/core/src/Http/Middleware/RememberFromCookie.php
View File

@@ -13,6 +13,7 @@ namespace Flarum\Http\Middleware;
use Flarum\Http\AccessToken;
use Flarum\Http\CookieFactory;
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;
@@ -35,7 +36,7 @@ class RememberFromCookie implements Middleware
public function process(Request $request, Handler $handler): Response
{
$id = array_get($request->getCookieParams(), $this->cookie->getName('remember'));
$id = Arr::get($request->getCookieParams(), $this->cookie->getName('remember'));
if ($id) {
$token = AccessToken::find($id);

3
framework/core/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)) {

3
framework/core/src/Http/Middleware/StartSession.php
View File

@@ -16,6 +16,7 @@ use Flarum\Http\CookieFactory;
use Illuminate\Contracts\Config\Repository as ConfigRepository;
use Illuminate\Contracts\Session\Session;
use Illuminate\Session\Store;
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;
@@ -72,7 +73,7 @@ class StartSession implements Middleware
return new Store(
$this->config['cookie'],
$this->handler,
array_get($request->getCookieParams(), $this->cookie->getName($this->config['cookie']))
Arr::get($request->getCookieParams(), $this->cookie->getName($this->config['cookie']))
);
}