mirror of
https://github.com/flarum/core.git
synced 2025-08-02 22:47:33 +02:00
Laravel components v8 (#2576)
- update actions ci - include json for 4 spaces tab - provide output int for process code exit - adhere to parent type hint of builder - mailer instance now needs a name, multiple can be instantiated - getOriginal now uses mutators in the model - Temporarily loosen MailableInterface requirements. This avoids an immediate BC break for classes in extensions that implement this interface. - Temporarily provide (and autoload) old symfony translator interface - make queue exception handler compatible with the contract of L8 - Update phpunit schema for newer version - Update phpunit assert calls for newer version
This commit is contained in:
@@ -12,6 +12,7 @@ namespace Flarum\Queue;
|
||||
use Exception;
|
||||
use Illuminate\Contracts\Debug\ExceptionHandler as ExceptionHandling;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Throwable;
|
||||
|
||||
class ExceptionHandler implements ExceptionHandling
|
||||
{
|
||||
@@ -28,10 +29,10 @@ class ExceptionHandler implements ExceptionHandling
|
||||
/**
|
||||
* Report or log an exception.
|
||||
*
|
||||
* @param \Exception $e
|
||||
* @param Throwable $e
|
||||
* @return void
|
||||
*/
|
||||
public function report(Exception $e)
|
||||
public function report(Throwable $e)
|
||||
{
|
||||
$this->logger->error((string) $e);
|
||||
}
|
||||
@@ -40,10 +41,10 @@ class ExceptionHandler implements ExceptionHandling
|
||||
* Render an exception into an HTTP response.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Exception $e
|
||||
* @param Throwable $e
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
public function render($request, Exception $e)
|
||||
public function render($request, Throwable $e)
|
||||
{
|
||||
// TODO: Implement render() method.
|
||||
}
|
||||
@@ -52,10 +53,10 @@ class ExceptionHandler implements ExceptionHandling
|
||||
* Render an exception to the console.
|
||||
*
|
||||
* @param \Symfony\Component\Console\Output\OutputInterface $output
|
||||
* @param \Exception $e
|
||||
* @param Throwable $e
|
||||
* @return void
|
||||
*/
|
||||
public function renderForConsole($output, Exception $e)
|
||||
public function renderForConsole($output, Throwable $e)
|
||||
{
|
||||
// TODO: Implement renderForConsole() method.
|
||||
}
|
||||
@@ -63,10 +64,10 @@ class ExceptionHandler implements ExceptionHandling
|
||||
/**
|
||||
* Determine if the exception should be reported.
|
||||
*
|
||||
* @param \Exception $e
|
||||
* @param Throwable $e
|
||||
* @return bool
|
||||
*/
|
||||
public function shouldReport(Exception $e)
|
||||
public function shouldReport(Throwable $e)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user