Merge branch 'develop' into next

laravel-json-api · Nov 30, 2024 · b0ab711 · b0ab711
2 parents 46291c8 + a22dc37
commit b0ab711
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,8 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3]
-        laravel: [11]
+        php: [8.2, 8.3, 8.4]
 
     steps:
       - name: Checkout Code
@@ -30,9 +29,6 @@ jobs:
           coverage: none
           ini-values: error_reporting=E_ALL
 
-      - name: Set Laravel Version
-        run: composer require "illuminate/contracts:^${{ matrix.laravel }}" --no-update
-
       - name: Install dependencies
         uses: nick-fields/retry@v3
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [4.1.0] - 2024-11-30
+
+### Added
+
+- Allow `laravel-json-api/core` v4 or v5.
+
+### Fixed
+
+- Remove deprecation notices in PHP 8.4.
+
 ## [4.0.0] - 2024-03-14
 
 ### Changed

diff --git a/composer.json b/composer.json
@@ -27,8 +27,8 @@
         "ext-json": "*",
         "illuminate/contracts": "^11.0",
         "illuminate/support": "^11.0",
-        "laravel-json-api/core": "^5.0",
-        "laravel-json-api/neomerx-json-api": "^5.0.2"
+        "laravel-json-api/core": "^6.0",
+        "laravel-json-api/neomerx-json-api": "^5.0.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.5"

diff --git a/phpunit.xml b/phpunit.xml
@@ -13,6 +13,7 @@
          failOnWarning="true"
          failOnDeprecation="true"
          failOnNotice="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
 >
     <coverage/>
     <testsuites>