Merge pull request #34 from TheDragonCode/2.x

Fixed method name after upgrading

Author: andrey-helldar

README.md

@@ -50,7 +50,7 @@ return new Sorter([
     'XXS',
     '2',
     '54',
-])->sort1();
+])->sort();
 
 /*
  * Returns:
@@ -76,7 +76,7 @@ $items = Size::query()->get();
 
 return new Sorter($items)
     ->column('title')
-    ->sort1();
+    ->sort();
 ```
 
 ```php
@@ -86,7 +86,7 @@ use DragonCode\SizeSorter\Sorter;
 $items = collect([...]);
 
 return new Sorter($items)
-    ->sort1();
+    ->sort();
 
 /*
  * Returns:
@@ -115,7 +115,7 @@ use DragonCode\SizeSorter\Sorter;
 
 return new Sorter($items)
     ->groupsOrder([3, 5, 4, 2, 1])
-    ->sort1();
+    ->sort();
 
 // or
 
@@ -127,7 +127,7 @@ return new Sorter($items)
         Group::ClothesAndShoes,
         Group::LetterClothingSize,
     ])
-    ->sort1();
+    ->sort();
 ```
 
 The final array will be formed in the specified order:
@@ -144,13 +144,13 @@ use DragonCode\SizeSorter\Sorter;
 
 return new Sorter($items)
     ->groupsOrder([3, 5])
-    ->sort1();
+    ->sort();
 
 // or
 
 return new Sorter($items)
     ->groupsOrder([Group::BraSize, Group::OtherSizes])
-    ->sort1();
+    ->sort();
 ```
 
 In this case, the first two logical groups will be sorted in the specified order, and the subsequent ones will be in

src/Sorter.php

@@ -40,7 +40,7 @@ public function groupsOrder(?array $order): static
         return $this;
     }
 
-    public function sort1(): iterable
+    public function sort(): iterable
     {
         return MainLogic::sort($this->items, $this->column, $this->groupsOrder);
     }

tests/Sorters/SortTest.php

@@ -16,7 +16,7 @@ public function testArray(?array $order, array $expected): void
     {
         $actual = Sorter::same($this->values)
             ->groupsOrder($order)
-            ->sort1()
+            ->sort()
             ->toArray();
 
         $this->assertSame($expected, $actual);
@@ -33,7 +33,7 @@ public function testObjects(?array $order, array $expected): void
 
         $actual = Sorter::same($items)
             ->groupsOrder($order)
-            ->sort1()
+            ->sort()
             ->pluck('value', 'id')
             ->toArray();
 
@@ -51,7 +51,7 @@ public function testCustomColumn(?array $order, array $expected): void
         $actual = Sorter::same($items)
             ->groupsOrder($order)
             ->column('some')
-            ->sort1()
+            ->sort()
             ->pluck('some', 'id')
             ->toArray();
 
@@ -73,7 +73,7 @@ public function testWithSaveKeys(?array $order, array $expected): void
 
         $actual = Sorter::same($values)
             ->groupsOrder($order)
-            ->sort1()
+            ->sort()
             ->toArray();
 
         $this->assertSame($expected, $actual);

tests/Sorters/TypeTest.php

@@ -63,7 +63,7 @@ public function testString(): void
                 104 => 'ONE SIZE',
                 131 => 'some',
             ],
-            Sorter::same($items)->sort1()->toArray()
+            Sorter::same($items)->sort()->toArray()
         );
     }
 
@@ -116,7 +116,7 @@ public function testStringable(): void
                 104 => $items[104],
                 131 => $items[131],
             ],
-            Sorter::same($items)->sort1()->toArray()
+            Sorter::same($items)->sort()->toArray()
         );
     }
 
@@ -139,7 +139,7 @@ public function testInteger(): void
                 149 => 21,
                 133 => 30,
             ],
-            Sorter::same($items)->sort1()->toArray()
+            Sorter::same($items)->sort()->toArray()
         );
     }
 
@@ -162,7 +162,7 @@ public function testFloat(): void
                 149 => 21.8,
                 133 => 30.5,
             ],
-            Sorter::same($items)->sort1()->toArray()
+            Sorter::same($items)->sort()->toArray()
         );
     }
 
@@ -213,7 +213,7 @@ public function testEnumString(): void
                 104 => StringValue::VALUE_ONE_SIZE,
                 131 => StringValue::VALUE_SOME,
             ],
-            Sorter::same($items)->sort1()->toArray()
+            Sorter::same($items)->sort()->toArray()
         );
     }
 
@@ -236,7 +236,7 @@ public function testEnumInteger(): void
                 149 => IntegerValue::VALUE_21,
                 133 => IntegerValue::VALUE_30,
             ],
-            Sorter::same($items)->sort1()->toArray()
+            Sorter::same($items)->sort()->toArray()
         );
     }
 
@@ -289,7 +289,7 @@ public function testNestedArray(): void
                 104 => ['foo' => 'Foo', 'bar' => ['some' => ['nested' => 'ONE SIZE']]],
                 131 => ['foo' => 'Foo', 'bar' => ['some' => ['nested' => 'some']]],
             ],
-            Sorter::same($items)->column('bar.some.nested')->sort1()->toArray()
+            Sorter::same($items)->column('bar.some.nested')->sort()->toArray()
         );
     }
 
@@ -344,7 +344,7 @@ public function testLaravelModels(): void
                 104 => 'ONE SIZE',
                 131 => 'some',
             ],
-            Sorter::same($items)->sort1()->pluck('value', 'id')->toArray()
+            Sorter::same($items)->sort()->pluck('value', 'id')->toArray()
         );
     }
 
@@ -397,7 +397,7 @@ public function testCollection(): void
                 104 => 'ONE SIZE',
                 131 => 'some',
             ],
-            Sorter::same($items)->sort1()->toArray()
+            Sorter::same($items)->sort()->toArray()
         );
     }
 }