Merge branch 'hotfix/6.0.45'

* hotfix/6.0.45: compiled assets use $casts instead of $dates fixing tests fixing tests fixing tests explicitely require testbench versions support for Laravel 10
austintoddj · Feb 17, 2023 · 71b809c · 71b809c
2 parents ac62b14 + 4789fb3
commit 71b809c
Show file tree

Hide file tree

Showing 11 changed files with 1,002 additions and 966 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,8 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.3, 7.4, 8.0, 8.1]
-        laravel: [^6.0, ^7.0, ^8.0, ^9.0]
+        php: [7.3, 7.4, 8.0, 8.1, 8.2]
+        laravel: [^6.0, ^7.0, ^8.0, ^9.0, ^10.0]
         include:
           - laravel: ^6.0
             testbench: ^4.0
@@ -26,15 +26,27 @@ jobs:
             testbench: ^6.0
           - laravel: ^9.0
             testbench: ^7.0
+          - laravel: ^10.0
+            testbench: ^8.0
         exclude:
           - php: 7.3
             laravel: ^9.0
+          - php: 7.3
+            laravel: ^10.0
           - php: 7.4
             laravel: ^9.0
+          - php: 7.4
+            laravel: ^10.0
+          - php: 8.0
+            laravel: ^10.0
           - php: 8.1
             laravel: ^6.0
           - php: 8.1
             laravel: ^7.0
+          - php: 8.2
+            laravel: ^6.0
+          - php: 8.2
+            laravel: ^7.0
 
     name: Laravel ${{ matrix.laravel }} on PHP ${{ matrix.php }}
 

diff --git a/composer.json b/composer.json
@@ -23,12 +23,12 @@
     "require": {
         "php": "^7.3|^8.0",
         "ext-json": "*",
-        "laravel/framework": "^6.0|^7.0|^8.0|^9.0"
+        "laravel/framework": "^6.0|^7.0|^8.0|^9.0|^10.0"
     },
     "require-dev": {
         "laravel/legacy-factories": "^1.0",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0",
+        "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0",
         "phpunit/phpunit": "^9.0"
     },
     "autoload": {