Merge branch 'master' into v2

Author: cmgmyr

.github/workflows/run-tests-mysql.yml

@@ -16,31 +16,20 @@ jobs:
           MYSQL_DATABASE: db_test_laravel
         ports:
           - 33306:3306
-        options: >-
-          --health-cmd="mysqladmin ping"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=3
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     strategy:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['8.1', '8.2', '8.3']
+        php-versions: ['8.3', '8.4']
         dependency-stability: [prefer-stable]
-        laravel: ['9.*', '10.*', '11.*']
+        laravel: ['11.*', '12.*']
         include:
-          - laravel: 9.*
-            testbench: 7.*
-          - laravel: 10.*
-            testbench: 8.*
           - laravel: 11.*
             testbench: 9.*
-        exclude:
-          - laravel: 10.*
-            php-versions: 8.0
-          - laravel: 11.*
-            php-versions: 8.1
+          - laravel: 12.*
+            testbench: 10.*
 
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
 

.github/workflows/run-tests-postgres.yml

@@ -17,31 +17,20 @@ jobs:
           POSTGRES_DB: db_test_laravel
         ports:
           - 55432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     strategy:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['8.1', '8.2', '8.3']
+        php-versions: ['8.3', '8.4']
         dependency-stability: [prefer-stable]
-        laravel: ['9.*', '10.*', '11.*']
+        laravel: ['11.*', '12.*']
         include:
-          - laravel: 9.*
-            testbench: 7.*
-          - laravel: 10.*
-            testbench: 8.*
           - laravel: 11.*
             testbench: 9.*
-        exclude:
-          - laravel: 10.*
-            php-versions: 8.0
-          - laravel: 11.*
-            php-versions: 8.1
+          - laravel: 12.*
+            testbench: 10.*
 
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
 

.github/workflows/run-tests.yml

@@ -12,9 +12,9 @@ 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']
+        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         dependency-stability: [prefer-stable]
-        laravel: ['6.*', '7.*', '8.*', '9.*', '10.*', '11.*']
+        laravel: ['6.*', '7.*', '8.*', '9.*', '10.*', '11.*', '12.*']
         include:
           - laravel: 6.*
             testbench: 4.*
@@ -34,21 +34,28 @@ jobs:
           - 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.0
+            php-versions: 8.4
           - laravel: 8.*
             php-versions: 7.2
           - laravel: 9.*
@@ -75,6 +82,16 @@ jobs:
             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
 
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
 

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",
-        "illuminate/database": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-        "illuminate/support": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.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"
     },
     "require-dev": {
-        "doctrine/dbal": "^3.1.2|^2.13.3",
+        "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",
-        "phpunit/phpunit": "^8.0|^9.3.3|^10.5"
+        "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"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -17,19 +17,6 @@
         beStrictAboutOutputDuringTests="true"
         verbose="true"
 >
-    <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
-        <exclude>
-            <file>src/MessengerServiceProvider.php</file>
-        </exclude>
-        <report>
-            <clover outputFile="build/logs/clover.xml"/>
-            <html outputDirectory="build/coverage"/>
-            <text outputFile="build/coverage.txt"/>
-        </report>
-    </coverage>
     <testsuites>
         <testsuite name="Messenger Test Suite">
             <directory suffix="Test.php">./tests/</directory>