Merge pull request #36 from TheDragonCode/2.x

Added validation for group sorting list

Author: andrey-helldar

src/Services/Order.php

@@ -40,7 +40,7 @@ protected function fillCustom(array $groups): array
     protected function fillDefault(array $groups): array
     {
         foreach ($this->groups() as $group) {
-            if (! in_array($group, $groups)) {
+            if (! in_array($group, $groups, true)) {
                 $groups[] = $group;
             }
         }
@@ -54,7 +54,7 @@ protected function existGroup(int $value): bool
     }
 
     /**
-     * @return array<Group>
+     * @return Group[]
      */
     protected function groups(): array
     {

src/SizeSorter.php

@@ -7,7 +7,7 @@
 use DragonCode\SizeSorter\Enum\Group;
 use DragonCode\SizeSorter\Services\MainLogic;
 use DragonCode\SizeSorter\Services\Order;
-use Illuminate\Support\Collection;
+use DragonCode\SizeSorter\Support\Validator;
 
 class SizeSorter
 {
@@ -22,7 +22,7 @@ public static function items(iterable $items): static
 
     public function __construct(
         protected readonly iterable $items,
-        protected readonly Order $order = new Order
+        protected readonly Order $order = new Order()
     ) {}
 
     public function column(string $name): static
@@ -34,11 +34,12 @@ public function column(string $name): static
 
     /**
      * @param  Group[]|null  $order
+     *
      * @return $this
      */
     public function orderBy(?array $order): static
     {
-        (new Collection($order))->ensure(Group::class);
+        Validator::ensure($order, Group::class);
 
         $this->orderBy = $this->order->resolve($order);
 

src/Support/Validator.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DragonCode\SizeSorter\Support;
+
+use Illuminate\Support\Collection;
+
+class Validator
+{
+    public static function ensure(?iterable $items, string $class): void
+    {
+        (new Collection($items))->ensure($class);
+    }
+}