Merge pull request #1792 from yajra/patch-order-dir

[8.0] Add validation for order direction.

Author: yajra

src/Utilities/Request.php

@@ -97,7 +97,7 @@ public function orderableColumns()
         $orderable = [];
         for ($i = 0, $c = count($this->request->input('order')); $i < $c; $i++) {
             $order_col = (int) $this->request->input("order.$i.column");
-            $order_dir = $this->request->input("order.$i.dir");
+            $order_dir = strtolower($this->request->input("order.$i.dir")) === 'asc' ? 'asc' : 'desc';
             if ($this->isColumnOrderable($order_col)) {
                 $orderable[] = ['column' => $order_col, 'direction' => $order_dir];
             }

tests/Unit/RequestTest.php

@@ -46,6 +46,30 @@ public function test_column_keyword()
     }
 
     public function test_orderable_columns()
+    {
+        $_GET['columns']   = [];
+        $_GET['columns'][] = [
+            'orderable' => 'true',
+            'search'    => [
+                'value' => 'foo',
+            ],
+        ];
+        $_GET['order']   = [];
+        $_GET['order'][] = [
+            'column' => 0,
+            'dir'    => 'asc',
+        ];
+        request()->merge($_GET);
+        $request = $this->getRequest();
+        $this->assertEquals([
+            ['column' => 0, 'direction' => 'asc'],
+        ], $request->orderableColumns());
+
+        $this->assertTrue($request->isOrderable());
+        $this->assertTrue($request->isColumnOrderable(0));
+    }
+
+    public function test_orderable_columns_will_set_descending_on_other_values()
     {
         $_GET['columns']   = [];
         $_GET['columns'][] = [
@@ -62,7 +86,7 @@ public function test_orderable_columns()
         request()->merge($_GET);
         $request = $this->getRequest();
         $this->assertEquals([
-            ['column' => 0, 'direction' => 'bar'],
+            ['column' => 0, 'direction' => 'desc'],
         ], $request->orderableColumns());
 
         $this->assertTrue($request->isOrderable());