Use 8.6 SortDirection enum #1315

Author: asika32764

composer.json

@@ -27,7 +27,8 @@
         "paragonie/constant_time_encoding": "^2.8||^3.1",
         "composer/ca-bundle": "^1.2",
         "symfony/options-resolver": "^6.0||^7.0||^8.0",
-        "asika/object-metadata": "^1.0"
+        "asika/object-metadata": "^1.0",
+        "symfony/polyfill-php86": "^1.38"
     },
     "require-dev": {
         "asika/sql-splitter": "^1.0",

packages/query/composer.json

@@ -13,7 +13,8 @@
     "license": "MIT",
     "require": {
         "php": ">=8.4.6",
-        "windwalker/utilities": "^4.0"
+        "windwalker/utilities": "^4.0",
+        "symfony/polyfill-php86": "^1.38"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0||^11.0||^12.0",

packages/query/src/Query.php

@@ -11,6 +11,7 @@
 use IteratorAggregate;
 use PDO;
 use ReflectionClass;
+use SortDirection;
 use SqlFormatter;
 use Stringable;
 use WeakReference;
@@ -577,13 +578,16 @@ private function val(mixed $value): ValueClause|QuoteNameClause
 
     /**
      * @param  array|string|ClauseInterface  $column
-     * @param  string|null                   $dir
+     * @param  \SortDirection|string|null    $dir
      * @param  ClausePosition                $pos
      *
      * @return  static
      */
-    public function order(mixed $column, ?string $dir = null, ClausePosition $pos = ClausePosition::APPEND): static
-    {
+    public function order(
+        mixed $column,
+        \SortDirection|string|null $dir = null,
+        ClausePosition $pos = ClausePosition::APPEND
+    ): static {
         if (is_array($column)) {
             foreach ($column as $col) {
                 if (!is_array($col)) {
@@ -599,20 +603,32 @@ public function order(mixed $column, ?string $dir = null, ClausePosition $pos =
         $order = [$this->resolveColumn($column)];
 
         if ($dir !== null) {
-            ArgumentsAssert::assert(
-                in_array($dir = strtoupper($dir), ['ASC', 'DESC'], true),
-                '{caller} argument 2 should be one of ASC/DESC, %s given',
-                $dir
-            );
-
-            $order[] = $dir;
+            $order[] = static::unwrapDirectionEnum($dir);
         }
 
         $this->orderRaw($this->clause('', $order), $pos);
 
         return $this;
     }
 
+    private static function unwrapDirectionEnum(\SortDirection|string $dir): string
+    {
+        if ($dir instanceof \SortDirection) {
+            return match ($dir) {
+                SortDirection::Ascending => 'ASC',
+                SortDirection::Descending => 'DESC',
+            };
+        }
+
+        $dir = strtoupper($dir);
+
+        if ($dir !== 'ASC' && $dir !== 'DESC') {
+            throw new \InvalidArgumentException("Invalid sort direction: $dir");
+        }
+
+        return $dir;
+    }
+
     public function orderRaw(string|Clause $order, mixed ...$args): static
     {
         if (!$this->order) {

packages/query/test/QueryTest.php

@@ -1468,6 +1468,29 @@ public function testOrder(): void
         );
     }
 
+    public function testOrderByPhp86Enum(): void
+    {
+        $q = self::createQuery()
+            ->select('*')
+            ->from('foo')
+            ->order(
+                [
+                    ['id', \SortDirection::Ascending],
+                    'f1',
+                    ['f2', \SortDirection::Descending],
+                    'f3',
+                ]
+            )
+            ->order('f4', \SortDirection::Descending)
+            ->order('p1', \SortDirection::Ascending, Query::PREPEND)
+            ->order(raw('COUNT(f5)'));
+
+        self::assertSqlEquals(
+            'SELECT * FROM "foo" ORDER BY "p1" ASC, "id" ASC, "f1", "f2" DESC, "f3", "f4" DESC, COUNT(f5)',
+            $q->render()
+        );
+    }
+
     public function testGroup()
     {
         $q = self::createQuery()