From bbab91663f499e483a1791c44c5aef8397d19f38 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 24 Jul 2020 17:14:56 +0200 Subject: [PATCH] Stop using obsolete global helpers from Laravel Refs flarum/core#2055. --- docs/extend/data.md | 11 +++++++---- docs/extend/routes.md | 4 +++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/docs/extend/data.md b/docs/extend/data.md index c555106be..235678b4b 100644 --- a/docs/extend/data.md +++ b/docs/extend/data.md @@ -285,6 +285,7 @@ For the controller that shows a single resource, extend the `Flarum\Api\Controll ```php use Flarum\Api\Controller\AbstractShowController; +use Illuminate\Support\Arr; use Psr\Http\Message\ServerRequestInterface as Request; use Tobscure\JsonApi\Document; @@ -294,7 +295,7 @@ class ShowTagController extends AbstractShowController protected function data(Request $request, Document $document) { - $id = array_get($request->getQueryParams(), 'id'); + $id = Arr::get($request->getQueryParams(), 'id'); return Tag::findOrFail($id); } @@ -307,6 +308,7 @@ For the controller that creates a resource, extend the `Flarum\Api\Controller\Ab ```php use Flarum\Api\Controller\AbstractCreateController; +use Illuminate\Support\Arr; use Psr\Http\Message\ServerRequestInterface as Request; use Tobscure\JsonApi\Document; @@ -316,10 +318,10 @@ class CreateTagController extends AbstractCreateController protected function data(Request $request, Document $document) { - $attributes = array_get($request->getParsedBody(), 'data.attributes'); + $attributes = Arr::get($request->getParsedBody(), 'data.attributes'); return Tag::create([ - 'name' => array_get($attributes, 'name') + 'name' => Arr::get($attributes, 'name') ]); } } @@ -335,13 +337,14 @@ For the controller that deletes a resource, extend the `Flarum\Api\Controller\Ab ```php use Flarum\Api\Controller\AbstractDeleteController; +use Illuminate\Support\Arr; use Psr\Http\Message\ServerRequestInterface as Request; class DeleteTagController extends AbstractDeleteController { protected function delete(Request $request) { - $id = array_get($request->getQueryParams(), 'id'); + $id = Arr::get($request->getQueryParams(), 'id'); Tag::findOrFail($id)->delete(); } diff --git a/docs/extend/routes.md b/docs/extend/routes.md index dc0499bc7..b626af542 100644 --- a/docs/extend/routes.md +++ b/docs/extend/routes.md @@ -73,7 +73,9 @@ Sometimes you will need to capture segments of the URI within your route. You ma The values of these parameters will be merged with the request's query params, which you can access in your controller by calling `$request->getQueryParams()`: ```php -$id = array_get($request->getQueryParams(), 'id'); +use Illuminate\Support\Arr; + +$id = Arr::get($request->getQueryParams(), 'id'); ``` ### Generating URLs