Support laravel 12

emargareten · emargareten · commit c276d28ed891 · 2025-02-24T12:29:33.000+02:00
diff --git a/.github/workflows/fix-php-code-style-issues.yml b/.github/workflows/fix-php-code-style-issues.yml
@@ -16,7 +16,7 @@ jobs:
           ref: ${{ github.head_ref }}
 
       - name: Fix PHP code style issues
-        uses: aglipanci/laravel-pint-action@2.4
+        uses: aglipanci/laravel-pint-action@2.5
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v5
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.4'
           coverage: none
 
       - name: Install composer dependencies
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -13,13 +13,12 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.2, 8.1]
-        laravel: [10.*]
+        php: [8.4, 8.3]
+        laravel: [12.*]
         stability: [prefer-stable]
         include:
-          - laravel: 10.*
-            testbench: 8.*
-            carbon: ^2.63
+          - laravel: 12.*
+            testbench: 10.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -31,7 +30,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          extensions: fileinfo, pdo, sqlite, pdo_sqlite
           coverage: none
 
       - name: Setup problem matchers
@@ -41,7 +40,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
       - name: List Installed Dependencies
diff --git a/composer.json b/composer.json
@@ -7,14 +7,14 @@
     "require": {
         "php": "^8.0",
         "bacon/bacon-qr-code": "^2.0",
-        "laravel/framework": "^9.0|^10.0|^11.0",
+        "laravel/framework": "^9.0|^10.0|^11.0|^12.0",
         "pragmarx/google2fa": "^7.0|^8.0.1"
     },
     "require-dev": {
-        "laravel/pint": "^1.6",
-        "orchestra/testbench": "^8.0",
-        "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^10.0"
+        "laravel/pint": "^1.21",
+        "orchestra/testbench": "^10.0",
+        "phpstan/phpstan": "^2.1.6",
+        "phpunit/phpunit": "^11.5.9"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -7,5 +7,5 @@ parameters:
         - src
         - tests
     ignoreErrors:
+        - identifier: missingType.iterableValue
         - '#Call to an undefined method Illuminate\\Contracts\\Auth\\StatefulGuard::getProvider\(\)#'
-    checkMissingIterableValueType: false
diff --git a/src/Actions/ConfirmTwoFactorAuthentication.php b/src/Actions/ConfirmTwoFactorAuthentication.php
@@ -16,9 +16,7 @@ class ConfirmTwoFactorAuthentication
      *
      * @return void
      */
-    public function __construct(protected TwoFactorProvider $provider)
-    {
-    }
+    public function __construct(protected TwoFactorProvider $provider) {}
 
     /**
      * Confirm the two-factor authentication configuration for the user.
diff --git a/src/Actions/EnableTwoFactorAuthentication.php b/src/Actions/EnableTwoFactorAuthentication.php
@@ -15,9 +15,7 @@ class EnableTwoFactorAuthentication
      *
      * @return void
      */
-    public function __construct(protected TwoFactorProvider $provider)
-    {
-    }
+    public function __construct(protected TwoFactorProvider $provider) {}
 
     /**
      * Enable two-factor authentication for the user.
diff --git a/src/Events/RecoveryCodeReplaced.php b/src/Events/RecoveryCodeReplaced.php
@@ -14,7 +14,5 @@ class RecoveryCodeReplaced
      * @param  \App\Models\User  $user
      * @return void
      */
-    public function __construct(public $user, public string $code)
-    {
-    }
+    public function __construct(public $user, public string $code) {}
 }
diff --git a/src/Events/RecoveryCodesGenerated.php b/src/Events/RecoveryCodesGenerated.php
@@ -14,7 +14,5 @@ class RecoveryCodesGenerated
      * @param  \App\Models\User  $user
      * @return void
      */
-    public function __construct(public $user)
-    {
-    }
+    public function __construct(public $user) {}
 }
diff --git a/src/Events/TwoFactorAuthenticationEvent.php b/src/Events/TwoFactorAuthenticationEvent.php
@@ -14,7 +14,5 @@ abstract class TwoFactorAuthenticationEvent
      * @param  \App\Models\User  $user
      * @return void
      */
-    public function __construct(public $user)
-    {
-    }
+    public function __construct(public $user) {}
 }
diff --git a/src/Http/Controllers/TwoFactorChallengeController.php b/src/Http/Controllers/TwoFactorChallengeController.php
@@ -16,9 +16,7 @@ class TwoFactorChallengeController extends Controller
      *
      * @return void
      */
