Merge pull request #18 from roach-php/laravel-10

Laravel 10 support

Author: ksassnowski

.github/workflows/run_tests.yml

@@ -7,11 +7,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        php: [8.0, 8.1]
-        dependency-version: [prefer-stable, prefer-lowest]
+        php: [8.1, 8.2]
+        laravel: [9.*, 10.*]
+        dependency-version: [prefer-stable]
         os: [ubuntu-latest]
+        include:
+          - laravel: 9.*
+            testbench: ^7.0
+          - laravel: 10.*
+            testbench: ^8.0
 
-    name: P${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel}} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
     steps:
       - name: Setup PHP
@@ -21,16 +27,18 @@ jobs:
           coverage: none
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Cache dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.composer/cache/files
-          key: dependencies-laravel-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
 
       - name: Install dependencies
-        run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
       - name: Execute tests
         run: vendor/bin/phpunit

composer.json

@@ -10,15 +10,15 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-        "laravel/framework": "^9.0",
-        "roach-php/core": "^1.0",
+        "php": "^8.1",
+        "laravel/framework": "^9.49 || ^10.0",
+        "roach-php/core": "^1.0 || ^2.0",
         "spatie/laravel-package-tools": "^1.11"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.15",
-        "ergebnis/php-cs-fixer-config": "^3.0",
-        "orchestra/testbench": "^7.0",
+        "ergebnis/php-cs-fixer-config": "^5.0",
+        "orchestra/testbench": "^7.0 || ^8.0",
         "phpunit/phpunit": "^9.5",
         "roave/security-advisories": "dev-latest",
         "spatie/phpunit-snapshot-assertions": "^4.2"