From 791e8b4d2a9ee714fada8987d40909d37abd2fea Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Wed, 25 Jan 2023 20:13:15 +0100 Subject: [PATCH] Add Support for Laravel 10 (#15) * Add Support for Laravel 10 * Update CI --- .github/workflows/php-cs-fixer.yml | 2 +- .github/workflows/phpstan.yml | 4 ++-- .github/workflows/run-tests.yml | 9 +++++++-- .github/workflows/update-changelog.yml | 2 +- composer.json | 4 ++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml index f55d1fa..0672942 100644 --- a/.github/workflows/php-cs-fixer.yml +++ b/.github/workflows/php-cs-fixer.yml @@ -8,7 +8,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 19d6402..3c93dae 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -11,12 +11,12 @@ jobs: name: phpstan runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.0' + php-version: '8.2' coverage: none - name: Install composer dependencies diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index a7a4ea2..7e3039d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,17 +10,22 @@ jobs: matrix: os: [ubuntu-latest] php: [8.2, 8.1, 8.0] - laravel: [9.*] + laravel: [9.*, 10.*] dependency-version: [prefer-stable] include: - laravel: 9.* testbench: 7.* + - laravel: 10.* + testbench: 8.* + exclude: + - laravel: 10.* + php: 8.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 5dddd2f..9abe967 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: main diff --git a/composer.json b/composer.json index 23221f5..82841fe 100644 --- a/composer.json +++ b/composer.json @@ -19,13 +19,13 @@ "require": { "php": "^8.0", "spatie/laravel-package-tools": "^1.9.2", - "illuminate/contracts": "^9.0" + "illuminate/contracts": "^9.0 | ^10.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.4", "nunomaduro/collision": "^5.10 |^6.0", "nunomaduro/larastan": "^2.0", - "orchestra/testbench": "^7", + "orchestra/testbench": "^7 | ^8", "pestphp/pest": "^1.21", "pestphp/pest-plugin-laravel": "^1.1", "phpstan/extension-installer": "^1.1",