Adjust to Laravel changes

staudenmeir · Feb 2, 2025 · 8889652 · 8889652
1 parent c99fe1a
commit 8889652
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/src/Grammars/JsonGrammar.php b/src/Grammars/JsonGrammar.php
@@ -9,7 +9,7 @@ interface JsonGrammar
     /**
      * Compile a "JSON array" statement into SQL.
      *
-     * @param string|\Illuminate\Database\Query\Expression $column
+     * @param string|\Illuminate\Database\Query\Expression<*> $column
      * @return string
      */
     public function compileJsonArray($column);

diff --git a/src/Grammars/PostgresGrammar.php b/src/Grammars/PostgresGrammar.php
@@ -12,7 +12,7 @@ class PostgresGrammar extends Base implements JsonGrammar
     /**
      * Compile a "JSON array" statement into SQL.
      *
-     * @param string|\Illuminate\Database\Query\Expression $column
+     * @param string|\Illuminate\Database\Query\Expression<*> $column
      * @return string
      */
     public function compileJsonArray($column)

diff --git a/src/Grammars/SQLiteGrammar.php b/src/Grammars/SQLiteGrammar.php
@@ -11,7 +11,7 @@ class SQLiteGrammar extends Base implements JsonGrammar
     /**
      * Compile a "JSON array" statement into SQL.
      *
-     * @param string|\Illuminate\Database\Query\Expression $column
+     * @param string|\Illuminate\Database\Query\Expression<*> $column
      * @return string
      */
     public function compileJsonArray($column)

diff --git a/src/Grammars/SqlServerGrammar.php b/src/Grammars/SqlServerGrammar.php
@@ -11,7 +11,7 @@ class SqlServerGrammar extends Base implements JsonGrammar
     /**
      * Compile a "JSON array" statement into SQL.
      *
-     * @param string|\Illuminate\Database\Query\Expression $column
+     * @param string|\Illuminate\Database\Query\Expression<*> $column
      * @return string
      */
     public function compileJsonArray($column)

diff --git a/src/Grammars/Traits/CompilesMySqlJsonQueries.php b/src/Grammars/Traits/CompilesMySqlJsonQueries.php
@@ -10,7 +10,7 @@ trait CompilesMySqlJsonQueries
     /**
      * Compile a "JSON array" statement into SQL.
      *
-     * @param string|\Illuminate\Database\Query\Expression $column
+     * @param string|\Illuminate\Database\Query\Expression<*> $column
      * @return string
      */
     public function compileJsonArray($column)

diff --git a/src/Relations/Postgres/IsPostgresRelation.php b/src/Relations/Postgres/IsPostgresRelation.php
@@ -16,7 +16,7 @@ trait IsPostgresRelation
      * @param \Illuminate\Database\Eloquent\Model $model
      * @param string $column
      * @param string $key
-     * @return \Illuminate\Database\Query\Expression
+     * @return \Illuminate\Database\Query\Expression<*>
      */
     protected function jsonColumn(Builder $query, Model $model, $column, $key)
     {

diff --git a/src/Relations/Traits/Concatenation/IsConcatenableHasManyJsonRelation.php b/src/Relations/Traits/Concatenation/IsConcatenableHasManyJsonRelation.php
@@ -64,7 +64,7 @@ public function appendToDeepRelationship(array $through, array $foreignKeys, arr
      * Get the custom through key for an eager load of the relation.
      *
      * @param string $alias
-     * @return \Illuminate\Database\Query\Expression
+     * @return \Illuminate\Database\Query\Expression<*>
      */
     public function getThroughKeyForDeepRelationships(string $alias): Expression
     {

diff --git a/src/Relations/Traits/Concatenation/IsConcatenableRelation.php b/src/Relations/Traits/Concatenation/IsConcatenableRelation.php
@@ -36,7 +36,7 @@ public function mergeWhereConstraints(Builder $query, Builder $from): Builder
         /** @var array<int, mixed> $whereBindings */
         $whereBindings = $from->getQuery()->getRawBindings()['where'] ?? [];
 
-        $wheres = $from->getQuery()->wheres ?? [];
+        $wheres = $from->getQuery()->wheres;
 
         $query->withoutGlobalScopes(
             $from->removedScopes()