Upgrade to Laravel 8

.env.example

@@ -22,6 +22,7 @@ SESSION_LIFETIME=10080
 SESSION_SECURE_COOKIE=true
 SAME_SITE_COOKIES=strict
 
+REDIS_CLIENT=phpredis
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379

app/Console/Commands/ListUsers.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;

app/Console/Commands/ReceiveEmail.php

@@ -2,19 +2,18 @@
 
 namespace App\Console\Commands;
 
-use App\AdditionalUsername;
-use App\Alias;
-use App\Domain;
-use App\EmailData;
 use App\Mail\ForwardEmail;
 use App\Mail\ReplyToEmail;
 use App\Mail\SendFromEmail;
+use App\Models\AdditionalUsername;
+use App\Models\Alias;
+use App\Models\Domain;
+use App\Models\EmailData;
+use App\Models\User;
 use App\Notifications\NearBandwidthLimit;
-use App\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Mail;
-use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Str;
 use PhpMimeMailParser\Parser;
 
@@ -177,7 +176,7 @@ protected function handleSendFrom($user, $recipient, $aliasable)
             'local_part' => $recipient['local_part'],
             'domain' => $recipient['domain'],
             'aliasable_id' => $aliasable->id ?? null,
-            'aliasable_type' => $aliasable ? 'App\\'.class_basename($aliasable) : null
+            'aliasable_type' => $aliasable ? 'App\\Models\\'.class_basename($aliasable) : null
         ]);
 
         // This is a new alias but at a shared domain or the sender is not a verified recipient.
@@ -204,7 +203,7 @@ protected function handleForward($user, $recipient, $aliasable)
             'local_part' => $recipient['local_part'],
             'domain' => $recipient['domain'],
             'aliasable_id' => $aliasable->id ?? null,
