Merge pull request #6 from TheDragonCode/1.x

Fixed Str::of(): Argument #1 ($value) must be of type ?string, int given
TheDragonCode · Feb 20, 2023 · 9de9797 · 9de9797
2 parents f469c5d + 759e887
commit 9de9797
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 200 deletions.
diff --git a/src/Services/Str.php b/src/Services/Str.php
@@ -9,9 +9,9 @@
 
 class Str
 {
-    public static function of(?string $value): Stringable
+    public static function of(mixed $value): Stringable
     {
-        return DS::of($value);
+        return DS::of((string) $value);
     }
 
     public static function pad(int $length, string $pad = 'x'): string

diff --git a/tests/Sorters/FullGroupsOrderTest.php b/tests/Sorters/FullGroupsOrderTest.php
@@ -10,66 +10,6 @@
 
 class FullGroupsOrderTest extends TestCase
 {
-    private array $values = [
-        100 => 'XXL',
-        101 => '26',
-        102 => '28',
-        103 => 'XL',
-        104 => 'ONE SIZE',
-        105 => 'XXS',
-        106 => '2',
-        107 => '54',
-        108 => 'XS',
-        109 => 'S',
-        110 => 'M',
-        111 => 'L',
-        112 => 'L/XL',
-        113 => 'XL/2XL',
-        114 => 'XS/S',
-        115 => 'M/L',
-        116 => '80B',
-        117 => '75C',
-        118 => '70B',
-        119 => '75A',
-        120 => '75B',
-        121 => '36',
-        122 => 'XXS-XS',
-        123 => '37',
-        124 => '38',
-        125 => '39',
-        126 => '40',
-        127 => 'S/M',
-        128 => '40х38х19 см',
-        129 => '70C',
-        130 => '44-46',
-        131 => 'some',
-        132 => '1',
-        133 => '30',
-        134 => '32',
-        135 => '34',
-        136 => '44/46',
-        137 => 'XXS/XS',
-        138 => 'XXS',
-        139 => '52-56',
-        140 => '102-104',
-        141 => '102-106',
-        142 => '102/106',
-        143 => '106',
-        145 => '110-112',
-        144 => '110-114',
-        146 => '90/94',
-        147 => '94-98',
-        148 => '98-102',
-        149 => '21',
-        150 => '3',
-        151 => '40х38х19 sm',
-        152 => '40х37х19 см',
-        153 => '40х37х20 см',
-        154 => '40х38х15 см',
-        155 => '41х38х15 см',
-        156 => '39х38х15 см',
-    ];
-
     private array $expected = [
         // 3
         118 => '70B',
@@ -94,14 +34,14 @@ class FullGroupsOrderTest extends TestCase
         106 => '2',
         150 => '3',
         149 => '21',
-        101 => '26',
-        102 => '28',
+        101 => 26,
+        102 => 28,
         133 => '30',
         134 => '32',
         135 => '34',
         121 => '36',
-        123 => '37',
-        124 => '38',
+        123 => 37,
+        124 => 38,
         125 => '39',
         126 => '40',
         130 => '44-46',
@@ -153,7 +93,7 @@ public function testArray(): void
 
     public function testObjects(): void
     {
-        $items = collect($this->values)->map(fn (string $value, int $key) => (object) [
+        $items = collect($this->values)->map(fn (mixed $value, int $key) => (object) [
             'id'     => $key,
             'value'  => $value,
             'active' => true,
@@ -167,7 +107,7 @@ public function testObjects(): void
 
     public function testCustomColumn(): void
     {
-        $items = collect($this->values)->map(fn (string $value, int $key) => (object) [
+        $items = collect($this->values)->map(fn (mixed $value, int $key) => (object) [
             'id'   => $key,
             'some' => $value,
         ]);

diff --git a/tests/Sorters/PartialGroupsOrderTest.php b/tests/Sorters/PartialGroupsOrderTest.php
@@ -10,66 +10,6 @@
 
 class PartialGroupsOrderTest extends TestCase
 {
-    private array $values = [
-        100 => 'XXL',
-        101 => '26',
-        102 => '28',
-        103 => 'XL',
-        104 => 'ONE SIZE',
-        105 => 'XXS',
-        106 => '2',
-        107 => '54',
-        108 => 'XS',
-        109 => 'S',
-        110 => 'M',
-        111 => 'L',
-        112 => 'L/XL',
-        113 => 'XL/2XL',
-        114 => 'XS/S',
-        115 => 'M/L',
-        116 => '80B',
-        117 => '75C',
-        118 => '70B',
-        119 => '75A',
-        120 => '75B',
-        121 => '36',
-        122 => 'XXS-XS',
-        123 => '37',
-        124 => '38',
-        125 => '39',
-        126 => '40',
-        127 => 'S/M',
-        128 => '40х38х19 см',
-        129 => '70C',
-        130 => '44-46',
-        131 => 'some',
-        132 => '1',
-        133 => '30',
-        134 => '32',
-        135 => '34',
-        136 => '44/46',
-        137 => 'XXS/XS',
-        138 => 'XXS',
-        139 => '52-56',
-        140 => '102-104',
-        141 => '102-106',
-        142 => '102/106',
-        143 => '106',
-        145 => '110-112',
-        144 => '110-114',
-        146 => '90/94',
-        147 => '94-98',
-        148 => '98-102',
-        149 => '21',
-        150 => '3',
-        151 => '40х38х19 sm',
-        152 => '40х37х19 см',
-        153 => '40х37х20 см',
-        154 => '40х38х15 см',
-        155 => '41х38х15 см',
-        156 => '39х38х15 см',
-    ];
-
     private array $expected = [
         // 3
         118 => '70B',
@@ -102,14 +42,14 @@ class PartialGroupsOrderTest extends TestCase
         106 => '2',
         150 => '3',
         149 => '21',
-        101 => '26',
-        102 => '28',
+        101 => 26,
+        102 => 28,
         133 => '30',
         134 => '32',
         135 => '34',
         121 => '36',
-        123 => '37',
-        124 => '38',
+        123 => 37,
+        124 => 38,
         125 => '39',
         126 => '40',
         130 => '44-46',
@@ -150,7 +90,7 @@ public function testArray(): void
 
     public function testObjects(): void
     {
-        $items = collect($this->values)->map(fn (string $value, int $key) => (object) [
+        $items = collect($this->values)->map(fn (mixed $value, int $key) => (object) [
             'id'     => $key,
             'value'  => $value,
             'active' => true,
@@ -164,7 +104,7 @@ public function testObjects(): void
 
     public function testCustomColumn(): void
     {
-        $items = collect($this->values)->map(fn (string $value, int $key) => (object) [
+        $items = collect($this->values)->map(fn (mixed $value, int $key) => (object) [
             'id'   => $key,
             'some' => $value,
         ]);

diff --git a/tests/Sorters/SorterTest.php b/tests/Sorters/SorterTest.php
@@ -9,66 +9,6 @@
 
 class SorterTest extends TestCase
 {
-    private array $values = [
-        100 => 'XXL',
-        101 => '26',
-        102 => '28',
-        103 => 'XL',
-        104 => 'ONE SIZE',
-        105 => 'XXS',
-        106 => '2',
-        107 => '54',
-        108 => 'XS',
-        109 => 'S',
-        110 => 'M',
-        111 => 'L',
-        112 => 'L/XL',
-        113 => 'XL/2XL',
-        114 => 'XS/S',
-        115 => 'M/L',
-        116 => '80B',
-        117 => '75C',
-        118 => '70B',
-        119 => '75A',
-        120 => '75B',
-        121 => '36',
-        122 => 'XXS-XS',
-        123 => '37',
-        124 => '38',
-        125 => '39',
-        126 => '40',
-        127 => 'S/M',
-        128 => '40х38х19 см',
-        129 => '70C',
-        130 => '44-46',
-        131 => 'some',
-        132 => '1',
-        133 => '30',
-        134 => '32',
-        135 => '34',
-        136 => '44/46',
-        137 => 'XXS/XS',
-        138 => 'XXS',
-        139 => '52-56',
-        140 => '102-104',
-        141 => '102-106',
-        142 => '102/106',
-        143 => '106',
-        145 => '110-112',
-        144 => '110-114',
-        146 => '90/94',
-        147 => '94-98',
-        148 => '98-102',
-        149 => '21',
-        150 => '3',
-        151 => '40х38х19 sm',
-        152 => '40х37х19 см',
-        153 => '40х37х20 см',
-        154 => '40х38х15 см',
-        155 => '41х38х15 см',
-        156 => '39х38х15 см',
-    ];
-
     private array $expected = [
         // 1
         105 => 'XXS',
@@ -91,14 +31,14 @@ class SorterTest extends TestCase
         106 => '2',
         150 => '3',
         149 => '21',
-        101 => '26',
-        102 => '28',
+        101 => 26,
+        102 => 28,
         133 => '30',
         134 => '32',
         135 => '34',
         121 => '36',
-        123 => '37',
-        124 => '38',
+        123 => 37,
+        124 => 38,
         125 => '39',
         126 => '40',
         130 => '44-46',
@@ -144,7 +84,7 @@ public function testArray(): void
 
     public function testObjects(): void
     {
-        $items = collect($this->values)->map(fn (string $value, int $key) => (object) [
+        $items = collect($this->values)->map(fn (mixed $value, int $key) => (object) [
             'id'     => $key,
             'value'  => $value,
             'active' => true,
@@ -158,7 +98,7 @@ public function testObjects(): void
 
     public function testCustomColumn(): void
     {
-        $items = collect($this->values)->map(fn (string $value, int $key) => (object) [
+        $items = collect($this->values)->map(fn (mixed $value, int $key) => (object) [
             'id'   => $key,
             'some' => $value,
         ]);

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -8,4 +8,63 @@
 
 abstract class TestCase extends BaseTestCase
 {
+    protected array $values = [
+        100 => 'XXL',
+        101 => 26,
+        102 => 28,
+        103 => 'XL',
+        104 => 'ONE SIZE',
+        105 => 'XXS',
+        106 => '2',
+        107 => '54',
+        108 => 'XS',
+        109 => 'S',
+        110 => 'M',
+        111 => 'L',
+        112 => 'L/XL',
+        113 => 'XL/2XL',
+        114 => 'XS/S',
+        115 => 'M/L',
+        116 => '80B',
+        117 => '75C',
+        118 => '70B',
+        119 => '75A',
+        120 => '75B',
+        121 => '36',
+        122 => 'XXS-XS',
+        123 => 37,
+        124 => 38,
+        125 => '39',
+        126 => '40',
+        127 => 'S/M',
+        128 => '40х38х19 см',
+        129 => '70C',
+        130 => '44-46',
+        131 => 'some',
+        132 => '1',
+        133 => '30',
+        134 => '32',
+        135 => '34',
+        136 => '44/46',
+        137 => 'XXS/XS',
+        138 => 'XXS',
+        139 => '52-56',
+        140 => '102-104',
+        141 => '102-106',
+        142 => '102/106',
+        143 => '106',
+        145 => '110-112',
+        144 => '110-114',
+        146 => '90/94',
+        147 => '94-98',
+        148 => '98-102',
+        149 => '21',
+        150 => '3',
+        151 => '40х38х19 sm',
+        152 => '40х37х19 см',
+        153 => '40х37х20 см',
+        154 => '40х38х15 см',
+        155 => '41х38х15 см',
+        156 => '39х38х15 см',
+    ];
 }