Improve serializable value handling

Changed:
- Moved JSON serialization to later to encode non-alphanumeric values.

Author: mcaskill

Function.HTML-Build-Attributes.php

@@ -37,8 +37,6 @@ function html_build_attributes($attr, callable $callback = null)
             if (is_object($val)) {
                 if ($val instanceof Closure) {
                     $val = $val();
-                } elseif ($val instanceof JsonSerializable) {
-                    $val = json_encode($val, (JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE));
                 } elseif (is_callable([ $val, 'toArray' ])) {
                     $val = $val->toArray();
                 } elseif (is_callable([ $val, '__toString' ])) {
@@ -51,9 +49,7 @@ function html_build_attributes($attr, callable $callback = null)
                     $html[] = $key;
                 }
                 continue;
-            }
-
-            if (is_array($val)) {
+            } elseif (is_array($val)) {
                 $val = implode(' ', array_reduce($val, function ($tokens, $token) {
                     if (is_string($token)) {
                         $token = trim($token);
@@ -71,6 +67,8 @@ function html_build_attributes($attr, callable $callback = null)
                 if (strlen($val) === 0) {
                     continue;
                 }
+            } elseif (!is_string($val) && !is_numeric($val)) {
+                $val = json_encode($val, (JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE));
             }
 
             if (is_callable($callback)) {
@@ -81,10 +79,7 @@ function html_build_attributes($attr, callable $callback = null)
                 $val = htmlspecialchars($val, ENT_QUOTES);
             }
 
-            if (is_string($val) || is_numeric($val)) {
-                $html[] = sprintf('%1$s="%2$s"', $key, $val);
-                continue;
-            }
+            $html[] = sprintf('%1$s="%2$s"', $key, $val);
         }
 
         return implode(' ', $html);