Skip to content

Commit 0429a6f

Browse files
Make types of parameter of join method consistent in the Query Builder (#48386)
Co-authored-by: Etienne <[email protected]>
1 parent dbfd495 commit 0429a6f

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/Illuminate/Database/Query/Builder.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ public function ignoreIndex($index)
512512
* @param \Illuminate\Contracts\Database\Query\Expression|string $table
513513
* @param \Closure|string $first
514514
* @param string|null $operator
515-
* @param string|null $second
515+
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
516516
* @param string $type
517517
* @param bool $where
518518
* @return $this
@@ -552,7 +552,7 @@ public function join($table, $first, $operator = null, $second = null, $type = '
552552
* @param \Illuminate\Contracts\Database\Query\Expression|string $table
553553
* @param \Closure|string $first
554554
* @param string $operator
555-
* @param string $second
555+
* @param \Illuminate\Contracts\Database\Query\Expression|string $second
556556
* @param string $type
557557
* @return $this
558558
*/
@@ -568,7 +568,7 @@ public function joinWhere($table, $first, $operator, $second, $type = 'inner')
568568
* @param string $as
569569
* @param \Closure|string $first
570570
* @param string|null $operator
571-
* @param string|null $second
571+
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
572572
* @param string $type
573573
* @param bool $where
574574
* @return $this
@@ -592,7 +592,7 @@ public function joinSub($query, $as, $first, $operator = null, $second = null, $
592592
* @param \Illuminate\Contracts\Database\Query\Expression|string $table
593593
* @param \Closure|string $first
594594
* @param string|null $operator
595-
* @param string|null $second
595+
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
596596
* @return $this
597597
*/
598598
public function leftJoin($table, $first, $operator = null, $second = null)
@@ -606,7 +606,7 @@ public function leftJoin($table, $first, $operator = null, $second = null)
606606
* @param \Illuminate\Contracts\Database\Query\Expression|string $table
607607
* @param \Closure|string $first
608608
* @param string $operator
609-
* @param string $second
609+
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
610610
* @return $this
611611
*/
612612
public function leftJoinWhere($table, $first, $operator, $second)
@@ -621,7 +621,7 @@ public function leftJoinWhere($table, $first, $operator, $second)
621621
* @param string $as
622622
* @param \Closure|string $first
623623
* @param string|null $operator
624-
* @param string|null $second
624+
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
625625
* @return $this
626626
*/
627627
public function leftJoinSub($query, $as, $first, $operator = null, $second = null)
@@ -635,7 +635,7 @@ public function leftJoinSub($query, $as, $first, $operator = null, $second = nul
635635
* @param \Illuminate\Contracts\Database\Query\Expression|string $table
636636
* @param \Closure|string $first
637637
* @param string|null $operator
638-
* @param string|null $second
638+
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
639639
* @return $this
640640
*/
641641
public function rightJoin($table, $first, $operator = null, $second = null)
@@ -649,7 +649,7 @@ public function rightJoin($table, $first, $operator = null, $second = null)
649649
* @param \Illuminate\Contracts\Database\Query\Expression|string $table
650650
* @param \Closure|string $first
651651
* @param string $operator
652-
* @param string $second
652+
* @param \Illuminate\Contracts\Database\Query\Expression|string $second
653653
* @return $this
654654
*/
655655
public function rightJoinWhere($table, $first, $operator, $second)
@@ -664,7 +664,7 @@ public function rightJoinWhere($table, $first, $operator, $second)
664664
* @param string $as
665665
* @param \Closure|string $first
666666
* @param string|null $operator
667-
* @param string|null $second
667+
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
668668
* @return $this
669669
*/
670670
public function rightJoinSub($query, $as, $first, $operator = null, $second = null)
@@ -678,7 +678,7 @@ public function rightJoinSub($query, $as, $first, $operator = null, $second = nu
678678
* @param \Illuminate\Contracts\Database\Query\Expression|string $table
679679
* @param \Closure|string|null $first
680680
* @param string|null $operator
681-
* @param string|null $second
681+
* @param \Illuminate\Contracts\Database\Query\Expression|string|null $second
682682
* @return $this
683683
*/
684684
public function crossJoin($table, $first = null, $operator = null, $second = null)

0 commit comments

Comments
 (0)