Skip to content

Commit 757a007

Browse files
morozovmorozov
committed
Merge branch 'fix/#2384-fluent-methods-in-query-builder-are-now-documented-as-returning-this' into 2.5
Backport #2384 to 2.5.x
2 parents 76b65d7 + 104b291 commit 757a007

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

‎lib/Doctrine/DBAL/Query/QueryBuilder.php‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ public function getSQL()
266266
* @param mixed $value The parameter value.
267267
* @param string|null $type One of the PDO::PARAM_* constants.
268268
*
269-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
269+
* @return $this This QueryBuilder instance.
270270
*/
271271
public function setParameter($key, $value, $type = null)
272272
{
@@ -296,7 +296,7 @@ public function setParameter($key, $value, $type = null)
296296
* @param array $params The query parameters to set.
297297
* @param array $types The query parameters types to set.
298298
*
299-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
299+
* @return $this This QueryBuilder instance.
300300
*/
301301
public function setParameters(array $params, array $types = array())
302302
{
@@ -355,7 +355,7 @@ public function getParameterType($key)
355355
*
356356
* @param integer $firstResult The first result to return.
357357
*
358-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
358+
* @return $this This QueryBuilder instance.
359359
*/
360360
public function setFirstResult($firstResult)
361361
{
@@ -381,7 +381,7 @@ public function getFirstResult()
381381
*
382382
* @param integer $maxResults The maximum number of results to retrieve.
383383
*
384-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
384+
* @return $this This QueryBuilder instance.
385385
*/
386386
public function setMaxResults($maxResults)
387387
{
@@ -412,7 +412,7 @@ public function getMaxResults()
412412
* @param string $sqlPart
413413
* @param boolean $append
414414
*
415-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
415+
* @return $this This QueryBuilder instance.
416416
*/
417417
public function add($sqlPartName, $sqlPart, $append = false)
418418
{
@@ -460,7 +460,7 @@ public function add($sqlPartName, $sqlPart, $append = false)
460460
*
461461
* @param mixed $select The selection expressions.
462462
*
463-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
463+
* @return $this This QueryBuilder instance.
464464
*/
465465
public function select($select = null)
466466
{
@@ -488,7 +488,7 @@ public function select($select = null)
488488
*
489489
* @param mixed $select The selection expression.
490490
*
491-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
491+
* @return $this This QueryBuilder instance.
492492
*/
493493
public function addSelect($select = null)
494494
{
@@ -517,7 +517,7 @@ public function addSelect($select = null)
517517
* @param string $delete The table whose rows are subject to the deletion.
518518
* @param string $alias The table alias used in the constructed query.
519519
*
520-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
520+
* @return $this This QueryBuilder instance.
521521
*/
522522
public function delete($delete = null, $alias = null)
523523
{
@@ -547,7 +547,7 @@ public function delete($delete = null, $alias = null)
547547
* @param string $update The table whose rows are subject to the update.
548548
* @param string $alias The table alias used in the constructed query.
549549
*
550-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
550+
* @return $this This QueryBuilder instance.
551551
*/
552552
public function update($update = null, $alias = null)
553553
{
@@ -580,7 +580,7 @@ public function update($update = null, $alias = null)
580580
*
581581
* @param string $insert The table into which the rows should be inserted.
582582
*
583-
* @return QueryBuilder This QueryBuilder instance.
583+
* @return $this This QueryBuilder instance.
584584
*/
585585
public function insert($insert = null)
586586
{
@@ -608,7 +608,7 @@ public function insert($insert = null)
608608
* @param string $from The table.
609609
* @param string|null $alias The alias of the table.
610610
*
611-
* @return QueryBuilder This QueryBuilder instance.
611+
* @return $this This QueryBuilder instance.
612612
*/
613613
public function from($from, $alias = null)
614614
{
@@ -633,7 +633,7 @@ public function from($from, $alias = null)
633633
* @param string $alias The alias of the join table.
634634
* @param string $condition The condition for the join.
635635
*
636-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
636+
* @return $this This QueryBuilder instance.
637637
*/
638638
public function join($fromAlias, $join, $alias, $condition = null)
639639
{
@@ -655,7 +655,7 @@ public function join($fromAlias, $join, $alias, $condition = null)
655655
* @param string $alias The alias of the join table.
656656
* @param string $condition The condition for the join.
657657
*
658-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
658+
* @return $this This QueryBuilder instance.
659659
*/
660660
public function innerJoin($fromAlias, $join, $alias, $condition = null)
661661
{
@@ -684,7 +684,7 @@ public function innerJoin($fromAlias, $join, $alias, $condition = null)
684684
* @param string $alias The alias of the join table.
685685
* @param string $condition The condition for the join.
686686
*
687-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
687+
* @return $this This QueryBuilder instance.
688688
*/
689689
public function leftJoin($fromAlias, $join, $alias, $condition = null)
690690
{
@@ -713,7 +713,7 @@ public function leftJoin($fromAlias, $join, $alias, $condition = null)
713713
* @param string $alias The alias of the join table.
714714
* @param string $condition The condition for the join.
715715
*
716-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
716+
* @return $this This QueryBuilder instance.
717717
*/
718718
public function rightJoin($fromAlias, $join, $alias, $condition = null)
719719
{
@@ -740,7 +740,7 @@ public function rightJoin($fromAlias, $join, $alias, $condition = null)
740740
* @param string $key The column to set.
741741
* @param string $value The value, expression, placeholder, etc.
742742
*
743-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
743+
* @return $this This QueryBuilder instance.
744744
*/
745745
public function set($key, $value)
746746
{
@@ -771,7 +771,7 @@ public function set($key, $value)
771771
*
772772
* @param mixed $predicates The restriction predicates.
773773
*
774-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
774+
* @return $this This QueryBuilder instance.
775775
*/
776776
public function where($predicates)
777777
{
@@ -796,7 +796,7 @@ public function where($predicates)
796796
*
797797
* @param mixed $where The query restrictions.
798798
*
799-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
799+
* @return $this This QueryBuilder instance.
800800
*
801801
* @see where()
802802
*/
@@ -829,7 +829,7 @@ public function andWhere($where)
829829
*
830830
* @param mixed $where The WHERE statement.
831831
*
832-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
832+
* @return $this This QueryBuilder instance.
833833
*
834834
* @see where()
835835
*/
@@ -861,7 +861,7 @@ public function orWhere($where)
861861
*
862862
* @param mixed $groupBy The grouping expression.
863863
*
864-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
864+
* @return $this This QueryBuilder instance.
865865
*/
866866
public function groupBy($groupBy)
867867
{
@@ -888,7 +888,7 @@ public function groupBy($groupBy)
888888
*
889889
* @param mixed $groupBy The grouping expression.
890890
*
891-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
891+
* @return $this This QueryBuilder instance.
892892
*/
893893
public function addGroupBy($groupBy)
894894
{
@@ -918,7 +918,7 @@ public function addGroupBy($groupBy)
918918
* @param string $column The column into which the value should be inserted.
919919
* @param string $value The value that should be inserted into the column.
920920
*
921-
* @return QueryBuilder This QueryBuilder instance.
921+
* @return $this This QueryBuilder instance.
922922
*/
923923
public function setValue($column, $value)
924924
{
@@ -944,7 +944,7 @@ public function setValue($column, $value)
944944
*
945945
* @param array $values The values to specify for the insert query indexed by column names.
946946
*
947-
* @return QueryBuilder This QueryBuilder instance.
947+
* @return $this This QueryBuilder instance.
948948
*/
949949
public function values(array $values)
950950
{
@@ -957,7 +957,7 @@ public function values(array $values)
957957
*
958958
* @param mixed $having The restriction over the groups.
959959
*
960-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
960+
* @return $this This QueryBuilder instance.
961961
*/
962962
public function having($having)
963963
{
@@ -974,7 +974,7 @@ public function having($having)
974974
*
975975
* @param mixed $having The restriction to append.
976976
*
977-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
977+
* @return $this This QueryBuilder instance.
978978
*/
979979
public function andHaving($having)
980980
{
@@ -997,7 +997,7 @@ public function andHaving($having)
997997
*
998998
* @param mixed $having The restriction to add.
999999
*
1000-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
1000+
* @return $this This QueryBuilder instance.
10011001
*/
10021002
public function orHaving($having)
10031003
{
@@ -1021,7 +1021,7 @@ public function orHaving($having)
10211021
* @param string $sort The ordering expression.
10221022
* @param string $order The ordering direction.
10231023
*
1024-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
1024+
* @return $this This QueryBuilder instance.
10251025
*/
10261026
public function orderBy($sort, $order = null)
10271027
{
@@ -1034,7 +1034,7 @@ public function orderBy($sort, $order = null)
10341034
* @param string $sort The ordering expression.
10351035
* @param string $order The ordering direction.
10361036
*
1037-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
1037+
* @return $this This QueryBuilder instance.
10381038
*/
10391039
public function addOrderBy($sort, $order = null)
10401040
{
@@ -1068,7 +1068,7 @@ public function getQueryParts()
10681068
*
10691069
* @param array|null $queryPartNames
10701070
*
1071-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
1071+
* @return $this This QueryBuilder instance.
10721072
*/
10731073
public function resetQueryParts($queryPartNames = null)
10741074
{
@@ -1088,7 +1088,7 @@ public function resetQueryParts($queryPartNames = null)
10881088
*
10891089
* @param string $queryPartName
10901090
*
1091-
* @return \Doctrine\DBAL\Query\QueryBuilder This QueryBuilder instance.
1091+
* @return $this This QueryBuilder instance.
10921092
*/
10931093
public function resetQueryPart($queryPartName)
10941094
{

0 commit comments

Comments
 (0)