Upgrade to Laravel 8

Author: mzur

.env.example

@@ -5,10 +5,13 @@ APP_NAME=BIIGLE
 APP_ENV="local"
 APP_KEY=
 APP_DEBUG=true
-LOG_CHANNEL=errorlog
 APP_URL="http://localhost"
 APP_TIMEZONE="Europe/Berlin"
 
+LOG_CHANNEL=errorlog
+LOG_DEPRECATIONS_CHANNEL=null
+LOG_LEVEL=debug
+
 ADMIN_EMAIL="[email protected]"
 
 DB_CONNECTION="pgsql"
@@ -23,11 +26,14 @@ DB_PASSWORD="secret"
 
 # normally you don't have to edit these
 CACHE_DRIVER="redis"
+FILESYSTEM_DRIVER=local
 SESSION_DRIVER="redis"
 SESSION_LIFETIME=120
 SESSION_SECURE_COOKIE=false
 QUEUE_CONNECTION="redis"
 
+MEMCACHED_HOST=127.0.0.1
+
 REDIS_HOST="127.0.0.1"
 REDIS_PASSWORD=null
 REDIS_PORT=6379
@@ -46,6 +52,7 @@ AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_DEFAULT_REGION=us-east-1
 AWS_BUCKET=
+AWS_USE_PATH_STYLE_ENDPOINT=false
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=

.gitattributes

@@ -1,5 +1,10 @@
 * text=auto
-*.css linguist-vendored
-*.scss linguist-vendored
-*.js linguist-vendored
+
+*.blade.php diff=html
+*.css diff=css
+*.html diff=html
+*.md diff=markdown
+*.php diff=php
+
+/.github export-ignore
 CHANGELOG.md export-ignore

.gitignore

