Merge branch 'master' into v2

cmgmyr · cmgmyr · commit 1389a06ace0c · 2026-03-17T23:25:29.000-04:00
diff --git a/.github/workflows/run-tests-mysql.yml b/.github/workflows/run-tests-mysql.yml
@@ -22,14 +22,14 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['8.3', '8.4']
+        php-versions: ["8.4", "8.5"]
         dependency-stability: [prefer-stable]
-        laravel: ['11.*', '12.*']
+        laravel: ["12.*", "13.*"]
         include:
-          - laravel: 11.*
-            testbench: 9.*
           - laravel: 12.*
             testbench: 10.*
+          - laravel: 13.*
+            testbench: 11.*
 
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
 
diff --git a/.github/workflows/run-tests-postgres.yml b/.github/workflows/run-tests-postgres.yml
@@ -23,14 +23,14 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['8.3', '8.4']
+        php-versions: ["8.4", "8.5"]
         dependency-stability: [prefer-stable]
-        laravel: ['11.*', '12.*']
+        laravel: ["12.*", "13.*"]
         include:
-          - laravel: 11.*
-            testbench: 9.*
           - laravel: 12.*
             testbench: 10.*
+          - laravel: 13.*
+            testbench: 11.*
 
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
 
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -12,86 +12,16 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-versions: ["8.4", "8.5"]
         dependency-stability: [prefer-stable]
-        laravel: ['6.*', '7.*', '8.*', '9.*', '10.*', '11.*', '12.*']
+        laravel: ["12.*", "13.*"]
         include:
-          - laravel: 6.*
-            testbench: 4.*
-            dbal: ^2.6
-          - laravel: 7.*
-            testbench: 5.*
-            dbal: ^2.6
-          - laravel: 8.*
-            testbench: 6.*
-            dbal: ^3.1.2|^2.13.3
-          - laravel: 9.*
-            testbench: 7.*
-            dbal: ^3.1.2
-          - laravel: 10.*
-            testbench: 8.*
-            dbal: ^3.1.2
-          - laravel: 11.*
-            testbench: 9.*
-            dbal: ^3.1.2
           - laravel: 12.*
             testbench: 10.*
             dbal: ^4.2
-        exclude:
-          - laravel: 6.*
-            php-versions: 8.1
-          - laravel: 6.*
-            php-versions: 8.2
-          - laravel: 6.*
-            php-versions: 8.3
-          - laravel: 6.*
-            php-versions: 8.4
-          - laravel: 7.*
-            php-versions: 8.0
-          - laravel: 7.*
-            php-versions: 8.1
-          - laravel: 7.*
-            php-versions: 8.2
-          - laravel: 7.*
-            php-versions: 8.3
-          - laravel: 7.*
-            php-versions: 8.4
-          - laravel: 8.*
-            php-versions: 7.2
-          - laravel: 9.*
-            php-versions: 7.2
-          - laravel: 9.*
-            php-versions: 7.3
-          - laravel: 9.*
-            php-versions: 7.4
-          - laravel: 10.*
-            php-versions: 8.0
-          - laravel: 10.*
-            php-versions: 7.2
-          - laravel: 10.*
-            php-versions: 7.3
-          - laravel: 10.*
-            php-versions: 7.4
-          - laravel: 11.*
-            php-versions: 8.0
-          - laravel: 11.*
-            php-versions: 8.1
-          - laravel: 11.*
-            php-versions: 7.2
-          - laravel: 11.*
-            php-versions: 7.3
-          - laravel: 11.*
-            php-versions: 7.4
-          - laravel: 12.*
-            php-versions: 7.2
-          - laravel: 12.*
-            php-versions: 7.3
-          - laravel: 12.*
-            php-versions: 7.4
-          - laravel: 12.*
-            php-versions: 8.0
-          - laravel: 12.*
-            php-versions: 8.1
+          - laravel: 13.*
+            testbench: 11.*
+            dbal: ^4.2
 
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
 
