From 0429a6f274724415df233164bdbe860cbefe5a5f Mon Sep 17 00:00:00 2001 From: melicerte Date: Wed, 13 Sep 2023 20:04:36 +0200 Subject: [PATCH] Make types of parameter of join method consistent in the Query Builder (#48386) Co-authored-by: Etienne --- src/Illuminate/Database/Query/Builder.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php index 9f756c48114e..3aa2b542e10e 100755 --- a/src/Illuminate/Database/Query/Builder.php +++ b/src/Illuminate/Database/Query/Builder.php @@ -512,7 +512,7 @@ public function ignoreIndex($index) * @param \Illuminate\Contracts\Database\Query\Expression|string $table * @param \Closure|string $first * @param string|null $operator - * @param string|null $second + * @param \Illuminate\Contracts\Database\Query\Expression|string|null $second * @param string $type * @param bool $where * @return $this @@ -552,7 +552,7 @@ public function join($table, $first, $operator = null, $second = null, $type = ' * @param \Illuminate\Contracts\Database\Query\Expression|string $table * @param \Closure|string $first * @param string $operator - * @param string $second + * @param \Illuminate\Contracts\Database\Query\Expression|string $second * @param string $type * @return $this */ @@ -568,7 +568,7 @@ public function joinWhere($table, $first, $operator, $second, $type = 'inner') * @param string $as * @param \Closure|string $first * @param string|null $operator - * @param string|null $second + * @param \Illuminate\Contracts\Database\Query\Expression|string|null $second * @param string $type * @param bool $where * @return $this @@ -592,7 +592,7 @@ public function joinSub($query, $as, $first, $operator = null, $second = null, $ * @param \Illuminate\Contracts\Database\Query\Expression|string $table * @param \Closure|string $first * @param string|null $operator - * @param string|null $second + * @param \Illuminate\Contracts\Database\Query\Expression|string|null $second * @return $this */ public function leftJoin($table, $first, $operator = null, $second = null) @@ -606,7 +606,7 @@ public function leftJoin($table, $first, $operator = null, $second = null) * @param \Illuminate\Contracts\Database\Query\Expression|string $table * @param \Closure|string $first * @param string $operator - * @param string $second + * @param \Illuminate\Contracts\Database\Query\Expression|string|null $second * @return $this */ public function leftJoinWhere($table, $first, $operator, $second) @@ -621,7 +621,7 @@ public function leftJoinWhere($table, $first, $operator, $second) * @param string $as * @param \Closure|string $first * @param string|null $operator - * @param string|null $second + * @param \Illuminate\Contracts\Database\Query\Expression|string|null $second * @return $this */ public function leftJoinSub($query, $as, $first, $operator = null, $second = null) @@ -635,7 +635,7 @@ public function leftJoinSub($query, $as, $first, $operator = null, $second = nul * @param \Illuminate\Contracts\Database\Query\Expression|string $table * @param \Closure|string $first * @param string|null $operator - * @param string|null $second + * @param \Illuminate\Contracts\Database\Query\Expression|string|null $second * @return $this */ public function rightJoin($table, $first, $operator = null, $second = null) @@ -649,7 +649,7 @@ public function rightJoin($table, $first, $operator = null, $second = null) * @param \Illuminate\Contracts\Database\Query\Expression|string $table * @param \Closure|string $first * @param string $operator - * @param string $second + * @param \Illuminate\Contracts\Database\Query\Expression|string $second * @return $this */ public function rightJoinWhere($table, $first, $operator, $second) @@ -664,7 +664,7 @@ public function rightJoinWhere($table, $first, $operator, $second) * @param string $as * @param \Closure|string $first * @param string|null $operator - * @param string|null $second + * @param \Illuminate\Contracts\Database\Query\Expression|string|null $second * @return $this */ public function rightJoinSub($query, $as, $first, $operator = null, $second = null) @@ -678,7 +678,7 @@ public function rightJoinSub($query, $as, $first, $operator = null, $second = nu * @param \Illuminate\Contracts\Database\Query\Expression|string $table * @param \Closure|string|null $first * @param string|null $operator - * @param string|null $second + * @param \Illuminate\Contracts\Database\Query\Expression|string|null $second * @return $this */ public function crossJoin($table, $first = null, $operator = null, $second = null)