Merge branch 'release/4.1.0'

Author: lindyhopchris

.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:
@@ -14,31 +18,31 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3]
-        laravel: [11]
+        php: [ 8.2, 8.3, 8.4 ]
+        laravel: [ 11, 12 ]
 
     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, pcntl, pdo, sqlite, pdo_sqlite, gd
-        tools: composer:v2
-        coverage: none
-        ini-values: error_reporting=E_ALL
-
-    - name: Set Laravel Version
-      run: composer require "illuminate/database:^${{ matrix.laravel }}" --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
+      - 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, pcntl, pdo, sqlite, pdo_sqlite, gd
+          tools: composer:v2
+          coverage: none
+          ini-values: error_reporting=E_ALL
+
+      - name: Set Laravel Version
+        run: composer require "illuminate/database:^${{ matrix.laravel }}" --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

CHANGELOG.md

@@ -3,7 +3,17 @@
 All notable changes to this project will be documented in this file. This project adheres to
 [Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
 
-## Unreleased (Laravel 11)
+## Unreleased
+
+## [4.1.0] - 2025-02-24
+
+### Added
+
+- Package now supports Laravel 12.
+
+### Fixed
+
+- Remove deprecation notices in PHP 8.4.
 
 ## [4.0.0] - 2024-03-14
 

composer.json

@@ -25,14 +25,14 @@
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "illuminate/database": "^11.0",
-        "illuminate/pagination": "^11.0",
-        "illuminate/support": "^11.0",
-        "laravel-json-api/eloquent": "^4.0"
+        "illuminate/database": "^11.0|^12.0",
+        "illuminate/pagination": "^11.0|^12.0",
+        "illuminate/support": "^11.0|^12.0",
+        "laravel-json-api/eloquent": "^4.5"
     },
     "require-dev": {
-        "orchestra/testbench": "^9.0",
-        "phpunit/phpunit": "^10.5"
+        "orchestra/testbench": "^9.0|^10.0",
+        "phpunit/phpunit": "^10.5|^11.0"
     },
     "autoload": {
         "psr-4": {

src/Cursor/Cursor.php

@@ -38,7 +38,7 @@ class Cursor
      * @param string|null $after
      * @param int|null $limit
      */
-    public function __construct(string $before = null, string $after = null, int $limit = null)
+    public function __construct(?string $before = null, ?string $after = null, ?int $limit = null)
     {
         if (is_int($limit) && 1 > $limit) {
             throw new InvalidArgumentException('Expecting a limit that is 1 or greater.');

src/Cursor/CursorBuilder.php

@@ -65,7 +65,7 @@ class CursorBuilder
      * @param string|null $key
      *      the key column that the before/after cursors related to.
      */
-    public function __construct($query, string $column = null, string $key = null)
+    public function __construct($query, ?string $column = null, ?string $key = null)
     {
         if (!$query instanceof Builder && !$query instanceof Relation) {
             throw new InvalidArgumentException('Expecting an Eloquent query builder or relation.');