@@ -1,14 +1,20 @@
+/node_modules
+/public/hot
+/public/storage
+/public/vendor
+/storage/*.key
+/storage/largo_patches
 /vendor
-public/vendor
-node_modules
-public/hot
-tmp
-storage/largo_patches
-
-npm-debug.log
 .env
 .env.backup
 .phpunit.result.cache
-*.sublime-*
-*.phar
-*.php_cs.cache
+docker-compose.override.yml
+Homestead.json
+Homestead.yaml
+npm-debug.log
+yarn-error.log
+/*.sublime-*
+/*.phar
+/*.php_cs.cache
+/.idea
+/.vscode

app/Annotation.php

@@ -5,6 +5,7 @@
 use Biigle\Contracts\Annotation as AnnotationContract;
 use Biigle\Traits\HasPointsAttribute;
 use DB;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
@@ -13,7 +14,7 @@
  */
 abstract class Annotation extends Model implements AnnotationContract
 {
-    use HasPointsAttribute;
+    use HasPointsAttribute, HasFactory;
 
     /**
      * The attributes excluded from the model's JSON form.

app/AnnotationLabel.php

@@ -2,10 +2,13 @@
 
 namespace Biigle;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 abstract class AnnotationLabel extends Model
 {
+    use HasFactory;
+
     /**
      * The attributes that are mass assignable.
      *

app/AnnotationSession.php

@@ -4,6 +4,7 @@
 
 use Carbon\Carbon;
 use DB;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
@@ -12,6 +13,8 @@
  */
 class AnnotationSession extends Model
 {
+    use HasFactory;
+
     /**
      * The attributes that should be casted to native types.
      *

app/ApiToken.php

@@ -2,10 +2,13 @@
 
 namespace Biigle;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class ApiToken extends Model
 {
+    use HasFactory;
+
     /**
      * The attributes excluded from the model's JSON form.
      *

app/Console/Kernel.php

@@ -10,15 +10,6 @@
 
 class Kernel extends ConsoleKernel
 {
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
-    protected $commands = [
-        //
-    ];
-
     /**
      * Define the application's command schedule.
      *

app/Exceptions/Handler.php

@@ -12,7 +12,7 @@ class Handler extends ExceptionHandler
     /**
      * A list of the exception types that are not reported.
      *
-     * @var array
+     * @var array<int, class-string<Throwable>>
      */
     protected $dontReport = [
         //
@@ -21,41 +21,25 @@ class Handler extends ExceptionHandler
     /**
      * A list of the inputs that are never flashed for validation exceptions.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $dontFlash = [
+        'current_password',
         'password',
         'password_confirmation',
         'auth_password',
     ];
 
     /**
-     * Report or log an exception.
+     * Register the exception handling callbacks for the application.
      *
-     * @param  Throwable  $exception
      * @return void
      */
-    public function report(Throwable $e)
+    public function register()
     {
-        parent::report($e);
-    }
-
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  Throwable  $e
-     * @return \Illuminate\Http\Response
-     */
-    public function render($request, Throwable $e)
-    {
-        // Convert the exception here because we want to throw a 403 and not a 500.
-        // Also set a helpful error message for the user.
-        if ($e instanceof TokenMismatchException) {
-            $e = new TokenMismatchException('Your user session expired. Please refresh the page.');
-        }
-
-        return parent::render($request, $e);
+        $this->reportable(function (Throwable $e) {
+            //
+        });
     }
 
     /**
@@ -66,7 +50,10 @@ public function render($request, Throwable $e)
      */
     protected function prepareException(Throwable $e)
     {
-        if ($e instanceof MethodNotAllowedHttpException) {
+        if ($e instanceof TokenMismatchException) {
+            // Set a helpful error message for the user.
+            $e = new TokenMismatchException('Your user session expired. Please refresh the page.');
+        } elseif ($e instanceof MethodNotAllowedHttpException) {
             // Add a helpful message to this exception.
             $allow = explode(', ', $e->getHeaders()['Allow']);
             $e = new MethodNotAllowedHttpException($allow, 'The HTTP method is not allowed.', $e);

app/FederatedSearchInstance.php

@@ -4,12 +4,13 @@
 
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 
 class FederatedSearchInstance extends Model implements AuthenticatableContract
 {
-    use Authenticatable;
+    use Authenticatable, HasFactory;
 
     /**
      * The attributes that are mass assignable.

app/FederatedSearchModel.php

@@ -3,11 +3,12 @@
 namespace Biigle;
 
 use Biigle\Traits\HasJsonAttributes;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class FederatedSearchModel extends Model
 {
-    use HasJsonAttributes;
+    use HasJsonAttributes, HasFactory;
 
     /**
      * The attributes that should be casted to native types.

app/Http/Controllers/Auth/LoginController.php

@@ -4,6 +4,7 @@
 
 use Biigle\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Foundation\Auth\ThrottlesLogins;
 use Illuminate\Http\Request;
 
 class LoginController extends Controller
@@ -19,6 +20,7 @@ class LoginController extends Controller
     |
     */
 
+    // use ThrottlesLogins;
     use AuthenticatesUsers {
         credentials as protected baseCredentials;
         attemptLogin as protected baseAttemptLogin;

app/Http/Kernel.php

@@ -11,15 +11,15 @@ class Kernel extends HttpKernel
      *
      * These middleware are run during every request to your application.
      *
-     * @var array
+     * @var array<int, class-string|string>
      */
     protected $middleware = [
         // If this is ever enabled, also enable TrustHosts.
         // see: https://github.com/laravel/laravel/pull/5477
         // \Biigle\Http\Middleware\TrustHosts::class,
         // \Biigle\Http\Middleware\TrustProxies::class,
         \Fruitcake\Cors\HandleCors::class,
-        \Biigle\Http\Middleware\CheckForMaintenanceMode::class,
+        \Biigle\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \Biigle\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
@@ -28,7 +28,7 @@ class Kernel extends HttpKernel
     /**
      * The application's route middleware groups.
      *
-     * @var array
+     * @var array<string, array<int, class-string|string>>
      */
     protected $middlewareGroups = [
         'web' => [
@@ -43,8 +43,8 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            'throttle:60,1',
-            'bindings',
+            'throttle:api',
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
 
@@ -53,13 +53,12 @@ class Kernel extends HttpKernel
      *
      * These middleware may be assigned to groups or used individually.
      *
-     * @var array
+     * @var array<string, class-string|string>
      */
     protected $routeMiddleware = [
         'auth' => \Biigle\Http\Middleware\Authenticate::class,
         // 'auth.api' => \Biigle\Http\Middleware\AuthenticateAPI::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \Biigle\Http\Middleware\RedirectIfAuthenticated::class,
         'session' => \Biigle\Http\Middleware\SessionOnly::class,

app/Http/Middleware/EncryptCookies.php

@@ -9,7 +9,7 @@ class EncryptCookies extends Middleware
     /**
      * The names of the cookies that should not be encrypted.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $except = [
         //

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

@@ -2,14 +2,14 @@
 
 namespace Biigle\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.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $except = [
         //

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -2,7 +2,9 @@
 
 namespace Biigle\Http\Middleware;
 
+use Biigle\Providers\RouteServiceProvider;
 use Closure;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 class RedirectIfAuthenticated
@@ -11,14 +13,18 @@ class RedirectIfAuthenticated
      * Handle an incoming request.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @param  string|null  $guard
-     * @return mixed
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @param  string|null  ...$guards
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
      */
-    public function handle($request, Closure $next, $guard = null)
+    public function handle(Request $request, Closure $next, ...$guards)
     {
-        if (Auth::guard($guard)->check()) {
-            return redirect(route('home'));
+        $guards = empty($guards) ? [null] : $guards;
+
+        foreach ($guards as $guard) {
+            if (Auth::guard($guard)->check()) {
+                return redirect(RouteServiceProvider::HOME);
+            }
         }
 
         return $next($request);