updated tests for sortings; allowed union type in query helper

Author: mechelon

src/Query/Sorting.php

@@ -93,16 +93,20 @@ public function toArray(): array
     }
 
     /**
-     * @param  Collection  $sortings
+     * @param  Sorting|Collection  $sortings
      * @return array
      */
-    public static function sortQuery(Collection $sortings): array
+    public static function sortQuery(Sorting|Collection $sortings): array
     {
         $querySortings = new Collection();
 
-        $sortings->each(function (Sorting $sorting) use ($querySortings) {
-            $querySortings->add($sorting->toArray());
-        });
+        if($sortings instanceof Collection) {
+            $sortings->each(function (Sorting $sorting) use ($querySortings) {
+                $querySortings->push($sorting->toArray());
+            });
+        } else {
+            $querySortings->push($sortings->toArray());
+        }
 
         return $querySortings->toArray();
     }

tests/SortingTest.php

@@ -5,7 +5,7 @@
 use Illuminate\Support\Collection;
 
 it('can sort by a single property', function () {
-    $expectedSortQuery = '[{"property":"Birth year","direction":"ascending"}';
+    $expectedSortQuery = '[{"property":"Birth year","direction":"ascending"}]';
 
     $sortBy = Sorting::propertySort("Birth year", "ascending");
     $this->assertEquals($expectedSortQuery, json_encode(Sorting::sortQuery($sortBy)));});
@@ -22,7 +22,7 @@
 });
 
 it('refuses other classes than sorting or collection in the sortBy() method', function () {
-    $this->expectException(HandlingException::class);
+    $this->expectException(TypeError::class);
 
     Notion::database('8284f3ff77e24d4a939d19459e4d6bdc')
         ->sortBy(new stdClass())