upgrade to Laravel framework 6.20.22

.dockerignore

@@ -1,6 +1,14 @@
-Dockerfile
-.dockerignore
-.git
+.env
+.gitignore
+.git/
+.idea/
 bootstrap/cache/*
+database/*.sqlite
+laradock/
 node_modules/
+storage/app/*
+storage/framework/cache/*
+storage/framework/sessions/*
+storage/framework/views/*
+storage/logs/*
 vendor/

.editorconfig

@@ -11,5 +11,5 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.yml]
+[*.{yml,yaml}]
 indent_size = 2

Dockerfile

@@ -1,61 +1,44 @@
-FROM php:7.3-apache
-MAINTAINER sinkcup <[email protected]>
+FROM php:8.0-apache
+
+WORKDIR /var/www/laravel
 
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
     && apt-get install -y \
     cron \
     icu-devtools \
+    jq \
     libfreetype6-dev libicu-dev libjpeg62-turbo-dev libpng-dev libsasl2-dev libssl-dev libwebp-dev libxpm-dev libzip-dev \
     nodejs \
     unzip \
-    zlib1g-dev
+    zlib1g-dev \
+    && apt-get clean \
+    && apt-get autoclean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
 RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini \
     && yes '' | pecl install redis \
-    && docker-php-ext-configure gd --with-freetype-dir --with-gd --with-jpeg-dir --with-png-dir --with-webp-dir --with-xpm-dir --with-zlib-dir \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm \
     && docker-php-ext-install gd intl pdo_mysql zip \
     && docker-php-ext-enable opcache redis
-RUN apt-get clean \
-    && apt-get autoclean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-WORKDIR /var/www/laravel
-
-COPY composer.json /var/www/laravel/
-COPY composer.lock /var/www/laravel/
+COPY composer.json composer.lock ./
 RUN composer install --no-autoloader --no-scripts --no-dev
 
-# Compiling Assets. uncomment these lines after you install Laravel UI
-COPY package.json /var/www/laravel/
-COPY package-lock.json /var/www/laravel/
+COPY package.json package-lock.json /var/www/laravel/
 RUN npm install
-COPY resources/js /var/www/laravel/resources/js
-COPY resources/sass /var/www/laravel/resources/sass
-COPY webpack.mix.js /var/www/laravel/
-RUN npm run production
-
-COPY app /var/www/laravel/app
-COPY artisan /var/www/laravel/artisan
-COPY bootstrap /var/www/laravel/bootstrap
-COPY config /var/www/laravel/config
-COPY database /var/www/laravel/database
-COPY public /var/www/laravel/public
-COPY resources /var/www/laravel/resources
-COPY routes /var/www/laravel/routes
-COPY server.php /var/www/laravel/server.php
-COPY storage /var/www/laravel/storage
-RUN composer install --optimize-autoloader --no-dev
-
-RUN rm -f public/storage \
-    && php artisan storage:link
 
 COPY docker/ /
 RUN a2enmod rewrite headers \
     && a2ensite laravel \
     && a2dissite 000-default
 
-COPY . /var/www/laravel/
+COPY . /var/www/laravel
+RUN composer install --optimize-autoloader --no-dev \
+  && npm run production
+
 RUN chown www-data:www-data bootstrap/cache \
-    && chown -R www-data:www-data storage/
+    && chown -R www-data:www-data storage/ \
+    && chmod +x /usr/local/bin/docker-laravel-entrypoint
 
 CMD ["docker-laravel-entrypoint"]

app/Exceptions/Handler.php

@@ -31,6 +31,8 @@ class Handler extends ExceptionHandler
      *
      * @param  \Exception  $exception
      * @return void
+     *
+     * @throws \Exception
      */
     public function report(Exception $exception)
     {
@@ -42,7 +44,9 @@ public function report(Exception $exception)
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Exception
      */
     public function render($request, Exception $exception)
     {

app/Http/Controllers/Auth/ConfirmPasswordController.php

@@ -3,12 +3,11 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\ConfirmsPasswords;
 
 class ConfirmPasswordController extends Controller
 {
-    use ConfirmsPasswords;
-
     /*
     |--------------------------------------------------------------------------
     | Confirm Password Controller
@@ -19,13 +18,14 @@ class ConfirmPasswordController extends Controller
     | this trait and override any functions that require customization.
     |
     */
+    use ConfirmsPasswords;
 
     /**
      * Where to redirect users when the intended url fails.
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = RouteServiceProvider::HOME;
 
     /**
      * Create a new controller instance.

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -7,8 +7,6 @@
 
 class ForgotPasswordController extends Controller
 {
-    use SendsPasswordResetEmails;
-
     /*
     |--------------------------------------------------------------------------
     | Password Reset Controller
@@ -19,4 +17,5 @@ class ForgotPasswordController extends Controller
     | your application to your users. Feel free to explore this trait.
     |
     */
+    use SendsPasswordResetEmails;
 }

app/Http/Controllers/Auth/LoginController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use Random;
-use sinkcup\LaravelUiSocialite\Socialite\Controllers\SocialiteLoginController;
+use LaravelFans\UiSocialite\Socialite\Controllers\SocialiteLoginController;
 
 class LoginController extends SocialiteLoginController
 {

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -3,12 +3,11 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 
 class ResetPasswordController extends Controller
 {
-    use ResetsPasswords;
-
     /*
     |--------------------------------------------------------------------------
     | Password Reset Controller
@@ -19,11 +18,12 @@ class ResetPasswordController extends Controller
     | explore this trait and override any methods you wish to tweak.
     |
     */
+    use ResetsPasswords;
 
     /**
      * Where to redirect users after resetting their password.
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = RouteServiceProvider::HOME;
 }

app/Http/Controllers/ProfileController.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
-use sinkcup\LaravelUiSocialite\SocialAccount;
+use LaravelFans\UiSocialite\SocialAccount;
 use Validator;
 
 class ProfileController extends Controller

app/Http/Controllers/Settings/ProfileController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Settings;
 
-use sinkcup\LaravelUiSocialite\Socialite\Controllers\Settings\ProfileController as PackageProfileController;
+use LaravelFans\UiSocialite\Socialite\Controllers\Settings\ProfileController as PackageProfileController;
 
 class ProfileController extends PackageProfileController
 {

app/Http/Kernel.php

@@ -39,7 +39,7 @@ class Kernel extends HttpKernel
 
         'api' => [
             'throttle:60,1',
-            'bindings',
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
 

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Providers\RouteServiceProvider;
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
@@ -18,7 +19,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-            return redirect('/home');
+            return redirect(RouteServiceProvider::HOME);
         }
 
         return $next($request);

app/Providers/RouteServiceProvider.php

@@ -16,6 +16,13 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected $namespace = 'App\Http\Controllers';
 
+    /**
+     * The path to the "home" route for your application.
+     *
+     * @var string
+     */
+    public const HOME = '/home';
+
     /**
      * Define your route model bindings, pattern filters, etc.
      *

composer.json

@@ -8,24 +8,25 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.2",
+        "php": "^7.2.5|^8.0",
         "ext-json": "*",
         "ext-redis": "*",
-        "doctrine/dbal": "^2.9",
-        "fideloper/proxy": "^4.0",
-        "laravel/framework": "^6.0",
-        "laravel/tinker": "^1.0",
-        "sinkcup/laravel-ui-socialite": "^5.0.4"
+        "doctrine/dbal": "^2.13",
+        "fideloper/proxy": "^4.4",
+        "laravel/framework": "^6.20",
+        "laravel/tinker": "^2.5",
+        "laravel-fans/ui-socialite": "^7.0"
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^2.6",
-        "facade/ignition": "^1.4",
-        "fzaninotto/faker": "^1.9",
+        "facade/ignition": "^1.16.4",
+        "fakerphp/faker": "^1.9.1",
+        "laravel-fans/docker": "^0.3.1",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^3.0",
         "php-mock/php-mock": "^2.1",
-        "phpunit/phpunit": "^8.0",
-        "squizlabs/php_codesniffer": "^3.4"
+        "phpunit/phpunit": "^8.5.8|^9.3.3",
+        "squizlabs/php_codesniffer": "^3.6"
     },
     "config": {
         "optimize-autoloader": true,