diff --git a/composer.json b/composer.json
@@ -18,16 +18,16 @@
     ],
     "require": {
         "php": "^7.2|^8.0",
-        "illuminate/config": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
-        "illuminate/database": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
-        "illuminate/support": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0"
+        "illuminate/config": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0",
+        "illuminate/database": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0",
+        "illuminate/support": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0"
     },
     "require-dev": {
         "doctrine/dbal": "^3.1.2|^2.13.3|^4.2",
         "fakerphp/faker": "^1.16|^1.9.1",
         "friendsofphp/php-cs-fixer": "^3.2|^2.18",
-        "orchestra/testbench": "^3.0|^4.0|^5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
-        "phpunit/phpunit": "^8.0|^9.3.3|^10.5|^11.5.3"
+        "orchestra/testbench": "^3.0|^4.0|^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+        "phpunit/phpunit": "^8.0|^9.3.3|^10.5|^11.5.3|^12.5.12"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -3,19 +3,13 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
         backupGlobals="false"
-        backupStaticAttributes="false"
         bootstrap="vendor/autoload.php"
         colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
         processIsolation="false"
         stopOnFailure="false"
         failOnWarning="true"
         failOnRisky="true"
         failOnEmptyTestSuite="true"
-        beStrictAboutOutputDuringTests="true"
-        verbose="true"
 >
     <testsuites>
         <testsuite name="Messenger Test Suite">
diff --git a/tests/CustomModelsTest.php b/tests/CustomModelsTest.php
@@ -12,32 +12,28 @@
 
 class CustomModelsTest extends TestCase
 {
-    /** @test */
-    public function it_can_use_custom_message_model(): void
+    public function test_it_can_use_custom_message_model(): void
     {
         $this->setMessageCustomModel();
         $this->assertEquals(CustomMessage::class, get_class(Models::message()));
         $this->unsetMessageCustomModel();
     }
 
-    /** @test */
-    public function it_can_use_custom_participant_model(): void
+    public function test_it_can_use_custom_participant_model(): void
     {
         $this->setParticipantCustomModel();
         $this->assertEquals(CustomParticipant::class, get_class(Models::participant()));
         $this->unsetParticipantCustomModel();
     }
 
-    /** @test */
-    public function it_can_use_custom_thread_model(): void
+    public function test_it_can_use_custom_thread_model(): void
     {
         $this->setThreadCustomModel();
         $this->assertEquals(CustomThread::class, get_class(Models::thread()));
         $this->unsetThreadCustomModel();
     }
 
-    /** @test */
-    public function it_can_use_custom_table(): void
+    public function test_it_can_use_custom_table(): void
     {
         $this->setMessageCustomModel();
         $this->setMessageCustomTable();
@@ -48,8 +44,7 @@ public function it_can_use_custom_table(): void
         $this->unsetMessageCustomTable();
     }
 
-    /** @test */
-    public function it_should_return_custom_name_when_not_available(): void
+    public function test_it_should_return_custom_name_when_not_available(): void
     {
         $modelName = 'ModelNotFound';
 
diff --git a/tests/EloquentMessageTest.php b/tests/EloquentMessageTest.php
@@ -4,8 +4,7 @@
 
 class EloquentMessageTest extends TestCase
 {
-    /** @test */
-    public function it_should_get_the_recipients_of_a_message(): void
+    public function test_it_should_get_the_recipients_of_a_message(): void
     {
         $message = $this->messageFactory();
         $thread = $this->threadFactory();
diff --git a/tests/EloquentThreadTest.php b/tests/EloquentThreadTest.php
diff --git a/tests/MessagableTraitTest.php b/tests/MessagableTraitTest.php

Original file line number	Diff line number	Diff line change
`@@ -12,32 +12,28 @@`
`12`	`12`
`13`	`13`	`class CustomModelsTest extends TestCase`
`14`	`14`	`{`
`15`		`- /** @test */`
`16`		`- public function it_can_use_custom_message_model(): void`
	`15`	`+ public function test_it_can_use_custom_message_model(): void`
`17`	`16`	`{`
`18`	`17`	`$this->setMessageCustomModel();`
`19`	`18`	`$this->assertEquals(CustomMessage::class, get_class(Models::message()));`
`20`	`19`	`$this->unsetMessageCustomModel();`
`21`	`20`	`}`
`22`	`21`
`23`		`- /** @test */`
`24`		`- public function it_can_use_custom_participant_model(): void`
	`22`	`+ public function test_it_can_use_custom_participant_model(): void`
`25`	`23`	`{`
`26`	`24`	`$this->setParticipantCustomModel();`
`27`	`25`	`$this->assertEquals(CustomParticipant::class, get_class(Models::participant()));`
`28`	`26`	`$this->unsetParticipantCustomModel();`
`29`	`27`	`}`
`30`	`28`
`31`		`- /** @test */`
`32`		`- public function it_can_use_custom_thread_model(): void`
	`29`	`+ public function test_it_can_use_custom_thread_model(): void`
`33`	`30`	`{`
`34`	`31`	`$this->setThreadCustomModel();`
`35`	`32`	`$this->assertEquals(CustomThread::class, get_class(Models::thread()));`
`36`	`33`	`$this->unsetThreadCustomModel();`
`37`	`34`	`}`
`38`	`35`
`39`		`- /** @test */`
`40`		`- public function it_can_use_custom_table(): void`
	`36`	`+ public function test_it_can_use_custom_table(): void`
`41`	`37`	`{`
`42`	`38`	`$this->setMessageCustomModel();`
`43`	`39`	`$this->setMessageCustomTable();`
`@@ -48,8 +44,7 @@ public function it_can_use_custom_table(): void`
`48`	`44`	`$this->unsetMessageCustomTable();`
`49`	`45`	`}`
`50`	`46`
`51`		`- /** @test */`
`52`		`- public function it_should_return_custom_name_when_not_available(): void`
	`47`	`+ public function test_it_should_return_custom_name_when_not_available(): void`
`53`	`48`	`{`
`54`	`49`	`$modelName = 'ModelNotFound';`
`55`	`50`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`
`5`	`5`	`class EloquentMessageTest extends TestCase`
`6`	`6`	`{`
`7`		`- /** @test */`
`8`		`- public function it_should_get_the_recipients_of_a_message(): void`
	`7`	`+ public function test_it_should_get_the_recipients_of_a_message(): void`
`9`	`8`	`{`
`10`	`9`	`$message = $this->messageFactory();`
`11`	`10`	`$thread = $this->threadFactory();`