Merge pull request #2420 from apeisa/fix/stringable-sort

[3.9] Fix/stringable sort
KarenEtheridg · Feb 23, 2024 · e0bc3ff · e0bc3ff
2 parents cf07c5a + eee8a18
commit e0bc3ff
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Query/Builder.php b/src/Query/Builder.php
@@ -512,7 +512,7 @@ public function orderBy($column, $direction = 'asc')
         if ($column == 'natural') {
             $this->orders['$natural'] = $direction;
         } else {
-            $this->orders[$column] = $direction;
+            $this->orders[(string) $column] = $direction;
         }
 
         return $this;

diff --git a/tests/QueryTest.php b/tests/QueryTest.php
@@ -239,6 +239,17 @@ public function testOrder(): void
         $this->assertEquals(35, $user->age);
     }
 
+    public function testStringableOrder(): void
+    {
+        $age = str('age');
+
+        $user = User::whereNotNull('age')->orderBy($age, 'asc')->first();
+        $this->assertEquals(13, $user->age);
+
+        $user = User::whereNotNull('age')->orderBy($age, 'desc')->first();
+        $this->assertEquals(37, $user->age);
+    }
+
     public function testGroupBy(): void
     {
         $users = User::groupBy('title')->get();