github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-23 03:24:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make registration errors still work properly when debug mode is on

Browse Source
This commit is contained in:
Toby Zerner 2018-09-21 14:18:17 +09:30
parent 5e1e7b2171
commit 5cda25c8b6
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
framework/core/src/Api/Client.php
View File

@ -14,6 +14,7 @@ namespace Flarum\Api;
use Exception; use Exception;
use Flarum\Foundation\Application; use Flarum\Foundation\Application;
use Flarum\User\User; use Flarum\User\User;
use Illuminate\Contracts\Container\Container;
use InvalidArgumentException; use InvalidArgumentException;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Server\RequestHandlerInterface; use Psr\Http\Server\RequestHandlerInterface;
@ -21,22 +22,23 @@ use Zend\Diactoros\ServerRequestFactory;
class Client class Client
{ {
/**
* @var Container
*/
protected $container;
/** /**
* @var ErrorHandler * @var ErrorHandler
*/ */
protected $errorHandler; protected $errorHandler;
/**
* @var Application
*/
private $app;
/** /**
* @param Application $app * @param Container $container
* @param ErrorHandler $errorHandler * @param ErrorHandler $errorHandler
*/ */
public function __construct(Application $app, ErrorHandler $errorHandler) public function __construct(Container $container, ErrorHandler $errorHandler = null)
{ {
$this->app = $app; $this->container = $container;
$this->errorHandler = $errorHandler; $this->errorHandler = $errorHandler;
} }
@ -57,7 +59,7 @@ class Client
$request = $request->withAttribute('actor', $actor); $request = $request->withAttribute('actor', $actor);
if (is_string($controller)) { if (is_string($controller)) {
$controller = $this->app->make($controller); $controller = $this->container->make($controller);
} }
if (! ($controller instanceof RequestHandlerInterface)) { if (! ($controller instanceof RequestHandlerInterface)) {
@ -69,11 +71,22 @@ class Client
try { try {
return $controller->handle($request); return $controller->handle($request);
} catch (Exception $e) { } catch (Exception $e) {
if ($this->app->inDebugMode()) { if (! $this->errorHandler) {
throw $e; throw $e;
} }
return $this->errorHandler->handle($e); return $this->errorHandler->handle($e);
} }
} }
/**
* @param ErrorHandler $errorHandler
* @return Client
*/
public function setErrorHandler(?ErrorHandler $errorHandler): Client
{
$this->errorHandler = $errorHandler;
return $this;
}
} }

2
framework/core/src/Frontend/HtmlDocumentFactory.php
View File

@ -128,6 +128,8 @@ class HtmlDocumentFactory
{ {
$actor = $request->getAttribute('actor'); $actor = $request->getAttribute('actor');
$this->api->setErrorHandler(null);
return $this->getResponseBody( return $this->getResponseBody(
$this->api->send(ShowForumController::class, $actor) $this->api->send(ShowForumController::class, $actor)
); );