Author: mcaskill

Function.HTML-Build-Attributes.php

@@ -5,54 +5,57 @@
 	/**
 	 * Generate a string of HTML attributes
 	 *
-	 * @param   array     $attr      Associative array of attribute names and values.
-	 * @param   callable  $callback  Callback function to escape values for HTML attributes.
-	 *                               Defaults to `htmlspecialchars()`.
+	 * @param   array     $attr           Associative array of attribute names and values.
+	 * @param   callable|null  $callback  Callback function to escape values for HTML attributes.
+	 *                                    Defaults to `htmlspecialchars()`.
 	 * @return  string  Returns a string of HTML attributes.
 	 */
-	function html_build_attributes( $attr = [], $callback = null )
+	function html_build_attributes( $attr, $callback = null )
 	{
-		$html = '';
-
-		if ( count($attr) ) {
-			$html = array_map(
-				function ( $val, $key ) {
-					if ( is_bool( $val ) ) {
-						return ( $val ? $key : '' );
-					} elseif ( isset( $val ) ) {
-						if ( $val instanceof Closure ) {
-							$val = $val();
-						} elseif ( is_callable( [ $val, 'toArray' ] ) ) {
-							$val = $val->toArray();
-						} elseif ( is_callable( [ $val, '__toString' ] ) ) {
-							$val = strval( $val );
-						}
-
-						if ( is_array( $val ) ) {
-							$val = implode( ' ', $val );
-						}
-
-						if ( is_callable( $callback ) ) {
-							$val = call_user_func( $callback, $val );
-						} elseif ( function_exists('esc_attr') ) {
-							$val = esc_attr( $val );
-						} else {
-							$val = htmlspecialchars( $val, ENT_QUOTES );
-						}
-
-						if ( is_string( $val ) ) {
-							return sprintf( '%1$s="%2$s"', $key, $val );
-						}
+	        if ( ! count($attr) ) {
+	            return '';
+	        }
+
+		$html = array_map(
+			function ( $val, $key ) use ( $callback ) {
+				if ( is_bool( $val ) ) {
+					return ( $val ? $key : '' );
+				} elseif ( isset( $val ) ) {
+					if ( $val instanceof \Closure ) {
+						$val = $val();
+					} elseif ( $val instanceof \JsonSerializable ) {
+                        $val = json_encode(
+                            $val->jsonSerialize(),
+                            (JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE)
+                        );
+                    } elseif ( is_callable( [ $val, 'toArray' ] ) ) {
+						$val = $val->toArray();
+					} elseif ( is_callable( [ $val, '__toString' ] ) ) {
+						$val = strval( $val );
 					}
-				},
-				$attr,
-				array_keys( $attr )
-			);
 
-			$html = implode( ' ', $html );
-		}
+					if ( is_array( $val ) ) {
+						$val = implode( ' ', $val );
+					}
+
+					if ( is_callable( $callback ) ) {
+						$val = call_user_func( $callback, $val );
+					} elseif ( function_exists('esc_attr') ) {
+						$val = esc_attr( $val );
+					} else {
+						$val = htmlspecialchars( $val, ENT_QUOTES );
+					}
+
+					if ( is_string( $val ) ) {
+						return sprintf( '%1$s="%2$s"', $key, $val );
+					}
+				}
+			},
+			$attr,
+			array_keys( $attr )
+		);
 
-		return $html;
+		return implode( ' ', $html );
 	}
 
 endif;