Merge 5.8 into 5.x (#3520)

Author: mongodb-drivers-pr-bot[bot]

src/Query/Builder.php

@@ -664,10 +664,16 @@ public function distinct($column = false)
     #[Override]
     public function orderBy($column, $direction = 'asc')
     {
-        if (is_string($direction) || $direction instanceof SortDirection) {
+        if ($direction instanceof SortDirection) {
             $direction = match ($direction) {
-                'asc', 'ASC', SortDirection::Ascending => 1,
-                'desc', 'DESC', SortDirection::Descending => -1,
+                SortDirection::Ascending => 1,
+                SortDirection::Descending => -1,
+                default => throw new InvalidArgumentException('Unexpected SortDirection enum case.'),
+            };
+        } elseif (is_string($direction)) {
+            $direction = match ($direction) {
+                'asc', 'ASC' => 1,
+                'desc', 'DESC' => -1,
                 default => throw new InvalidArgumentException('Order direction must be "asc", "desc" or a case from the SortDirection enum.'),
             };
         }

tests/Query/BuilderTest.php

@@ -24,6 +24,7 @@
 use SortDirection;
 use stdClass;
 
+use function class_exists;
 use function collect;
 use function method_exists;
 use function now;
@@ -567,20 +568,22 @@ function (Builder $builder) {
             fn (Builder $builder) => $builder->orderByDesc('email'),
         ];
 
-        yield 'orderBy SortDirection::Ascending' => [
-            ['find' => [[], ['sort' => ['email' => 1]]]],
-            fn (Builder $builder) => $builder->orderBy('email', SortDirection::Ascending),
-        ];
+        if (class_exists(SortDirection::class)) {
+            yield 'orderBy SortDirection::Ascending' => [
+                ['find' => [[], ['sort' => ['email' => 1]]]],
+                fn (Builder $builder) => $builder->orderBy('email', SortDirection::Ascending),
+            ];
 
-        yield 'orderBy SortDirection::Descending' => [
-            ['find' => [[], ['sort' => ['email' => -1]]]],
-            fn (Builder $builder) => $builder->orderBy('email', SortDirection::Descending),
-        ];
+            yield 'orderBy SortDirection::Descending' => [
+                ['find' => [[], ['sort' => ['email' => -1]]]],
+                fn (Builder $builder) => $builder->orderBy('email', SortDirection::Descending),
+            ];
 
-        yield 'orderBy SortDirection on natural' => [
-            ['find' => [[], ['sort' => ['$natural' => -1]]]],
-            fn (Builder $builder) => $builder->orderBy('natural', SortDirection::Descending),
-        ];
+            yield 'orderBy SortDirection on natural' => [
+                ['find' => [[], ['sort' => ['$natural' => -1]]]],
+                fn (Builder $builder) => $builder->orderBy('natural', SortDirection::Descending),
+            ];
+        }
 
         /** @see DatabaseQueryBuilderTest::testReorder() */
         yield 'reorder reset' => [