[11.x] SORT_NATURAL on Collection no longer throws warning for nulls (#…

…52557) * casting occasional nulls to strings * update * Updated test --------- Co-authored-by: Scott Chaplinski <scott@scotts-mbp.lan>
laravel · Aug 23, 2024 · d16ce25 · d16ce25
1 parent 0d7fdc3
commit d16ce25
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/Illuminate/Collections/Collection.php b/src/Illuminate/Collections/Collection.php
@@ -1561,7 +1561,7 @@ protected function sortByMany(array $comparisons = [], int $options = SORT_REGUL
                         $result = match ($options) {
                             SORT_NUMERIC => intval($values[0]) <=> intval($values[1]),
                             SORT_STRING => strcmp($values[0], $values[1]),
-                            SORT_NATURAL => strnatcmp($values[0], $values[1]),
+                            SORT_NATURAL => strnatcmp((string) $values[0], (string) $values[1]),
                             SORT_LOCALE_STRING => strcoll($values[0], $values[1]),
                             default => $values[0] <=> $values[1],
                         };

diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
@@ -2003,6 +2003,32 @@ public function testSortByMany($collection)
     }
 
     #[DataProvider('collectionClassProvider')]
+    /**
+     * @dataProvider collectionClassProvider
+     */
+    public function testNaturalSortByManyWithNull($collection)
+    {
+        $itemFoo = new \stdClass();
+        $itemFoo->first = 'f';
+        $itemFoo->second = null;
+        $itemBar = new \stdClass();
+        $itemBar->first = 'f';
+        $itemBar->second = 's';
+
+        $data = new $collection([$itemFoo, $itemBar]);
+        $data = $data->sortBy([
+            ['first', 'desc'],
+            ['second', 'desc'],
+        ], SORT_NATURAL);
+
+        $this->assertEquals($itemBar, $data->first());
+        $this->assertEquals($itemFoo, $data->skip(1)->first());
+    }
+
+    #[DataProvider('collectionClassProvider')]
+    /**
+     * @dataProvider collectionClassProvider
+     */
     public function testSortKeys($collection)
     {
         $data = new $collection(['b' => 'dayle', 'a' => 'taylor']);