Upgrade Laravel 6 (lts) -> 9 (lts) #105

Philhil · Feb 11, 2022 · d13315b · d13315b
1 parent 82bd321
commit d13315b
Show file tree

Hide file tree

Showing 14 changed files with 2,362 additions and 1,918 deletions.
diff --git a/.env.example b/.env.example
@@ -23,7 +23,7 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_DRIVER=smtp
+MAIL_MAILER=smtp
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null

diff --git a/.env.testing b/.env.testing
@@ -23,7 +23,7 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_DRIVER=log
+MAIL_MAILER=log
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -2,7 +2,7 @@
 
 namespace App\Exceptions;
 
-use Exception;
+use Throwable;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
@@ -27,26 +27,36 @@ class Handler extends ExceptionHandler
      *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
 
+    public function shouldReport(Throwable $exception)
+    {
+        parent::shouldReport($exception);
+    }
+
     /**
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }
 
+    public function renderForConsole($output, Throwable $exception)
+    {
+        return parent::renderForConsole($output, $exception);
+    }
+
     /**
      * Convert an authentication exception into an unauthenticated response.
      *

diff --git a/composer.json b/composer.json
@@ -7,44 +7,49 @@
     ],
     "license": "MIT",
     "type": "project",
+    "repositories": [
+        {
+            "type": "git",
+            "url": "https://github.com/xndbogdan/captcha.git"
+        }
+    ],
     "require": {
-        "php": ">=7.2",
-        "barryvdh/laravel-dompdf": "^0.8.4",
-        "doctrine/dbal": "^2.5",
-        "eluceo/ical": "^0.15.0",
+        "php": ">=8.0.2",
+        "barryvdh/laravel-dompdf": "^1.0.0",
+        "doctrine/dbal": "^3.0",
+        "eluceo/ical": "^2.4",
         "hisorange/browser-detect": "^4.3",
-        "laravel/framework": "^6.0",
+        "laravel/framework": "^9.0",
         "laravel/socialite": "^5.0",
-        "laravel/tinker": "~1.0",
-        "laravelcollective/html": "^6.0",
-        "league/flysystem-aws-s3-v3": "^1.0",
-        "mews/captcha": "^3.2.4",
+        "laravel/tinker": "~2.0",
+        "laravelcollective/html": "^6.2",
+        "mews/captcha": "dev-master",
         "predis/predis": "^1.1",
-        "spatie/laravel-backup": "^6.0",
-        "watson/active": "^4.0"
+        "spatie/laravel-backup": "^8.0",
+        "watson/active": "^6.0.1",
+        "laravel/ui": "^3.0"
     },
     "require-dev": {
-        "barryvdh/laravel-debugbar": "^3.4",
-        "filp/whoops": "~2.9.1",
-        "fakerphp/faker": "~1.9",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~9.0"
+        "filp/whoops": "^2.14",
+        "fakerphp/faker": "~1.19",
+        "mockery/mockery": "1.5.*",
+        "phpunit/phpunit": "~9.5"
     },
     "autoload": {
-        "classmap": [
-            "database"
-        ],
         "psr-4": {
-            "App\\": "app/"
+            "App\\": "app/",
+            "Database\\Factories\\": "database/factories/",
+            "Database\\Seeders\\": "database/seeders/"
         }
     },
     "autoload-dev": {
         "classmap": [
-            "tests",
-            "database"
+            "tests"
         ],
         "psr-4": {
-            "Tests\\": "tests/"
+            "Tests\\": "tests/",
+            "Database\\Factories\\": "database/factories/",
+            "Database\\Seeders\\": "database/seeders/"
         }
     },
     "scripts": {