Merge pull request #37 from TheDragonCode/2.x

Removed sorter manager

Author: andrey-helldar

src/Contracts/Sorter.php

@@ -6,5 +6,5 @@
 
 interface Sorter
 {
-    public static function callback(string $column, int $arrow = 1): callable;
+    public static function get(string $column, int $arrow = 1): callable;
 }

src/Services/MainLogic.php

@@ -5,7 +5,9 @@
 namespace DragonCode\SizeSorter\Services;
 
 use DragonCode\SizeSorter\Enum\Group;
-use DragonCode\SizeSorter\Sorters\SorterManager;
+use DragonCode\SizeSorter\Sorters\ArrowSorter;
+use DragonCode\SizeSorter\Sorters\CharSorter;
+use DragonCode\SizeSorter\Sorters\NumberSorter;
 use DragonCode\Support\Helpers\Ables\Stringable;
 use Illuminate\Support\Collection as IC;
 
@@ -73,7 +75,7 @@ protected static function sortChars(IC $values, string $column): IC
     protected static function sortSmallSizes(IC $values, string $column): IC
     {
         return $values->sort(
-            SorterManager::byArrow($column, -1)
+            ArrowSorter::get($column, -1)
         )
             ->groupBy(static fn (mixed $size) => static::resolveValue($size, $column)->toString(), true)
             ->map(static fn (IC $values) => static::sortSpecialChars($values, $column));
@@ -82,21 +84,21 @@ protected static function sortSmallSizes(IC $values, string $column): IC
     protected static function sortSpecialChars(IC $values, string $column): IC
     {
         return $values->sort(
-            SorterManager::byChars($column)
+            CharSorter::get($column)
         );
     }
 
     protected static function sortArrows(IC $values, string $column): IC
     {
         return $values->sort(
-            SorterManager::byArrow($column)
+            ArrowSorter::get($column)
         );
     }
 
     protected static function sortNumbers(IC $items, string $column): IC
     {
         return $items->sort(
-            SorterManager::byNumbers($column)
+            NumberSorter::get($column)
         );
     }
 

src/SizeSorter.php

@@ -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,7 +34,6 @@ public function column(string $name): static
 
     /**
      * @param  Group[]|null  $order
-     *
      * @return $this
      */
     public function orderBy(?array $order): static

src/Sorters/Arrow.php src/Sorters/ArrowSorter.phpsrc/Sorters/Arrow.php renamed to src/Sorters/ArrowSorter.php

@@ -4,9 +4,9 @@
 
 namespace DragonCode\SizeSorter\Sorters;
 
-class Arrow extends Base
+class ArrowSorter extends BaseSorter
 {
-    public static function callback(string $column, int $arrow = 1): callable
+    public static function get(string $column, int $arrow = 1): callable
     {
         return static function (mixed $a, mixed $b) use ($arrow, $column) {
             $a = static::key($a, $column);

src/Sorters/Base.php src/Sorters/BaseSorter.phpsrc/Sorters/Base.php renamed to src/Sorters/BaseSorter.php

@@ -7,7 +7,7 @@
 use DragonCode\SizeSorter\Contracts\Sorter;
 use DragonCode\SizeSorter\Services\Resolver;
 
-abstract class Base implements Sorter
+abstract class BaseSorter implements Sorter
 {
     protected static function key(mixed $value, string $column): mixed
     {

src/Sorters/Chars.php src/Sorters/CharSorter.phpsrc/Sorters/Chars.php renamed to src/Sorters/CharSorter.php

@@ -7,9 +7,9 @@
 use DragonCode\SizeSorter\Services\Resolver;
 use DragonCode\SizeSorter\Services\Str;
 
-class Chars extends Base
+class CharSorter extends BaseSorter
 {
-    public static function callback(string $column, int $arrow = 1): callable
+    public static function get(string $column, int $arrow = 1): callable
     {
         return static function (mixed $a, mixed $b) use ($column, $arrow) {
             $a = static::key($a, $column);
@@ -23,7 +23,7 @@ public static function callback(string $column, int $arrow = 1): callable
 
     protected static function resolveArrow(int $arrow, string $column): callable
     {
-        return Arrow::callback($column, $arrow);
+        return ArrowSorter::get($column, $arrow);
     }
 
     protected static function contains(string $value, string $needle): bool

src/Sorters/Numbers.php src/Sorters/NumberSorter.phpsrc/Sorters/Numbers.php renamed to src/Sorters/NumberSorter.php

@@ -6,9 +6,9 @@
 
 use DragonCode\SizeSorter\Services\Resolver;
 
-class Numbers extends Base
+class NumberSorter extends BaseSorter
 {
-    public static function callback(string $column, int $arrow = 1): callable
+    public static function get(string $column, int $arrow = 1): callable
     {
         return static function (mixed $a, mixed $b) use ($column, $arrow) {
             $a = static::number($a, $column);