From eaf391069156c487dbd761efdc33cef513212c93 Mon Sep 17 00:00:00 2001 From: Fabio Capucci Date: Wed, 11 Jan 2023 12:09:01 +0100 Subject: [PATCH 1/2] support laravel 10 --- .github/workflows/run-tests.yml | 2 +- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index a18588d..92389cd 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,7 +13,7 @@ jobs: fail-fast: true matrix: php: [8.1, 8.2] - laravel: [9.*] + laravel: [9.*, 10.*] stability: [prefer-stable] include: - laravel: 9.* diff --git a/composer.json b/composer.json index c16ee43..4cf8028 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^8.1", - "illuminate/contracts": "^9.0", + "illuminate/contracts": "^9.0 || ^10.0", "spatie/laravel-package-tools": "^1.9.2", "spiral/roadrunner": "^2.8", "symfony/process": "^6.0", @@ -28,7 +28,7 @@ "laravel/pint": "^1.0", "nunomaduro/collision": "^6.0", "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^7.0", + "orchestra/testbench": "^7.0 || ^8.0", "pestphp/pest": "^1.21", "pestphp/pest-plugin-laravel": "^1.1", "phpstan/extension-installer": "^1.1", From 40e3cea9042b287b62a50323f400fdbd8cb1fd18 Mon Sep 17 00:00:00 2001 From: Fabio Capucci Date: Wed, 11 Jan 2023 12:20:55 +0100 Subject: [PATCH 2/2] improve tests setup --- .github/workflows/run-tests.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 92389cd..5efc9a3 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,11 +13,8 @@ jobs: fail-fast: true matrix: php: [8.1, 8.2] - laravel: [9.*, 10.*] + laravel: [^9.0, ^10.0] stability: [prefer-stable] - include: - - laravel: 9.* - testbench: 7.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} @@ -39,8 +36,8 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --${{ matrix.stability }} --prefer-dist --no-interaction + composer require "illuminate/contracts:${{ matrix.laravel }}" --no-interaction --no-update + composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress - name: Execute tests run: vendor/bin/pest