Merge pull request #142 from beyondcode/l13-compatibility

mechelon · web-flow · commit 651f19b73d3a · 2026-03-20T16:46:53.000+01:00
Laravel 13 compatibility
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -13,39 +13,39 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        php: [8.0, 8.1, 8.2]
-        laravel: ['8.*', '9.*', '10.*', '11.*', '12.*']
+        php: ['8.1', '8.2', '8.3', '8.4', '8.5']
+        laravel: ['10.*', '11.*', '12.*', '13.*']
         stability: [prefer-stable]
         exclude:
-          - php: 8.0
-            laravel: 10.*
-          - php: 8.2
-            laravel: 8.*
-          - laravel: 11.*
-            php: 8.0
-          - laravel: 11.*
-            php: 8.1
-          - laravel: 12.*
-            php: 8.0
-          - laravel: 12.*
-            php: 8.1
+          - laravel: '10.*'
+            php: '8.4'
+          - laravel: '10.*'
+            php: '8.5'
+          - laravel: '11.*'
+            php: '8.1'
+          - laravel: '11.*'
+            php: '8.5'
+          - laravel: '12.*'
+            php: '8.1'
+          - laravel: '13.*'
+            php: '8.1'
+          - laravel: '13.*'
+            php: '8.2'
         include:
-          - laravel: 10.*
-            testbench: 8.*
-          - laravel: 9.*
-            testbench: 7.*
-          - laravel: 8.*
-            testbench: 6.23
-          - laravel: 11.*
-            testbench: 9.*
-          - laravel: 12.*
-            testbench: 10.*
+          - laravel: '10.*'
+            testbench: '8.*'
+          - laravel: '11.*'
+            testbench: '9.*'
+          - laravel: '12.*'
+            testbench: '10.*'
+          - laravel: '13.*'
+            testbench: '11.*'
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/composer.json b/composer.json
@@ -16,20 +16,20 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-        "illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
-        "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
-        "illuminate/log": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
-        "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
-        "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+        "php": "^8.1",
+        "illuminate/container": "^10.0|^11.0|^12.0|^13.0",
+        "illuminate/database": "^10.0|^11.0|^12.0|^13.0",
+        "illuminate/log": "^10.0|^11.0|^12.0|^13.0",
+        "illuminate/routing": "^10.0|^11.0|^12.0|^13.0",
+        "illuminate/support": "^10.0|^11.0|^12.0|^13.0",
         "willdurand/email-reply-parser": "^2.8",
