Laravel 10.x Compatibility (#20)

Co-authored-by: Pascal Baljet <pascal@pascalbaljet.nl>
protonemedia · Feb 21, 2023 · faa03bb · faa03bb
1 parent 8180c11
commit faa03bb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -8,15 +8,14 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.1, 8.0]
-        laravel: [9.*]
+        php: [8.2, 8.1]
+        laravel: [10.*, 9.*]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
+          - laravel: 10.*
+            testbench: 8.*
           - laravel: 9.*
             testbench: 7.*
-        exclude:
-          - laravel: 9.*
-            php: 7.4
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

diff --git a/composer.json b/composer.json
@@ -16,13 +16,13 @@
         }
     ],
     "require": {
-        "php": "^8.0 || ^8.1 || ^8.2",
-        "illuminate/support": "^9.0"
+        "php": "^8.1|^8.2",
+        "illuminate/support": "^9.0|^10.0"
     },
     "require-dev": {
-        "nesbot/carbon": "^2.63",
-        "orchestra/testbench": "^7.0",
-        "phpunit/phpunit": "^9.4"
+        "nesbot/carbon": "^2.66",
+        "orchestra/testbench": "^7.0|^8.0",
+        "phpunit/phpunit": "^9.5.10"
     },
     "autoload": {
         "psr-4": {
@@ -50,4 +50,4 @@
             ]
         }
     }
-}
+}
diff --git a/tests/MustVerifyNewEmailTest.php b/tests/MustVerifyNewEmailTest.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Mail\Mailable;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Testing\Fakes\MailFake;
 use ProtoneMedia\LaravelVerifyNewEmail\InvalidEmailVerificationModelException;
 use ProtoneMedia\LaravelVerifyNewEmail\Mail\VerifyFirstEmail;
 use ProtoneMedia\LaravelVerifyNewEmail\Mail\VerifyNewEmail;
@@ -102,14 +103,15 @@ public function it_can_generate_a_token_and_mail_it_to_the_new_email_address()
     /** @test */
     public function it_can_regenerate_a_token_and_mail_it()
     {
-        Mail::fake();
+        $mailRoot = Mail::getFacadeRoot();
+        Mail::swap(new MailFake($mailRoot));
 
         $user = $this->user();
 
         $pendingUserEmailFirst = $user->newEmail('new@example.com');
 
         // reset mail fake
-        Mail::fake();
+        Mail::swap(new MailFake($mailRoot));
         Mail::assertNothingQueued();
 
         $pendingUserEmailSecond = $user->resendPendingEmailVerificationMail();