Merge branch 'release/3.1.0'

lindyhopchris · lindyhopchris · commit f696228b8a1d · 2025-01-18T16:16:13.000Z
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,8 +14,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3]
-        laravel: [11]
+        php: [8.2, 8.3, 8.4]
+        core: ['4.3.2', '5.0.1']
 
     steps:
     - name: Checkout Code
@@ -30,8 +30,8 @@ jobs:
         coverage: none
         ini-values: error_reporting=E_ALL
 
-    - name: Set Laravel Version
-      run: composer require "laravel/framework:^${{ matrix.laravel }}" --no-update
+    - name: Set Laravel JSON:API Core Version
+      run: composer require "laravel-json-api/core:^${{ matrix.core }}" --no-update
 
     - name: Install dependencies
       uses: nick-fields/retry@v3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [3.1.0] - 2025-01-18
+
+### Added
+
+- Support `laravel-json-api/core` v4 and v5.
+- Remove deprecation messages in PHP 8.4.
+
 ## [3.0.0] - 2024-03-28
 
 ### Changed
diff --git a/composer.json b/composer.json
@@ -24,8 +24,8 @@
     ],
     "require": {
         "php": "^8.2",
-        "laravel-json-api/core": "^4.0",
-        "laravel-json-api/eloquent": "^4.0",
+        "laravel-json-api/core": "^4.3.2|^5.0.1",
+        "laravel-json-api/eloquent": "^4.4",
         "vinkla/hashids": "^12.0"
     },
     "require-dev": {
diff --git a/src/HashId.php b/src/HashId.php
@@ -64,7 +64,7 @@ public static function withDefaultConnection(?string $connection): void
      *
      * @param string|null $column
      */
-    public function __construct(string $column = null)
+    public function __construct(?string $column = null)
     {
         parent::__construct($column);
         $this->matchAs('[a-zA-Z0-9]+');

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public static function withDefaultConnection(?string $connection): void`
`64`	`64`	`*`
`65`	`65`	`* @param string\|null $column`
`66`	`66`	`*/`
`67`		`- public function __construct(string $column = null)`
	`67`	`+ public function __construct(?string $column = null)`
`68`	`68`	`{`
`69`	`69`	`parent::__construct($column);`
`70`	`70`	`$this->matchAs('[a-zA-Z0-9]+');`