Partial support of laravel 6

README.md

@@ -31,7 +31,7 @@ You can now [join our Slack community!](http://cachethq-slack.herokuapp.com)
 
 ## Requirements
 
-- PHP 7.1.3 – 7.3
+- PHP 7.3 − 8.0
 - HTTP server with PHP support (e.g.: Apache, Nginx, Caddy)
 - [Composer](https://getcomposer.org)
 - A supported database: MySQL, PostgreSQL or SQLite

app/Console/Commands/AppResetCommand.php

@@ -61,16 +61,16 @@ public function __construct(Dispatcher $events)
      */
     public function handle()
     {
-        $this->events->fire('command.resetting', $this);
-        $this->events->fire('command.generatekey', $this);
-        $this->events->fire('command.cacheconfig', $this);
-        $this->events->fire('command.cacheroutes', $this);
-        $this->events->fire('command.publishvendors', $this);
-        $this->events->fire('command.resetmigrations', $this);
-        $this->events->fire('command.runmigrations', $this);
-        $this->events->fire('command.runseeding', $this);
-        $this->events->fire('command.updatecache', $this);
-        $this->events->fire('command.extrastuff', $this);
-        $this->events->fire('command.reset', $this);
+        $this->events->dispatch('command.resetting', $this);
+        $this->events->dispatch('command.generatekey', $this);
+        $this->events->dispatch('command.cacheconfig', $this);
+        $this->events->dispatch('command.cacheroutes', $this);
+        $this->events->dispatch('command.publishvendors', $this);
+        $this->events->dispatch('command.resetmigrations', $this);
+        $this->events->dispatch('command.runmigrations', $this);
+        $this->events->dispatch('command.runseeding', $this);
+        $this->events->dispatch('command.updatecache', $this);
+        $this->events->dispatch('command.extrastuff', $this);
+        $this->events->dispatch('command.reset', $this);
     }
 }

app/Console/Commands/AppUpdateCommand.php

@@ -61,13 +61,13 @@ public function __construct(Dispatcher $events)
      */
     public function handle()
     {
-        $this->events->fire('command.updating', $this);
-        $this->events->fire('command.cacheconfig', $this);
-        $this->events->fire('command.cacheroutes', $this);
-        $this->events->fire('command.publishvendors', $this);
-        $this->events->fire('command.runmigrations', $this);
-        $this->events->fire('command.updatecache', $this);
-        $this->events->fire('command.extrastuff', $this);
-        $this->events->fire('command.updated', $this);
+        $this->events->dispatch('command.updating', $this);
+        $this->events->dispatch('command.cacheconfig', $this);
+        $this->events->dispatch('command.cacheroutes', $this);
+        $this->events->dispatch('command.publishvendors', $this);
+        $this->events->dispatch('command.runmigrations', $this);
+        $this->events->dispatch('command.updatecache', $this);
+        $this->events->dispatch('command.extrastuff', $this);
+        $this->events->dispatch('command.updated', $this);
     }
 }

app/Console/Commands/InstallCommand.php

@@ -77,17 +77,17 @@ public function handle()
 
         $this->line('Installing Cachet...');
 
-        $this->events->fire('command.installing', $this);
-        $this->events->fire('command.generatekey', $this);
-        $this->events->fire('command.cacheconfig', $this);
-        $this->events->fire('command.cacheroutes', $this);
-        $this->events->fire('command.publishvendors', $this);
-        $this->events->fire('command.runmigrations', $this);
-        $this->events->fire('command.runseeding', $this);
-        $this->events->fire('command.updatecache', $this);
-        $this->events->fire('command.linkstorage', $this);
-        $this->events->fire('command.extrastuff', $this);
-        $this->events->fire('command.installed', $this);
+        $this->events->dispatch('command.installing', $this);
+        $this->events->dispatch('command.generatekey', $this);
+        $this->events->dispatch('command.cacheconfig', $this);
+        $this->events->dispatch('command.cacheroutes', $this);
+        $this->events->dispatch('command.publishvendors', $this);
+        $this->events->dispatch('command.runmigrations', $this);
+        $this->events->dispatch('command.runseeding', $this);
+        $this->events->dispatch('command.updatecache', $this);
+        $this->events->dispatch('command.linkstorage', $this);
+        $this->events->dispatch('command.extrastuff', $this);
+        $this->events->dispatch('command.installed', $this);
 
         $this->info('Cachet is installed ⚡');
     }

app/Exceptions/Displayers/JsonValidationDisplayer.php

@@ -12,24 +12,24 @@
 namespace CachetHQ\Cachet\Exceptions\Displayers;
 
 use AltThree\Validator\ValidationException;
