Merge pull request #407 from pacoorozco/upgrade-to-laravel-10

Upgrade to Laravel 10

Author: pacoorozco

.gitattributes

@@ -1,4 +1,4 @@
-* text=auto
+* text=auto eol=lf
 *.css linguist-vendored
 *.scss linguist-vendored
 *.js linguist-vendored

.github/workflows/phpstan.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           coverage: none
 
       - name: Install composer dependencies

.github/workflows/run-tests.yml

@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [ '8.0' ]
+        php-versions: [ '8.1' ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -70,7 +70,7 @@ jobs:
 
       - name: Run PHPUnit
         run: |
-          php artisan test --parallel --runner WrapperRunner --stop-on-failure --coverage-text --coverage-clover=clover.xml
+          vendor/bin/phpunit
         env:
           DB_PORT: ${{ job.services.mysql.ports['3306'] }}
           REDIS_PORT: ${{ job.services.redis.ports['6379'] }}

.gitignore

@@ -17,6 +17,7 @@ package-lock.json
 .env
 .env.backup
 .phpunit.result.cache
+/.phpunit.cache
 
 # Homestead deployment. https://laravel.com/docs/master/homestead
 Homestead.yaml

app/Console/Kernel.php

@@ -42,21 +42,17 @@ class Kernel extends ConsoleKernel
 
     /**
      * Define the application's command schedule.
-     *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
-     * @return void
      */
-    protected function schedule(Schedule $schedule)
+    protected function schedule(Schedule $schedule): void
     {
         $schedule->command(PublishScheduledQuestions::class)->hourly();
+        $schedule->command('cache:prune-stale-tags')->hourly();
     }
 
     /**
      * Register the commands for the application.
-     *
-     * @return void
      */
-    protected function commands()
+    protected function commands(): void
     {
         $this->load(__DIR__.'/Commands');
 

app/Exceptions/Handler.php

@@ -51,10 +51,8 @@ class Handler extends ExceptionHandler
 
     /**
      * Register the exception handling callbacks for the application.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
         //
     }

app/Http/Controllers/Auth/SocialAccountController.php

@@ -35,21 +35,14 @@ class SocialAccountController extends Controller
 {
     /**
      * Redirect the user to the Provider authentication page.
-     *
-     * @param  string  $provider
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function redirectToProvider(string $provider): RedirectResponse
+    public function redirectToProvider(string $provider): \Symfony\Component\HttpFoundation\RedirectResponse|RedirectResponse
     {
         return Socialite::driver($provider)->redirect();
     }
 
     /**
      * Obtain the user information.
-     *
-     * @param  \Gamify\Services\SocialAccountService  $accountRepository
-     * @param  string  $provider
-     * @return \Illuminate\Http\RedirectResponse
      */
     public function handleProviderCallback(SocialAccountService $accountRepository, string $provider): RedirectResponse
     {

app/Http/Kernel.php

@@ -34,7 +34,7 @@ class Kernel extends HttpKernel
      *
      * These middleware are run during every request to your application.
      *
-     * @var array
+     * @var array<int, class-string|string>
      */
     protected $middleware = [
         // \Gamify\Http\Middleware\TrustHosts::class,
@@ -49,7 +49,7 @@ class Kernel extends HttpKernel
     /**
      * The application's route middleware groups.
      *
-     * @var array
+     * @var array<string, array<int, class-string|string>>
      */
     protected $middlewareGroups = [
         'web' => [
@@ -62,19 +62,19 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            'throttle:api',
+            \Illuminate\Routing\Middleware\ThrottleRequests::class.':api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
 
     /**
-     * The application's route middleware.
+     * The application's middleware aliases.
      *
      * These middleware may be assigned to groups or used individually.
      *
-     * @var array
+     * @var array<string, class-string|string>
      */
-    protected $routeMiddleware = [
+    protected $middlewareAliases = [
         'auth' => \Gamify\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,

app/Http/Middleware/Authenticate.php

@@ -26,21 +26,15 @@
 namespace Gamify\Http\Middleware;
 
 use Illuminate\Auth\Middleware\Authenticate as Middleware;
+use Illuminate\Http\Request;
 
 class Authenticate extends Middleware
 {
     /**
      * Get the path the user should be redirected to when they are not authenticated.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return string|null
      */
-    protected function redirectTo($request): ?string
+    protected function redirectTo(Request $request): ?string
     {
-        if (! $request->expectsJson()) {
-            return route('login');
-        }
-
-        return null;
+        return $request->expectsJson() ? null : route('login');
     }
 }

app/Http/Middleware/EncryptCookies.php

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