From f9850137c075fec968db8c31f85509cd76051f3f Mon Sep 17 00:00:00 2001 From: Jaanus Vapper Date: Tue, 26 Mar 2024 00:05:46 +0200 Subject: [PATCH] Update L11 (#5) * Update to Laravel 11 * use release version of orchestra/testbench * bump actions/checkout to v4 --- .github/workflows/tests.yml | 13 ++++--------- composer.json | 12 ++++++------ phpunit.xml | 12 ++++++------ 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 80cf12b..630a637 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,20 +9,15 @@ jobs: strategy: matrix: - php: [8.1, 8.2] - laravel: [10.*, 9.*] + php: [8.2, 8.3] + laravel: [11.*] dependency-version: [prefer-stable] - include: - - laravel: 10.* - testbench: ^8.0 - - laravel: 9.* - testbench: ^7.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -33,7 +28,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.dependency-version }} --prefer-dist --no-interaction - name: Execute tests diff --git a/composer.json b/composer.json index ff03c2c..2acf209 100644 --- a/composer.json +++ b/composer.json @@ -4,16 +4,16 @@ "homepage": "https://github.com/hulkur/laravel-hasmany-keyby", "license": "MIT", "require": { - "php" : "^8.1", - "illuminate/database": "^9.0|^10.0", - "illuminate/support": "^9.0|^10.0" + "php" : "^8.2", + "illuminate/database": "^11.0", + "illuminate/support": "^11.0" }, "require-dev": { - "brianium/paratest": "^6.4", + "brianium/paratest": "^7.0", "doctrine/persistence": "^2.0", "mockery/mockery": "^1.5", - "nunomaduro/collision": "^6.0", - "orchestra/testbench": "^7.0|^8.0" + "nunomaduro/collision": "^8.1", + "orchestra/testbench": "^9.0" }, "authors": [ { diff --git a/phpunit.xml b/phpunit.xml index d7a240d..f96d6e3 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,13 +1,13 @@ - - - - src/ - - + tests + + + src/ + +