-use Exception;
-use GrahamCampbell\Exceptions\Displayers\DisplayerInterface;
-use GrahamCampbell\Exceptions\Displayers\JsonDisplayer;
+use Throwable;
+use GrahamCampbell\Exceptions\Displayer\DisplayerInterface;
+use GrahamCampbell\Exceptions\Displayer\AbstractJsonDisplayer;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
-class JsonValidationDisplayer extends JsonDisplayer implements DisplayerInterface
+class JsonValidationDisplayer extends AbstractJsonDisplayer implements DisplayerInterface
 {
     /**
      * Get the error response associated with the given exception.
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      * @param string     $id
      * @param int        $code
      * @param string[]   $headers
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function display(Exception $exception, string $id, int $code, array $headers)
+    public function display(Throwable $exception, string $id, int $code, array $headers)
     {
         $info = $this->info->generate($exception, $id, 400);
 
@@ -41,14 +41,24 @@ public function display(Exception $exception, string $id, int $code, array $head
     /**
      * Can we display the exception?
      *
-     * @param \Exception $original
-     * @param \Exception $transformed
+     * @param \Throwable $original
+     * @param \Throwable $transformed
      * @param int        $code
      *
      * @return bool
      */
-    public function canDisplay(Exception $original, Exception $transformed, int $code)
+    public function canDisplay(Throwable $original, Throwable $transformed, int $code)
     {
         return $transformed instanceof ValidationException;
     }
+
+    /**
+     * Get the supported content type.
+     *
+     * @return string
+     */
+    public function contentType()
+    {
+        return 'application/json';
+    }
 }

app/Exceptions/Displayers/MaintenanceDisplayer.php

@@ -11,8 +11,8 @@
 
 namespace CachetHQ\Cachet\Exceptions\Displayers;
 
-use Exception;
-use GrahamCampbell\Exceptions\Displayers\DisplayerInterface;
+use Throwable;
+use GrahamCampbell\Exceptions\Displayer\DisplayerInterface;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Foundation\Http\Exceptions\MaintenanceModeException;
 use Illuminate\Http\Response;
@@ -46,14 +46,14 @@ public function __construct(Factory $view)
     /**
      * Get the error response associated with the given exception.
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      * @param string     $id
      * @param int        $code
      * @param string[]   $headers
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function display(Exception $exception, string $id, int $code, array $headers)
+    public function display(Throwable $exception, string $id, int $code, array $headers)
     {
         return new Response($this->render(), $code, array_merge($headers, ['Content-Type' => $this->contentType()]));
     }
@@ -81,13 +81,13 @@ public function contentType()
     /**
      * Can we display the exception?
      *
-     * @param \Exception $original
-     * @param \Exception $transformed
+     * @param \Throwable $original
+     * @param \Throwable $transformed
      * @param int        $code
      *
      * @return bool
      */
-    public function canDisplay(Exception $original, Exception $transformed, int $code)
+    public function canDisplay(Throwable $original, Throwable $transformed, int $code)
     {
         return $transformed instanceof MaintenanceModeException;
     }

app/Exceptions/Displayers/RedirectDisplayer.php

@@ -11,8 +11,8 @@
 
 namespace CachetHQ\Cachet\Exceptions\Displayers;
 
-use Exception;
-use GrahamCampbell\Exceptions\Displayers\DisplayerInterface;
+use Throwable;
+use GrahamCampbell\Exceptions\Displayer\DisplayerInterface;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
@@ -40,14 +40,14 @@ public function __construct(Request $request)
     /**
      * Get the error response associated with the given exception.
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      * @param string     $id
      * @param int        $code
      * @param string[]   $headers
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function display(Exception $exception, string $id, int $code, array $headers)
+    public function display(Throwable $exception, string $id, int $code, array $headers)
     {
         return redirect()->guest('auth/login');
     }
@@ -65,13 +65,13 @@ public function contentType()
     /**
      * Can we display the exception?
      *
-     * @param \Exception $original
-     * @param \Exception $transformed
+     * @param \Throwable $original
+     * @param \Throwable $transformed
      * @param int        $code
      *
      * @return bool
      */
