From a284f599c146678fd2f5b53efa67620c9066050b Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 18 Feb 2025 18:29:17 +0000 Subject: [PATCH 1/2] Bump dependencies for Laravel 12 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 26a21ce6..bca5a24f 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "php": "^8.2", "ext-json": "*", "laravel-json-api/neomerx-json-api": "^5.0.3", - "laravel/framework": "^11.0", + "laravel/framework": "^11.0|^12.0", "nyholm/psr7": "^1.8", "ramsey/uuid": "^4.0", "symfony/psr-http-message-bridge": "^7.0" @@ -37,8 +37,8 @@ "laravel/legacy-factories": "^1.4.0", "laravel/ui": "^4.4", "mockery/mockery": "^1.6", - "orchestra/testbench": "^9.0", - "phpunit/phpunit": "^10.5" + "orchestra/testbench": "^9.0|^10.0", + "phpunit/phpunit": "^10.5|^11.5.3" }, "suggest": { "cloudcreativity/json-api-testing": "Required to use the test helpers." From a5d97651a13b40f5ca737343d2914119e6bb7d4f Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 18 Feb 2025 18:29:17 +0000 Subject: [PATCH 2/2] Update GitHub Actions for Laravel 12 --- .github/workflows/tests.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c92f166a..23b752bb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,20 +2,23 @@ name: Tests on: push: - branches: [ main, develop ] + branches: + - main + - develop pull_request: - branches: [ main, develop ] + branches: + - main + - develop jobs: build: - runs-on: ubuntu-latest strategy: fail-fast: true matrix: php: [8.2, 8.3, 8.4] - laravel: [11] + laravel: [11, '12'] steps: - name: Checkout Code