mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-15 21:04:30 +02:00
Code Issues Releases Wiki Activity

chore: adapt whoops formatter

Browse Source
This commit is contained in:
Sami Mazouz
2023-08-11 14:20:18 +01:00
parent 495b24a5aa
commit 0ce33c3ec0
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/src/Foundation/ErrorHandling/HttpFormatter.php
View File

@@ -9,8 +9,8 @@
namespace Flarum\Foundation\ErrorHandling; namespace Flarum\Foundation\ErrorHandling;
use Psr\Http\Message\ResponseInterface as Response; use Illuminate\Http\Request;
use Psr\Http\Message\ServerRequestInterface as Request; use Symfony\Component\HttpFoundation\Response;
interface HttpFormatter interface HttpFormatter
{ {

4
framework/core/src/Foundation/ErrorHandling/JsonApiFormatter.php
View File

@@ -10,8 +10,8 @@
namespace Flarum\Foundation\ErrorHandling; namespace Flarum\Foundation\ErrorHandling;
use Flarum\Api\JsonApiResponse; use Flarum\Api\JsonApiResponse;
use Psr\Http\Message\ResponseInterface as Response; use Illuminate\Http\Request;
use Psr\Http\Message\ServerRequestInterface as Request; use Symfony\Component\HttpFoundation\Response;
use Tobscure\JsonApi\Document; use Tobscure\JsonApi\Document;
/** /**

6
framework/core/src/Foundation/ErrorHandling/ViewFormatter.php
View File

@@ -12,9 +12,9 @@ namespace Flarum\Foundation\ErrorHandling;
use Flarum\Locale\TranslatorInterface; use Flarum\Locale\TranslatorInterface;
use Flarum\Settings\SettingsRepositoryInterface; use Flarum\Settings\SettingsRepositoryInterface;
use Illuminate\Contracts\View\Factory as ViewFactory; use Illuminate\Contracts\View\Factory as ViewFactory;
use Illuminate\Http\Request;
use Laminas\Diactoros\Response\HtmlResponse; use Laminas\Diactoros\Response\HtmlResponse;
use Psr\Http\Message\ResponseInterface as Response; use Symfony\Component\HttpFoundation\Response;
use Psr\Http\Message\ServerRequestInterface as Request;
/** /**
* A formatter for turning caught exceptions into "pretty" HTML error pages. * A formatter for turning caught exceptions into "pretty" HTML error pages.
@@ -45,7 +45,7 @@ class ViewFormatter implements HttpFormatter
->with('error', $error->getException()) ->with('error', $error->getException())
->with('message', $this->getMessage($error)); ->with('message', $this->getMessage($error));
return new HtmlResponse($view->render(), $error->getStatusCode()); return new \Illuminate\Http\Response($view->render(), $error->getStatusCode());
} }
private function determineView(HandledError $error): string private function determineView(HandledError $error): string

11
framework/core/src/Foundation/ErrorHandling/WhoopsFormatter.php
View File

@@ -9,9 +9,10 @@
namespace Flarum\Foundation\ErrorHandling; namespace Flarum\Foundation\ErrorHandling;
use Flarum\Http\RequestUtil;
use Franzl\Middleware\Whoops\WhoopsRunner; use Franzl\Middleware\Whoops\WhoopsRunner;
use Psr\Http\Message\ResponseInterface as Response; use Illuminate\Http\Request;
use Psr\Http\Message\ServerRequestInterface as Request; use Symfony\Component\HttpFoundation\Response;
/** /**
* Handle errors using the Whoops error handler for debugging. * Handle errors using the Whoops error handler for debugging.
@@ -26,7 +27,11 @@ class WhoopsFormatter implements HttpFormatter
{ {
public function format(HandledError $error, Request $request): Response public function format(HandledError $error, Request $request): Response
{ {
return WhoopsRunner::handle($error->getException(), $request) $psr7Request = RequestUtil::toPsr7($request);
$psr7Response = WhoopsRunner::handle($error->getException(), $psr7Request)
->withStatus($error->getStatusCode()); ->withStatus($error->getStatusCode());
return RequestUtil::responseToSymfony($psr7Response);
} }
} }