-    public function canDisplay(Exception $original, Exception $transformed, int $code)
+    public function canDisplay(Throwable $original, Throwable $transformed, int $code)
     {
         $redirect = $transformed instanceof HttpExceptionInterface && $transformed->getStatusCode() === 401;
 

app/Exceptions/Displayers/SettingsDisplayer.php

@@ -12,8 +12,8 @@
 namespace CachetHQ\Cachet\Exceptions\Displayers;
 
 use CachetHQ\Cachet\Settings\ReadException;
-use Exception;
-use GrahamCampbell\Exceptions\Displayers\DisplayerInterface;
+use Throwable;
+use GrahamCampbell\Exceptions\Displayer\DisplayerInterface;
 use Illuminate\Http\Request;
 
 class SettingsDisplayer implements DisplayerInterface
@@ -40,14 +40,14 @@ public function __construct(Request $request)
     /**
      * Get the error response associated with the given exception.
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      * @param string     $id
      * @param int        $code
      * @param string[]   $headers
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function display(Exception $exception, string $id, int $code, array $headers)
+    public function display(Throwable $exception, string $id, int $code, array $headers)
     {
         return cachet_redirect('setup');
     }
@@ -65,13 +65,13 @@ public function contentType()
     /**
      * Can we display the exception?
      *
-     * @param \Exception $original
-     * @param \Exception $transformed
+     * @param \Throwable $original
+     * @param \Throwable $transformed
      * @param int        $code
      *
      * @return bool
      */
-    public function canDisplay(Exception $original, Exception $transformed, int $code)
+    public function canDisplay(Throwable $original, Throwable $transformed, int $code)
     {
         return ($transformed instanceof ReadException) && !$this->request->is('setup*');
     }

app/Exceptions/Displayers/ThrottleDisplayer.php

@@ -11,8 +11,8 @@
 
 namespace CachetHQ\Cachet\Exceptions\Displayers;
 
-use Exception;
-use GrahamCampbell\Exceptions\Displayers\DisplayerInterface;
+use Throwable;
+use GrahamCampbell\Exceptions\Displayer\DisplayerInterface;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException;
 
@@ -40,14 +40,14 @@ public function __construct(Request $request)
     /**
      * Get the error response associated with the given exception.
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      * @param string     $id
      * @param int        $code
      * @param string[]   $headers
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function display(Exception $exception, string $id, int $code, array $headers)
+    public function display(Throwable $exception, string $id, int $code, array $headers)
     {
         return cachet_redirect('auth.login')->withError(trans('forms.login.rate-limit'));
     }
@@ -65,13 +65,13 @@ public function contentType()
     /**
      * Can we display the exception?
      *
-     * @param \Exception $original
-     * @param \Exception $transformed
+     * @param \Throwable $original
+     * @param \Throwable $transformed
      * @param int        $code
      *
      * @return bool
      */
-    public function canDisplay(Exception $original, Exception $transformed, int $code)
+    public function canDisplay(Throwable $original, Throwable $transformed, int $code)
     {
         return $transformed instanceof TooManyRequestsHttpException && $this->request->is('auth*');
     }

app/Exceptions/Filters/ApiFilter.php

@@ -20,13 +20,13 @@ class ApiFilter
     /**
      * Filter and return the displayers.
      *
-     * @param \GrahamCampbell\Exceptions\Displayers\DisplayerInterface[] $displayers
+     * @param \GrahamCampbell\Exceptions\Displayer\DisplayerInterface[] $displayers
      * @param \Illuminate\Http\Request                                   $request
      * @param \Exception                                                 $original
      * @param \Exception                                                 $transformed
      * @param int                                                        $code
      *
-     * @return \GrahamCampbell\Exceptions\Displayers\DisplayerInterface[]
+     * @return \GrahamCampbell\Exceptions\Displayer\DisplayerInterface[]
      */
     public function filter(array $displayers, Request $request, Exception $original, Exception $transformed, int $code)
     {

app/Exceptions/Transformers/BusTransformer.php

@@ -12,8 +12,8 @@
 namespace CachetHQ\Cachet\Exceptions\Transformers;
 
 use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
-use Exception;
-use GrahamCampbell\Exceptions\Transformers\TransformerInterface;
+use Throwable;
+use GrahamCampbell\Exceptions\Transformer\TransformerInterface;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 /**
@@ -26,11 +26,11 @@ class BusTransformer implements TransformerInterface
     /**
      * Transform the provided exception.
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      *
-     * @return \Exception
+     * @return \Throwable
      */
-    public function transform(Exception $exception)
+    public function transform(Throwable $exception)
     {
         if ($exception instanceof ExceptionInterface) {
             $exception = new BadRequestHttpException($exception->getMessage());

bootstrap/app.php

@@ -28,6 +28,7 @@
 
 $app->singleton(Illuminate\Contracts\Debug\ExceptionHandler::class, GrahamCampbell\Exceptions\ExceptionHandler::class);
 
+$app->singleton(GrahamCampbell\Exceptions\Identifier\IdentifierInterface::class, GrahamCampbell\Exceptions\Identifier\HashingIdentifier::class);
 /*
 |--------------------------------------------------------------------------
 | Return The Application