From 9042b6e73fa10c630312e98a228303f8cee063b8 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Sun, 26 Jan 2025 09:24:21 +0800 Subject: [PATCH] [2.x] Supports Laravel 12 Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 10 ++++++---- composer.json | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bf5e78d8..e3d2361b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,13 +13,15 @@ jobs: fail-fast: true matrix: php: [8.1, 8.2, 8.3, 8.4] - laravel: [10, 11] + laravel: [10, 11, 12] stability: ["prefer-lowest", "prefer-stable"] exclude: - php: 8.4 laravel: 10 - php: 8.1 laravel: 11 + - php: 8.1 + laravel: 12 name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} (w/ ${{ matrix.stability }}) steps: @@ -52,7 +54,7 @@ jobs: max_attempts: 5 command: | composer require nesbot/carbon:^2.62.1 --dev --${{ matrix.stability }} --no-update --no-interaction - if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest' + if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest' && matrix.laravel < 12 - name: Set Minimum PHP 8.2 Versions and Laravel > 11 uses: nick-fields/retry@v3 @@ -60,8 +62,8 @@ jobs: timeout_minutes: 5 max_attempts: 5 command: | - composer require orchestra/testbench:^9.2 --dev --${{ matrix.stability }} --no-update --no-interaction - composer require phpunit/phpunit:^10.4 --dev --${{ matrix.stability }} --no-update --no-interaction + composer require "orchestra/testbench:^9.2|^10.0" --dev --${{ matrix.stability }} --no-update --no-interaction + composer require "phpunit/phpunit:^10.4|^11.5" --dev --${{ matrix.stability }} --no-update --no-interaction if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest' && matrix.laravel >= 11 - name: Set Laravel version diff --git a/composer.json b/composer.json index 8f02899a..6cf6f0c4 100644 --- a/composer.json +++ b/composer.json @@ -30,14 +30,14 @@ "require": { "php": "^8.1.0", "ext-json": "*", - "laravel/framework": "^10.0|^11.0", + "laravel/framework": "^10.0|^11.0|^12.0", "symfony/console": "^6.2|^7.0" }, "require-dev": { "roave/security-advisories": "dev-master", - "orchestra/testbench": "^8.0|^9.2", + "orchestra/testbench": "^8.0|^9.2|^10.0", "mockery/mockery": "^1.3.3", - "phpunit/phpunit": "^10.4|^11.0", + "phpunit/phpunit": "^10.4|^11.5", "laravel/pint": "^1.16" }, "suggest": {