From c13b8139e55c13150d1e0c9957d6d5f816e08c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Tue, 27 Feb 2024 08:31:00 +0100
Subject: [PATCH 1/2] Update branch metadata (#402)

---
 .doctrine-project.json | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.doctrine-project.json b/.doctrine-project.json
index ec0cae0c..1907133a 100644
--- a/.doctrine-project.json
+++ b/.doctrine-project.json
@@ -11,11 +11,17 @@
             "upcoming": true
         },
         {
-            "name": "2.1",
-            "branchName": "2.1.x",
+            "name": "2.2",
+            "branchName": "2.2.x",
             "slug": "stable",
             "current": true
         },
+        {
+            "name": "2.1",
+            "branchName": "2.1.x",
+            "slug": "2.1",
+            "maintained": false
+        },
         {
             "name": "2.0",
             "branchName": "2.0.x",

From aed9ea8fde19667acd049970f3754ff670a0b648 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Tue, 5 Mar 2024 10:09:29 +0100
Subject: [PATCH 2/2] Improve deprecation message for Criteria::orderBy()

---
 src/Criteria.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Criteria.php b/src/Criteria.php
index 6959aa9e..4c8a0a7a 100644
--- a/src/Criteria.php
+++ b/src/Criteria.php
@@ -198,8 +198,9 @@ public function orderings(): array
      */
     public function orderBy(array $orderings)
     {
+        $method          = __METHOD__;
         $this->orderings = array_map(
-            static function (string|Order $ordering): Order {
+            static function (string|Order $ordering) use ($method): Order {
                 if ($ordering instanceof Order) {
                     return $ordering;
                 }
@@ -211,7 +212,7 @@ static function (string|Order $ordering): Order {
                         'doctrine/collections',
                         'https://github.com/doctrine/collections/pull/389',
                         'Passing non-Order enum values to %s() is deprecated. Pass Order enum values instead.',
-                        __METHOD__,
+                        $method,
                     );
                 }