Fix type error into String helper when argument is not a string

webeweb · Jun 12, 2024 · 3d55f6a · 3d55f6a
1 parent dfbde55
commit 3d55f6a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/src/Helper/StringHelper.php b/src/Helper/StringHelper.php
@@ -181,24 +181,37 @@ public static function parseArray(array $values): string {
 
         $output = [];
 
+        $callback = function($v): ?string {
+
+            if (true === is_bool($v)) {
+                return static::parseBoolean($v);
+            }
+
+            if (true === is_numeric($v)) {
+                return "$v";
+            }
+
+            if (true === is_string($v)) {
+                return trim($v);
+            }
+
+            return $v;
+        };
+
         foreach ($values as $key => $value) {
 
             if (null === $value) {
                 continue;
             }
 
             if (true === is_array($value)) {
-                $buffer = trim(implode(" ", $value));
-            } elseif (true === is_bool($value)) {
-                $buffer = static::parseBoolean($value);
-            } elseif (true === is_numeric($value)) {
-                $buffer = "$value";
+                $buffer = trim(implode(" ", array_map($callback, $value)));
             } else {
-                $buffer = trim($value);
+                $buffer = $callback($value);
             }
 
             if ("" !== $buffer) {
-                $output[] = $key . '="' . preg_replace("/\s+/", " ", $buffer) . '"';
+                $output[] = $callback($key) . '="' . preg_replace("/\s+/", " ", $buffer) . '"';
             }
         }
 

diff --git a/tests/Helper/StringHelperTest.php b/tests/Helper/StringHelperTest.php
@@ -148,15 +148,17 @@ public function testParseArray(): void {
             "exception"          => null,
             "id"                 => "id",
             "class"              => [
-                "class1",
-                "class2",
-                "class3   class4",
+                null,
+                0.1,
+                1,
+                true,
+                "class1   class2",
             ],
             "data-type-boolean" => true,
             "data-type-float"   => 0.1,
             "data-type-integer" => 1,
         ];
-        $exp = 'id="id" class="class1 class2 class3 class4" data-type-boolean="true" data-type-float="0.1" data-type-integer="1"';
+        $exp = 'id="id" class="0.1 1 true class1 class2" data-type-boolean="true" data-type-float="0.1" data-type-integer="1"';
 
         $this->assertEquals($exp, StringHelper::parseArray($arg));
     }