Merge branch 'release/4.4.0'

.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 "illuminate/database:^${{ 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

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [4.4.0] - 2024-11-30
+
+### Added
+
+- Allow `laravel-json-api/core` v4 and v5.
+
+### Fixed
+
+- Remove deprecation notices in PHP 8.4.
+
 ## [4.3.1] - 2024-10-31
 
 ### Fixed

composer.json

@@ -27,7 +27,7 @@
         "ext-json": "*",
         "illuminate/database": "^11.0",
         "illuminate/support": "^11.0",
-        "laravel-json-api/core": "^4.0"
+        "laravel-json-api/core": "^4.3.2|^5.0.1"
     },
     "require-dev": {
         "orchestra/testbench": "^9.0",
@@ -50,7 +50,7 @@
             "dev-develop": "4.x-dev"
         }
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true,
     "config": {
         "sort-packages": true

phpunit.xml

@@ -13,6 +13,7 @@
          failOnWarning="true"
          failOnDeprecation="true"
          failOnNotice="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
 >
     <coverage/>
     <testsuites>

src/Fields/ArrayHash.php

@@ -55,7 +55,7 @@ class ArrayHash extends Attribute
      * @param string|null $column
      * @return ArrayHash
      */
-    public static function make(string $fieldName, string $column = null): self
+    public static function make(string $fieldName, ?string $column = null): self
     {
         return new self($fieldName, $column);
     }

src/Fields/ArrayList.php

@@ -30,7 +30,7 @@ class ArrayList extends Attribute
      * @param string|null $column
      * @return ArrayList
      */
-    public static function make(string $fieldName, string $column = null): self
+    public static function make(string $fieldName, ?string $column = null): self
     {
         return new self($fieldName, $column);
     }

src/Fields/Attribute.php

@@ -91,7 +91,7 @@ abstract protected function assertValue($value): void;
      * @param string $fieldName
      * @param string|null $column
      */
-    public function __construct(string $fieldName, string $column = null)
+    public function __construct(string $fieldName, ?string $column = null)
     {
         if (empty($fieldName)) {
             throw new InvalidArgumentException('Expecting a non-empty string field name.');

src/Fields/Boolean.php

@@ -21,7 +21,7 @@ class Boolean extends Attribute
      * @param string|null $column
      * @return Boolean
      */
-    public static function make(string $fieldName, string $column = null): self
+    public static function make(string $fieldName, ?string $column = null): self
     {
         return new self($fieldName, $column);
     }

src/Fields/DateTime.php

@@ -37,7 +37,7 @@ class DateTime extends Attribute
      * @param string|null $column
      * @return static
      */
-    public static function make(string $fieldName, string $column = null): self
+    public static function make(string $fieldName, ?string $column = null): self
     {
         return new static($fieldName, $column);
     }

src/Fields/ID.php

@@ -36,7 +36,7 @@ class ID implements IDContract, Fillable
      * @param string|null $column
      * @return static
      */
-    public static function make(string $column = null): self
+    public static function make(?string $column = null): self
     {
         return new static($column);
     }
@@ -46,7 +46,7 @@ public static function make(string $column = null): self
      *
      * @param string|null $column
      */
-    public function __construct(string $column = null)
+    public function __construct(?string $column = null)
     {
         $this->column = $column ?: null;
         $this->sortable();

src/Fields/Number.php

@@ -27,7 +27,7 @@ class Number extends Attribute
      * @param string|null $column
      * @return Number
      */
-    public static function make(string $fieldName, string $column = null): self
+    public static function make(string $fieldName, ?string $column = null): self
     {
         return new self($fieldName, $column);
     }

src/Fields/Relations/BelongsTo.php

@@ -26,7 +26,7 @@ class BelongsTo extends ToOne implements FillableToOne
      * @param string|null $relation
      * @return static
      */
-    public static function make(string $fieldName, string $relation = null): BelongsTo
+    public static function make(string $fieldName, ?string $relation = null): BelongsTo
     {
         return new static($fieldName, $relation);
     }
@@ -37,7 +37,7 @@ public static function make(string $fieldName, string $relation = null): Belongs
      * @param string $fieldName
      * @param string|null $relation
      */
-    public function __construct(string $fieldName, string $relation = null)
+    public function __construct(string $fieldName, ?string $relation = null)
     {
         parent::__construct($fieldName, $relation);
         $this->mustValidate();

src/Fields/Relations/BelongsToMany.php

@@ -31,7 +31,7 @@ class BelongsToMany extends ToMany implements FillableToMany
      * @param string|null $relation
      * @return BelongsToMany
      */
-    public static function make(string $fieldName, string $relation = null): BelongsToMany
+    public static function make(string $fieldName, ?string $relation = null): BelongsToMany
     {
         return new self($fieldName, $relation);
     }

src/Fields/Relations/HasMany.php

@@ -46,7 +46,7 @@ class HasMany extends ToMany implements FillableToMany
      * @param string|null $relation
      * @return HasMany
      */
-    public static function make(string $fieldName, string $relation = null): HasMany
+    public static function make(string $fieldName, ?string $relation = null): HasMany
     {
         return new self($fieldName, $relation);
     }

src/Fields/Relations/HasManyThrough.php

@@ -21,7 +21,7 @@ class HasManyThrough extends ToMany
      * @param string|null $relation
      * @return HasManyThrough
      */
-    public static function make(string $fieldName, string $relation = null): HasManyThrough
+    public static function make(string $fieldName, ?string $relation = null): HasManyThrough
     {
         return new self($fieldName, $relation);
     }

src/Fields/Relations/HasOne.php

@@ -44,7 +44,7 @@ class HasOne extends ToOne implements FillableToOne
      * @param string|null $relation
      * @return HasOne
      */
-    public static function make(string $fieldName, string $relation = null): HasOne
+    public static function make(string $fieldName, ?string $relation = null): HasOne
     {
         return new self($fieldName, $relation);
     }

src/Fields/Relations/HasOneThrough.php

@@ -21,7 +21,7 @@ class HasOneThrough extends ToOne
      * @param string|null $relation
      * @return HasOneThrough
      */
-    public static function make(string $fieldName, string $relation = null): HasOneThrough
+    public static function make(string $fieldName, ?string $relation = null): HasOneThrough
     {
         return new self($fieldName, $relation);
     }

src/Fields/Relations/Relation.php

@@ -89,7 +89,7 @@ abstract protected function guessInverse(): string;
      * @param string $fieldName
      * @param string|null $relation
      */
-    public function __construct(string $fieldName, string $relation = null)
+    public function __construct(string $fieldName, ?string $relation = null)
     {
         $this->name = $fieldName;
         $this->relation = $relation;

src/Fields/SoftDelete.php

@@ -32,7 +32,7 @@ class SoftDelete extends DateTime
      * @param string $fieldName
      * @param string|null $column
      */
-    public function __construct(string $fieldName, string $column = null)
+    public function __construct(string $fieldName, ?string $column = null)
     {
         parent::__construct($fieldName, $column);
         $this->unguarded();

src/Fields/Str.php

@@ -21,7 +21,7 @@ class Str extends Attribute
      * @param string|null $column
      * @return Str
      */
-    public static function make(string $fieldName, string $column = null): self
+    public static function make(string $fieldName, ?string $column = null): self
     {
         return new self($fieldName, $column);
     }

src/Filters/Has.php

@@ -30,7 +30,7 @@ class Has implements Filter
      * @param string|null $key
      * @return static
      */
-    public static function make(Schema $schema, string $fieldName, string $key = null)
+    public static function make(Schema $schema, string $fieldName, ?string $key = null)
     {
         return new static($schema, $fieldName, $key);
     }
@@ -42,7 +42,7 @@ public static function make(Schema $schema, string $fieldName, string $key = nul
      * @param string $fieldName
      * @param string|null $key
      */
-    public function __construct(Schema $schema, string $fieldName, string $key = null)
+    public function __construct(Schema $schema, string $fieldName, ?string $key = null)
     {
         $this->schema = $schema;
         $this->fieldName = $fieldName;

src/Filters/Scope.php

@@ -37,7 +37,7 @@ class Scope implements Filter
      * @param string|null $scope
      * @return static
      */
-    public static function make(string $name, string $scope = null)
+    public static function make(string $name, ?string $scope = null)
     {
         return new static($name, $scope);
     }
@@ -48,7 +48,7 @@ public static function make(string $name, string $scope = null)
      * @param string $name
      * @param string|null $scope
      */
-    public function __construct(string $name, string $scope = null)
+    public function __construct(string $name, ?string $scope = null)
     {
         $this->name = $name;
         $this->scope = $scope ?: $this->guessScope();

src/Filters/Where.php

@@ -34,7 +34,7 @@ class Where implements Filter
      * @param string|null $column
      * @return static
      */
-    public static function make(string $name, string $column = null): self
+    public static function make(string $name, ?string $column = null): self
     {
         return new static($name, $column);
     }
@@ -45,7 +45,7 @@ public static function make(string $name, string $column = null): self
      * @param string $name
      * @param string|null $column
      */
-    public function __construct(string $name, string $column = null)
+    public function __construct(string $name, ?string $column = null)
     {
         $this->name = $name;
         $this->column = $column ?: $this->guessColumn();

src/Filters/WhereAll.php

@@ -34,7 +34,7 @@ class WhereAll implements Filter
      * @param array<string>|null $columns
      * @return static
      */
-    public static function make(string $name, array $columns = null): static
+    public static function make(string $name, ?array $columns = null): static
     {
         return new static($name, $columns);
     }
@@ -45,7 +45,7 @@ public static function make(string $name, array $columns = null): static
      * @param string $name
      * @param array<string>|null $columns
     */
-    public function __construct(string $name, array $columns = null)
+    public function __construct(string $name, ?array $columns = null)
     {
         $this->name = $name;
         $this->columns = $columns ?? [];

src/Filters/WhereAny.php

@@ -34,7 +34,7 @@ class WhereAny implements Filter
      * @param array<string>|null $columns
      * @return static
      */
-    public static function make(string $name, array $columns = null): static
+    public static function make(string $name, ?array $columns = null): static
     {
         return new static($name, $columns);
     }
@@ -45,7 +45,7 @@ public static function make(string $name, array $columns = null): static
      * @param string $name
      * @param array<string>|null $columns
     */
-    public function __construct(string $name, array $columns = null)
+    public function __construct(string $name, ?array $columns = null)
     {
         $this->name = $name;
         $this->columns = $columns ?? [];

src/Filters/WhereHas.php

@@ -33,7 +33,7 @@ class WhereHas implements Filter
      * @param string|null $key
      * @return static
      */
-    public static function make(Schema $schema, string $fieldName, string $key = null)
+    public static function make(Schema $schema, string $fieldName, ?string $key = null)
     {
         return new static($schema, $fieldName, $key);
     }
@@ -45,7 +45,7 @@ public static function make(Schema $schema, string $fieldName, string $key = nul
      * @param string $fieldName
      * @param string|null $key
      */
-    public function __construct(Schema $schema, string $fieldName, string $key = null)
+    public function __construct(Schema $schema, string $fieldName, ?string $key = null)
     {
         $this->schema = $schema;
         $this->fieldName = $fieldName;

src/Filters/WhereIdIn.php

@@ -45,7 +45,7 @@ class WhereIdIn implements Filter
      * @param string|null $key
      * @return static
      */
-    public static function make(Schema $schema, string $key = null): self
+    public static function make(Schema $schema, ?string $key = null): self
     {
         if ($schema instanceof EloquentSchema) {
             return new static(

src/Filters/WhereIn.php

@@ -33,7 +33,7 @@ class WhereIn implements Filter
      * @param string|null $column
      * @return static
      */
-    public static function make(string $name, string $column = null): self
+    public static function make(string $name, ?string $column = null): self
     {
         return new static($name, $column);
     }
@@ -44,7 +44,7 @@ public static function make(string $name, string $column = null): self
      * @param string $name
      * @param string|null $column
      */
-    public function __construct(string $name, string $column = null)
+    public function __construct(string $name, ?string $column = null)
     {
         $this->name = $name;
         $this->column = $column ?: $this->guessColumn();

src/Filters/WhereNull.php

@@ -32,7 +32,7 @@ class WhereNull implements Filter
      *
      * @return static
      */
-    public static function make(string $name, string $column = null): self
+    public static function make(string $name, ?string $column = null): self
     {
         return new static($name, $column);
     }
@@ -42,7 +42,7 @@ public static function make(string $name, string $column = null): self
      *
      * @param string|null $column
      */
-    public function __construct(string $name, string $column = null)
+    public function __construct(string $name, ?string $column = null)
     {
         $this->name = $name;
         $this->column = $column ?: $this->guessColumn();

src/ProxySchema.php

@@ -55,7 +55,7 @@ public function isModel($model): bool
      * @param Model|null $model
      * @return ProxyContract
      */
-    public function newProxy(Model $model = null): ProxyContract
+    public function newProxy(?Model $model = null): ProxyContract
     {
         $proxyClass = $this->model();
 

src/QueryBuilder/Applicators/FilterApplicator.php

@@ -50,7 +50,7 @@ class FilterApplicator
      * @param SchemaRelation|null $relation
      * @return static
      */
-    public static function make(Schema $schema, SchemaRelation $relation = null): self
+    public static function make(Schema $schema, ?SchemaRelation $relation = null): self
     {
         return new self($schema, $relation);
     }