Fix default order.

yii-tools · May 16, 2023 · bee920f · bee920f
1 parent c4140be
commit bee920f
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/src/Sort.php b/src/Sort.php
@@ -205,7 +205,7 @@ public function getColumnOrders(bool $value = false): array
                 }
             }
         } else {
-            $this->columnOrders = $this->defaultColumnOrder;
+            $this->setDefaultColumnOrders();
         }
 
         return $this->columnOrders;
@@ -404,4 +404,25 @@ private function parseSortParam(string $param): array
     {
         return explode($this->separator, $param);
     }
+
+    private function setDefaultColumnOrders(): void
+    {
+        if ($this->defaultColumnOrder !== []) {
+            $this->columnOrders = $this->defaultColumnOrder;
+            return;
+        }
+
+        $defaultColumnOrder = [];
+
+        foreach ($this->columns as $name => $definition) {
+            $defaultDirection = $definition['default'] ?? SORT_ASC;
+            $defaultColumnOrder[$name] = $defaultDirection;
+
+            if ($this->multiSort === false) {
+                break;
+            }
+        }
+
+        $this->columnOrders = $defaultColumnOrder;
+    }
 }
diff --git a/tests/DataProvider/SortTest.php b/tests/DataProvider/SortTest.php
@@ -4,6 +4,7 @@
 
 namespace Yii\DataProvider\Tests\DataProvider;
 
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Yii\DataProvider\Sort;
 
@@ -104,6 +105,22 @@ public function testGetColumnOrders()
         $this->assertSame(SORT_ASC, $orders['age']);
     }
 
+    public function testGetColumnOrdersWithEmpty()
+    {
+        $this->sort->columns(['age', 'name'])->multiSort();
+
+        $orders = $this->sort->getColumnOrders();
+        $this->assertCount(2, $orders);
+        $this->assertSame(SORT_ASC, $orders['age']);
+        $this->assertSame(SORT_ASC, $orders['name']);
+
+        $this->sort->multiSort(false);
+
+        $orders = $this->sort->getColumnOrders(true);
+        $this->assertCount(1, $orders);
+        $this->assertSame(SORT_ASC, $orders['age']);
+    }
+
     /**
      * @see https://github.com/yiisoft/yii2/pull/13260
      */
@@ -197,7 +214,7 @@ public function testGetSortParam(): void
 
     public function testGetSortParamWithException(): void
     {
-        $this->expectException(\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Unknown attribute: unexistingAttribute');
 
         $this->sort->columns(