Merge branch 'release/3.1.0'

lindyhopchris · lindyhopchris · commit bbf3b31b9779 · 2025-02-24T20:39:08.000Z
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,9 +2,13 @@ name: Tests
 
 on:
   push:
-    branches: [ main, develop ]
+    branches:
+      - main
+      - develop
   pull_request:
-    branches: [ main, develop ]
+    branches:
+      - main
+      - develop
 
 jobs:
   build:
@@ -15,26 +19,34 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.2, 8.3, 8.4]
+        laravel: [11, 12]
+        phpunit: ['10.5', '11.0']
 
     steps:
-    - name: Checkout Code
-      uses: actions/checkout@v4
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php }}
-        extensions: dom, curl, libxml, mbstring, zip
-        tools: composer:v2
-        coverage: none
-        ini-values: error_reporting=E_ALL
-
-    - name: Install dependencies
-      uses: nick-fields/retry@v3
-      with:
-        timeout_minutes: 5
-        max_attempts: 5
-        command: composer update --prefer-dist --no-interaction --no-progress
-
-    - name: Execute tests
-      run: vendor/bin/phpunit
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip
+          tools: composer:v2
+          coverage: none
+          ini-values: error_reporting=E_ALL
+
+      - name: Set Laravel Version
+        run: composer require "illuminate/contracts:^${{ matrix.laravel }}" --no-update
+
+      - name: Set PHPUnit Version
+        run: composer require "phpunit/phpunit:^${{ matrix.phpunit }}" --no-update
+
+      - name: Install dependencies
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer update --prefer-dist --no-interaction --no-progress
+
+      - name: Execute tests
+        run: vendor/bin/phpunit
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [3.1.0] - 2025-02-24
+
+### Added
+
+- Package now supports Laravel 11 and 12.
+
 ## [3.0.2] - 2024-11-30
 
 ### Changed
diff --git a/composer.json b/composer.json
@@ -25,14 +25,14 @@
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "cloudcreativity/json-api-testing": "^6.0.1",
-        "illuminate/http": "^11.0",
-        "illuminate/support": "^11.0",
-        "illuminate/testing": "^11.0"
+        "cloudcreativity/json-api-testing": "^6.1",
+        "illuminate/http": "^11.0|^12.0",
+        "illuminate/support": "^11.0|^12.0",
+        "illuminate/testing": "^11.0|^12.0"
     },
     "require-dev": {
-        "laravel/framework": "^11.0",
-        "phpunit/phpunit": "^10.5"
+        "laravel/framework": "^11.0|^12.0",
+        "phpunit/phpunit": "^10.5|^11.0"
     },
     "autoload": {
         "psr-4": {
