Laravel 8 upgrade

.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

.github/workflows/laravel-tests.yml

@@ -56,7 +56,7 @@ jobs:
       - name: Build assets
         run: npm run production
       - name: Run PHPUnit
-        run: vendor/bin/phpunit
+        run: php artisan test
         env:
           DB_PORT: ${{ job.services.mysql.ports['3306'] }}
       - name: Start chromedriver

app/Appeal.php

@@ -3,12 +3,15 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use RuntimeException;
 use App\MwApi\MwApiUrls;
 use Illuminate\Database\Eloquent\Model;
 
 class Appeal extends Model
 {
+    use HasFactory;
+
     const REPLY_STATUS_CHANGE_OPTIONS = [
         self::STATUS_OPEN           => self::STATUS_OPEN,
         self::STATUS_AWAITING_REPLY => self::STATUS_AWAITING_REPLY,

app/Ban.php

@@ -6,9 +6,12 @@
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Ban extends Model
 {
+    use HasFactory;
+
 	protected $primaryKey = 'id';
     public $timestamps = false;
     protected $guarded = ['id'];

app/Exceptions/Handler.php

@@ -2,7 +2,6 @@
 
 namespace App\Exceptions;
 
-use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 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  \Exception  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function register()
     {
-        parent::report($exception);
-    }
-
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
-     */
-    public function render($request, Exception $exception)
-    {
-        return parent::render($request, $exception);
+        //
     }
 }

app/Http/Controllers/AppealController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App;
 use App\Appeal;
 use App\Jobs\GetBlockDetailsJob;
 use App\Log;
@@ -15,6 +14,7 @@
 use App\Template;
 use App\User;
 use Auth;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
@@ -31,25 +31,9 @@ public function __construct()
     public function appeal($id)
     {
         $info = Appeal::find($id);
-        if (is_null($info)) {
-            $info = Oldappeal::findOrFail($id);
-            $this->authorize('view', $info);
-
-            $comments = $info->comments;
-            $userlist = [];
 
-            foreach ($comments as $comment) {
-                if (!is_null($comment->commentUser) && !in_array($comment->commentUser, $userlist)) {
-                    $userlist[$comment->commentUser] = Olduser::findOrFail($comment->commentUser)->username;
-                }
-            }
-
-            if ($info['status'] === "UNVERIFIED") {
-                return view('appeals.unverifiedappeal');
-            }
-
-            return view('appeals.oldappeal', ['info' => $info, 'comments' => $comments, 'userlist' => $userlist]);
-        } else {
+        // UTRS 2 appeal exists
+        if ($info) {
             $this->authorize('view', $info);
             $isDeveloper = Permission::checkSecurity(Auth::id(), "DEVELOPER","*");
 
@@ -93,6 +77,29 @@ public function appeal($id)
                 'previousAppeals' => $previousAppeals,
             ]);
         }
+
+        // if UTRS 1 table exists, let's check there as well
+        if (Schema::hasTable('oldappeals')) {
+            $info = Oldappeal::findOrFail($id);
+            $this->authorize('view', $info);
+
+            $comments = $info->comments;
+            $userlist = [];
+
+            foreach ($comments as $comment) {
+                if (!is_null($comment->commentUser) && !in_array($comment->commentUser, $userlist)) {
+                    $userlist[$comment->commentUser] = Olduser::findOrFail($comment->commentUser)->username;
+                }
+            }
+
+            if ($info['status'] === "UNVERIFIED") {
+                return view('appeals.unverifiedappeal');
+            }
+
+            return view('appeals.oldappeal', ['info' => $info, 'comments' => $comments, 'userlist' => $userlist]);
+        }
+
+        throw (new ModelNotFoundException)->setModel(Appeal::class, $id);
     }
 
     public function appeallist()

app/Http/Kernel.php

@@ -2,8 +2,6 @@
 
 namespace App\Http;
 
-use App\Http\Middleware\ForceHttps;
-use App\Http\Middleware\AddHstsHeader;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 class Kernel extends HttpKernel
@@ -16,14 +14,13 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
+        \App\Http\Middleware\TrustHosts::class,
         \App\Http\Middleware\TrustProxies::class,
-        \App\Http\Middleware\CheckForMaintenanceMode::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,
-
-        ForceHttps::class,
-        AddHstsHeader::class,
     ];
 
     /**
@@ -43,8 +40,8 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            'throttle:60,1',
-            'bindings',
+            'throttle:api',
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
 
@@ -58,29 +55,12 @@ 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,
     ];
-
-    /**
-     * 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\Routing\Middleware\ThrottleRequests::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

@@ -12,14 +12,18 @@ 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('/')
-                ->with('message', 'This action can only be performed by users who are not logged in.');
+        $guards = empty($guards) ? [null] : $guards;
+
+        foreach ($guards as $guard) {
+            if (Auth::guard($guard)->check()) {
+                return redirect('/')
+                    ->with('message', 'This action can only be performed by users who are not logged in.');
+            }
         }
 
         return $next($request);

app/Http/Middleware/TrustHosts.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Http\Middleware\TrustHosts as Middleware;
+
+class TrustHosts extends Middleware
+{
+    /**
+     * Get the host patterns that should be trusted.
+     *
+     * @return array
+     */
+    public function hosts()
+    {
+        return [
+            $this->allSubdomainsOfApplicationUrl(),
+        ];
+    }
+}
+

app/Http/Middleware/TrustProxies.php

@@ -10,7 +10,7 @@ class TrustProxies extends Middleware
     /**
      * The trusted proxies for this application.
      *
-     * @var array|string
+     * @var array|string|null
      */
     protected $proxies = [
         // https://openstack-browser.toolforge.org/project/project-proxy

app/Http/Middleware/VerifyCsrfToken.php

@@ -6,13 +6,6 @@
 
 class VerifyCsrfToken extends Middleware
 {
-    /**
-     * Indicates whether the XSRF-TOKEN cookie should be set on the response.
-     *
-     * @var bool
-     */
-    protected $addHttpCookie = true;
-
     /**
      * The URIs that should be excluded from CSRF verification.
      *

app/Oldappeal.php

@@ -13,7 +13,7 @@ class Oldappeal extends Model
 
     public function comments()
     {
-        return $this->hasMany('App\Oldcomment', 'appealID','appealID');
+        return $this->hasMany(Oldcomment::class, 'appealID','appealID');
     }
 
     /** hack: add read-only 'id' attribute even thru it's appealID in database. ref #236 */

app/Oldcomment.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 
-class oldcomment extends Model
+class Oldcomment extends Model
 {
     //
 }