From 7e55666ca1175131c8ee07e426aeebd65e52c09c Mon Sep 17 00:00:00 2001 From: Bastien Philippe Date: Mon, 27 Feb 2023 15:03:07 +0100 Subject: [PATCH 1/2] Laravel 10 support --- .github/workflows/run-tests.yml | 8 +++----- composer.json | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 1fcc422..fe81a4c 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,13 +14,11 @@ jobs: matrix: os: [ ubuntu-latest ] php: [ 8.1, 8.2 ] - laravel: [ 9.* ] + laravel: [ 9.*, 10.* ] stability: [ prefer-lowest, prefer-stable ] - include: - - laravel: 9.* - testbench: 7.* exclude: - php: 8.2 + laravel: 9.* stability: prefer-lowest name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} @@ -52,7 +50,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: Execute tests diff --git a/composer.json b/composer.json index f4d120d..7ae6385 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^8.1", - "illuminate/support": "^9.0", + "illuminate/support": "^9.0 || ^10.0", "nesbot/carbon": "^2.0", "phpstan/phpstan": "^1.4.5" }, From 823a9bed793e8bb6d2712c8a7721771e927f1499 Mon Sep 17 00:00:00 2001 From: Bastien Philippe Date: Mon, 27 Feb 2023 15:07:30 +0100 Subject: [PATCH 2/2] Configure orchestra --- .github/workflows/run-tests.yml | 7 ++++++- composer.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index fe81a4c..4f88290 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -16,6 +16,11 @@ jobs: php: [ 8.1, 8.2 ] laravel: [ 9.*, 10.* ] stability: [ prefer-lowest, prefer-stable ] + include: + - laravel: 9.* + testbench: 7.* + - laravel: 10.* + testbench: 8.* exclude: - php: 8.2 laravel: 9.* @@ -50,7 +55,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: Execute tests diff --git a/composer.json b/composer.json index 7ae6385..4a9bcca 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "friendsofphp/php-cs-fixer": "^3.7", "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",