Merge branch 'chore/laravel-9'

Author: michaeldyrynda

.github/workflows/run-tests.yml

@@ -8,16 +8,19 @@ on:
 
 jobs:
   test:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        php: [8.0, 7.4, 7.3]
-        laravel: [^8.0]
-        dependency-version: [prefer-lowest, prefer-stable]
-        os: [ubuntu-latest]
+        php: [8.1, 8.0, 7.4, 7.3]
+        laravel: [^8.0, ^9.0]
+        exclude:
+          - php: 7.3
+            laravel: '^9.0'
+          - php: 7.4
+            laravel: '^9.0'
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} ${{ matrix.dependency-version }} - ${{ matrix.os }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }}
 
     steps:
       - name: Checkout code
@@ -38,8 +41,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "illuminate/container:${{ matrix.laravel }}" "illuminate/contracts:${{ matrix.laravel }}" "illuminate/database:${{ matrix.laravel }}" --no-interaction --no-update
-          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+          composer require "illuminate/contracts:${{ matrix.laravel }}"  --prefer-dist --no-interaction --no-update
+          composer update --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests
         run: vendor/bin/phpunit

composer.json

@@ -13,15 +13,15 @@
   "require": {
     "php": "^7.3|^8.0",
     "dyrynda/laravel-model-uuid": "^6.5",
-    "illuminate/container": "^8.12",
-    "illuminate/contracts": "^8.12",
-    "illuminate/database": "^8.12",
+    "illuminate/container": "^8.12|^9.0",
+    "illuminate/contracts": "^8.12|^9.0",
+    "illuminate/database": "^8.12|^9.0",
     "ramsey/uuid": "^4.1"
   },
   "require-dev": {
     "laravel/legacy-factories": "^1.1",
     "mockery/mockery": "^1.4.2",
-    "orchestra/testbench": "^6.0",
+    "orchestra/testbench": "^6.0|^7.0",
     "phpunit/phpunit": "^9.3"
   },
   "autoload": {