Prepare for PHP 8.4

staudenmeir · Jul 13, 2024 · c8fe75d · c8fe75d
1 parent fc9dc9c
commit c8fe75d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/HasJsonRelationships.php b/src/HasJsonRelationships.php
@@ -322,9 +322,9 @@ public function hasManyThroughJson(
         string $related,
         string $through,
         string|JsonKey $firstKey,
-        string $secondKey = null,
-        string $localKey = null,
-        string|JsonKey $secondLocalKey = null
+        ?string $secondKey = null,
+        ?string $localKey = null,
+        string|JsonKey|null $secondLocalKey = null
     ) {
         $relationships = [];
 

diff --git a/src/Relations/BelongsToJson.php b/src/Relations/BelongsToJson.php
@@ -328,7 +328,7 @@ public function pivotAttributes(Model $model, Model $parent, array $records)
      * @param \Illuminate\Database\Eloquent\Model|null $model
      * @return array
      */
-    public function getForeignKeys(Model $model = null)
+    public function getForeignKeys(?Model $model = null)
     {
         $model = $model ?: $this->child;
 

diff --git a/src/Relations/Postgres/HasOneOrManyThrough.php b/src/Relations/Postgres/HasOneOrManyThrough.php
@@ -14,7 +14,7 @@ trait HasOneOrManyThrough
      * @param \Illuminate\Database\Eloquent\Builder|null $query
      * @return void
      */
-    protected function performJoin(Builder $query = null)
+    protected function performJoin(?Builder $query = null)
     {
         $query = $query ?: $this->query;
 

diff --git a/src/Relations/Traits/Concatenation/IsConcatenableBelongsToJsonRelation.php b/src/Relations/Traits/Concatenation/IsConcatenableBelongsToJsonRelation.php
@@ -24,7 +24,7 @@ public function appendToDeepRelationship(array $through, array $foreignKeys, arr
         if ($position === 0) {
             $foreignKeys[] = $this->ownerKey;
 
-            $localKeys[] = function (Builder $query, Builder $parentQuery = null) {
+            $localKeys[] = function (Builder $query, ?Builder $parentQuery = null) {
                 if ($parentQuery) {
                     $this->getRelationExistenceQuery($this->query, $parentQuery);
                 }

diff --git a/src/Relations/Traits/Concatenation/IsConcatenableHasManyJsonRelation.php b/src/Relations/Traits/Concatenation/IsConcatenableHasManyJsonRelation.php
@@ -25,7 +25,7 @@ trait IsConcatenableHasManyJsonRelation
     public function appendToDeepRelationship(array $through, array $foreignKeys, array $localKeys, int $position): array
     {
         if ($position === 0) {
-            $foreignKeys[] = function (Builder $query, Builder $parentQuery = null) {
+            $foreignKeys[] = function (Builder $query, ?Builder $parentQuery = null) {
                 if ($parentQuery) {
                     $this->getRelationExistenceQuery($this->query, $parentQuery);
                 }

diff --git a/src/Relations/Traits/IsJsonRelation.php b/src/Relations/Traits/IsJsonRelation.php
@@ -117,7 +117,7 @@ protected function whereJsonContainsOrMemberOf(
         Builder $query,
         string $column,
         mixed $value,
-        callable $objectValueCallback = null,
+        ?callable $objectValueCallback = null,
         string $boolean = 'and'
     ): void {
         $grammar = $this->getJsonGrammar($query);