From fd97b678591521426f89e93718f35ffc17a25500 Mon Sep 17 00:00:00 2001 From: jim Date: Wed, 3 Jan 2024 15:35:20 +0000 Subject: [PATCH] Allow installation with laravel 11 --- .github/workflows/run-tests.yml | 6 +++++- composer.json | 10 +++++----- phpunit.xml.dist | 32 ++++++++++---------------------- 3 files changed, 20 insertions(+), 28 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index aa66e67..4cf9e44 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,16 +14,20 @@ jobs: matrix: os: [ubuntu-latest] php: [8.0,8.1,8.2] - laravel: [9.*,10.*] + laravel: [ 9.*,10.*,11.* ] stability: [prefer-stable] include: - laravel: 9.* testbench: 7.* - laravel: 10.* testbench: 8.* + - laravel: 11.* + testbench: 8.* exclude: - php: 8.0 laravel: 10.* + - php: 8.0 + laravel: 11.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index 07488a7..cb68358 100644 --- a/composer.json +++ b/composer.json @@ -19,22 +19,22 @@ "require": { "php": "^8.0", "doctrine/dbal": "^3.3", - "illuminate/contracts": "^9.0|^10.0", + "illuminate/contracts": "^9.0|^10.0|^11.0", "spatie/laravel-package-tools": "^1.9.2" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.8", - "nunomaduro/collision": "^6.0", + "nunomaduro/collision": "^7.3.1", "nunomaduro/larastan": "^2.0.1", "orchestra/testbench": "^7.0|^8.0", - "pestphp/pest": "^1.21", + "pestphp/pest": "^2", "pestphp/pest-plugin-laravel": "^1.1|^2.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^10.0", "roave/security-advisories": "dev-latest", - "spatie/pest-plugin-test-time": "^1.1", + "spatie/pest-plugin-test-time": "^2.0.0", "spatie/ray": "^1.37" }, "autoload": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 7439509..e482d61 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,32 +1,15 @@ - + tests - - ./src - @@ -36,4 +19,9 @@ + + + ./src + +