-    public function __construct(protected StatefulGuard $guard)
-    {
-    }
+    public function __construct(protected StatefulGuard $guard) {}
 
     /**
      * Show the two-factor authentication challenge view.
diff --git a/src/Http/Controllers/TwoFactorChallengeRecoveryController.php b/src/Http/Controllers/TwoFactorChallengeRecoveryController.php
@@ -3,7 +3,6 @@
 namespace Emargareten\TwoFactor\Http\Controllers;
 
 use Emargareten\TwoFactor\Contracts\TwoFactorChallengeRecoveryViewResponse;
-use Emargareten\TwoFactor\Contracts\TwoFactorChallengeViewResponse;
 use Emargareten\TwoFactor\Events\RecoveryCodeReplaced;
 use Emargareten\TwoFactor\Http\Requests\TwoFactorChallengeRequest;
 use Illuminate\Auth\AuthenticationException;
@@ -18,14 +17,12 @@ class TwoFactorChallengeRecoveryController extends Controller
      *
      * @return void
      */
-    public function __construct(protected StatefulGuard $guard)
-    {
-    }
+    public function __construct(protected StatefulGuard $guard) {}
 
     /**
      * Show the two-factor authentication challenge view.
      */
-    public function create(): TwoFactorChallengeViewResponse
+    public function create(): TwoFactorChallengeRecoveryViewResponse
     {
         $model = $this->guard->getProvider()->getModel();
 
diff --git a/src/Http/Requests/TwoFactorChallengeRequest.php b/src/Http/Requests/TwoFactorChallengeRequest.php
@@ -104,7 +104,7 @@ public function challengedUser()
         $model = app(StatefulGuard::class)->getProvider()->getModel();
 
         if (! $this->session()->has('two-factor.login.id') || ! $user = $model::find($this->session()->get('two-factor.login.id'))) {
-            throw new AuthenticationException();
+            throw new AuthenticationException;
         }
 
         return $this->challengedUser = $user;
diff --git a/src/Http/Responses/SimpleViewResponse.php b/src/Http/Responses/SimpleViewResponse.php
@@ -6,17 +6,15 @@
 use Emargareten\TwoFactor\Contracts\TwoFactorChallengeViewResponse;
 use Illuminate\Contracts\Support\Responsable;
 
-class SimpleViewResponse implements TwoFactorChallengeViewResponse, TwoFactorChallengeRecoveryViewResponse
+class SimpleViewResponse implements TwoFactorChallengeRecoveryViewResponse, TwoFactorChallengeViewResponse
 {
     /**
      * Create a new response instance.
      *
      * @param  callable|string  $view
      * @return void
      */
-    public function __construct(protected $view)
-    {
-    }
+    public function __construct(protected $view) {}
 
     /**
      * Create an HTTP response that represents the object.
diff --git a/src/TwoFactorProvider.php b/src/TwoFactorProvider.php
@@ -15,9 +15,7 @@ class TwoFactorProvider implements TwoFactorProviderContract
      *
      * @return void
      */
-    public function __construct(protected Google2FA $engine, protected ?Repository $cache = null)
-    {
-    }
+    public function __construct(protected Google2FA $engine, protected ?Repository $cache = null) {}
 
     /**
      * Generate a new secret key.
diff --git a/tests/TwoFactorAuthenticationChallengeTest.php b/tests/TwoFactorAuthenticationChallengeTest.php
@@ -45,7 +45,7 @@ public function test_two_factor_challenge_can_be_passed_via_code(): void
 
     public function test_two_factor_challenge_fails_for_old_otp_and_zero_window(): void
     {
-        //Setting window to 0 should mean any old OTP is instantly invalid
+        // Setting window to 0 should mean any old OTP is instantly invalid
         app(TwoFactorProvider::class)->setWindow(0);
 
         $this->loadLaravelMigrations(['--database' => 'testbench']);

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,5 @@ class RecoveryCodeReplaced`
`14`	`14`	`* @param \App\Models\User $user`
`15`	`15`	`* @return void`
`16`	`16`	`*/`
`17`		`- public function __construct(public $user, public string $code)`
`18`		`- {`
`19`		`- }`
	`17`	`+ public function __construct(public $user, public string $code) {}`
`20`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,5 @@ class RecoveryCodesGenerated`
`14`	`14`	`* @param \App\Models\User $user`
`15`	`15`	`* @return void`
`16`	`16`	`*/`
`17`		`- public function __construct(public $user)`
`18`		`- {`
`19`		`- }`
	`17`	`+ public function __construct(public $user) {}`
`20`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,5 @@ abstract class TwoFactorAuthenticationEvent`
`14`	`14`	`* @param \App\Models\User $user`
`15`	`15`	`* @return void`
`16`	`16`	`*/`
`17`		`- public function __construct(public $user)`
`18`		`- {`
`19`		`- }`
	`17`	`+ public function __construct(public $user) {}`
`20`	`18`	`}`