From b75ee9a187e6f8830605fecbc0ad4053466dd337 Mon Sep 17 00:00:00 2001 From: jordyvanderhaegen Date: Thu, 20 Feb 2025 21:52:22 +0100 Subject: [PATCH 1/2] chore: support laravel 12 --- .github/workflows/main.yml | 10 +++++++++- composer.json | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e961351..9488420 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,9 +14,11 @@ jobs: matrix: os: [ubuntu-latest] php: [8.4, 8.3, 8.2, 8.1, 8.0, 7.4] - laravel: [11.*, 10.*, 9.*, 8.*] + laravel: [12.*, 11.*, 10.*, 9.*, 8.*] stability: [prefer-lowest, prefer-stable] include: + - laravel: 12.* + testbench: 10.* - laravel: 11.* testbench: 9.* - laravel: 10.* @@ -26,6 +28,12 @@ jobs: - laravel: 8.* testbench: ^6.23 exclude: + - laravel: 12.* + php: 7.4 + - laravel: 12.* + php: 8.0 + - laravel: 12.* + php: 8.1 - laravel: 11.* php: 7.4 - laravel: 11.* diff --git a/composer.json b/composer.json index a872607..24015cd 100644 --- a/composer.json +++ b/composer.json @@ -18,13 +18,13 @@ ], "require": { "php": "^7.4|^8.0", - "illuminate/support": "^8.0|^9.0|^10.0|^11.0", - "illuminate/view": "^8.0|^9.0|^10.0|^11.0" + "illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/view": "^8.0|^9.0|^10.0|^11.0|^12.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.5", - "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0", - "phpunit/phpunit": "^9.0|^10.0" + "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0|^10.0", + "phpunit/phpunit": "^9.0|^10.0|^11.0" }, "autoload": { "psr-4": { From 3001ead9e319cf3438e3846c8df0294fc9b2b60c Mon Sep 17 00:00:00 2001 From: jordyvanderhaegen Date: Thu, 20 Feb 2025 21:53:52 +0100 Subject: [PATCH 2/2] chore: remove nestbot carbon requirement --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9488420..d0a369c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -68,7 +68,7 @@ jobs: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.64" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: Execute tests run: vendor/bin/phpunit