💥 Change - updated laravel

maelstrom-cms · Jun 25, 2020 · ea038f9 · ea038f9
1 parent 69e172a
commit ea038f9
Show file tree

Hide file tree

Showing 4 changed files with 2,130 additions and 921 deletions.
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -2,7 +2,10 @@
 
 namespace App\Exceptions;
 
+use Throwable;
 use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
@@ -29,22 +32,24 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param  \Exception  $exception
+     * @param Throwable $exception
      * @return void
+     * @throws Exception
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
 
     /**
      * Render an exception into an HTTP response.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
+     * @param Request $request
+     * @param Throwable $exception
+     * @return Response
+     * @throws Throwable
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }

diff --git a/app/HasUptime.php b/app/HasUptime.php
@@ -25,6 +25,8 @@ public function generateUptimeReport($refreshCache = false)
             }]);
         }
 
+        dd('x');
+
         return cache()->rememberForever($this->cache_key, function () {
             return [
                 'uptime' => $this->uptime_summary,

diff --git a/composer.json b/composer.json
@@ -8,18 +8,20 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.2.5",
         "doctrine/annotations": "^1.7",
         "doctrine/dbal": "^2.9",
         "embed/embed": "^3.4",
-        "fideloper/proxy": "^4.0",
+        "fideloper/proxy": "^4.2",
+        "fruitcake/laravel-cors": "^1.0",
         "guzzlehttp/guzzle": "^6.3",
-        "laravel/framework": "5.8.*",
-        "laravel/horizon": "^3.3",
-        "laravel/tinker": "^1.0",
+        "laravel/framework": "^7.0",
+        "laravel/horizon": "^4.0",
+        "laravel/tinker": "^2.0",
+        "laravel/ui": "^2.0",
         "maelstrom-cms/toolkit": "^1.0",
         "morrislaptop/laravel-queue-clear": "^1.2",
-        "owenmelbz/domain-enforcement": "^0.0.6",
+        "owenmelbz/domain-enforcement": "^0.0.7",
         "predis/predis": "^1.1",
         "sebastian/diff": "^3.0",
         "spatie/crawler": "^4.6",
@@ -31,11 +33,11 @@
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.2",
         "beyondcode/laravel-dump-server": "^1.0",
-        "filp/whoops": "^2.0",
-        "fzaninotto/faker": "^1.4",
-        "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^3.0",
-        "phpunit/phpunit": "^7.5"
+        "facade/ignition": "^2.0",
+        "fzaninotto/faker": "^1.9.1",
+        "mockery/mockery": "^1.3.1",
+        "nunomaduro/collision": "^4.1",
+        "phpunit/phpunit": "^8.5"
     },
     "config": {
         "optimize-autoloader": true,