Merge branch 'master' into v2

cmgmyr · Feb 11, 2022 · d19d3e3 · d19d3e3
2 parents e719816 + 14b72e1
commit d19d3e3
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 19 deletions.
diff --git a/.github/workflows/run-tests-mysql.yml b/.github/workflows/run-tests-mysql.yml
@@ -1,4 +1,4 @@
-name: Laravel Messenger - MySQL Tests
+name: MySQL Tests
 
 on: [push, pull_request]
 
@@ -31,10 +31,10 @@ jobs:
         php-versions: [ '8.1','8.0' ]
         dependency-stability: [ prefer-stable ]
 
-        laravel: [ '8.*' ]
+        laravel: [ '9.*' ]
         include:
-          - laravel:  8.*
-            testbench: 6.*
+          - laravel:  9.*
+            testbench: 7.*
 
     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
@@ -1,4 +1,4 @@
-name: Laravel Messenger - PostgreSQL Tests
+name:  PostgreSQL Tests
 
 on: [push, pull_request]
 
@@ -32,10 +32,10 @@ jobs:
         php-versions: [ '8.1','8.0' ]
         dependency-stability: [ prefer-stable ]
 
-        laravel: [ '8.*' ]
+        laravel: [ '9.*' ]
         include:
-          - laravel:  8.*
-            testbench: 6.*
+          - laravel:  9.*
+            testbench: 7.*
 
     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
@@ -1,4 +1,4 @@
-name: Laravel Messenger - Tests
+name: SQLite Tests
 
 on: [push, pull_request]
 
@@ -12,9 +12,12 @@ jobs:
         operating-system: [ubuntu-latest]
         php-versions: [ '8.1','8.0','7.4','7.3','7.2' ]
         dependency-stability: [ prefer-stable ]
-        laravel: [ '8.*','7.*','6.*' ]
+        laravel: [ '9.*','8.*','7.*','6.*' ]
 
         include:
+          - laravel:  9.*
+            testbench: 7.*
+            dbal: ^3.1.2
           - laravel:  8.*
             testbench: 6.*
             dbal: ^3.1.2|^2.13.3
@@ -25,8 +28,12 @@ jobs:
             testbench: 4.*
             dbal: ^2.6
         exclude:
-          - laravel: 8.*
+          - laravel: 9.*
+            php-versions: 7.2
+          - laravel: 9.*
             php-versions: 7.3
+          - laravel: 9.*
+            php-versions: 7.4
           - laravel: 8.*
             php-versions: 7.2
           - laravel: 7.*
@@ -35,8 +42,6 @@ jobs:
             php-versions: 8.0
           - laravel: 6.*
             php-versions: 8.1
-          - laravel: 6.*
-            php-versions: 8.0
 
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
 

diff --git a/composer.json b/composer.json
@@ -13,15 +13,15 @@
     ],
     "require": {
         "php": "^7.2|^8.0",
-        "illuminate/config": "^5.5|^6.0|^7.0|^8.0",
-        "illuminate/database": "^5.5|^6.0|^7.0|^8.0",
-        "illuminate/support": "^5.5|^6.0|^7.0|^8.0"
+        "illuminate/config": "^5.5|^6.0|^7.0|^8.0|^9.0",
+        "illuminate/database": "^5.5|^6.0|^7.0|^8.0|^9.0",
+        "illuminate/support": "^5.5|^6.0|^7.0|^8.0|^9.0"
     },
     "require-dev": {
         "doctrine/dbal": "^3.1.2|^2.13.3",
         "fakerphp/faker": "^1.16",
         "friendsofphp/php-cs-fixer": "^3.2|^2.18",
-        "orchestra/testbench": "^3.0|^4.0|^5.0|^6.0",
+        "orchestra/testbench": "^3.0|^4.0|^5.0|^6.0|^7.0",
         "phpunit/phpunit": "^8.0|^9.3.3"
     },
     "autoload": {
@@ -40,7 +40,10 @@
         "format": "vendor/bin/php-cs-fixer fix"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true
+        }
     },
     "extra": {
         "laravel": {

diff --git a/readme.md b/readme.md
@@ -1,4 +1,4 @@
-[![Tests](https://github.com/cmgmyr/laravel-messenger/actions/workflows/run-tests.yml/badge.svg)](https://github.com/cmgmyr/laravel-messenger/actions/workflows/run-tests.yml)
+[![SQLite Tests](https://github.com/cmgmyr/laravel-messenger/actions/workflows/run-tests.yml/badge.svg)](https://github.com/cmgmyr/laravel-messenger/actions/workflows/run-tests.yml)
 [![MySQL Tests](https://github.com/cmgmyr/laravel-messenger/actions/workflows/run-tests-mysql.yml/badge.svg)](https://github.com/cmgmyr/laravel-messenger/actions/workflows/run-tests-mysql.yml)
 [![PostgreSQL Tests](https://github.com/cmgmyr/laravel-messenger/actions/workflows/run-tests-postgres.yml/badge.svg)](https://github.com/cmgmyr/laravel-messenger/actions/workflows/run-tests-postgres.yml)