Merge pull request #12467 from doctrine/2.20.x-merge-up-into-2.21.x_SfpLgHE4

greg0ire · web-flow · commit 1eb08963d435 · 2026-05-08T21:32:42.000+02:00
Merge release 2.20.12 into 2.21.x
diff --git a/src/Query/AST/OrderByClause.php b/src/Query/AST/OrderByClause.php
@@ -17,7 +17,7 @@ class OrderByClause extends Node
     public $includeCollectionOrderByItems = true;
 
     /** @param OrderByItem[] $orderByItems */
-    public function __construct(array $orderByItems, bool $includeCollectionOrderByItems)
+    public function __construct(array $orderByItems, bool $includeCollectionOrderByItems = true)
     {
         $this->orderByItems                  = $orderByItems;
         $this->includeCollectionOrderByItems = $includeCollectionOrderByItems;

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class OrderByClause extends Node`
`17`	`17`	`public $includeCollectionOrderByItems = true;`
`18`	`18`
`19`	`19`	`/** @param OrderByItem[] $orderByItems */`
`20`		`- public function __construct(array $orderByItems, bool $includeCollectionOrderByItems)`
	`20`	`+ public function __construct(array $orderByItems, bool $includeCollectionOrderByItems = true)`
`21`	`21`	`{`
`22`	`22`	`$this->orderByItems = $orderByItems;`
`23`	`23`	`$this->includeCollectionOrderByItems = $includeCollectionOrderByItems;`