-        "zbateson/mail-mime-parser": "^1.1|^2.4|^3.0"
+        "zbateson/mail-mime-parser": "^2.4|^3.0|^4.0"
     },
     "require-dev": {
         "laminas/laminas-mail": "^2.13",
         "mockery/mockery": "^1.2",
-        "orchestra/testbench": "^4.0|^5.0|^7.0|^8.0|^9.0|^10.0",
-        "phpunit/phpunit": "^7.0|^8.0|^9.3|^10.5|^11.5.3"
+        "orchestra/testbench": "^8.0|^9.0|^10.0|^11.0",
+        "phpunit/phpunit": "^10.5|^11.0|^12.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/tests/Console/CleanEmailsTest.php b/tests/Console/CleanEmailsTest.php
@@ -8,6 +8,7 @@
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use PHPUnit\Framework\Attributes\Test;
 
 class CleanEmailsTest extends TestCase
 {
@@ -20,7 +21,7 @@ public function setUp(): void
         $this->app['config']->set('mailbox.store_incoming_emails_for_days', 31);
     }
 
-    /** @test */
+    #[Test]
     public function it_can_clean_the_statistics()
     {
         Collection::times(200)->each(function (int $index) {
@@ -41,7 +42,7 @@ public function it_can_clean_the_statistics()
         $this->assertCount(0, InboundEmail::where('created_at', '<', $cutOffDate)->get());
     }
 
-    /** @test */
+    #[Test]
     public function it_errors_if_max_age_inf()
     {
         $this->app['config']->set('mailbox.store_incoming_emails_for_days', INF);
diff --git a/tests/Controllers/MailgunTest.php b/tests/Controllers/MailgunTest.php
@@ -3,6 +3,7 @@
 namespace BeyondCode\Mailbox\Tests\Controllers;
 
 use BeyondCode\Mailbox\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
 
 class MailgunTest extends TestCase
 {
@@ -13,7 +14,7 @@ protected function getEnvironmentSetUp($app)
         $app['config']['mailbox.driver'] = 'mailgun';
     }
 
-    /** @test */
+    #[Test]
     public function it_verifies_mailgun_signatures()
     {
         $this->post('/laravel-mailbox/mailgun/mime', [
@@ -38,7 +39,7 @@ public function it_verifies_mailgun_signatures()
         ])->assertStatus(200);
     }
 
-    /** @test */
+    #[Test]
     public function it_verifies_fresh_timestamps()
     {
         $timestamp = now()->subMinutes(5)->timestamp;
diff --git a/tests/Controllers/PostmarkTest.php b/tests/Controllers/PostmarkTest.php
@@ -3,6 +3,7 @@
 namespace BeyondCode\Mailbox\Tests\Controllers;
 
 use BeyondCode\Mailbox\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
 
 class PostmarkTest extends TestCase
 {
@@ -13,7 +14,7 @@ protected function getEnvironmentSetUp($app)
         $app['config']['mailbox.driver'] = 'postmark';
     }
 
-    /** @test */
+    #[Test]
     public function it_expects_to_receive_raw_email_field()
     {
         $this->withoutMiddleware();
diff --git a/tests/Drivers/LogTest.php b/tests/Drivers/LogTest.php
@@ -7,6 +7,7 @@
 use BeyondCode\Mailbox\Tests\TestCase;
 use Illuminate\Mail\Mailable;
 use Illuminate\Support\Facades\Mail;
+use PHPUnit\Framework\Attributes\Test;
 
 class LogTest extends TestCase
 {
@@ -18,7 +19,7 @@ protected function getEnvironmentSetUp($app)
         $app['config']['mailbox.driver'] = 'log';
     }
 
-    /** @test */
+    #[Test]
     public function it_catches_logged_mails()
     {
         Mailbox::from('{name}@beyondco.de', function (InboundEmail $email, $name) {
diff --git a/tests/InboundEmailTest.php b/tests/InboundEmailTest.php
@@ -6,6 +6,7 @@
 use BeyondCode\Mailbox\InboundEmail;
 use Illuminate\Mail\Mailable;
 use Illuminate\Support\Facades\Mail;
+use PHPUnit\Framework\Attributes\Test;
 
 class InboundEmailTest extends TestCase
 {
@@ -17,7 +18,7 @@ protected function getEnvironmentSetUp($app)
         $app['config']['mailbox.driver'] = 'log';
     }
 
-    /** @test */
+    #[Test]
     public function it_stores_inbound_emails()
     {
         Mailbox::to('someone@beyondco.de', function ($email) {
@@ -29,7 +30,7 @@ public function it_stores_inbound_emails()
         $this->assertSame(1, InboundEmail::query()->count());
     }
 
-    /** @test */
+    #[Test]
     public function it_stores_all_inbound_emails()
     {
         $this->app['config']['mailbox.only_store_matching_emails'] = false;
@@ -43,7 +44,7 @@ public function it_stores_all_inbound_emails()
         $this->assertSame(2, InboundEmail::query()->count());
     }
 
-    /** @test */
+    #[Test]
     public function it_can_use_fallbacks()
     {
         Mailbox::fallback(function (InboundEmail $email) {
@@ -57,7 +58,7 @@ public function it_can_use_fallbacks()
         Mail::assertSent(ReplyMail::class);
     }
 
-    /** @test */
+    #[Test]
     public function it_can_use_catchall()
     {
         Mailbox::to('someone@beyondco.de', function ($email) {
@@ -74,7 +75,7 @@ public function it_can_use_catchall()
         Mail::assertSent(ReplyMail::class);
     }
 
-    /** @test */
+    #[Test]
     public function it_stores_inbound_emails_with_catchall()
     {
         Mailbox::catchAll(function ($email) {
@@ -86,7 +87,7 @@ public function it_stores_inbound_emails_with_catchall()
         $this->assertSame(2, InboundEmail::query()->count());
     }
 
-    /** @test */
+    #[Test]
     public function it_stores_inbound_emails_with_fallback()
     {
         Mailbox::fallback(function ($email) {
@@ -98,7 +99,7 @@ public function it_stores_inbound_emails_with_fallback()
         $this->assertSame(2, InboundEmail::query()->count());
     }
 
-    /** @test */
+    #[Test]
     public function it_stores_inbound_emails_with_fallback_and_catchall_only_once()
     {
         Mailbox::fallback(function ($email) {
@@ -113,7 +114,7 @@ public function it_stores_inbound_emails_with_fallback_and_catchall_only_once()
         $this->assertSame(2, InboundEmail::query()->count());
     }
 
-    /** @test */
+    #[Test]
     public function it_does_not_store_inbound_emails_if_configured()
     {
         $this->app['config']['mailbox.store_incoming_emails_for_days'] = 0;
@@ -127,7 +128,7 @@ public function it_does_not_store_inbound_emails_if_configured()
         $this->assertSame(0, InboundEmail::query()->count());
     }
 
-    /** @test */
+    #[Test]
     public function it_can_reply_to_mails()
     {
         Mailbox::from('example@beyondco.de', function (InboundEmail $email) {
@@ -141,7 +142,7 @@ public function it_can_reply_to_mails()
         Mail::assertSent(ReplyMail::class);
     }
 
-    /** @test */
+    #[Test]
     public function it_uses_the_configured_model()
     {
         $this->app['config']['mailbox.model'] = ExtendedInboundEmail::class;
diff --git a/tests/MailboxRouteCollectionTest.php b/tests/MailboxRouteCollectionTest.php
@@ -6,10 +6,11 @@
 use BeyondCode\Mailbox\Routing\Route;
 use BeyondCode\Mailbox\Routing\RouteCollection;
 use Laminas\Mail\Message as TestMail;
+use PHPUnit\Framework\Attributes\Test;
 
 class MailboxRouteCollectionTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function it_returns_all_matching_mailbox_routes()
     {
         $collection = new RouteCollection();
diff --git a/tests/MailboxRouteTest.php b/tests/MailboxRouteTest.php

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`use Carbon\Carbon;`
`9`	`9`	`use Illuminate\Support\Collection;`
`10`	`10`	`use Illuminate\Support\Str;`
	`11`	`+use PHPUnit\Framework\Attributes\Test;`
`11`	`12`
`12`	`13`	`class CleanEmailsTest extends TestCase`
`13`	`14`	`{`
`@@ -20,7 +21,7 @@ public function setUp(): void`
`20`	`21`	`$this->app['config']->set('mailbox.store_incoming_emails_for_days', 31);`
`21`	`22`	`}`
`22`	`23`
`23`		`- /** @test */`
	`24`	`+ #[Test]`
`24`	`25`	`public function it_can_clean_the_statistics()`
`25`	`26`	`{`
`26`	`27`	`Collection::times(200)->each(function (int $index) {`
`@@ -41,7 +42,7 @@ public function it_can_clean_the_statistics()`
`41`	`42`	`$this->assertCount(0, InboundEmail::where('created_at', '<', $cutOffDate)->get());`
`42`	`43`	`}`
`43`	`44`
`44`		`- /** @test */`
	`45`	`+ #[Test]`
`45`	`46`	`public function it_errors_if_max_age_inf()`
`46`	`47`	`{`
`47`	`48`	`$this->app['config']->set('mailbox.store_incoming_emails_for_days', INF);`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace BeyondCode\Mailbox\Tests\Controllers;`
`4`	`4`
`5`	`5`	`use BeyondCode\Mailbox\Tests\TestCase;`
	`6`	`+use PHPUnit\Framework\Attributes\Test;`
`6`	`7`
`7`	`8`	`class MailgunTest extends TestCase`
`8`	`9`	`{`
`@@ -13,7 +14,7 @@ protected function getEnvironmentSetUp($app)`
`13`	`14`	`$app['config']['mailbox.driver'] = 'mailgun';`
`14`	`15`	`}`
`15`	`16`
`16`		`- /** @test */`
	`17`	`+ #[Test]`
`17`	`18`	`public function it_verifies_mailgun_signatures()`
`18`	`19`	`{`
`19`	`20`	`$this->post('/laravel-mailbox/mailgun/mime', [`
`@@ -38,7 +39,7 @@ public function it_verifies_mailgun_signatures()`
`38`	`39`	`])->assertStatus(200);`
`39`	`40`	`}`
`40`	`41`
`41`		`- /** @test */`
	`42`	`+ #[Test]`
`42`	`43`	`public function it_verifies_fresh_timestamps()`
`43`	`44`	`{`
`44`	`45`	`$timestamp = now()->subMinutes(5)->timestamp;`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`use BeyondCode\Mailbox\Tests\TestCase;`
`8`	`8`	`use Illuminate\Mail\Mailable;`
`9`	`9`	`use Illuminate\Support\Facades\Mail;`
	`10`	`+use PHPUnit\Framework\Attributes\Test;`
`10`	`11`
`11`	`12`	`class LogTest extends TestCase`
`12`	`13`	`{`
`@@ -18,7 +19,7 @@ protected function getEnvironmentSetUp($app)`
`18`	`19`	`$app['config']['mailbox.driver'] = 'log';`
`19`	`20`	`}`
`20`	`21`
`21`		`- /** @test */`
	`22`	`+ #[Test]`
`22`	`23`	`public function it_catches_logged_mails()`
`23`	`24`	`{`
`24`	`25`	`Mailbox::from('{name}@beyondco.de', function (InboundEmail $email, $name) {`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`use BeyondCode\Mailbox\InboundEmail;`
`7`	`7`	`use Illuminate\Mail\Mailable;`
`8`	`8`	`use Illuminate\Support\Facades\Mail;`
	`9`	`+use PHPUnit\Framework\Attributes\Test;`
`9`	`10`
`10`	`11`	`class InboundEmailTest extends TestCase`
`11`	`12`	`{`
`@@ -17,7 +18,7 @@ protected function getEnvironmentSetUp($app)`
`17`	`18`	`$app['config']['mailbox.driver'] = 'log';`
`18`	`19`	`}`
`19`	`20`
`20`		`- /** @test */`
	`21`	`+ #[Test]`
`21`	`22`	`public function it_stores_inbound_emails()`
`22`	`23`	`{`
`23`	`24`	`Mailbox::to('someone@beyondco.de', function ($email) {`
`@@ -29,7 +30,7 @@ public function it_stores_inbound_emails()`
`29`	`30`	`$this->assertSame(1, InboundEmail::query()->count());`
`30`	`31`	`}`
`31`	`32`
`32`		`- /** @test */`
	`33`	`+ #[Test]`
`33`	`34`	`public function it_stores_all_inbound_emails()`
`34`	`35`	`{`
`35`	`36`	`$this->app['config']['mailbox.only_store_matching_emails'] = false;`
`@@ -43,7 +44,7 @@ public function it_stores_all_inbound_emails()`
`43`	`44`	`$this->assertSame(2, InboundEmail::query()->count());`
`44`	`45`	`}`
`45`	`46`
`46`		`- /** @test */`
	`47`	`+ #[Test]`
`47`	`48`	`public function it_can_use_fallbacks()`
`48`	`49`	`{`
`49`	`50`	`Mailbox::fallback(function (InboundEmail $email) {`
`@@ -57,7 +58,7 @@ public function it_can_use_fallbacks()`
`57`	`58`	`Mail::assertSent(ReplyMail::class);`
`58`	`59`	`}`
`59`	`60`
`60`		`- /** @test */`
	`61`	`+ #[Test]`
`61`	`62`	`public function it_can_use_catchall()`
`62`	`63`	`{`
`63`	`64`	`Mailbox::to('someone@beyondco.de', function ($email) {`
`@@ -74,7 +75,7 @@ public function it_can_use_catchall()`
`74`	`75`	`Mail::assertSent(ReplyMail::class);`
`75`	`76`	`}`
`76`	`77`
`77`		`- /** @test */`
	`78`	`+ #[Test]`
`78`	`79`	`public function it_stores_inbound_emails_with_catchall()`
`79`	`80`	`{`
`80`	`81`	`Mailbox::catchAll(function ($email) {`
`@@ -86,7 +87,7 @@ public function it_stores_inbound_emails_with_catchall()`
`86`	`87`	`$this->assertSame(2, InboundEmail::query()->count());`
`87`	`88`	`}`
`88`	`89`
`89`		`- /** @test */`
	`90`	`+ #[Test]`
`90`	`91`	`public function it_stores_inbound_emails_with_fallback()`
`91`	`92`	`{`
`92`	`93`	`Mailbox::fallback(function ($email) {`
`@@ -98,7 +99,7 @@ public function it_stores_inbound_emails_with_fallback()`
`98`	`99`	`$this->assertSame(2, InboundEmail::query()->count());`
`99`	`100`	`}`
`100`	`101`
`101`		`- /** @test */`
	`102`	`+ #[Test]`
`102`	`103`	`public function it_stores_inbound_emails_with_fallback_and_catchall_only_once()`
`103`	`104`	`{`
`104`	`105`	`Mailbox::fallback(function ($email) {`
`@@ -113,7 +114,7 @@ public function it_stores_inbound_emails_with_fallback_and_catchall_only_once()`
`113`	`114`	`$this->assertSame(2, InboundEmail::query()->count());`
`114`	`115`	`}`
`115`	`116`
`116`		`- /** @test */`
	`117`	`+ #[Test]`
`117`	`118`	`public function it_does_not_store_inbound_emails_if_configured()`
`118`	`119`	`{`
`119`	`120`	`$this->app['config']['mailbox.store_incoming_emails_for_days'] = 0;`
`@@ -127,7 +128,7 @@ public function it_does_not_store_inbound_emails_if_configured()`
`127`	`128`	`$this->assertSame(0, InboundEmail::query()->count());`
`128`	`129`	`}`
`129`	`130`
`130`		`- /** @test */`
	`131`	`+ #[Test]`
`131`	`132`	`public function it_can_reply_to_mails()`
`132`	`133`	`{`
`133`	`134`	`Mailbox::from('example@beyondco.de', function (InboundEmail $email) {`
`@@ -141,7 +142,7 @@ public function it_can_reply_to_mails()`
`141`	`142`	`Mail::assertSent(ReplyMail::class);`
`142`	`143`	`}`
`143`	`144`
`144`		`- /** @test */`
	`145`	`+ #[Test]`
`145`	`146`	`public function it_uses_the_configured_model()`
`146`	`147`	`{`
`147`	`148`	`$this->app['config']['mailbox.model'] = ExtendedInboundEmail::class;`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,11 @@`
`6`	`6`	`use BeyondCode\Mailbox\Routing\Route;`
`7`	`7`	`use BeyondCode\Mailbox\Routing\RouteCollection;`
`8`	`8`	`use Laminas\Mail\Message as TestMail;`
	`9`	`+use PHPUnit\Framework\Attributes\Test;`
`9`	`10`
`10`	`11`	`class MailboxRouteCollectionTest extends TestCase`
`11`	`12`	`{`
`12`		`- /** @test */`
	`13`	`+ #[Test]`
`13`	`14`	`public function it_returns_all_matching_mailbox_routes()`
`14`	`15`	`{`
`15`	`16`	`$collection = new RouteCollection();`