-            'aliasable_type' => $aliasable ? 'App\\'.class_basename($aliasable) : null
+            'aliasable_type' => $aliasable ? 'App\\Models\\'.class_basename($aliasable) : null
         ]);
 
         if (!isset($alias->id)) {
@@ -266,7 +265,7 @@ protected function checkBandwidthLimit($user)
 
     protected function checkRateLimit($user)
     {
-        Redis::throttle("user:{$user->username}:limit:emails")
+        \Illuminate\Support\Facades\Redis::throttle("user:{$user->username}:limit:emails")
             ->allow(config('anonaddy.limit'))
             ->every(3600)
             ->then(

app/Console/Commands/ResetBandwidth.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class ResetBandwidth extends Command

app/Exceptions/Handler.php

@@ -3,7 +3,6 @@
 namespace App\Exceptions;
 
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -27,25 +26,12 @@ class Handler extends ExceptionHandler
     ];
 
     /**
-     * Report or log an exception.
+     * Register the exception handling callbacks for the application.
      *
-     * @param  \Throwable  $exception
      * @return void
      */
-    public function report(Throwable $exception)
+    public function register()
     {
-        parent::report($exception);
-    }
-
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Throwable  $exception
-     * @return \Illuminate\Http\Response
-     */
-    public function render($request, Throwable $exception)
-    {
-        return parent::render($request, $exception);
+        //
     }
 }

app/Http/Controllers/Api/AdditionalUsernameController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\DeletedUsername;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\StoreAdditionalUsernameRequest;
 use App\Http\Requests\UpdateAdditionalUsernameRequest;
 use App\Http\Resources\AdditionalUsernameResource;
+use App\Models\DeletedUsername;
 
 class AdditionalUsernameController extends Controller
 {

app/Http/Controllers/Api/AliasController.php

@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\AdditionalUsername;
-use App\Domain;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\StoreAliasRequest;
 use App\Http\Requests\UpdateAliasRequest;
 use App\Http\Resources\AliasResource;
+use App\Models\AdditionalUsername;
+use App\Models\Domain;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Ramsey\Uuid\Uuid;
@@ -82,7 +82,7 @@ public function store(StoreAliasRequest $request)
         }
 
         $data['aliasable_id'] = $aliasable->id ?? null;
-        $data['aliasable_type'] = $aliasable ? 'App\\'.class_basename($aliasable) : null;
+        $data['aliasable_type'] = $aliasable ? 'App\\Models\\'.class_basename($aliasable) : null;
 
         $data['domain'] = $request->domain;
         $data['description'] = $request->description;

app/Http/Controllers/Api/DomainController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Domain;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\StoreDomainRequest;
 use App\Http\Requests\UpdateDomainRequest;
 use App\Http\Resources\DomainResource;
+use App\Models\Domain;
 
 class DomainController extends Controller
 {

app/Http/Controllers/Api/ReorderRuleController.php

@@ -4,7 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\StoreReorderRuleRequest;
-use App\Rule;
+use App\Models\Rule;
 
 class ReorderRuleController extends Controller
 {

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\User;
+use App\Models\User;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Password;

app/Http/Controllers/Auth/ForgotUsernameController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\Recipient;
+use App\Models\Recipient;
 use Illuminate\Http\Request;
 
 class ForgotUsernameController extends Controller

app/Http/Controllers/Auth/RegisterController.php

@@ -3,12 +3,12 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\Recipient;
+use App\Models\Recipient;
+use App\Models\User;
 use App\Rules\NotBlacklisted;
 use App\Rules\NotDeletedUsername;
 use App\Rules\NotLocalRecipient;
 use App\Rules\RegisterUniqueRecipient;
-use App\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Hash;
@@ -86,7 +86,7 @@ protected function validator(array $data)
      * Create a new user instance after a valid registration.
      *
      * @param  array  $data
-     * @return \App\User
+     * @return \App\Models\User
      */
     protected function create(array $data)
     {

app/Http/Controllers/Auth/VerificationController.php

@@ -3,8 +3,8 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\Recipient;
-use App\User;
+use App\Models\Recipient;
+use App\Models\User;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\Events\Verified;
 use Illuminate\Foundation\Auth\VerifiesEmails;

app/Http/Kernel.php

@@ -14,12 +14,13 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \App\Http\Middleware\CheckForMaintenanceMode::class,
+        // \App\Http\Middleware\TrustHosts::class,
+        \App\Http\Middleware\TrustProxies::class,
+        \Fruitcake\Cors\HandleCors::class,
+        \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrustProxies::class,
-        \Fruitcake\Cors\HandleCors::class,
     ];
 
     /**
@@ -40,8 +41,8 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            'throttle:60,1',
-            'bindings',
+            'throttle:api',
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
 
@@ -55,29 +56,13 @@ class Kernel extends HttpKernel
     protected $routeMiddleware = [
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         '2fa' => \App\Http\Middleware\VerifyTwoFactorAuth::class,
     ];
-
-    /**
-     * The priority-sorted list of middleware.
-     *
-     * This forces non-global middleware to always be in the given order.
-     *
-     * @var array
-     */
-    protected $middlewarePriority = [
-        \Illuminate\Session\Middleware\StartSession::class,
-        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-        \App\Http\Middleware\Authenticate::class,
-        \Illuminate\Session\Middleware\AuthenticateSession::class,
-        \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        \Illuminate\Auth\Middleware\Authorize::class,
-    ];
 }

app/Http/Middleware/CheckForMaintenanceMode.php → app/Http/Middleware/PreventRequestsDuringMaintenance.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
+use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware;
 
-class CheckForMaintenanceMode extends Middleware
+class PreventRequestsDuringMaintenance extends Middleware
 {
     /**
      * The URIs that should be reachable while maintenance mode is enabled.

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Providers\RouteServiceProvider;
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
@@ -12,13 +13,17 @@ class RedirectIfAuthenticated
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
-     * @param  string|null  $guard
+     * @param  string|null  ...$guards
      * @return mixed
      */
-    public function handle($request, Closure $next, $guard = null)
+    public function handle($request, Closure $next, ...$guards)
     {
-        if (Auth::guard($guard)->check()) {
-            return redirect('/');
+        $guards = empty($guards) ? [null] : $guards;
+
+        foreach ($guards as $guard) {
+            if (Auth::guard($guard)->check()) {
+                return redirect(RouteServiceProvider::HOME);
+            }
         }
 
         return $next($request);

app/Jobs/DeleteAccount.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs;
 
-use App\DeletedUsername;
-use App\User;
+use App\Models\DeletedUsername;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -45,6 +45,7 @@ public function handle()
         $this->user->domains()->delete();
         $this->user->additionalUsernames()->get()->each->delete(); // In order to fire deleting model event.
         $this->user->tokens()->delete();
+        $this->user->rules()->delete();
         $this->user->delete();
     }
 }

app/Mail/ForwardEmail.php

@@ -2,12 +2,12 @@
 
 namespace App\Mail;
 
-use App\Alias;
-use App\EmailData;
 use App\Helpers\AlreadyEncryptedSigner;
 use App\Helpers\OpenPGPSigner;
+use App\Models\Alias;
+use App\Models\EmailData;
+use App\Models\Recipient;
 use App\Notifications\GpgKeyExpired;
-use App\Recipient;
 use App\Traits\CheckUserRules;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;

app/Mail/ReplyToEmail.php

@@ -2,11 +2,11 @@
 
 namespace App\Mail;
 
-use App\Alias;
-use App\EmailData;
 use App\Helpers\AlreadyEncryptedSigner;
+use App\Models\Alias;
+use App\Models\EmailData;
+use App\Models\User;
 use App\Traits\CheckUserRules;
-use App\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;

app/Mail/SendFromEmail.php

@@ -2,11 +2,11 @@
 
 namespace App\Mail;
 
-use App\Alias;
-use App\EmailData;
 use App\Helpers\AlreadyEncryptedSigner;
+use App\Models\Alias;
+use App\Models\EmailData;
+use App\Models\User;
 use App\Traits\CheckUserRules;
-use App\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;