From 474af5e5ae6f6008f0afe0cb9c3841046b612427 Mon Sep 17 00:00:00 2001 From: jim Date: Wed, 3 Jan 2024 15:35:20 +0000 Subject: [PATCH 1/3] Allow installation with laravel 11 --- .github/workflows/run-tests.yml | 8 +++++++- composer.json | 10 +++++----- phpunit.xml.dist | 32 ++++++++++---------------------- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index aa66e67..ead24ef 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,16 +14,22 @@ 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.* + - php: 8.1 + laravel: 11.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index 07488a7..de6d11e 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": "^6.0|^7.0", "nunomaduro/larastan": "^2.0.1", "orchestra/testbench": "^7.0|^8.0", - "pestphp/pest": "^1.21", + "pestphp/pest": "^1|^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": "^9.0|^10.0", "roave/security-advisories": "dev-latest", - "spatie/pest-plugin-test-time": "^1.1", + "spatie/pest-plugin-test-time": "^1.0|^2.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 + + From 4322f47caa054f2ad8976cdbf0b10c49eafaf769 Mon Sep 17 00:00:00 2001 From: jim Date: Tue, 27 Feb 2024 16:05:14 +0000 Subject: [PATCH 2/3] Update testbench --- .github/workflows/run-tests.yml | 4 ++-- composer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index ead24ef..9cf06b0 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,7 +13,7 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.0,8.1,8.2] + php: [ 8.0,8.1,8.2,8.3 ] laravel: [ 9.*,10.*,11.* ] stability: [prefer-stable] include: @@ -22,7 +22,7 @@ jobs: - laravel: 10.* testbench: 8.* - laravel: 11.* - testbench: 8.* + testbench: 9.* exclude: - php: 8.0 laravel: 10.* diff --git a/composer.json b/composer.json index de6d11e..9da5de2 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "friendsofphp/php-cs-fixer": "^3.8", "nunomaduro/collision": "^6.0|^7.0", "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^7.0|^8.0", + "orchestra/testbench": "^7.0|^8.0|^9.0", "pestphp/pest": "^1|^2", "pestphp/pest-plugin-laravel": "^1.1|^2.0", "phpstan/extension-installer": "^1.1", From 974ce060a34a05b51d9f5959f59c663b1258b4a2 Mon Sep 17 00:00:00 2001 From: jim Date: Tue, 27 Feb 2024 16:07:41 +0000 Subject: [PATCH 3/3] Remove collision --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 9da5de2..0d2d04b 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,6 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.8", - "nunomaduro/collision": "^6.0|^7.0", "nunomaduro/larastan": "^2.0.1", "orchestra/testbench": "^7.0|^8.0|^9.0", "pestphp/pest": "^1|^2",