From 53889efa8d737ea572c8e87300b14f758e798ca3 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Fri, 11 Dec 2015 11:44:34 +0000 Subject: [PATCH] Updated exceptions package --- .../Exceptions/Filters/ApiFilter.php | 24 +++---------------- composer.json | 2 +- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/app/Foundation/Exceptions/Filters/ApiFilter.php b/app/Foundation/Exceptions/Filters/ApiFilter.php index 447e6480..e824de2a 100644 --- a/app/Foundation/Exceptions/Filters/ApiFilter.php +++ b/app/Foundation/Exceptions/Filters/ApiFilter.php @@ -16,38 +16,20 @@ use Illuminate\Http\Request; class ApiFilter { - /** - * The request instance. - * - * @var \Illuminate\Http\Request - */ - protected $request; - - /** - * Create a new api filter instance. - * - * @param \Illuminate\Http\Request $request - * - * @return void - */ - public function __construct(Request $request) - { - $this->request = $request; - } - /** * Filter and return the displayers. * * @param \GrahamCampbell\Exceptions\Displayers\DisplayerInterface[] $displayers + * @param \Illuminate\Http\Request $request * @param \Exception $original * @param \Exception $transformed * @param int $code * * @return \GrahamCampbell\Exceptions\Displayers\DisplayerInterface[] */ - public function filter(array $displayers, Exception $original, Exception $transformed, $code) + public function filter(array $displayers, Request $request, Exception $original, Exception $transformed, $code) { - if ($this->request->is('api*')) { + if ($request->is('api*')) { foreach ($displayers as $index => $displayer) { if (!str_contains($displayer->contentType(), 'application/')) { unset($displayers[$index]); diff --git a/composer.json b/composer.json index 0d891762..b5939ceb 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "graham-campbell/core": "^4.2", "graham-campbell/markdown": "^5.3", "graham-campbell/throttle": "^5.1", - "graham-campbell/exceptions": "^6.1", + "graham-campbell/exceptions": "^7.0", "guzzlehttp/guzzle": "^6.1", "jenssegers/date": "^3.0", "mccool/laravel-auto-presenter": "^4.2",