From 1381fa40276691d8b8b03d9014018dc0100ea680 Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Mon, 26 Feb 2024 17:48:22 +0000 Subject: [PATCH 1/6] Laravel 10 --- .github/workflows/run-tests.yml | 8 +++++++- composer.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 98986ac..24fd073 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,14 +14,20 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] php: [8.2, 8.1, 8.0] - laravel: [10.*, 9.*] + laravel: [11.*, 10.*, 9.*] stability: [prefer-lowest, prefer-stable] include: + - laravel: 11.* + testbench: 9.* - laravel: 10.* testbench: 8.* - laravel: 9.* testbench: ^7.22 exclude: + - php: 8.1 + laravel: 11.* + - php: 8.0 + laravel: 11.* - php: 8.0 laravel: 10.* diff --git a/composer.json b/composer.json index dfddaef..8587d50 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "php": "^8.0", "spatie/laravel-package-tools": "^1.9.2", - "illuminate/contracts": "^9.0|^10.0" + "illuminate/contracts": "^9.0|^10.0|^11.0" }, "require-dev": { "nunomaduro/collision": "^6.0|^7.0", From a360fed04bac836353be8cf5b095076aa8315c4b Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Mon, 26 Feb 2024 17:50:04 +0000 Subject: [PATCH 2/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8587d50..2b547e6 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "require-dev": { "nunomaduro/collision": "^6.0|^7.0", "nunomaduro/larastan": "^2.0", - "orchestra/testbench": "^7.22|^8.0", + "orchestra/testbench": "^7.22|^8.0|^9.0", "pestphp/pest": "^1.21", "pestphp/pest-plugin-laravel": "^1.1", "phpstan/extension-installer": "^1.1", From 0eba293a6bf6d6fe65feff63b9d822c9af4d3b77 Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Mon, 26 Feb 2024 17:51:01 +0000 Subject: [PATCH 3/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2b547e6..0f2ba14 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.5|^10.0", "spatie/laravel-ray": "^1.26" }, "autoload": { From 695ca9aafbefc81a3ad1b28696153d308e6a838b Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Mon, 26 Feb 2024 17:52:58 +0000 Subject: [PATCH 4/6] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 0f2ba14..0dd908f 100644 --- a/composer.json +++ b/composer.json @@ -24,8 +24,8 @@ "nunomaduro/collision": "^6.0|^7.0", "nunomaduro/larastan": "^2.0", "orchestra/testbench": "^7.22|^8.0|^9.0", - "pestphp/pest": "^1.21", - "pestphp/pest-plugin-laravel": "^1.1", + "pestphp/pest": "^1.21|^2.0", + "pestphp/pest-plugin-laravel": "^1.1|^2.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", From 9750a7f9e17fa03c95c0d64ed427903568493300 Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Mon, 26 Feb 2024 17:53:42 +0000 Subject: [PATCH 5/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0dd908f..2f3ccf0 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "illuminate/contracts": "^9.0|^10.0|^11.0" }, "require-dev": { - "nunomaduro/collision": "^6.0|^7.0", + "nunomaduro/collision": "^6.0|^7.0|^8.0", "nunomaduro/larastan": "^2.0", "orchestra/testbench": "^7.22|^8.0|^9.0", "pestphp/pest": "^1.21|^2.0", From 3b3953783e7396579089a2b00d53ea08df5fcf47 Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Mon, 26 Feb 2024 18:02:22 +0000 Subject: [PATCH 6/6] drop laravel 9 & php 8.0 --- .github/workflows/phpstan.yml | 2 +- .github/workflows/run-tests.yml | 8 ++------ composer.json | 14 +++++++------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 19d6402..cbaaeee 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -16,7 +16,7 @@ jobs: - 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 24fd073..03aa9a6 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,23 +13,19 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] - php: [8.2, 8.1, 8.0] - laravel: [11.*, 10.*, 9.*] + php: [8.2, 8.1] + laravel: [11.*, 10.*] stability: [prefer-lowest, prefer-stable] include: - laravel: 11.* testbench: 9.* - laravel: 10.* testbench: 8.* - - laravel: 9.* - testbench: ^7.22 exclude: - php: 8.1 laravel: 11.* - php: 8.0 laravel: 11.* - - php: 8.0 - laravel: 10.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index 2f3ccf0..73c6cbb 100644 --- a/composer.json +++ b/composer.json @@ -16,20 +16,20 @@ } ], "require": { - "php": "^8.0", + "php": "^8.1", "spatie/laravel-package-tools": "^1.9.2", - "illuminate/contracts": "^9.0|^10.0|^11.0" + "illuminate/contracts": "^10.0|^11.0" }, "require-dev": { - "nunomaduro/collision": "^6.0|^7.0|^8.0", + "nunomaduro/collision": "^7.0|^8.0", "nunomaduro/larastan": "^2.0", - "orchestra/testbench": "^7.22|^8.0|^9.0", - "pestphp/pest": "^1.21|^2.0", - "pestphp/pest-plugin-laravel": "^1.1|^2.0", + "orchestra/testbench": "^8.0|^9.0", + "pestphp/pest": "^2.0", + "pestphp/pest-plugin-laravel": "^2.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^9.5|^10.0", + "phpunit/phpunit": "^10.0", "spatie/laravel-ray": "^1.26" }, "autoload": {