Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make types of parameter of join method consistent in the Query Builder #48386

Merged
merged 1 commit into from Sep 13, 2023
Merged

Make types of parameter of join method consistent in the Query Builder #48386

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/Illuminate/Database/Query/Builder.php
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
*/
Expand All @@ -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
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down