sc0ttkclark / wordpress-fields-api

includes/class-wp-fields-api-field.php

Doc Comments +3 added lines, -6 removed lines

@@ -133,10 +133,8 @@ 
 	 * Check user capabilities and theme supports, and then save
 	 * the value of the field.
 	 *
-	 * @param mixed $value   The value to save.
-	 * @param int   $item_id The Item ID.
 	 *
-	 * @return false|mixed False if cap check fails or value isn't set.
+	 * @return null|boolean False if cap check fails or value isn't set.
 	 */
 	public function save() {
 
@@ -188,9 +186,8 @@ 
 	 * Save the value of the field, using the related API.
 	 *
 	 * @param mixed $value The value to update.
-	 * @param int $item_id Item ID.
 	 *
-	 * @return mixed The result of saving the value.
+	 * @return null|boolean The result of saving the value.
 	 */
 	protected function update( $value ) {
 
@@ -538,7 +535,7 @@ 
 	 *
 	 * @param       $root
 	 * @param       $keys
-	 * @param mixed $default A default value which is used as a fallback. Default is null.
+	 * @param string $default A default value which is used as a fallback. Default is null.
 	 *
 	 * @return mixed The requested value or the default value.
 	 */

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Fields API Field Class
- *
- * Handles saving and sanitizing of fields.
- *
- * @package    WordPress
- * @subpackage Fields_API
- */
+	 * Fields API Field Class
+	 *
+	 * Handles saving and sanitizing of fields.
+	 *
+	 * @package    WordPress
+	 * @subpackage Fields_API
+	 */
 class WP_Fields_API_Field {
 
 	/**

Spacing +105 added lines, -105 removed lines

@@ -74,7 +74,7 @@ 
 
 		$args = func_get_args();
 
-		call_user_func_array( array( $this, 'init' ), $args );
+		call_user_func_array(array($this, 'init'), $args);
 
 	}
 
@@ -88,11 +88,11 @@ 
 	 *
 	 * @return WP_Fields_API_Field $field
 	 */
-	public function init( $object_type, $id, $args = array() ) {
+	public function init($object_type, $id, $args = array()) {
 
 		$this->object_type = $object_type;
 
-		if ( is_array( $id ) ) {
+		if (is_array($id)) {
 			$args = $id;
 
 			$id = '';
@@ -100,31 +100,31 @@ 
 			$this->id = $id;
 		}
 
-		$keys = array_keys( get_object_vars( $this ) );
+		$keys = array_keys(get_object_vars($this));
 
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
 		// Parse the ID for array keys.
-		$this->id_data['keys'] = preg_split( '/\[/', str_replace( ']', '', $this->id ) );
-		$this->id_data['base'] = array_shift( $this->id_data['keys'] );
+		$this->id_data['keys'] = preg_split('/\[/', str_replace(']', '', $this->id));
+		$this->id_data['base'] = array_shift($this->id_data['keys']);
 
 		// Rebuild the ID.
 		$this->id = $this->id_data['base'];
 
-		if ( ! empty( $this->id_data['keys'] ) ) {
-			$this->id .= '[' . implode( '][', $this->id_data['keys'] ) . ']';
+		if ( ! empty($this->id_data['keys'])) {
+			$this->id .= '['.implode('][', $this->id_data['keys']).']';
 		}
 
-		if ( $this->sanitize_callback ) {
-			add_filter( "fields_sanitize_{$this->object_type}_{$this->object_name}_{$this->id}", $this->sanitize_callback, 10, 2 );
+		if ($this->sanitize_callback) {
+			add_filter("fields_sanitize_{$this->object_type}_{$this->object_name}_{$this->id}", $this->sanitize_callback, 10, 2);
 		}
 
-		if ( $this->sanitize_js_callback ) {
-			add_filter( "fields_sanitize_js_{$this->object_type}_{$this->object_name}_{$this->id}", $this->sanitize_js_callback, 10, 2 );
+		if ($this->sanitize_js_callback) {
+			add_filter("fields_sanitize_js_{$this->object_type}_{$this->object_name}_{$this->id}", $this->sanitize_js_callback, 10, 2);
 		}
 
 	}
@@ -143,7 +143,7 @@ 
 		$value   = func_get_arg(0);
 		$item_id = func_get_arg(1);
 
-		if ( ! $this->check_capabilities() || false === $value ) {
+		if ( ! $this->check_capabilities() || false === $value) {
 			return false;
 		}
 
@@ -157,9 +157,9 @@ 
 		 *
 		 * @param WP_Fields_API_Field $this {@see WP_Fields_API_Field} instance.
 		 */
-		do_action( 'field_save_' . $this->object_type . ' _' . $this->id_data[ 'base' ], $this, $value, $item_id );
+		do_action('field_save_'.$this->object_type.' _'.$this->id_data['base'], $this, $value, $item_id);
 
-		return $this->update( $value, $item_id );
+		return $this->update($value, $item_id);
 
 	}
 
@@ -170,9 +170,9 @@ 
 	 *
 	 * @return mixed Null if an input isn't valid, otherwise the sanitized value.
 	 */
-	public function sanitize( $value ) {
+	public function sanitize($value) {
 
-		$value = wp_unslash( $value );
+		$value = wp_unslash($value);
 
 		/**
 		 * Filter a Customize field value in un-slashed form.
@@ -180,7 +180,7 @@ 
 		 * @param mixed                $value Value of the field.
 		 * @param WP_Fields_API_Field $this  WP_Fields_API_Field instance.
 		 */
-		return apply_filters( "fields_sanitize_{$this->object_type}_{$this->object_name}_{$this->id}", $value, $this );
+		return apply_filters("fields_sanitize_{$this->object_type}_{$this->object_name}_{$this->id}", $value, $this);
 
 	}
 
@@ -192,22 +192,22 @@ 
 	 *
 	 * @return mixed The result of saving the value.
 	 */
-	protected function update( $value ) {
+	protected function update($value) {
 
 		$item_id = func_get_arg(1);
 
-		switch ( $this->object_type ) {
+		switch ($this->object_type) {
 			case 'customizer' :
-				return $this->_update_theme_mod( $value );
+				return $this->_update_theme_mod($value);
 
 			case 'settings' :
-				return $this->_update_option( $value );
+				return $this->_update_option($value);
 
 			case 'post' :
-				return $this->_update_post_meta( $value, $item_id );
+				return $this->_update_post_meta($value, $item_id);
 
 			case 'user' :
-				return $this->_update_user_meta( $value, $item_id );
+				return $this->_update_user_meta($value, $item_id);
 
 			default :
 
@@ -221,7 +221,7 @@ 
 				 * @param int                 $item_id Item ID.
 				 * @param WP_Fields_API_Field $this    WP_Fields_API_Field instance.
 				 */
-				do_action( "fields_update_{$this->object_type}", $value, $item_id, $this );
+				do_action("fields_update_{$this->object_type}", $value, $item_id, $this);
 		}
 
 		return null;
@@ -235,22 +235,22 @@ 
 	 *
 	 * @return null
 	 */
-	protected function _update_theme_mod( $value ) {
+	protected function _update_theme_mod($value) {
 
-		if ( is_null( $value ) ) {
-			remove_theme_mod( $this->id_data['base'] );
+		if (is_null($value)) {
+			remove_theme_mod($this->id_data['base']);
 		}
 
 		// Handle non-array theme mod.
-		if ( empty( $this->id_data['keys'] ) ) {
-			set_theme_mod( $this->id_data['base'], $value );
+		if (empty($this->id_data['keys'])) {
+			set_theme_mod($this->id_data['base'], $value);
 		} else {
 			// Handle array-based theme mod.
-			$mods = get_theme_mod( $this->id_data['base'] );
-			$mods = $this->multidimensional_replace( $mods, $this->id_data['keys'], $value );
+			$mods = get_theme_mod($this->id_data['base']);
+			$mods = $this->multidimensional_replace($mods, $this->id_data['keys'], $value);
 
-			if ( isset( $mods ) ) {
-				set_theme_mod( $this->id_data['base'], $mods );
+			if (isset($mods)) {
+				set_theme_mod($this->id_data['base'], $mods);
 			}
 		}
 
@@ -265,23 +265,23 @@ 
 	 *
 	 * @return bool|null The result of saving the value.
 	 */
-	protected function _update_option( $value ) {
+	protected function _update_option($value) {
 
-		if ( is_null( $value ) ) {
-			delete_option( $this->id_data['base'] );
+		if (is_null($value)) {
+			delete_option($this->id_data['base']);
 		}
 
 		// Handle non-array option.
-		if ( empty( $this->id_data['keys'] ) ) {
-			return update_option( $this->id_data['base'], $value );
+		if (empty($this->id_data['keys'])) {
+			return update_option($this->id_data['base'], $value);
 		}
 
 		// Handle array-based options.
-		$options = get_option( $this->id_data['base'] );
-		$options = $this->multidimensional_replace( $options, $this->id_data['keys'], $value );
+		$options = get_option($this->id_data['base']);
+		$options = $this->multidimensional_replace($options, $this->id_data['keys'], $value);
 
-		if ( isset( $options ) ) {
-			return update_option( $this->id_data['base'], $options );
+		if (isset($options)) {
+			return update_option($this->id_data['base'], $options);
 		}
 
 		return null;
@@ -296,23 +296,23 @@ 
 	 *
 	 * @return bool|null The result of saving the value.
 	 */
-	protected function _update_post_meta( $value, $item_id = 0 ) {
+	protected function _update_post_meta($value, $item_id = 0) {
 
-		if ( is_null( $value ) ) {
-			delete_post_meta( $item_id, $this->id_data['base'] );
+		if (is_null($value)) {
+			delete_post_meta($item_id, $this->id_data['base']);
 		}
 
 		// Handle non-array option.
-		if ( empty( $this->id_data['keys'] ) ) {
-			return update_post_meta( $item_id, $this->id_data['base'], $value );
+		if (empty($this->id_data['keys'])) {
+			return update_post_meta($item_id, $this->id_data['base'], $value);
 		}
 
 		// Handle array-based keys.
-		$keys = get_post_meta( 0, $this->id_data['base'] );
-		$keys = $this->multidimensional_replace( $keys, $this->id_data['keys'], $value );
+		$keys = get_post_meta(0, $this->id_data['base']);
+		$keys = $this->multidimensional_replace($keys, $this->id_data['keys'], $value);
 
-		if ( isset( $keys ) ) {
-			return update_post_meta( $item_id, $this->id_data['base'], $keys );
+		if (isset($keys)) {
+			return update_post_meta($item_id, $this->id_data['base'], $keys);
 		}
 
 		return null;
@@ -327,23 +327,23 @@ 
 	 *
 	 * @return bool|null The result of saving the value.
 	 */
-	protected function _update_user_meta( $value, $item_id = 0 ) {
+	protected function _update_user_meta($value, $item_id = 0) {
 
-		if ( is_null( $value ) ) {
-			delete_user_meta( $item_id, $this->id_data['base'] );
+		if (is_null($value)) {
+			delete_user_meta($item_id, $this->id_data['base']);
 		}
 
 		// Handle non-array option.
-		if ( empty( $this->id_data['keys'] ) ) {
-			return update_user_meta( $item_id, $this->id_data['base'], $value );
+		if (empty($this->id_data['keys'])) {
+			return update_user_meta($item_id, $this->id_data['base'], $value);
 		}
 
 		// Handle array-based options.
-		$keys = get_user_meta( 0, $this->id_data['base'] );
-		$keys = $this->multidimensional_replace( $keys, $this->id_data['keys'], $value );
+		$keys = get_user_meta(0, $this->id_data['base']);
+		$keys = $this->multidimensional_replace($keys, $this->id_data['keys'], $value);
 
-		if ( isset( $keys ) ) {
-			return update_user_meta( $item_id, $this->id_data['base'], $keys );
+		if (isset($keys)) {
+			return update_user_meta($item_id, $this->id_data['base'], $keys);
 		}
 
 		return null;
@@ -357,7 +357,7 @@ 
 	 */
 	public function value() {
 
-		switch ( $this->object_type ) {
+		switch ($this->object_type) {
 			case 'customizer' :
 				$function = 'get_theme_mod';
 				break;
@@ -388,18 +388,18 @@ 
 				 *
 				 * @param mixed $default The field default value. Default empty.
 				 */
-				return apply_filters( 'fields_value_' . $this->object_type . '_' . $this->object_name . '_' . $this->id_data['base'], $this->default );
+				return apply_filters('fields_value_'.$this->object_type.'_'.$this->object_name.'_'.$this->id_data['base'], $this->default);
 		}
 
 		// Handle non-array value
-		if ( empty( $this->id_data['keys'] ) ) {
-			return $function( $this->id_data['base'], $this->default );
+		if (empty($this->id_data['keys'])) {
+			return $function($this->id_data['base'], $this->default);
 		}
 
 		// Handle array-based value
-		$values = $function( $this->id_data['base'] );
+		$values = $function($this->id_data['base']);
 
-		return $this->multidimensional_get( $values, $this->id_data['keys'], $this->default );
+		return $this->multidimensional_get($values, $this->id_data['keys'], $this->default);
 
 	}
 
@@ -420,10 +420,10 @@ 
 		 * @param mixed                $value The field value.
 		 * @param WP_Fields_API_Field $this  {@see WP_Fields_API_Field} instance.
 		 */
-		$value = apply_filters( "fields_sanitize_js_{$this->object_type}_{$this->object_name}_{$this->id}", $value, $this );
+		$value = apply_filters("fields_sanitize_js_{$this->object_type}_{$this->object_name}_{$this->id}", $value, $this);
 
-		if ( is_string( $value ) ) {
-			return html_entity_decode( $value, ENT_QUOTES, 'UTF-8' );
+		if (is_string($value)) {
+			return html_entity_decode($value, ENT_QUOTES, 'UTF-8');
 		}
 
 		return $value;
@@ -437,11 +437,11 @@ 
 	 */
 	public function check_capabilities() {
 
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) ) {
+		if ($this->capability && ! call_user_func_array('current_user_can', (array) $this->capability)) {
 			return false;
 		}
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) ) {
+		if ($this->theme_supports && ! call_user_func_array('current_theme_supports', (array) $this->theme_supports)) {
 			return false;
 		}
 
@@ -458,42 +458,42 @@ 
 	 *
 	 * @return null|array Keys are 'root', 'node', and 'key'.
 	 */
-	final protected function multidimensional( &$root, $keys, $create = false ) {
+	final protected function multidimensional(&$root, $keys, $create = false) {
 
-		if ( $create && empty( $root ) ) {
+		if ($create && empty($root)) {
 			$root = array();
 		}
 
-		if ( ! isset( $root ) || empty( $keys ) ) {
+		if ( ! isset($root) || empty($keys)) {
 			return null;
 		}
 
-		$last = array_pop( $keys );
+		$last = array_pop($keys);
 		$node = &$root;
 
-		foreach ( $keys as $key ) {
-			if ( $create && ! isset( $node[ $key ] ) ) {
-				$node[ $key ] = array();
+		foreach ($keys as $key) {
+			if ($create && ! isset($node[$key])) {
+				$node[$key] = array();
 			}
 
-			if ( ! is_array( $node ) || ! isset( $node[ $key ] ) ) {
+			if ( ! is_array($node) || ! isset($node[$key])) {
 				return null;
 			}
 
-			$node = &$node[ $key ];
+			$node = &$node[$key];
 		}
 
-		if ( $create ) {
-			if ( ! is_array( $node ) ) {
+		if ($create) {
+			if ( ! is_array($node)) {
 				// account for an array overriding a string or object value
 				$node = array();
 			}
-			if ( ! isset( $node[ $last ] ) ) {
-				$node[ $last ] = array();
+			if ( ! isset($node[$last])) {
+				$node[$last] = array();
 			}
 		}
 
-		if ( ! isset( $node[ $last ] ) ) {
+		if ( ! isset($node[$last])) {
 			return null;
 		}
 
@@ -514,19 +514,19 @@ 
 	 *
 	 * @return
 	 */
-	final protected function multidimensional_replace( $root, $keys, $value ) {
+	final protected function multidimensional_replace($root, $keys, $value) {
 
-		if ( ! isset( $value ) ) {
+		if ( ! isset($value)) {
 			return $root;
-		} elseif ( empty( $keys ) ) {
+		} elseif (empty($keys)) {
 			// If there are no keys, we're replacing the root.
 			return $value;
 		}
 
-		$result = $this->multidimensional( $root, $keys, true );
+		$result = $this->multidimensional($root, $keys, true);
 
-		if ( isset( $result ) ) {
-			$result['node'][ $result['key'] ] = $value;
+		if (isset($result)) {
+			$result['node'][$result['key']] = $value;
 		}
 
 		return $root;
@@ -542,18 +542,18 @@ 
 	 *
 	 * @return mixed The requested value or the default value.
 	 */
-	final protected function multidimensional_get( $root, $keys, $default = null ) {
+	final protected function multidimensional_get($root, $keys, $default = null) {
 
 		// If there are no keys, test the root.
-		if ( empty( $keys ) ) {
-			if ( isset( $root ) ) {
+		if (empty($keys)) {
+			if (isset($root)) {
 				return $root;
 			}
 		} else {
-			$result = $this->multidimensional( $root, $keys );
+			$result = $this->multidimensional($root, $keys);
 
-			if ( isset( $result ) ) {
-				return $result['node'][ $result['key'] ];
+			if (isset($result)) {
+				return $result['node'][$result['key']];
 			}
 		}
 
@@ -569,11 +569,11 @@ 
 	 *
 	 * @return bool True if value is set, false if not.
 	 */
-	final protected function multidimensional_isset( $root, $keys ) {
+	final protected function multidimensional_isset($root, $keys) {
 
-		$result = $this->multidimensional_get( $root, $keys );
+		$result = $this->multidimensional_get($root, $keys);
 
-		return isset( $result );
+		return isset($result);
 
 	}
 }
@@ -595,7 +595,7 @@ 
 	 *
 	 * @return mixed The result of saving the value.
 	 */
-	public function update( $value ) {
+	public function update($value) {
 
 		return null;
 

includes/class-wp-fields-api.php

Doc Comments +4 added lines, -5 removed lines

@@ -132,7 +132,7 @@ 
 	 * @access public
 	 *
 	 * @param string|null         $object_type   Object type. Null for all containers for all object types.
-	 * @param string|boolean|null $object_name   Object name (for post types and taxonomies).
+	 * @param string|boolean $object_name   Object name (for post types and taxonomies).
 	 *                                           True for all containers for all object names.
 	 *
 	 * @return WP_Fields_API_Screen[]|WP_Fields_API_Section[]
@@ -226,7 +226,7 @@ 
 	 * @access public
 	 *
 	 * @param string                      $object_type Object type.
-	 * @param WP_Fields_API_Screen|string $id          Field Screen object, or Screen ID.
+	 * @param string|null $id          Field Screen object, or Screen ID.
 	 * @param string                      $object_name Object name (for post types and taxonomies).
 	 * @param array                       $args        Optional. Screen arguments. Default empty array.
 	 */
@@ -498,7 +498,7 @@ 
 	 * @access public
 	 *
 	 * @param string                       $object_type Object type.
-	 * @param WP_Fields_API_Section|string $id          Field Section object, or Section ID.
+	 * @param string $id          Field Section object, or Section ID.
 	 * @param string                       $object_name Object name (for post types and taxonomies).
 	 * @param array                        $args        Section arguments.
 	 */
@@ -730,7 +730,7 @@ 
 	 * @access public
 	 *
 	 * @param string                     $object_type Object type.
-	 * @param WP_Fields_API_Field|string $id          Fields API Field object, or ID.
+	 * @param string $id          Fields API Field object, or ID.
 	 * @param string                     $object_name Object name (for post types and taxonomies).
 	 * @param array                      $args        Field arguments; passed to WP_Fields_API_Field
 	 *                                                constructor.
@@ -908,7 +908,6 @@ 
 	 * @see    WP_Fields_API_Field
 	 *
 	 * @param string $type         Field type ID.
-	 * @param string $screen_class Name of a custom field type which is a subclass of WP_Fields_API_Field.
 	 */
 	public function register_field_type( $type, $field_class = null ) {
 

Spacing +351 added lines, -351 removed lines

@@ -96,15 +96,15 @@ 
 	 */
 	public function __construct() {
 
-		require_once( WP_FIELDS_API_DIR . 'includes/class-wp-fields-api-field.php' );
-		require_once( WP_FIELDS_API_DIR . 'includes/class-wp-fields-api-control.php' );
-		require_once( WP_FIELDS_API_DIR . 'includes/class-wp-fields-api-section.php' );
-		require_once( WP_FIELDS_API_DIR . 'includes/class-wp-fields-api-screen.php' );
+		require_once(WP_FIELDS_API_DIR.'includes/class-wp-fields-api-field.php');
+		require_once(WP_FIELDS_API_DIR.'includes/class-wp-fields-api-control.php');
+		require_once(WP_FIELDS_API_DIR.'includes/class-wp-fields-api-section.php');
+		require_once(WP_FIELDS_API_DIR.'includes/class-wp-fields-api-screen.php');
 
 		// Register our wp_loaded() first before WP_Customize_Manage::wp_loaded()
-		add_action( 'wp_loaded', array( $this, 'wp_loaded' ), 9 );
+		add_action('wp_loaded', array($this, 'wp_loaded'), 9);
 
-		add_action( 'fields_register', array( $this, 'register_controls' ) );
+		add_action('fields_register', array($this, 'register_controls'));
 
 	}
 
@@ -122,7 +122,7 @@ 
 		 *
 		 * @param WP_Fields_API $this The Fields manager object.
 		 */
-		do_action( 'fields_register', $this );
+		do_action('fields_register', $this);
 
 	}
 
@@ -137,34 +137,34 @@ 
 	 *
 	 * @return WP_Fields_API_Screen[]|WP_Fields_API_Section[]
 	 */
-	public function get_containers( $object_type = null, $object_name = null ) {
+	public function get_containers($object_type = null, $object_name = null) {
 
 		// $object_name defaults to '_{$object_type}' for internal handling.
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type;
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type;
 		}
 
 		// Setup containers.
-		if ( empty( self::$containers ) ) {
-			if ( true === $object_name ) {
-				$this->prepare_controls( $object_type );
+		if (empty(self::$containers)) {
+			if (true === $object_name) {
+				$this->prepare_controls($object_type);
 			} else {
-				$this->prepare_object_controls( $object_type, $object_name );
+				$this->prepare_object_controls($object_type, $object_name);
 			}
 		}
 
 		$containers = array();
 
-		if ( null === $object_type ) {
+		if (null === $object_type) {
 			// Get all containers.
 			$containers = self::$containers;
-		} elseif ( isset( self::$containers[ $object_type ][ $object_name ] ) ) {
+		} elseif (isset(self::$containers[$object_type][$object_name])) {
 			// Get all containers by object name.
-			$containers = self::$containers[ $object_type ][ $object_name ];
-		} elseif ( true === $object_name ) {
+			$containers = self::$containers[$object_type][$object_name];
+		} elseif (true === $object_name) {
 			// Get all containers by object type.
-			foreach ( self::$containers[ $object_type ] as $object_name => $object_containers ) {
-				$containers = array_merge( $containers, array_values( $object_containers ) );
+			foreach (self::$containers[$object_type] as $object_name => $object_containers) {
+				$containers = array_merge($containers, array_values($object_containers));
 			}
 		}
 
@@ -182,37 +182,37 @@ 
 	 *
 	 * @return WP_Fields_API_Screen[]
 	 */
-	public function get_screens( $object_type = null, $object_name = null ) {
+	public function get_screens($object_type = null, $object_name = null) {
 
 		// $object_name defaults to '_{$object_type}' for internal handling.
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type;
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type;
 		}
 
 		$screens = array();
 
-		if ( null === $object_type ) {
+		if (null === $object_type) {
 			// Late init.
-			foreach ( self::$screens as $object_type => $object_names ) {
-				foreach ( $object_names as $object_name => $screens ) {
-					$this->get_screens( $object_type, $object_name );
+			foreach (self::$screens as $object_type => $object_names) {
+				foreach ($object_names as $object_name => $screens) {
+					$this->get_screens($object_type, $object_name);
 				}
 			}
 
 			$screens = self::$screens;
-		} elseif ( isset( self::$screens[ $object_type ][ $object_name ] ) ) {
+		} elseif (isset(self::$screens[$object_type][$object_name])) {
 			// Late init.
-			foreach ( self::$screens[ $object_type ][ $object_name ] as $id => $screen ) {
+			foreach (self::$screens[$object_type][$object_name] as $id => $screen) {
 				// Late init
-				self::$screens[ $object_type ][ $object_name ][ $id ] = $this->setup_screen( $object_type, $id, $object_name, $screen );
+				self::$screens[$object_type][$object_name][$id] = $this->setup_screen($object_type, $id, $object_name, $screen);
 			}
 
-			$screens = self::$screens[ $object_type ][ $object_name ];
-		} elseif ( true === $object_name ) {
+			$screens = self::$screens[$object_type][$object_name];
+		} elseif (true === $object_name) {
 			// Get all screens.
 			// Late init.
-			foreach ( self::$screens[ $object_type ] as $object_name => $object_screens ) {
-				$screens = array_merge( $screens, array_values( $this->get_screens( $object_type, $object_name ) ) );
+			foreach (self::$screens[$object_type] as $object_name => $object_screens) {
+				$screens = array_merge($screens, array_values($this->get_screens($object_type, $object_name)));
 			}
 		}
 
@@ -230,13 +230,13 @@ 
 	 * @param string                      $object_name Object name (for post types and taxonomies).
 	 * @param array                       $args        Optional. Screen arguments. Default empty array.
 	 */
-	public function add_screen( $object_type, $id, $object_name = null, $args = array() ) {
+	public function add_screen($object_type, $id, $object_name = null, $args = array()) {
 
-		if ( empty( $id ) && empty( $args ) ) {
+		if (empty($id) && empty($args)) {
 			return;
 		}
 
-		if ( is_a( $id, 'WP_Fields_API_Screen' ) ) {
+		if (is_a($id, 'WP_Fields_API_Screen')) {
 			$screen = $id;
 
 			$id = $screen->id;
@@ -246,19 +246,19 @@ 
 		}
 
 		// $object_name defaults to '_{$object_type}' for internal handling.
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type;
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type;
 		}
 
-		if ( ! isset( self::$screens[ $object_type ] ) ) {
-			self::$screens[ $object_type ] = array();
+		if ( ! isset(self::$screens[$object_type])) {
+			self::$screens[$object_type] = array();
 		}
 
-		if ( ! isset( self::$screens[ $object_type ][ $object_name ] ) ) {
-			self::$screens[ $object_type ][ $object_name ] = array();
+		if ( ! isset(self::$screens[$object_type][$object_name])) {
+			self::$screens[$object_type][$object_name] = array();
 		}
 
-		self::$screens[ $object_type ][ $object_name ][ $id ] = $screen;
+		self::$screens[$object_type][$object_name][$id] = $screen;
 
 	}
 
@@ -273,19 +273,19 @@ 
 	 *
 	 * @return WP_Fields_API_Screen|null Requested screen instance.
 	 */
-	public function get_screen( $object_type, $id, $object_name = null ) {
+	public function get_screen($object_type, $id, $object_name = null) {
 
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type; // Default to _object_type for internal handling
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type; // Default to _object_type for internal handling
 		}
 
 		$screen = null;
 
-		if ( isset( self::$screens[ $object_type ][ $object_name ][ $id ] ) ) {
+		if (isset(self::$screens[$object_type][$object_name][$id])) {
 			// Late init
-			self::$screens[ $object_type ][ $object_name ][ $id ] = $this->setup_screen( $object_type, $id, $object_name, self::$screens[ $object_type ][ $object_name ][ $id ] );
+			self::$screens[$object_type][$object_name][$id] = $this->setup_screen($object_type, $id, $object_name, self::$screens[$object_type][$object_name][$id]);
 
-			$screen = self::$screens[ $object_type ][ $object_name ][ $id ];
+			$screen = self::$screens[$object_type][$object_name][$id];
 		}
 
 		return $screen;
@@ -304,26 +304,26 @@ 
 	 *
 	 * @return WP_Fields_API_Screen|null $screen The screen object.
 	 */
-	public function setup_screen( $object_type, $id, $object_name = null, $args = null ) {
+	public function setup_screen($object_type, $id, $object_name = null, $args = null) {
 
 		$screen = null;
 
 		$screen_class = 'WP_Fields_API_Screen';
 
-		if ( is_a( $args, $screen_class ) ) {
+		if (is_a($args, $screen_class)) {
 			$screen = $args;
-		} elseif ( is_array( $args ) ) {
+		} elseif (is_array($args)) {
 			$args['object_name'] = $object_name;
 
-			if ( ! empty( $args['type'] ) ) {
-				if ( ! empty( self::$registered_screen_types[ $args['type'] ] ) ) {
-					$screen_class = self::$registered_screen_types[ $args['type'] ];
-				} elseif ( in_array( $args['type'], self::$registered_screen_types ) ) {
+			if ( ! empty($args['type'])) {
+				if ( ! empty(self::$registered_screen_types[$args['type']])) {
+					$screen_class = self::$registered_screen_types[$args['type']];
+				} elseif (in_array($args['type'], self::$registered_screen_types)) {
 					$screen_class = $args['type'];
 				}
 			}
 
-			$screen = new $screen_class( $object_type, $id, $args );
+			$screen = new $screen_class($object_type, $id, $args);
 		}
 
 		return $screen;
@@ -339,29 +339,29 @@ 
 	 * @param string $id          Screen ID to remove, set true to remove all screens from an object.
 	 * @param string $object_name Object name (for post types and taxonomies), set true to remove to all objects from an object type.
 	 */
-	public function remove_screen( $object_type, $id, $object_name = null ) {
+	public function remove_screen($object_type, $id, $object_name = null) {
 
-		if ( true === $object_type ) {
+		if (true === $object_type) {
 			// Remove all screens
 			self::$screens = array();
-		} elseif ( true === $object_name ) {
+		} elseif (true === $object_name) {
 			// Remove all screens for an object type
-			if ( isset( self::$screens[ $object_type ] ) ) {
-				unset( self::$screens[ $object_type ] );
+			if (isset(self::$screens[$object_type])) {
+				unset(self::$screens[$object_type]);
 			}
 		} else {
-			if ( empty( $object_name ) && ! empty( $object_type ) ) {
-				$object_name = '_' . $object_type; // Default to _object_type for internal handling
+			if (empty($object_name) && ! empty($object_type)) {
+				$object_name = '_'.$object_type; // Default to _object_type for internal handling
 			}
 
-			if ( true === $id && null !== $object_name ) {
+			if (true === $id && null !== $object_name) {
 				// Remove all screens for an object type
-				if ( isset( self::$screens[ $object_type ][ $object_name ] ) ) {
-					unset( self::$screens[ $object_type ][ $object_name ] );
+				if (isset(self::$screens[$object_type][$object_name])) {
+					unset(self::$screens[$object_type][$object_name]);
 				}
-			} elseif ( isset( self::$screens[ $object_type ][ $object_name ][ $id ] ) ) {
+			} elseif (isset(self::$screens[$object_type][$object_name][$id])) {
 				// Remove screen from object type and name
-				unset( self::$screens[ $object_type ][ $object_name ][ $id ] );
+				unset(self::$screens[$object_type][$object_name][$id]);
 			}
 		}
 
@@ -377,13 +377,13 @@ 
 	 * @param string $type         Screen type ID.
 	 * @param string $screen_class Name of a custom screen which is a subclass of WP_Fields_API_Screen.
 	 */
-	public function register_screen_type( $type, $screen_class = null ) {
+	public function register_screen_type($type, $screen_class = null) {
 
-		if ( null === $screen_class ) {
+		if (null === $screen_class) {
 			$screen_class = $type;
 		}
 
-		self::$registered_screen_types[ $type ] = $screen_class;
+		self::$registered_screen_types[$type] = $screen_class;
 
 	}
 
@@ -397,8 +397,8 @@ 
 		/**
 		 * @var WP_Fields_API_Screen $screen
 		 */
-		foreach ( self::$registered_screen_types as $screen_type => $screen_class ) {
-			$screen = $this->setup_screen( null, 'temp', null, array( 'type' => $screen_type ) );
+		foreach (self::$registered_screen_types as $screen_type => $screen_class) {
+			$screen = $this->setup_screen(null, 'temp', null, array('type' => $screen_type));
 
 			$screen->print_template();
 		}
@@ -416,41 +416,41 @@ 
 	 *
 	 * @return WP_Fields_API_Section[]
 	 */
-	public function get_sections( $object_type = null, $object_name = null, $screen = null ) {
+	public function get_sections($object_type = null, $object_name = null, $screen = null) {
 
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type; // Default to _object_type for internal handling
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type; // Default to _object_type for internal handling
 		}
 
 		$sections = array();
 
-		if ( null === $object_type ) {
+		if (null === $object_type) {
 			// Late init
-			foreach ( self::$sections as $object_type => $object_names ) {
-				foreach ( $object_names as $object_name => $sections ) {
-					$this->get_sections( $object_type, $object_name );
+			foreach (self::$sections as $object_type => $object_names) {
+				foreach ($object_names as $object_name => $sections) {
+					$this->get_sections($object_type, $object_name);
 				}
 			}
 
 			$sections = self::$sections;
 
 			// Get only sections for a specific screen
-			if ( null !== $screen ) {
+			if (null !== $screen) {
 				$screen_sections = array();
 
-				foreach ( $sections as $object_type => $object_names ) {
-					foreach ( $object_names as $object_name => $object_sections ) {
-						foreach ( $object_sections as $id => $section ) {
-							if ( $screen == $section->screen->id ) {
-								if ( ! isset( $screen_sections[ $object_type ] ) ) {
-									$screen_sections[ $object_type ] = array();
+				foreach ($sections as $object_type => $object_names) {
+					foreach ($object_names as $object_name => $object_sections) {
+						foreach ($object_sections as $id => $section) {
+							if ($screen == $section->screen->id) {
+								if ( ! isset($screen_sections[$object_type])) {
+									$screen_sections[$object_type] = array();
 								}
 
-								if ( ! isset( $screen_sections[ $object_type ][ $object_name ] ) ) {
-									$screen_sections[ $object_type ][ $object_name ] = array();
+								if ( ! isset($screen_sections[$object_type][$object_name])) {
+									$screen_sections[$object_type][$object_name] = array();
 								}
 
-								$screen_sections[ $object_type ][ $object_name ][ $id ] = $screen;
+								$screen_sections[$object_type][$object_name][$id] = $screen;
 							}
 						}
 					}
@@ -458,33 +458,33 @@ 
 
 				$sections = $screen_sections;
 			}
-		} elseif ( isset( self::$sections[ $object_type ][ $object_name ] ) ) {
+		} elseif (isset(self::$sections[$object_type][$object_name])) {
 			// Late init
-			foreach ( self::$sections[ $object_type ][ $object_name ] as $id => $section ) {
+			foreach (self::$sections[$object_type][$object_name] as $id => $section) {
 				// Late init
-				self::$sections[ $object_type ][ $object_name ][ $id ] = $this->setup_section( $object_type, $id, $object_name, $section );
+				self::$sections[$object_type][$object_name][$id] = $this->setup_section($object_type, $id, $object_name, $section);
 			}
 
-			$sections = self::$sections[ $object_type ][ $object_name ];
+			$sections = self::$sections[$object_type][$object_name];
 
 			// Get only sections for a specific screen
-			if ( null !== $screen ) {
+			if (null !== $screen) {
 				$screen_sections = array();
 
-				foreach ( $sections as $id => $section ) {
-					if ( $screen == $section->screen ) {
-						$screen_sections[ $id ] = $section;
+				foreach ($sections as $id => $section) {
+					if ($screen == $section->screen) {
+						$screen_sections[$id] = $section;
 					}
 				}
 
 				$sections = $screen_sections;
 			}
-		} elseif ( true === $object_name ) {
+		} elseif (true === $object_name) {
 			// Get all sections
 
 			// Late init
-			foreach ( self::$sections[ $object_type ] as $object_name => $object_sections ) {
-				$sections = array_merge( $sections, array_values( $this->get_sections( $object_type, $object_name, $screen ) ) );
+			foreach (self::$sections[$object_type] as $object_name => $object_sections) {
+				$sections = array_merge($sections, array_values($this->get_sections($object_type, $object_name, $screen)));
 			}
 		}
 
@@ -502,13 +502,13 @@ 
 	 * @param string                       $object_name Object name (for post types and taxonomies).
 	 * @param array                        $args        Section arguments.
 	 */
-	public function add_section( $object_type, $id, $object_name = null, $args = array() ) {
+	public function add_section($object_type, $id, $object_name = null, $args = array()) {
 
-		if ( empty( $id ) && empty( $args ) ) {
+		if (empty($id) && empty($args)) {
 			return;
 		}
 
-		if ( is_a( $id, 'WP_Fields_API_Section' ) ) {
+		if (is_a($id, 'WP_Fields_API_Section')) {
 			$section = $id;
 
 			$id = $section->id;
@@ -517,19 +517,19 @@ 
 			$section = $args;
 		}
 
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type; // Default to _object_type for internal handling
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type; // Default to _object_type for internal handling
 		}
 
-		if ( ! isset( self::$sections[ $object_type ] ) ) {
-			self::$sections[ $object_type ] = array();
+		if ( ! isset(self::$sections[$object_type])) {
+			self::$sections[$object_type] = array();
 		}
 
-		if ( ! isset( self::$sections[ $object_type ][ $object_name ] ) ) {
-			self::$sections[ $object_type ][ $object_name ] = array();
+		if ( ! isset(self::$sections[$object_type][$object_name])) {
+			self::$sections[$object_type][$object_name] = array();
 		}
 
-		self::$sections[ $object_type ][ $object_name ][ $id ] = $section;
+		self::$sections[$object_type][$object_name][$id] = $section;
 
 	}
 
@@ -544,19 +544,19 @@ 
 	 *
 	 * @return WP_Fields_API_Section|null Requested section instance.
 	 */
-	public function get_section( $object_type, $id, $object_name = null ) {
+	public function get_section($object_type, $id, $object_name = null) {
 
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type; // Default to _object_type for internal handling
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type; // Default to _object_type for internal handling
 		}
 
 		$section = null;
 
-		if ( isset( self::$sections[ $object_type ][ $object_name ][ $id ] ) ) {
+		if (isset(self::$sections[$object_type][$object_name][$id])) {
 			// Late init
-			self::$sections[ $object_type ][ $object_name ][ $id ] = $this->setup_section( $object_type, $id, $object_name, self::$sections[ $object_type ][ $object_name ][ $id ] );
+			self::$sections[$object_type][$object_name][$id] = $this->setup_section($object_type, $id, $object_name, self::$sections[$object_type][$object_name][$id]);
 
-			$section = self::$sections[ $object_type ][ $object_name ][ $id ];
+			$section = self::$sections[$object_type][$object_name][$id];
 		}
 
 		return $section;
@@ -575,26 +575,26 @@ 
 	 *
 	 * @return WP_Fields_API_Screen|null $section The section object.
 	 */
-	public function setup_section( $object_type, $id, $object_name = null, $args = null ) {
+	public function setup_section($object_type, $id, $object_name = null, $args = null) {
 
 		$section = null;
 
 		$section_class = 'WP_Fields_API_Section';
 
-		if ( is_a( $args, $section_class ) ) {
+		if (is_a($args, $section_class)) {
 			$section = $args;
-		} elseif ( is_array( $args ) ) {
+		} elseif (is_array($args)) {
 			$args['object_name'] = $object_name;
 
-			if ( ! empty( $args['type'] ) ) {
-				if ( ! empty( self::$registered_section_types[ $args['type'] ] ) ) {
-					$section_class = self::$registered_section_types[ $args['type'] ];
-				} elseif ( in_array( $args['type'], self::$registered_section_types ) ) {
+			if ( ! empty($args['type'])) {
+				if ( ! empty(self::$registered_section_types[$args['type']])) {
+					$section_class = self::$registered_section_types[$args['type']];
+				} elseif (in_array($args['type'], self::$registered_section_types)) {
 					$section_class = $args['type'];
 				}
 			}
 
-			$section = new $section_class( $object_type, $id, $args );
+			$section = new $section_class($object_type, $id, $args);
 		}
 
 		return $section;
@@ -610,29 +610,29 @@ 
 	 * @param string $id          Section ID to remove, set true to remove all sections from an object.
 	 * @param string $object_name Object name (for post types and taxonomies), set true to remove to all objects from an object type.
 	 */
-	public function remove_section( $object_type, $id, $object_name = null ) {
+	public function remove_section($object_type, $id, $object_name = null) {
 
-		if ( true === $object_type ) {
+		if (true === $object_type) {
 			// Remove all sections
 			self::$sections = array();
-		} elseif ( true === $object_name ) {
+		} elseif (true === $object_name) {
 			// Remove all sections for an object type
-			if ( isset( self::$sections[ $object_type ] ) ) {
-				unset( self::$sections[ $object_type ] );
+			if (isset(self::$sections[$object_type])) {
+				unset(self::$sections[$object_type]);
 			}
 		} else {
-			if ( empty( $object_name ) && ! empty( $object_type ) ) {
-				$object_name = '_' . $object_type; // Default to _object_type for internal handling
+			if (empty($object_name) && ! empty($object_type)) {
+				$object_name = '_'.$object_type; // Default to _object_type for internal handling
 			}
 
-			if ( true === $id && null !== $object_name ) {
+			if (true === $id && null !== $object_name) {
 				// Remove all sections for an object type
-				if ( isset( self::$sections[ $object_type ][ $object_name ] ) ) {
-					unset( self::$sections[ $object_type ][ $object_name ] );
+				if (isset(self::$sections[$object_type][$object_name])) {
+					unset(self::$sections[$object_type][$object_name]);
 				}
-			} elseif ( isset( self::$sections[ $object_type ][ $object_name ][ $id ] ) ) {
+			} elseif (isset(self::$sections[$object_type][$object_name][$id])) {
 				// Remove section from object type and name
-				unset( self::$sections[ $object_type ][ $object_name ][ $id ] );
+				unset(self::$sections[$object_type][$object_name][$id]);
 			}
 		}
 
@@ -648,13 +648,13 @@ 
 	 * @param string $type          Section type ID.
 	 * @param string $section_class Name of a custom section which is a subclass of WP_Fields_API_Section.
 	 */
-	public function register_section_type( $type, $section_class = null ) {
+	public function register_section_type($type, $section_class = null) {
 
-		if ( null === $section_class ) {
+		if (null === $section_class) {
 			$section_class = $type;
 		}
 
-		self::$registered_section_types[ $type ] = $section_class;
+		self::$registered_section_types[$type] = $section_class;
 
 	}
 
@@ -668,8 +668,8 @@ 
 		/**
 		 * @var $section WP_Fields_API_Section
 		 */
-		foreach ( self::$registered_control_types as $section_type => $section_class ) {
-			$section = $this->setup_section( null, 'temp', null, array( 'type' => $section_type ) );
+		foreach (self::$registered_control_types as $section_type => $section_class) {
+			$section = $this->setup_section(null, 'temp', null, array('type' => $section_type));
 
 			$section->print_template();
 		}
@@ -686,37 +686,37 @@ 
 	 *
 	 * @return WP_Fields_API_Field[]
 	 */
-	public function get_fields( $object_type = null, $object_name = null ) {
+	public function get_fields($object_type = null, $object_name = null) {
 
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type; // Default to _object_type for internal handling
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type; // Default to _object_type for internal handling
 		}
 
 		$fields = array();
 
-		if ( null === $object_type ) {
+		if (null === $object_type) {
 			// Late init
-			foreach ( self::$fields as $object_type => $object_names ) {
-				foreach ( $object_names as $object_name => $fields ) {
-					$this->get_fields( $object_type, $object_name );
+			foreach (self::$fields as $object_type => $object_names) {
+				foreach ($object_names as $object_name => $fields) {
+					$this->get_fields($object_type, $object_name);
 				}
 			}
 
 			$fields = self::$fields;
-		} elseif ( isset( self::$fields[ $object_type ][ $object_name ] ) ) {
+		} elseif (isset(self::$fields[$object_type][$object_name])) {
 			// Late init
-			foreach ( self::$fields[ $object_type ][ $object_name ] as $id => $field ) {
+			foreach (self::$fields[$object_type][$object_name] as $id => $field) {
 				// Late init
-				self::$fields[ $object_type ][ $object_name ][ $id ] = $this->setup_field( $object_type, $id, $object_name, $field );
+				self::$fields[$object_type][$object_name][$id] = $this->setup_field($object_type, $id, $object_name, $field);
 			}
 
-			$fields = self::$fields[ $object_type ][ $object_name ];
-		} elseif ( true === $object_name ) {
+			$fields = self::$fields[$object_type][$object_name];
+		} elseif (true === $object_name) {
 			// Get all fields
 
 			// Late init
-			foreach ( self::$fields[ $object_type ] as $object_name => $object_fields ) {
-				$fields = array_merge( $fields, array_values( $this->get_fields( $object_type, $object_name ) ) );
+			foreach (self::$fields[$object_type] as $object_name => $object_fields) {
+				$fields = array_merge($fields, array_values($this->get_fields($object_type, $object_name)));
 			}
 		}
 
@@ -735,15 +735,15 @@ 
 	 * @param array                      $args        Field arguments; passed to WP_Fields_API_Field
 	 *                                                constructor.
 	 */
-	public function add_field( $object_type, $id, $object_name = null, $args = array() ) {
+	public function add_field($object_type, $id, $object_name = null, $args = array()) {
 
-		if ( empty( $id ) && empty( $args ) ) {
+		if (empty($id) && empty($args)) {
 			return;
 		}
 
 		$control = array();
 
-		if ( is_a( $id, 'WP_Fields_API_Field' ) ) {
+		if (is_a($id, 'WP_Fields_API_Field')) {
 			$field = $id;
 
 			$id = $field->id;
@@ -751,46 +751,46 @@ 
 			// Save for late init
 			$field = $args;
 
-			if ( isset( $field['control'] ) ) {
+			if (isset($field['control'])) {
 				$control = $field['control'];
 
 				// Remove from field args
-				unset( $field['control'] );
+				unset($field['control']);
 			}
 		}
 
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type; // Default to _object_type for internal handling
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type; // Default to _object_type for internal handling
 		}
 
-		if ( ! isset( self::$fields[ $object_type ] ) ) {
-			self::$fields[ $object_type ] = array();
+		if ( ! isset(self::$fields[$object_type])) {
+			self::$fields[$object_type] = array();
 		}
 
-		if ( ! isset( self::$fields[ $object_type ][ $object_name ] ) ) {
-			self::$fields[ $object_type ][ $object_name ] = array();
+		if ( ! isset(self::$fields[$object_type][$object_name])) {
+			self::$fields[$object_type][$object_name] = array();
 		}
 
-		self::$fields[ $object_type ][ $object_name ][ $id ] = $field;
+		self::$fields[$object_type][$object_name][$id] = $field;
 
 		// Control handling
-		if ( ! empty( $control ) ) {
+		if ( ! empty($control)) {
 			// Generate Control ID if not set
-			if ( empty( $control['id'] ) ) {
-				$control['id'] = 'control_' . sanitize_key( $object_type ) . '_' . sanitize_key( $object_name ) . '_' . sanitize_key( $id );
+			if (empty($control['id'])) {
+				$control['id'] = 'control_'.sanitize_key($object_type).'_'.sanitize_key($object_name).'_'.sanitize_key($id);
 			}
 
 			// Get Control ID
 			$control_id = $control['id'];
 
 			// Remove ID from control args
-			unset( $control['id'] );
+			unset($control['id']);
 
 			// Add field
 			$control['fields'] = $id;
 
 			// Add control for field
-			$this->add_control( $object_type, $control_id, $object_name, $control );
+			$this->add_control($object_type, $control_id, $object_name, $control);
 		}
 
 	}
@@ -806,19 +806,19 @@ 
 	 *
 	 * @return WP_Fields_API_Field|null
 	 */
-	public function get_field( $object_type, $id, $object_name = null ) {
+	public function get_field($object_type, $id, $object_name = null) {
 
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type; // Default to _object_type for internal handling
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type; // Default to _object_type for internal handling
 		}
 
 		$field = null;
 
-		if ( isset( self::$fields[ $object_type ][ $object_name ][ $id ] ) ) {
+		if (isset(self::$fields[$object_type][$object_name][$id])) {
 			// Late init
-			self::$fields[ $object_type ][ $object_name ][ $id ] = $this->setup_field( $object_type, $id, $object_name, self::$fields[ $object_type ][ $object_name ][ $id ] );
+			self::$fields[$object_type][$object_name][$id] = $this->setup_field($object_type, $id, $object_name, self::$fields[$object_type][$object_name][$id]);
 
-			$field = self::$fields[ $object_type ][ $object_name ][ $id ];
+			$field = self::$fields[$object_type][$object_name][$id];
 		}
 
 		return $field;
@@ -837,26 +837,26 @@ 
 	 *
 	 * @return WP_Fields_API_Screen|null $field The field object.
 	 */
-	public function setup_field( $object_type, $id, $object_name = null, $args = null ) {
+	public function setup_field($object_type, $id, $object_name = null, $args = null) {
 
 		$field = null;
 
 		$field_class = 'WP_Fields_API_Field';
 
-		if ( is_a( $args, $field_class ) ) {
+		if (is_a($args, $field_class)) {
 			$field = $args;
-		} elseif ( is_array( $args ) ) {
+		} elseif (is_array($args)) {
 			$args['object_name'] = $object_name;
 
-			if ( ! empty( $args['type'] ) ) {
-				if ( ! empty( self::$registered_field_types[ $args['type'] ] ) ) {
-					$field_class = self::$registered_field_types[ $args['type'] ];
-				} elseif ( in_array( $args['type'], self::$registered_field_types ) ) {
+			if ( ! empty($args['type'])) {
+				if ( ! empty(self::$registered_field_types[$args['type']])) {
+					$field_class = self::$registered_field_types[$args['type']];
+				} elseif (in_array($args['type'], self::$registered_field_types)) {
 					$field_class = $args['type'];
 				}
 			}
 
-			$field = new $field_class( $object_type, $id, $args );
+			$field = new $field_class($object_type, $id, $args);
 		}
 
 		return $field;
@@ -872,29 +872,29 @@ 
 	 * @param string $id          Field ID to remove, set true to remove all fields from an object.
 	 * @param string $object_name Object name (for post types and taxonomies), set true to remove to all objects from an object type.
 	 */
-	public function remove_field( $object_type, $id, $object_name = null ) {
+	public function remove_field($object_type, $id, $object_name = null) {
 
-		if ( true === $object_type ) {
+		if (true === $object_type) {
 			// Remove all fields
 			self::$fields = array();
-		} elseif ( true === $object_name ) {
+		} elseif (true === $object_name) {
 			// Remove all fields for an object type
-			if ( isset( self::$fields[ $object_type ] ) ) {
-				unset( self::$fields[ $object_type ] );
+			if (isset(self::$fields[$object_type])) {
+				unset(self::$fields[$object_type]);
 			}
 		} else {
-			if ( empty( $object_name ) && ! empty( $object_type ) ) {
-				$object_name = '_' . $object_type; // Default to _object_type for internal handling
+			if (empty($object_name) && ! empty($object_type)) {
+				$object_name = '_'.$object_type; // Default to _object_type for internal handling
 			}
 
-			if ( true === $id && null !== $object_name ) {
+			if (true === $id && null !== $object_name) {
 				// Remove all fields for an object type
-				if ( isset( self::$fields[ $object_type ][ $object_name ] ) ) {
-					unset( self::$fields[ $object_type ][ $object_name ] );
+				if (isset(self::$fields[$object_type][$object_name])) {
+					unset(self::$fields[$object_type][$object_name]);
 				}
-			} elseif ( isset( self::$fields[ $object_type ][ $object_name ][ $id ] ) ) {
+			} elseif (isset(self::$fields[$object_type][$object_name][$id])) {
 				// Remove field from object type and name
-				unset( self::$fields[ $object_type ][ $object_name ][ $id ] );
+				unset(self::$fields[$object_type][$object_name][$id]);
 			}
 		}
 
@@ -910,13 +910,13 @@ 
 	 * @param string $type         Field type ID.
 	 * @param string $screen_class Name of a custom field type which is a subclass of WP_Fields_API_Field.
 	 */
-	public function register_field_type( $type, $field_class = null ) {
+	public function register_field_type($type, $field_class = null) {
 
-		if ( null === $field_class ) {
+		if (null === $field_class) {
 			$field_class = $type;
 		}
 
-		self::$registered_field_types[ $type ] = $field_class;
+		self::$registered_field_types[$type] = $field_class;
 
 	}
 
@@ -931,41 +931,41 @@ 
 	 *
 	 * @return WP_Fields_API_Control[]
 	 */
-	public function get_controls( $object_type = null, $object_name = null, $section = null ) {
+	public function get_controls($object_type = null, $object_name = null, $section = null) {
 
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type; // Default to _object_type for internal handling
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type; // Default to _object_type for internal handling
 		}
 
 		$controls = array();
 
-		if ( null === $object_type ) {
+		if (null === $object_type) {
 			// Late init
-			foreach ( self::$controls as $object_type => $object_names ) {
-				foreach ( $object_names as $object_name => $controls ) {
-					$this->get_controls( $object_type, $object_name );
+			foreach (self::$controls as $object_type => $object_names) {
+				foreach ($object_names as $object_name => $controls) {
+					$this->get_controls($object_type, $object_name);
 				}
 			}
 
 			$controls = self::$controls;
 
 			// Get only controls for a specific section
-			if ( null !== $section ) {
+			if (null !== $section) {
 				$section_controls = array();
 
-				foreach ( $controls as $object_type => $object_names ) {
-					foreach ( $object_names as $object_name => $object_controls ) {
-						foreach ( $object_controls as $id => $control ) {
-							if ( $section == $control->section->id ) {
-								if ( ! isset( $section_controls[ $object_type ] ) ) {
-									$section_controls[ $object_type ] = array();
+				foreach ($controls as $object_type => $object_names) {
+					foreach ($object_names as $object_name => $object_controls) {
+						foreach ($object_controls as $id => $control) {
+							if ($section == $control->section->id) {
+								if ( ! isset($section_controls[$object_type])) {
+									$section_controls[$object_type] = array();
 								}
 
-								if ( ! isset( $section_controls[ $object_type ][ $object_name ] ) ) {
-									$section_controls[ $object_type ][ $object_name ] = array();
+								if ( ! isset($section_controls[$object_type][$object_name])) {
+									$section_controls[$object_type][$object_name] = array();
 								}
 
-								$section_controls[ $object_type ][ $object_name ][ $id ] = $control;
+								$section_controls[$object_type][$object_name][$id] = $control;
 							}
 						}
 					}
@@ -973,34 +973,34 @@ 
 
 				$controls = $section_controls;
 			}
-		} elseif ( isset( self::$controls[ $object_type ][ $object_name ] ) ) {
+		} elseif (isset(self::$controls[$object_type][$object_name])) {
 			// Late init
-			foreach ( self::$controls[ $object_type ][ $object_name ] as $id => $control ) {
+			foreach (self::$controls[$object_type][$object_name] as $id => $control) {
 				// Late init
-				self::$controls[ $object_type ][ $object_name ][ $id ] = $this->setup_control( $object_type, $id, $object_name, $control );
+				self::$controls[$object_type][$object_name][$id] = $this->setup_control($object_type, $id, $object_name, $control);
 			}
 
-			$controls = self::$controls[ $object_type ][ $object_name ];
+			$controls = self::$controls[$object_type][$object_name];
 
 			// Get only controls for a specific section
-			if ( null !== $section ) {
+			if (null !== $section) {
 				$section_controls = array();
 
-				foreach ( $controls as $id => $control ) {
+				foreach ($controls as $id => $control) {
 					// $control->section is not an object, like $control->field is
-					if ( $section == $control->section ) {
-						$section_controls[ $id ] = $control;
+					if ($section == $control->section) {
+						$section_controls[$id] = $control;
 					}
 				}
 
 				$controls = $section_controls;
 			}
-		} elseif ( true === $object_name ) {
+		} elseif (true === $object_name) {
 			// Get all fields
 
 			// Late init
-			foreach ( self::$controls[ $object_type ] as $object_name => $object_controls ) {
-				$controls = array_merge( $controls, array_values( $this->get_controls( $object_type, $object_name, $section ) ) );
+			foreach (self::$controls[$object_type] as $object_name => $object_controls) {
+				$controls = array_merge($controls, array_values($this->get_controls($object_type, $object_name, $section)));
 			}
 		}
 
@@ -1019,13 +1019,13 @@ 
 	 * @param array                        $args        Control arguments; passed to WP_Fields_API_Control
 	 *                                                  constructor.
 	 */
-	public function add_control( $object_type, $id, $object_name = null, $args = array() ) {
+	public function add_control($object_type, $id, $object_name = null, $args = array()) {
 
-		if ( empty( $id ) && empty( $args ) ) {
+		if (empty($id) && empty($args)) {
 			return;
 		}
 
-		if ( is_a( $id, 'WP_Fields_API_Control' ) ) {
+		if (is_a($id, 'WP_Fields_API_Control')) {
 			$control = $id;
 
 			$id = $control->id;
@@ -1034,19 +1034,19 @@ 
 			$control = $args;
 		}
 
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type; // Default to _object_type for internal handling
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type; // Default to _object_type for internal handling
 		}
 
-		if ( ! isset( self::$controls[ $object_type ] ) ) {
-			self::$controls[ $object_type ] = array();
+		if ( ! isset(self::$controls[$object_type])) {
+			self::$controls[$object_type] = array();
 		}
 
-		if ( ! isset( self::$controls[ $object_type ][ $object_name ] ) ) {
-			self::$controls[ $object_type ][ $object_name ] = array();
+		if ( ! isset(self::$controls[$object_type][$object_name])) {
+			self::$controls[$object_type][$object_name] = array();
 		}
 
-		self::$controls[ $object_type ][ $object_name ][ $id ] = $control;
+		self::$controls[$object_type][$object_name][$id] = $control;
 
 	}
 
@@ -1061,19 +1061,19 @@ 
 	 *
 	 * @return WP_Fields_API_Control|null $control The control object.
 	 */
-	public function get_control( $object_type, $id, $object_name = null ) {
+	public function get_control($object_type, $id, $object_name = null) {
 
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type; // Default to _object_type for internal handling
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type; // Default to _object_type for internal handling
 		}
 
 		$control = null;
 
-		if ( isset( self::$controls[ $object_type ][ $object_name ][ $id ] ) ) {
+		if (isset(self::$controls[$object_type][$object_name][$id])) {
 			// Late init
-			self::$controls[ $object_type ][ $object_name ][ $id ] = $this->setup_control( $object_type, $id, $object_name, self::$controls[ $object_type ][ $object_name ][ $id ] );
+			self::$controls[$object_type][$object_name][$id] = $this->setup_control($object_type, $id, $object_name, self::$controls[$object_type][$object_name][$id]);
 
-			$control = self::$controls[ $object_type ][ $object_name ][ $id ];
+			$control = self::$controls[$object_type][$object_name][$id];
 		}
 
 		return $control;
@@ -1092,26 +1092,26 @@ 
 	 *
 	 * @return WP_Fields_API_Control|null $control The control object.
 	 */
-	public function setup_control( $object_type, $id, $object_name = null, $args = null ) {
+	public function setup_control($object_type, $id, $object_name = null, $args = null) {
 
 		$control = null;
 
 		$control_class = 'WP_Fields_API_Control';
 
-		if ( is_a( $args, $control_class ) ) {
+		if (is_a($args, $control_class)) {
 			$control = $args;
-		} elseif ( is_array( $args ) ) {
+		} elseif (is_array($args)) {
 			$args['object_name'] = $object_name;
 
-			if ( ! empty( $args['type'] ) ) {
-				if ( ! empty( self::$registered_control_types[ $args['type'] ] ) ) {
-					$control_class = self::$registered_control_types[ $args['type'] ];
-				} elseif ( in_array( $args['type'], self::$registered_control_types ) ) {
+			if ( ! empty($args['type'])) {
+				if ( ! empty(self::$registered_control_types[$args['type']])) {
+					$control_class = self::$registered_control_types[$args['type']];
+				} elseif (in_array($args['type'], self::$registered_control_types)) {
 					$control_class = $args['type'];
 				}
 			}
 
-			$control = new $control_class( $object_type, $id, $args );
+			$control = new $control_class($object_type, $id, $args);
 		}
 
 		return $control;
@@ -1127,29 +1127,29 @@ 
 	 * @param string $id          Control ID to remove, set true to remove all controls from an object.
 	 * @param string $object_name Object name (for post types and taxonomies), set true to remove to all objects from an object type.
 	 */
-	public function remove_control( $object_type, $id, $object_name = null ) {
+	public function remove_control($object_type, $id, $object_name = null) {
 
-		if ( true === $object_type ) {
+		if (true === $object_type) {
 			// Remove all controls
 			self::$controls = array();
-		} elseif ( true === $object_name ) {
+		} elseif (true === $object_name) {
 			// Remove all controls for an object type
-			if ( isset( self::$controls[ $object_type ] ) ) {
-				unset( self::$controls[ $object_type ] );
+			if (isset(self::$controls[$object_type])) {
+				unset(self::$controls[$object_type]);
 			}
 		} else {
-			if ( empty( $object_name ) && ! empty( $object_type ) ) {
-				$object_name = '_' . $object_type; // Default to _object_type for internal handling
+			if (empty($object_name) && ! empty($object_type)) {
+				$object_name = '_'.$object_type; // Default to _object_type for internal handling
 			}
 
-			if ( true === $id && null !== $object_name ) {
+			if (true === $id && null !== $object_name) {
 				// Remove all controls for an object type
-				if ( isset( self::$controls[ $object_type ][ $object_name ] ) ) {
-					unset( self::$controls[ $object_type ][ $object_name ] );
+				if (isset(self::$controls[$object_type][$object_name])) {
+					unset(self::$controls[$object_type][$object_name]);
 				}
-			} elseif ( isset( self::$controls[ $object_type ][ $object_name ][ $id ] ) ) {
+			} elseif (isset(self::$controls[$object_type][$object_name][$id])) {
 				// Remove control from object type and name
-				unset( self::$controls[ $object_type ][ $object_name ][ $id ] );
+				unset(self::$controls[$object_type][$object_name][$id]);
 			}
 		}
 
@@ -1165,13 +1165,13 @@ 
 	 * @param string $type          Control type ID.
 	 * @param string $control_class Name of a custom control which is a subclass of WP_Fields_API_Control.
 	 */
-	public function register_control_type( $type, $control_class = null ) {
+	public function register_control_type($type, $control_class = null) {
 
-		if ( null === $control_class ) {
+		if (null === $control_class) {
 			$control_class = $type;
 		}
 
-		self::$registered_control_types[ $type ] = $control_class;
+		self::$registered_control_types[$type] = $control_class;
 
 	}
 
@@ -1185,8 +1185,8 @@ 
 		/**
 		 * @var $control WP_Fields_API_Control
 		 */
-		foreach ( self::$registered_control_types as $control_type => $control_class ) {
-			$control = $this->setup_control( null, 'temp', null, array( 'type' => $control_type ) );
+		foreach (self::$registered_control_types as $control_type => $control_class) {
+			$control = $this->setup_control(null, 'temp', null, array('type' => $control_type));
 
 			$control->print_template();
 		}
@@ -1203,13 +1203,13 @@ 
 	 *
 	 * @return int
 	 */
-	protected final function _cmp_priority( $a, $b ) {
+	protected final function _cmp_priority($a, $b) {
 
-		if ( is_int( $a->priority ) && is_int( $b->priority ) ) {
+		if (is_int($a->priority) && is_int($b->priority)) {
 			// Priority integers
 			$compare = $a->priority - $b->priority;
 
-			if ( $a->priority === $b->priority ) {
+			if ($a->priority === $b->priority) {
 				$compare = $a->instance_number - $a->instance_number;
 			}
 		} else {
@@ -1232,13 +1232,13 @@ 
 	 *
 	 * @param string $object_type Object type.
 	 */
-	public function prepare_controls( $object_type = null ) {
+	public function prepare_controls($object_type = null) {
 
 		// Prepare controls for all object types
-		foreach ( self::$fields as $object => $object_names ) {
-			if ( null === $object_type || $object === $object_type ) {
-				foreach ( $object_names as $object_name => $fields ) {
-					$this->prepare_object_controls( $object, $object_name );
+		foreach (self::$fields as $object => $object_names) {
+			if (null === $object_type || $object === $object_type) {
+				foreach ($object_names as $object_name => $fields) {
+					$this->prepare_object_controls($object, $object_name);
 				}
 			}
 		}
@@ -1257,10 +1257,10 @@ 
 	 * @param string $object_type Object type.
 	 * @param string $object_name Object name (for post types and taxonomies).
 	 */
-	public function prepare_object_controls( $object_type, $object_name = null ) {
+	public function prepare_object_controls($object_type, $object_name = null) {
 
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type; // Default to _object_type for internal handling
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type; // Default to _object_type for internal handling
 		}
 
 		// Reset prepared IDs
@@ -1274,69 +1274,69 @@ 
 		// Setup
 
 		// Get controls
-		$controls = $this->get_controls( $object_type, $object_name );
+		$controls = $this->get_controls($object_type, $object_name);
 
 		// Get sections
-		$sections = $this->get_sections( $object_type, $object_name );
+		$sections = $this->get_sections($object_type, $object_name);
 
 		// Get screens
-		$screens = $this->get_screens( $object_type, $object_name );
+		$screens = $this->get_screens($object_type, $object_name);
 
 		// Controls
 
 		// Sort controls by priority
-		uasort( $controls, array( $this, '_cmp_priority' ) );
+		uasort($controls, array($this, '_cmp_priority'));
 
-		foreach ( $controls as $id => $control ) {
+		foreach ($controls as $id => $control) {
 			// Check if section or screen exists
-			if ( $control->section && ! isset( $sections[ $control->section ] ) ) {
+			if ($control->section && ! isset($sections[$control->section])) {
 				continue;
-			} elseif ( $control->screen && ! isset( $screens[ $control->screen ] ) ) {
+			} elseif ($control->screen && ! isset($screens[$control->screen])) {
 				continue;
 			}
 
 			// Check if control can be used by user
-			if ( ! $control->check_capabilities() ) {
+			if ( ! $control->check_capabilities()) {
 				continue;
 			}
 
 			// Add to prepared IDs
 			$prepared_ids['control'][] = $id;
 
-			if ( $control->section ) {
+			if ($control->section) {
 				// Add control to section controls
-				$sections[ $control->section ]->controls[] = $control;
-			} elseif ( $control->screen ) {
+				$sections[$control->section]->controls[] = $control;
+			} elseif ($control->screen) {
 				// Add control to screen controls
-				$screens[ $control->screen ]->controls[] = $control;
+				$screens[$control->screen]->controls[] = $control;
 			}
 		}
 
 		// Sections
 
 		// Sort sections by priority
-		uasort( $sections, array( $this, '_cmp_priority' ) );
+		uasort($sections, array($this, '_cmp_priority'));
 
-		foreach ( $sections as $id => $section ) {
+		foreach ($sections as $id => $section) {
 			// Check if section can be seen by user
-			if ( ! $section->check_capabilities() ) {
+			if ( ! $section->check_capabilities()) {
 				continue;
 			}
 
-			if ( $section->controls ) {
+			if ($section->controls) {
 				// Sort section controls by priority
-				usort( $section->controls, array( $this, '_cmp_priority' ) );
+				usort($section->controls, array($this, '_cmp_priority'));
 			}
 
-			if ( ! $section->screen ) {
+			if ( ! $section->screen) {
 				// Top-level section.
 
 				// Add to prepared IDs
 				$prepared_ids['section'][]   = $id;
 				$prepared_ids['container'][] = $id;
-			} elseif ( $section->screen && isset( $screens[ $section->screen ] ) ) {
+			} elseif ($section->screen && isset($screens[$section->screen])) {
 				// This section belongs to a screen.
-				$screens[ $section->screen ]->sections[ $id ] = $section;
+				$screens[$section->screen]->sections[$id] = $section;
 
 				// Add to prepared IDs
 				$prepared_ids['section'][]   = $id;
@@ -1347,17 +1347,17 @@ 
 		// Screens
 
 		// Sort screens by priority
-		uasort( $screens, array( $this, '_cmp_priority' ) );
+		uasort($screens, array($this, '_cmp_priority'));
 
-		foreach ( $screens as $id => $screen ) {
+		foreach ($screens as $id => $screen) {
 			// Check if screen has sections or can be seen by user
-			if ( ! $screen->check_capabilities() ) {
+			if ( ! $screen->check_capabilities()) {
 				continue;
 			}
 
-			if ( $screen->sections ) {
+			if ($screen->sections) {
 				// Sort screen sections by priority
-				uasort( $screen->sections, array( $this, '_cmp_priority' ) );
+				uasort($screen->sections, array($this, '_cmp_priority'));
 			}
 
 			// Add to prepared IDs
@@ -1366,67 +1366,67 @@ 
 		}
 
 		// Merge screens and top-level sections together.
-		$containers = array_merge( $screens, $sections );
+		$containers = array_merge($screens, $sections);
 
 		// Sort containers by priority
-		uasort( $containers, array( $this, '_cmp_priority' ) );
+		uasort($containers, array($this, '_cmp_priority'));
 
 		// Saving
 
 		// Save controls
-		if ( ! isset( self::$controls[ $object_type ] ) ) {
-			self::$controls[ $object_type ] = array();
+		if ( ! isset(self::$controls[$object_type])) {
+			self::$controls[$object_type] = array();
 		}
 
-		if ( ! isset( self::$controls[ $object_type ][ $object_name ] ) ) {
-			self::$controls[ $object_type ][ $object_name ] = array();
+		if ( ! isset(self::$controls[$object_type][$object_name])) {
+			self::$controls[$object_type][$object_name] = array();
 		}
 
-		self::$controls[ $object_type ][ $object_name ] = $controls;
+		self::$controls[$object_type][$object_name] = $controls;
 
 		// Save sections
-		if ( ! isset( self::$sections[ $object_type ] ) ) {
-			self::$sections[ $object_type ] = array();
+		if ( ! isset(self::$sections[$object_type])) {
+			self::$sections[$object_type] = array();
 		}
 
-		if ( ! isset( self::$sections[ $object_type ][ $object_name ] ) ) {
-			self::$sections[ $object_type ][ $object_name ] = array();
+		if ( ! isset(self::$sections[$object_type][$object_name])) {
+			self::$sections[$object_type][$object_name] = array();
 		}
 
-		self::$sections[ $object_type ][ $object_name ] = $sections;
+		self::$sections[$object_type][$object_name] = $sections;
 
 		// Save screens
-		if ( ! isset( self::$screens[ $object_type ] ) ) {
-			self::$screens[ $object_type ] = array();
+		if ( ! isset(self::$screens[$object_type])) {
+			self::$screens[$object_type] = array();
 		}
 
-		if ( ! isset( self::$screens[ $object_type ][ $object_name ] ) ) {
-			self::$screens[ $object_type ][ $object_name ] = array();
+		if ( ! isset(self::$screens[$object_type][$object_name])) {
+			self::$screens[$object_type][$object_name] = array();
 		}
 
-		self::$screens[ $object_type ][ $object_name ] = $screens;
+		self::$screens[$object_type][$object_name] = $screens;
 
 		// Save containers
-		if ( ! isset( self::$containers[ $object_type ] ) ) {
-			self::$containers[ $object_type ] = array();
+		if ( ! isset(self::$containers[$object_type])) {
+			self::$containers[$object_type] = array();
 		}
 
-		if ( ! isset( self::$containers[ $object_type ][ $object_name ] ) ) {
-			self::$containers[ $object_type ][ $object_name ] = array();
+		if ( ! isset(self::$containers[$object_type][$object_name])) {
+			self::$containers[$object_type][$object_name] = array();
 		}
 
-		self::$containers[ $object_type ][ $object_name ] = $containers;
+		self::$containers[$object_type][$object_name] = $containers;
 
 		// Saved prepared IDs
-		if ( ! isset( self::$prepared_ids[ $object_type ] ) ) {
-			self::$prepared_ids[ $object_type ] = array();
+		if ( ! isset(self::$prepared_ids[$object_type])) {
+			self::$prepared_ids[$object_type] = array();
 		}
 
-		if ( ! isset( self::$prepared_ids[ $object_type ][ $object_name ] ) ) {
-			self::$prepared_ids[ $object_type ][ $object_name ] = array();
+		if ( ! isset(self::$prepared_ids[$object_type][$object_name])) {
+			self::$prepared_ids[$object_type][$object_name] = array();
 		}
 
-		self::$prepared_ids[ $object_type ][ $object_name ] = $prepared_ids;
+		self::$prepared_ids[$object_type][$object_name] = $prepared_ids;
 
 	}
 
@@ -1438,23 +1438,23 @@ 
 	public function register_controls() {
 
 		/* Control Types */
-		$this->register_control_type( 'text', 'WP_Fields_API_Control' );
-		$this->register_control_type( 'checkbox', 'WP_Fields_API_Checkbox_Control' );
-		$this->register_control_type( 'multi-checkbox', 'WP_Fields_API_Multi_Checkbox_Control' );
-		$this->register_control_type( 'radio', 'WP_Fields_API_Radio_Control' );
-		$this->register_control_type( 'select', 'WP_Fields_API_Select_Control' );
-		$this->register_control_type( 'dropdown-pages', 'WP_Fields_API_Dropdown_Pages_Control' );
-		$this->register_control_type( 'color', 'WP_Fields_API_Color_Control' );
-		$this->register_control_type( 'media', 'WP_Fields_API_Media_Control' );
-		$this->register_control_type( 'upload', 'WP_Fields_API_Upload_Control' );
-		$this->register_control_type( 'image', 'WP_Fields_API_Image_Control' );
+		$this->register_control_type('text', 'WP_Fields_API_Control');
+		$this->register_control_type('checkbox', 'WP_Fields_API_Checkbox_Control');
+		$this->register_control_type('multi-checkbox', 'WP_Fields_API_Multi_Checkbox_Control');
+		$this->register_control_type('radio', 'WP_Fields_API_Radio_Control');
+		$this->register_control_type('select', 'WP_Fields_API_Select_Control');
+		$this->register_control_type('dropdown-pages', 'WP_Fields_API_Dropdown_Pages_Control');
+		$this->register_control_type('color', 'WP_Fields_API_Color_Control');
+		$this->register_control_type('media', 'WP_Fields_API_Media_Control');
+		$this->register_control_type('upload', 'WP_Fields_API_Upload_Control');
+		$this->register_control_type('image', 'WP_Fields_API_Image_Control');
 
 		/**
 		 * Fires once WordPress has loaded, allowing control types to be registered.
 		 *
 		 * @param WP_Fields_API $this WP_Fields_API instance.
 		 */
-		do_action( 'fields_register_controls', $this );
+		do_action('fields_register_controls', $this);
 
 	}
 
@@ -1470,15 +1470,15 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function is_prepared( $object_type, $type, $id, $object_name = null ) {
+	public function is_prepared($object_type, $type, $id, $object_name = null) {
 
-		if ( empty( $object_name ) && ! empty( $object_type ) ) {
-			$object_name = '_' . $object_type; // Default to _object_type for internal handling
+		if (empty($object_name) && ! empty($object_type)) {
+			$object_name = '_'.$object_type; // Default to _object_type for internal handling
 		}
 
 		$found = false;
 
-		if ( ! empty( self::$prepared_ids[ $object_type ][ $object_name ][ $type ] ) && in_array( $id, self::$prepared_ids[ $object_type ][ $object_name ][ $type ] ) ) {
+		if ( ! empty(self::$prepared_ids[$object_type][$object_name][$type]) && in_array($id, self::$prepared_ids[$object_type][$object_name][$type])) {
 			$found = true;
 		}
 

tests/test-wp-fields-api.php

Doc Comments -1 removed lines

@@ -124,7 +124,6 @@
 	 * Test WP_Fields_API::add_screen()
 	 *
 	 * @param string $object_type
-	 * @param string $object_name
 	 */
 	public function test_add_screen_invalid( $object_type = 'post' ) {
 

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Class WP_Test_Fields_API_Testcase
- *
- * @uses PHPUnit_Framework_TestCase
- */
+	 * Class WP_Test_Fields_API_Testcase
+	 *
+	 * @uses PHPUnit_Framework_TestCase
+	 */
 class WP_Test_Fields_API_Testcase extends WP_UnitTestCase {
 
 	public function tearDown() {

Spacing +175 added lines, -175 removed lines

@@ -17,10 +17,10 @@ 
 		global $wp_fields;
 
 		// Reset WP Fields instance for testing purposes
-		$wp_fields->remove_screen( true, true );
-		$wp_fields->remove_section( true, true );
-		$wp_fields->remove_field( true, true );
-		$wp_fields->remove_control( true, true );
+		$wp_fields->remove_screen(true, true);
+		$wp_fields->remove_section(true, true);
+		$wp_fields->remove_field(true, true);
+		$wp_fields->remove_control(true, true);
 
 	}
 
@@ -36,7 +36,7 @@ 
 		 */
 		global $wp_fields;
 
-		$this->assertTrue( is_a( $wp_fields, 'WP_Fields_API' ) );
+		$this->assertTrue(is_a($wp_fields, 'WP_Fields_API'));
 
 	}
 
@@ -51,29 +51,29 @@ 
 		global $wp_fields;
 
 		// Add a section / screen
-		$this->test_add_section( 'post', 'my_custom_post_type' );
+		$this->test_add_section('post', 'my_custom_post_type');
 
 		// Get containers for object type / name
-		$containers = $wp_fields->get_containers( 'post', 'my_custom_post_type' );
+		$containers = $wp_fields->get_containers('post', 'my_custom_post_type');
 
 		// There are two containers, the screen and the section
-		$this->assertEquals( 2, count( $containers ) );
+		$this->assertEquals(2, count($containers));
 
-		$this->assertArrayHasKey( 'my_test_screen', $containers );
-		$this->assertArrayHasKey( 'my_test_section', $containers );
+		$this->assertArrayHasKey('my_test_screen', $containers);
+		$this->assertArrayHasKey('my_test_section', $containers);
 
 		// Get a containers that doesn't exist
-		$containers = $wp_fields->get_containers( 'post' );
+		$containers = $wp_fields->get_containers('post');
 
-		$this->assertEquals( 0, count( $containers ) );
+		$this->assertEquals(0, count($containers));
 
 		// Get all containers for all object types
 		$containers = $wp_fields->get_containers();
 
 		// Each array item is an object type with an array of object names
-		$this->assertEquals( 1, count( $containers ) );
+		$this->assertEquals(1, count($containers));
 
-		$this->assertArrayHasKey( 'post', $containers );
+		$this->assertArrayHasKey('post', $containers);
 
 	}
 
@@ -88,18 +88,18 @@ 
 		global $wp_fields;
 
 		// Add a section / screen
-		$this->test_add_section( 'post', 'my_custom_post_type' );
+		$this->test_add_section('post', 'my_custom_post_type');
 
 		// Get containers for object type / name
-		$containers = $wp_fields->get_containers( 'post', true );
+		$containers = $wp_fields->get_containers('post', true);
 
 		// There are two containers, the screen and the section
-		$this->assertEquals( 2, count( $containers ) );
+		$this->assertEquals(2, count($containers));
 
-		$container_ids = wp_list_pluck( $containers, 'id' );
+		$container_ids = wp_list_pluck($containers, 'id');
 
-		$this->assertContains( 'my_test_screen', $container_ids );
-		$this->assertContains( 'my_test_section', $container_ids );
+		$this->assertContains('my_test_screen', $container_ids);
+		$this->assertContains('my_test_section', $container_ids);
 
 	}
 
@@ -109,14 +109,14 @@ 
 	 * @param string $object_type
 	 * @param string $object_name
 	 */
-	public function test_add_screen( $object_type = 'post', $object_name = null ) {
+	public function test_add_screen($object_type = 'post', $object_name = null) {
 
 		/**
 		 * @var $wp_fields WP_Fields_API
 		 */
 		global $wp_fields;
 
-		$wp_fields->add_screen( $object_type, 'my_test_screen', $object_name );
+		$wp_fields->add_screen($object_type, 'my_test_screen', $object_name);
 
 	}
 
@@ -126,14 +126,14 @@ 
 	 * @param string $object_type
 	 * @param string $object_name
 	 */
-	public function test_add_screen_invalid( $object_type = 'post' ) {
+	public function test_add_screen_invalid($object_type = 'post') {
 
 		/**
 		 * @var $wp_fields WP_Fields_API
 		 */
 		global $wp_fields;
 
-		$wp_fields->add_screen( $object_type, null, null, array() );
+		$wp_fields->add_screen($object_type, null, null, array());
 
 	}
 
@@ -148,37 +148,37 @@ 
 		global $wp_fields;
 
 		// Add a screen
-		$this->test_add_screen( 'post', 'my_custom_post_type' );
+		$this->test_add_screen('post', 'my_custom_post_type');
 
 		// Get screens for object type / name
-		$screens = $wp_fields->get_screens( 'post', 'my_custom_post_type' );
+		$screens = $wp_fields->get_screens('post', 'my_custom_post_type');
 
-		$this->assertEquals( 1, count( $screens ) );
+		$this->assertEquals(1, count($screens));
 
-		$this->assertArrayHasKey( 'my_test_screen', $screens );
+		$this->assertArrayHasKey('my_test_screen', $screens);
 
 		// Get a screen that doesn't exist
-		$screens = $wp_fields->get_screens( 'post', 'some_other_post_type' );
+		$screens = $wp_fields->get_screens('post', 'some_other_post_type');
 
-		$this->assertEquals( 0, count( $screens ) );
+		$this->assertEquals(0, count($screens));
 
 		// Get all screens for object type
-		$screens = $wp_fields->get_screens( 'post', true );
+		$screens = $wp_fields->get_screens('post', true);
 
-		$this->assertEquals( 1, count( $screens ) );
+		$this->assertEquals(1, count($screens));
 
-		$screen_ids = wp_list_pluck( $screens, 'id' );
+		$screen_ids = wp_list_pluck($screens, 'id');
 
-		$this->assertContains( 'my_test_screen', $screen_ids );
+		$this->assertContains('my_test_screen', $screen_ids);
 
 		// Get all screens for all object types
 		$screens = $wp_fields->get_screens();
 
 		// Each array item is an object type with an array of object names
-		$this->assertEquals( 1, count( $screens ) );
+		$this->assertEquals(1, count($screens));
 
 		// Array keys are object types
-		$this->assertArrayHasKey( 'post', $screens );
+		$this->assertArrayHasKey('post', $screens);
 
 	}
 
@@ -193,14 +193,14 @@ 
 		global $wp_fields;
 
 		// Add a screen
-		$this->test_add_screen( 'post' );
+		$this->test_add_screen('post');
 
 		// Get screens for object type / name
-		$screens = $wp_fields->get_screens( 'post' );
+		$screens = $wp_fields->get_screens('post');
 
-		$this->assertEquals( 1, count( $screens ) );
+		$this->assertEquals(1, count($screens));
 
-		$this->assertArrayHasKey( 'my_test_screen', $screens );
+		$this->assertArrayHasKey('my_test_screen', $screens);
 
 	}
 
@@ -215,24 +215,24 @@ 
 		global $wp_fields;
 
 		// Add a screen
-		$this->test_add_screen( 'post', 'my_custom_post_type' );
+		$this->test_add_screen('post', 'my_custom_post_type');
 
 		// Screen exists for this object type / name
-		$screen = $wp_fields->get_screen( 'post', 'my_test_screen', 'my_custom_post_type' );
+		$screen = $wp_fields->get_screen('post', 'my_test_screen', 'my_custom_post_type');
 
-		$this->assertNotEmpty( $screen );
+		$this->assertNotEmpty($screen);
 
-		$this->assertEquals( 'my_test_screen', $screen->id );
+		$this->assertEquals('my_test_screen', $screen->id);
 
 		// Screen doesn't exist for this object type / name
-		$screen = $wp_fields->get_screen( 'post', 'my_test_screen1' );
+		$screen = $wp_fields->get_screen('post', 'my_test_screen1');
 
-		$this->assertEmpty( $screen );
+		$this->assertEmpty($screen);
 
 		// Screen doesn't exist for this object type / name
-		$screen = $wp_fields->get_screen( 'post', 'my_test_screen2', 'my_custom_post_type' );
+		$screen = $wp_fields->get_screen('post', 'my_test_screen2', 'my_custom_post_type');
 
-		$this->assertEmpty( $screen );
+		$this->assertEmpty($screen);
 
 	}
 
@@ -247,22 +247,22 @@ 
 		global $wp_fields;
 
 		// Add a screen
-		$this->test_add_screen( 'post', 'my_custom_post_type' );
+		$this->test_add_screen('post', 'my_custom_post_type');
 
 		// Screen exists for this object type / name
-		$screen = $wp_fields->get_screen( 'post', 'my_test_screen', 'my_custom_post_type' );
+		$screen = $wp_fields->get_screen('post', 'my_test_screen', 'my_custom_post_type');
 
-		$this->assertNotEmpty( $screen );
+		$this->assertNotEmpty($screen);
 
-		$this->assertEquals( 'my_test_screen', $screen->id );
+		$this->assertEquals('my_test_screen', $screen->id);
 
 		// Remove screen
-		$wp_fields->remove_screen( 'post', 'my_test_screen', 'my_custom_post_type' );
+		$wp_fields->remove_screen('post', 'my_test_screen', 'my_custom_post_type');
 
 		// Screen no longer exists for this object type / name
-		$screen = $wp_fields->get_screen( 'post', 'my_test_screen', 'my_custom_post_type' );
+		$screen = $wp_fields->get_screen('post', 'my_test_screen', 'my_custom_post_type');
 
-		$this->assertEmpty( $screen );
+		$this->assertEmpty($screen);
 
 	}
 
@@ -277,15 +277,15 @@ 
 		global $wp_fields;
 
 		// Add a screen
-		$this->test_add_screen( 'post', 'my_custom_post_type' );
+		$this->test_add_screen('post', 'my_custom_post_type');
 
 		// Remove screen
-		$wp_fields->remove_screen( 'post', null, true );
+		$wp_fields->remove_screen('post', null, true);
 
 		// Screen no longer exists for this object type / name
-		$screen = $wp_fields->get_screen( 'post', 'my_test_screen', 'my_custom_post_type' );
+		$screen = $wp_fields->get_screen('post', 'my_test_screen', 'my_custom_post_type');
 
-		$this->assertEmpty( $screen );
+		$this->assertEmpty($screen);
 
 	}
 
@@ -300,15 +300,15 @@ 
 		global $wp_fields;
 
 		// Add a screen
-		$this->test_add_screen( 'post' );
+		$this->test_add_screen('post');
 
 		// Remove screen
-		$wp_fields->remove_screen( 'post', 'my_test_screen' );
+		$wp_fields->remove_screen('post', 'my_test_screen');
 
 		// Screen no longer exists for this object type / name
-		$screen = $wp_fields->get_screen( 'post', 'my_test_screen' );
+		$screen = $wp_fields->get_screen('post', 'my_test_screen');
 
-		$this->assertEmpty( $screen );
+		$this->assertEmpty($screen);
 
 	}
 
@@ -323,15 +323,15 @@ 
 		global $wp_fields;
 
 		// Add a screen
-		$this->test_add_screen( 'post', 'my_custom_post_type' );
+		$this->test_add_screen('post', 'my_custom_post_type');
 
 		// Remove screen
-		$wp_fields->remove_screen( 'post', true, 'my_custom_post_type' );
+		$wp_fields->remove_screen('post', true, 'my_custom_post_type');
 
 		// Screen no longer exists for this object type / name
-		$screen = $wp_fields->get_screen( 'post', 'my_test_screen', 'my_custom_post_type' );
+		$screen = $wp_fields->get_screen('post', 'my_test_screen', 'my_custom_post_type');
 
-		$this->assertEmpty( $screen );
+		$this->assertEmpty($screen);
 
 	}
 
@@ -341,7 +341,7 @@ 
 	 * @param string $object_type
 	 * @param string $object_name
 	 */
-	public function test_add_section( $object_type = 'post', $object_name = null ) {
+	public function test_add_section($object_type = 'post', $object_name = null) {
 
 		/**
 		 * @var $wp_fields WP_Fields_API
@@ -349,11 +349,11 @@ 
 		global $wp_fields;
 
 		// Add a screen
-		$this->test_add_screen( $object_type, $object_name );
+		$this->test_add_screen($object_type, $object_name);
 
-		$wp_fields->add_section( $object_type, 'my_test_section', $object_name, array(
+		$wp_fields->add_section($object_type, 'my_test_section', $object_name, array(
 			'screen' => 'my_test_screen',
-		) );
+		));
 
 	}
 
@@ -368,43 +368,43 @@ 
 		global $wp_fields;
 
 		// Add a screen
-		$this->test_add_section( 'post', 'my_custom_post_type' );
+		$this->test_add_section('post', 'my_custom_post_type');
 
 		// Get sections for object type / name
-		$sections = $wp_fields->get_sections( 'post', 'my_custom_post_type' );
+		$sections = $wp_fields->get_sections('post', 'my_custom_post_type');
 
-		$this->assertEquals( 1, count( $sections ) );
+		$this->assertEquals(1, count($sections));
 
-		$this->assertArrayHasKey( 'my_test_section', $sections );
+		$this->assertArrayHasKey('my_test_section', $sections);
 
 		// Get a section that doesn't exist
-		$sections = $wp_fields->get_sections( 'post', 'some_other_post_type' );
+		$sections = $wp_fields->get_sections('post', 'some_other_post_type');
 
-		$this->assertEquals( 0, count( $sections ) );
+		$this->assertEquals(0, count($sections));
 
 		// Get sections by screen
-		$sections = $wp_fields->get_sections( 'post', 'my_custom_post_type', 'my_test_screen' );
+		$sections = $wp_fields->get_sections('post', 'my_custom_post_type', 'my_test_screen');
 
-		$this->assertEquals( 1, count( $sections ) );
+		$this->assertEquals(1, count($sections));
 
-		$this->assertArrayHasKey( 'my_test_section', $sections );
+		$this->assertArrayHasKey('my_test_section', $sections);
 
 		// Get all sections for object type
-		$sections = $wp_fields->get_sections( 'post', true );
+		$sections = $wp_fields->get_sections('post', true);
 
-		$this->assertEquals( 1, count( $sections ) );
+		$this->assertEquals(1, count($sections));
 
-		$section_ids = wp_list_pluck( $sections, 'id' );
+		$section_ids = wp_list_pluck($sections, 'id');
 
-		$this->assertContains( 'my_test_section', $section_ids );
+		$this->assertContains('my_test_section', $section_ids);
 
 		// Get all sections for all object types
 		$sections = $wp_fields->get_sections();
 
 		// Each array item is an object type with an array of object names
-		$this->assertEquals( 1, count( $sections ) );
+		$this->assertEquals(1, count($sections));
 
-		$this->assertArrayHasKey( 'post', $sections );
+		$this->assertArrayHasKey('post', $sections);
 
 	}
 
@@ -419,24 +419,24 @@ 
 		global $wp_fields;
 
 		// Add a screen
-		$this->test_add_section( 'post', 'my_custom_post_type' );
+		$this->test_add_section('post', 'my_custom_post_type');
 
 		// Section exists for this object type / name
-		$section = $wp_fields->get_section( 'post', 'my_test_section', 'my_custom_post_type' );
+		$section = $wp_fields->get_section('post', 'my_test_section', 'my_custom_post_type');
 
-		$this->assertNotEmpty( $section );
+		$this->assertNotEmpty($section);
 
-		$this->assertEquals( 'my_test_section', $section->id );
+		$this->assertEquals('my_test_section', $section->id);
 
 		// Section doesn't exist for this object type / name
-		$section = $wp_fields->get_section( 'post', 'my_test_section', 'some_other_post_type' );
+		$section = $wp_fields->get_section('post', 'my_test_section', 'some_other_post_type');
 
-		$this->assertEmpty( $section );
+		$this->assertEmpty($section);
 
 		// Section doesn't exist for this object type / name
-		$section = $wp_fields->get_section( 'post', 'my_test_section2', 'my_custom_post_type' );
+		$section = $wp_fields->get_section('post', 'my_test_section2', 'my_custom_post_type');
 
-		$this->assertEmpty( $section );
+		$this->assertEmpty($section);
 
 	}
 
@@ -451,22 +451,22 @@ 
 		global $wp_fields;
 
 		// Add a screen
-		$this->test_add_section( 'post', 'my_custom_post_type' );
+		$this->test_add_section('post', 'my_custom_post_type');
 
 		// Section exists for this object type / name
-		$section = $wp_fields->get_section( 'post', 'my_test_section', 'my_custom_post_type' );
+		$section = $wp_fields->get_section('post', 'my_test_section', 'my_custom_post_type');
 
-		$this->assertNotEmpty( $section );
+		$this->assertNotEmpty($section);
 
-		$this->assertEquals( 'my_test_section', $section->id );
+		$this->assertEquals('my_test_section', $section->id);
 
 		// Remove section
-		$wp_fields->remove_section( 'post', 'my_test_section', 'my_custom_post_type' );
+		$wp_fields->remove_section('post', 'my_test_section', 'my_custom_post_type');
 
 		// Section no longer exists for this object type / name
-		$section = $wp_fields->get_section( 'post', 'my_test_section', 'my_custom_post_type' );
+		$section = $wp_fields->get_section('post', 'my_test_section', 'my_custom_post_type');
 
-		$this->assertEmpty( $section );
+		$this->assertEmpty($section);
 
 	}
 
@@ -476,7 +476,7 @@ 
 	 * @param string $object_type
 	 * @param string $object_name
 	 */
-	public function test_add_field( $object_type = 'post', $object_name = null ) {
+	public function test_add_field($object_type = 'post', $object_name = null) {
 
 		/**
 		 * @var $wp_fields WP_Fields_API
@@ -484,16 +484,16 @@ 
 		global $wp_fields;
 
 		// Add a section for the control
-		$this->test_add_section( $object_type, $object_name );
+		$this->test_add_section($object_type, $object_name);
 
-		$wp_fields->add_field( $object_type, 'my_test_field', $object_name, array(
+		$wp_fields->add_field($object_type, 'my_test_field', $object_name, array(
 			'control' => array(
 				'id' => 'my_test_field_control',
 				'label' => 'My Test Field',
 				'type' => 'text',
 				'section' => 'my_test_section',
 			),
-		) );
+		));
 
 	}
 
@@ -508,26 +508,26 @@ 
 		global $wp_fields;
 
 		// Add a field
-		$this->test_add_field( 'post', 'my_custom_post_type' );
+		$this->test_add_field('post', 'my_custom_post_type');
 
 		// Get fields for object type / name
-		$fields = $wp_fields->get_fields( 'post', 'my_custom_post_type' );
+		$fields = $wp_fields->get_fields('post', 'my_custom_post_type');
 
-		$this->assertEquals( 1, count( $fields ) );
+		$this->assertEquals(1, count($fields));
 
-		$this->assertArrayHasKey( 'my_test_field', $fields );
+		$this->assertArrayHasKey('my_test_field', $fields);
 
 		// Get a field that doesn't exist
-		$fields = $wp_fields->get_fields( 'post', 'some_other_post_type' );
+		$fields = $wp_fields->get_fields('post', 'some_other_post_type');
 
-		$this->assertEquals( 0, count( $fields ) );
+		$this->assertEquals(0, count($fields));
 
 		// Get fields by section
-		$fields = $wp_fields->get_fields( 'post', 'my_custom_post_type', 'my_test_section' );
+		$fields = $wp_fields->get_fields('post', 'my_custom_post_type', 'my_test_section');
 
-		$this->assertEquals( 1, count( $fields ) );
+		$this->assertEquals(1, count($fields));
 
-		$this->assertArrayHasKey( 'my_test_field', $fields );
+		$this->assertArrayHasKey('my_test_field', $fields);
 
 	}
 
@@ -542,24 +542,24 @@ 
 		global $wp_fields;
 
 		// Add a field
-		$this->test_add_field( 'post', 'my_custom_post_type' );
+		$this->test_add_field('post', 'my_custom_post_type');
 
 		// Field exists for this object type / name
-		$field = $wp_fields->get_field( 'post', 'my_test_field', 'my_custom_post_type' );
+		$field = $wp_fields->get_field('post', 'my_test_field', 'my_custom_post_type');
 
-		$this->assertNotEmpty( $field );
+		$this->assertNotEmpty($field);
 
-		$this->assertEquals( 'my_test_field', $field->id );
+		$this->assertEquals('my_test_field', $field->id);
 
 		// Field doesn't exist for this object type / name
-		$field = $wp_fields->get_field( 'post', 'my_test_field', 'some_other_post_type' );
+		$field = $wp_fields->get_field('post', 'my_test_field', 'some_other_post_type');
 
-		$this->assertEmpty( $field );
+		$this->assertEmpty($field);
 
 		// Field doesn't exist for this object type / name
-		$field = $wp_fields->get_field( 'post', 'my_test_field2', 'my_custom_post_type' );
+		$field = $wp_fields->get_field('post', 'my_test_field2', 'my_custom_post_type');
 
-		$this->assertEmpty( $field );
+		$this->assertEmpty($field);
 
 	}
 
@@ -574,22 +574,22 @@ 
 		global $wp_fields;
 
 		// Add a field
-		$this->test_add_field( 'post', 'my_custom_post_type' );
+		$this->test_add_field('post', 'my_custom_post_type');
 
 		// Field exists for this object type / name
-		$field = $wp_fields->get_field( 'post', 'my_test_field', 'my_custom_post_type' );
+		$field = $wp_fields->get_field('post', 'my_test_field', 'my_custom_post_type');
 
-		$this->assertNotEmpty( $field );
+		$this->assertNotEmpty($field);
 
-		$this->assertEquals( 'my_test_field', $field->id );
+		$this->assertEquals('my_test_field', $field->id);
 
 		// Remove field
-		$wp_fields->remove_field( 'post', 'my_test_field', 'my_custom_post_type' );
+		$wp_fields->remove_field('post', 'my_test_field', 'my_custom_post_type');
 
 		// Field no longer exists for this object type / name
-		$field = $wp_fields->get_field( 'post', 'my_test_field', 'my_custom_post_type' );
+		$field = $wp_fields->get_field('post', 'my_test_field', 'my_custom_post_type');
 
-		$this->assertEmpty( $field );
+		$this->assertEmpty($field);
 
 	}
 
@@ -599,7 +599,7 @@ 
 	 * @param string $object_type
 	 * @param string $object_name
 	 */
-	public function test_add_control( $object_type = 'post', $object_name = null ) {
+	public function test_add_control($object_type = 'post', $object_name = null) {
 
 		/**
 		 * @var $wp_fields WP_Fields_API
@@ -607,14 +607,14 @@ 
 		global $wp_fields;
 
 		// Add a field for the control
-		$this->test_add_field( $object_type, $object_name );
+		$this->test_add_field($object_type, $object_name);
 
-		$wp_fields->add_control( $object_type, 'my_test_control', $object_name, array(
+		$wp_fields->add_control($object_type, 'my_test_control', $object_name, array(
 			'section' => 'my_test_section',
 			'fields' => 'my_test_field',
 			'label' => 'My Test Control Field',
 			'type' => 'text',
-		) );
+		));
 
 	}
 
@@ -629,33 +629,33 @@ 
 		global $wp_fields;
 
 		// Add a control / field / section
-		$this->test_add_control( 'post', 'my_custom_post_type' );
+		$this->test_add_control('post', 'my_custom_post_type');
 
 		// Get controls for object type / name
-		$controls = $wp_fields->get_controls( 'post', 'my_custom_post_type' );
+		$controls = $wp_fields->get_controls('post', 'my_custom_post_type');
 
 		// There are two controls, the default one with the main field and this control
-		$this->assertEquals( 2, count( $controls ) );
+		$this->assertEquals(2, count($controls));
 
-		$this->assertArrayHasKey( 'my_test_control', $controls );
-		$this->assertArrayHasKey( 'my_test_field_control', $controls );
+		$this->assertArrayHasKey('my_test_control', $controls);
+		$this->assertArrayHasKey('my_test_field_control', $controls);
 
-		$this->assertEquals( 'my_test_section', $controls['my_test_control']->section );
+		$this->assertEquals('my_test_section', $controls['my_test_control']->section);
 
 		// Get a control that doesn't exist
-		$controls = $wp_fields->get_controls( 'post', 'some_other_post_type' );
+		$controls = $wp_fields->get_controls('post', 'some_other_post_type');
 
-		$this->assertEquals( 0, count( $controls ) );
+		$this->assertEquals(0, count($controls));
 
 		// Get controls by section
-		$controls = $wp_fields->get_controls( 'post', 'my_custom_post_type', 'my_test_section' );
+		$controls = $wp_fields->get_controls('post', 'my_custom_post_type', 'my_test_section');
 
-		$this->assertEquals( 2, count( $controls ) );
+		$this->assertEquals(2, count($controls));
 
-		$this->assertArrayHasKey( 'my_test_control', $controls );
-		$this->assertArrayHasKey( 'my_test_field_control', $controls );
+		$this->assertArrayHasKey('my_test_control', $controls);
+		$this->assertArrayHasKey('my_test_field_control', $controls);
 
-		$this->assertEquals( 'my_test_section', $controls['my_test_control']->section );
+		$this->assertEquals('my_test_section', $controls['my_test_control']->section);
 
 	}
 
@@ -670,37 +670,37 @@ 
 		global $wp_fields;
 
 		// Add a control / field / section
-		$this->test_add_control( 'post', 'my_custom_post_type' );
+		$this->test_add_control('post', 'my_custom_post_type');
 
 		// Control exists for this object type / name
-		$control = $wp_fields->get_control( 'post', 'my_test_field_control', 'my_custom_post_type' );
+		$control = $wp_fields->get_control('post', 'my_test_field_control', 'my_custom_post_type');
 
-		$this->assertNotEmpty( $control );
+		$this->assertNotEmpty($control);
 
-		$this->assertEquals( 'my_test_field_control', $control->id );
-		$this->assertNotEmpty( $control->field );
-		$this->assertEquals( 'my_test_field', $control->field->id );
-		$this->assertEquals( 'my_test_section', $control->section );
+		$this->assertEquals('my_test_field_control', $control->id);
+		$this->assertNotEmpty($control->field);
+		$this->assertEquals('my_test_field', $control->field->id);
+		$this->assertEquals('my_test_section', $control->section);
 
 		// Control exists for this object type / name
-		$control = $wp_fields->get_control( 'post', 'my_test_control', 'my_custom_post_type' );
+		$control = $wp_fields->get_control('post', 'my_test_control', 'my_custom_post_type');
 
-		$this->assertNotEmpty( $control );
+		$this->assertNotEmpty($control);
 
-		$this->assertEquals( 'my_test_control', $control->id );
-		$this->assertNotEmpty( $control->field );
-		$this->assertEquals( 'my_test_field', $control->field->id );
-		$this->assertEquals( 'my_test_section', $control->section );
+		$this->assertEquals('my_test_control', $control->id);
+		$this->assertNotEmpty($control->field);
+		$this->assertEquals('my_test_field', $control->field->id);
+		$this->assertEquals('my_test_section', $control->section);
 
 		// Control doesn't exist for this object type / name
-		$control = $wp_fields->get_control( 'post', 'my_test_control', 'some_other_post_type' );
+		$control = $wp_fields->get_control('post', 'my_test_control', 'some_other_post_type');
 
-		$this->assertEmpty( $control );
+		$this->assertEmpty($control);
 
 		// Control doesn't exist for this object type / name
-		$control = $wp_fields->get_control( 'post', 'my_test_control2', 'my_custom_post_type' );
+		$control = $wp_fields->get_control('post', 'my_test_control2', 'my_custom_post_type');
 
-		$this->assertEmpty( $control );
+		$this->assertEmpty($control);
 
 	}
 
@@ -715,32 +715,32 @@ 
 		global $wp_fields;
 
 		// Add a control / field / section
-		$this->test_add_control( 'post', 'my_custom_post_type' );
+		$this->test_add_control('post', 'my_custom_post_type');
 
 		// Control exists for this object type / name
-		$control = $wp_fields->get_control( 'post', 'my_test_control', 'my_custom_post_type' );
+		$control = $wp_fields->get_control('post', 'my_test_control', 'my_custom_post_type');
 
-		$this->assertNotEmpty( $control );
+		$this->assertNotEmpty($control);
 
-		$this->assertEquals( 'my_test_control', $control->id );
-		$this->assertEquals( 'my_test_field', $control->field->id );
-		$this->assertEquals( 'my_test_section', $control->section );
+		$this->assertEquals('my_test_control', $control->id);
+		$this->assertEquals('my_test_field', $control->field->id);
+		$this->assertEquals('my_test_section', $control->section);
 
 		// Remove control
-		$wp_fields->remove_control( 'post', 'my_test_control', 'my_custom_post_type' );
+		$wp_fields->remove_control('post', 'my_test_control', 'my_custom_post_type');
 
 		// Control no longer exists for this object type / name
-		$control = $wp_fields->get_control( 'post', 'my_test_control', 'my_custom_post_type' );
+		$control = $wp_fields->get_control('post', 'my_test_control', 'my_custom_post_type');
 
-		$this->assertEmpty( $control );
+		$this->assertEmpty($control);
 
 		// Remove field's control
-		$wp_fields->remove_control( 'post', 'my_test_field_control', 'my_custom_post_type' );
+		$wp_fields->remove_control('post', 'my_test_field_control', 'my_custom_post_type');
 
 		// Control no longer exists for this object type / name
-		$control = $wp_fields->get_control( 'post', 'my_test_field_control', 'my_custom_post_type' );
+		$control = $wp_fields->get_control('post', 'my_test_field_control', 'my_custom_post_type');
 
-		$this->assertEmpty( $control );
+		$this->assertEmpty($control);
 
 	}
 

wordpress-fields-api.php

Spacing +11 added lines, -11 removed lines

@@ -22,56 +22,56 @@
 /**
  * The absolute server path to the fields API directory.
  */
-define( 'WP_FIELDS_API_DIR', plugin_dir_path( __FILE__ ) );
+define('WP_FIELDS_API_DIR', plugin_dir_path(__FILE__));
 
 /**
  * On `plugins_loaded`, create an instance of the Fields API manager class.
  */
 function _wp_fields_api_include() {
 
-	require_once( WP_FIELDS_API_DIR . 'includes/class-wp-fields-api.php' );
+	require_once(WP_FIELDS_API_DIR.'includes/class-wp-fields-api.php');
 
 	// Init Customize class
 	$GLOBALS['wp_fields'] = new WP_Fields_API;
 
 }
 
-add_action( 'plugins_loaded', '_wp_fields_api_include', 8 );
+add_action('plugins_loaded', '_wp_fields_api_include', 8);
 
 /**
  * Implement Fields API Customizer instead of WP Core Customizer.
  */
 function _wp_fields_api_customize_include() {
 
-	if ( ! ( ( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] ) || ( is_admin() && 'customize.php' == basename( $_SERVER['PHP_SELF'] ) ) ) ) {
+	if ( ! ((isset($_REQUEST['wp_customize']) && 'on' == $_REQUEST['wp_customize']) || (is_admin() && 'customize.php' == basename($_SERVER['PHP_SELF'])))) {
 		return;
 	}
 
-	require_once( WP_FIELDS_API_DIR . 'implementation/wp-includes/class-wp-customize-manager.php' );
+	require_once(WP_FIELDS_API_DIR.'implementation/wp-includes/class-wp-customize-manager.php');
 
 	// Init Customize class
 	$GLOBALS['wp_customize'] = new WP_Customize_Manager;
 
 }
 
-remove_action( 'plugins_loaded', '_wp_customize_include' );
-add_action( 'plugins_loaded', '_wp_fields_api_customize_include', 9 );
+remove_action('plugins_loaded', '_wp_customize_include');
+add_action('plugins_loaded', '_wp_fields_api_customize_include', 9);
 
 /**
  * Implement Fields API User edit to override WP Core.
  */
 function _wp_fields_api_user_edit_include() {
 
-	require_once( WP_FIELDS_API_DIR . 'implementation/user-profile.php' );
+	require_once(WP_FIELDS_API_DIR.'implementation/user-profile.php');
 
 	return;
 
 	// Load our overrides
-	require_once( WP_FIELDS_API_DIR . 'implementation/wp-admin/includes/user.php' );
-	require_once( WP_FIELDS_API_DIR . 'implementation/wp-admin/user-edit.php' );
+	require_once(WP_FIELDS_API_DIR.'implementation/wp-admin/includes/user.php');
+	require_once(WP_FIELDS_API_DIR.'implementation/wp-admin/user-edit.php');
 
 	// Bail on original core file, don't run the rest
 	exit;
 
 }
-add_action( 'load-user-edit.php', '_wp_fields_api_user_edit_include' );
\ No newline at end of file
+add_action('load-user-edit.php', '_wp_fields_api_user_edit_include');
\ No newline at end of file

includes/class-wp-fields-api-section.php

Spacing +20 added lines, -20 removed lines

@@ -143,7 +143,7 @@ 
 
 		$args = func_get_args();
 
-		call_user_func_array( array( $this, 'init' ), $args );
+		call_user_func_array(array($this, 'init'), $args);
 
 	}
 
@@ -154,7 +154,7 @@ 
 	 * @param string $id            A specific ID of the section.
 	 * @param array  $args          Section arguments.
 	 */
-	public function init( $object_type, $id, $args = array() ) {
+	public function init($object_type, $id, $args = array()) {
 
 		/**
 		 * @var $wp_fields WP_Fields_API
@@ -163,7 +163,7 @@ 
 
 		$this->object_type = $object_type;
 
-		if ( is_array( $id ) ) {
+		if (is_array($id)) {
 			$args = $id;
 
 			$id = '';
@@ -171,19 +171,19 @@ 
 			$this->id = $id;
 		}
 
-		$keys = array_keys( get_object_vars( $this ) );
+		$keys = array_keys(get_object_vars($this));
 
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
 		self::$instance_count += 1;
 		$this->instance_number = self::$instance_count;
 
-		if ( empty( $this->active_callback ) ) {
-			$this->active_callback = array( $this, 'active_callback' );
+		if (empty($this->active_callback)) {
+			$this->active_callback = array($this, 'active_callback');
 		}
 
 		/*if ( $this->screen ) {
@@ -209,7 +209,7 @@ 
 	final public function active() {
 
 		$section = $this;
-		$active = call_user_func( $this->active_callback, $this );
+		$active = call_user_func($this->active_callback, $this);
 
 		/**
 		 * Filter response of {@see WP_Fields_API_Section::active()}.
@@ -217,7 +217,7 @@ 
 		 * @param bool                 $active  Whether the Fields API section is active.
 		 * @param WP_Fields_API_Section $section {@see WP_Fields_API_Section} instance.
 		 */
-		$active = apply_filters( 'fields_api_section_active_' . $this->object_type, $active, $section );
+		$active = apply_filters('fields_api_section_active_'.$this->object_type, $active, $section);
 
 		return $active;
 
@@ -247,8 +247,8 @@ 
 	 */
 	public function json() {
 
-		$array = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'screen', 'type' ) );
-		$array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$array = wp_array_slice_assoc((array) $this, array('id', 'description', 'priority', 'screen', 'type'));
+		$array['title'] = html_entity_decode($this->title, ENT_QUOTES, get_bloginfo('charset'));
 		$array['content'] = $this->get_content();
 		$array['active'] = $this->active();
 		$array['instanceNumber'] = $this->instance_number;
@@ -265,11 +265,11 @@ 
 	 */
 	public function check_capabilities() {
 
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) ) {
+		if ($this->capability && ! call_user_func_array('current_user_can', (array) $this->capability)) {
 			return false;
 		}
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) ) {
+		if ($this->theme_supports && ! call_user_func_array('current_theme_supports', (array) $this->theme_supports)) {
 			return false;
 		}
 
@@ -288,7 +288,7 @@ 
 
 		$this->maybe_render();
 
-		$template = trim( ob_get_contents() );
+		$template = trim(ob_get_contents());
 
 		ob_end_clean();
 
@@ -301,7 +301,7 @@ 
 	 */
 	final public function maybe_render() {
 
-		if ( ! $this->check_capabilities() ) {
+		if ( ! $this->check_capabilities()) {
 			return;
 		}
 
@@ -313,7 +313,7 @@ 
 		 *
 		 * @param WP_Fields_API_Section $this WP_Fields API_Section instance.
 		 */
-		do_action( "fields_api_render_section_{$this->object_type}", $this );
+		do_action("fields_api_render_section_{$this->object_type}", $this);
 
 		/**
 		 * Fires before rendering a specific Fields API section.
@@ -325,7 +325,7 @@ 
 		 * of the specific Fields API section to be rendered.
 		 *
 		 */
-		do_action( "fields_api_render_section_{$this->object_type}_{$this->object_name}_{$this->id}" );
+		do_action("fields_api_render_section_{$this->object_type}_{$this->object_name}_{$this->id}");
 
 		$this->render();
 
@@ -337,7 +337,7 @@ 
 	 * // @todo Merge render_template / print_template() from Customizer
 	 */
 	protected function render() {
-		echo esc_html( $this->title );
+		echo esc_html($this->title);
 	}
 
 	/**

includes/class-wp-fields-api-screen.php

Spacing +25 added lines, -25 removed lines

@@ -136,7 +136,7 @@ 
 
 		$args = func_get_args();
 
-		call_user_func_array( array( $this, 'init' ), $args );
+		call_user_func_array(array($this, 'init'), $args);
 
 	}
 
@@ -147,11 +147,11 @@ 
 	 * @param string $id            A specific ID of the screen.
 	 * @param array  $args          Screen arguments.
 	 */
-	public function init( $object_type, $id, $args = array() ) {
+	public function init($object_type, $id, $args = array()) {
 
 		$this->object_type = $object_type;
 
-		if ( is_array( $id ) ) {
+		if (is_array($id)) {
 			$args = $id;
 
 			$id = '';
@@ -159,19 +159,19 @@ 
 			$this->id = $id;
 		}
 
-		$keys = array_keys( get_object_vars( $this ) );
+		$keys = array_keys(get_object_vars($this));
 
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
 		self::$instance_count += 1;
 		$this->instance_number = self::$instance_count;
 
-		if ( empty( $this->active_callback ) ) {
-			$this->active_callback = array( $this, 'active_callback' );
+		if (empty($this->active_callback)) {
+			$this->active_callback = array($this, 'active_callback');
 		}
 
 		$this->sections = array(); // Users cannot customize the $sections array.
@@ -188,7 +188,7 @@ 
 	final public function active() {
 
 		$screen = $this;
-		$active = call_user_func( $this->active_callback, $this );
+		$active = call_user_func($this->active_callback, $this);
 
 		/**
 		 * Filter response of WP_Fields_API_Screen::active().
@@ -197,7 +197,7 @@ 
 		 * @param bool                $active  Whether the Fields API screen is active.
 		 * @param WP_Fields_API_Screen $screen   {@see WP_Fields_API_Screen} instance.
 		 */
-		$active = apply_filters( 'fields_api_screen_active_' . $this->object_type, $active, $screen );
+		$active = apply_filters('fields_api_screen_active_'.$this->object_type, $active, $screen);
 
 		return $active;
 
@@ -226,7 +226,7 @@ 
 	 */
 	public function json() {
 
-		$array = wp_array_slice_assoc( (array) $this, array( 'id', 'title', 'description', 'priority', 'type' ) );
+		$array = wp_array_slice_assoc((array) $this, array('id', 'title', 'description', 'priority', 'type'));
 
 		$array['content'] = $this->get_content();
 		$array['active'] = $this->active();
@@ -244,11 +244,11 @@ 
 	 */
 	public function check_capabilities() {
 
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) ) {
+		if ($this->capability && ! call_user_func_array('current_user_can', (array) $this->capability)) {
 			return false;
 		}
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) ) {
+		if ($this->theme_supports && ! call_user_func_array('current_theme_supports', (array) $this->theme_supports)) {
 			return false;
 		}
 
@@ -267,7 +267,7 @@ 
 
 		$this->maybe_render();
 
-		$template = trim( ob_get_contents() );
+		$template = trim(ob_get_contents());
 
 		ob_end_clean();
 
@@ -281,7 +281,7 @@ 
 	 */
 	final public function maybe_render() {
 
-		if ( ! $this->check_capabilities() ) {
+		if ( ! $this->check_capabilities()) {
 			return;
 		}
 
@@ -290,7 +290,7 @@ 
 		 *
 		 * @param WP_Fields_API_Screen $this WP_Fields_API_Screen instance.
 		 */
-		do_action( "fields_api_render_screen_{$this->object_type}", $this );
+		do_action("fields_api_render_screen_{$this->object_type}", $this);
 
 		/**
 		 * Fires before rendering a specific Fields API screen.
@@ -298,7 +298,7 @@ 
 		 * The dynamic portion of the hook name, `$this->id`, refers to
 		 * the ID of the specific Fields API screen to be rendered.
 		 */
-		do_action( "fields_api_render_screen_{$this->object_type}_{$this->object_name}_{$this->id}" );
+		do_action("fields_api_render_screen_{$this->object_type}_{$this->object_name}_{$this->id}");
 
 		$this->render();
 
@@ -310,12 +310,12 @@ 
 	 * @access protected
 	 */
 	protected function render() {
-		$classes = 'accordion-section control-section control-screen control-screen-' . $this->type;
+		$classes = 'accordion-section control-section control-screen control-screen-'.$this->type;
 		?>
-		<li id="accordion-screen-<?php echo esc_attr( $this->id ); ?>" class="<?php echo esc_attr( $classes ); ?>">
+		<li id="accordion-screen-<?php echo esc_attr($this->id); ?>" class="<?php echo esc_attr($classes); ?>">
 			<h3 class="accordion-section-title" tabindex="0">
-				<?php echo esc_html( $this->title ); ?>
-				<span class="screen-reader-text"><?php _e( 'Press return or enter to open this screen' ); ?></span>
+				<?php echo esc_html($this->title); ?>
+				<span class="screen-reader-text"><?php _e('Press return or enter to open this screen'); ?></span>
 			</h3>
 			<ul class="accordion-sub-container control-screen-content">
 				<?php $this->render_content(); ?>
@@ -378,14 +378,14 @@ 
 	 */
 	protected function render_content() {
 		?>
-		<li class="screen-meta accordion-section control-section<?php if ( empty( $this->description ) ) { echo ' cannot-expand'; } ?>">
+		<li class="screen-meta accordion-section control-section<?php if (empty($this->description)) { echo ' cannot-expand'; } ?>">
 			<div class="accordion-section-title" tabindex="0">
 				<span class="preview-notice"><?php
 					/* translators: %s is the site/screen title in the Fields API */
-					printf( __( 'You are editing %s' ), '<strong class="screen-title">' . esc_html( $this->title ) . '</strong>' );
+					printf(__('You are editing %s'), '<strong class="screen-title">'.esc_html($this->title).'</strong>');
 				?></span>
 			</div>
-			<?php if ( ! empty( $this->description ) ) : ?>
+			<?php if ( ! empty($this->description)) : ?>
 				<div class="accordion-section-content description">
 					<?php echo $this->description; ?>
 				</div>

includes/fields-api-controls.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Fields API Text Control class.
- *
- * @see WP_Fields_API_Control
- */
+	 * Fields API Text Control class.
+	 *
+	 * @see WP_Fields_API_Control
+	 */
 class WP_Fields_API_Text_Control extends WP_Fields_API_Control {
 
 	/**

Spacing +85 added lines, -85 removed lines

@@ -13,13 +13,13 @@ 
 
 		?>
 		<label>
-			<?php if ( ! empty( $this->label ) ) : ?>
-				<span class="fields-control-title"><?php echo esc_html( $this->label ); ?></span>
+			<?php if ( ! empty($this->label)) : ?>
+				<span class="fields-control-title"><?php echo esc_html($this->label); ?></span>
 			<?php endif;
-			if ( ! empty( $this->description ) ) : ?>
+			if ( ! empty($this->description)) : ?>
 				<span class="description fields-control-description"><?php echo $this->description; ?></span>
 			<?php endif; ?>
-			<input type="<?php echo esc_attr( $this->type ); ?>" <?php $this->input_attrs(); ?> value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->link(); ?> />
+			<input type="<?php echo esc_attr($this->type); ?>" <?php $this->input_attrs(); ?> value="<?php echo esc_attr($this->value()); ?>" <?php $this->link(); ?> />
 		</label>
 		<?php
 
@@ -41,9 +41,9 @@ 
 
 		?>
 		<label>
-			<input type="checkbox" value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->link(); checked( $this->value() ); ?> />
-			<?php echo esc_html( $this->label ); ?>
-			<?php if ( ! empty( $this->description ) ) : ?>
+			<input type="checkbox" value="<?php echo esc_attr($this->value()); ?>" <?php $this->link(); checked($this->value()); ?> />
+			<?php echo esc_html($this->label); ?>
+			<?php if ( ! empty($this->description)) : ?>
 				<span class="description fields-control-description"><?php echo $this->description; ?></span>
 			<?php endif; ?>
 		</label>
@@ -65,24 +65,24 @@ 
 	 */
 	public function render_content() {
 
-		if ( empty( $this->choices ) ) {
+		if (empty($this->choices)) {
 			return;
 		}
 
-		$name = '_fields-checkbox-' . $this->id;
+		$name = '_fields-checkbox-'.$this->id;
 
-		if ( ! empty( $this->label ) ) : ?>
-			<span class="fields-control-title"><?php echo esc_html( $this->label ); ?></span>
+		if ( ! empty($this->label)) : ?>
+			<span class="fields-control-title"><?php echo esc_html($this->label); ?></span>
 		<?php endif;
-		if ( ! empty( $this->description ) ) : ?>
-			<span class="description fields-control-description"><?php echo $this->description ; ?></span>
+		if ( ! empty($this->description)) : ?>
+			<span class="description fields-control-description"><?php echo $this->description; ?></span>
 		<?php endif;
 
-		foreach ( $this->choices as $value => $label ) :
+		foreach ($this->choices as $value => $label) :
 			?>
 			<label>
-				<input type="checkbox" value="<?php echo esc_attr( $value ); ?>" name="<?php echo esc_attr( $name ); ?>" <?php $this->link(); checked( $this->value(), $value ); ?> />
-				<?php echo esc_html( $label ); ?><br/>
+				<input type="checkbox" value="<?php echo esc_attr($value); ?>" name="<?php echo esc_attr($name); ?>" <?php $this->link(); checked($this->value(), $value); ?> />
+				<?php echo esc_html($label); ?><br/>
 			</label>
 			<?php
 		endforeach;
@@ -103,24 +103,24 @@ 
 	 */
 	public function render_content() {
 
-		if ( empty( $this->choices ) ) {
+		if (empty($this->choices)) {
 			return;
 		}
 
-		$name = '_fields-radio-' . $this->id;
+		$name = '_fields-radio-'.$this->id;
 
-		if ( ! empty( $this->label ) ) : ?>
-			<span class="fields-control-title"><?php echo esc_html( $this->label ); ?></span>
+		if ( ! empty($this->label)) : ?>
+			<span class="fields-control-title"><?php echo esc_html($this->label); ?></span>
 		<?php endif;
-		if ( ! empty( $this->description ) ) : ?>
-			<span class="description fields-control-description"><?php echo $this->description ; ?></span>
+		if ( ! empty($this->description)) : ?>
+			<span class="description fields-control-description"><?php echo $this->description; ?></span>
 		<?php endif;
 
-		foreach ( $this->choices as $value => $label ) :
+		foreach ($this->choices as $value => $label) :
 			?>
 			<label>
-				<input type="radio" value="<?php echo esc_attr( $value ); ?>" name="<?php echo esc_attr( $name ); ?>" <?php $this->link(); checked( $this->value(), $value ); ?> />
-				<?php echo esc_html( $label ); ?><br/>
+				<input type="radio" value="<?php echo esc_attr($value); ?>" name="<?php echo esc_attr($name); ?>" <?php $this->link(); checked($this->value(), $value); ?> />
+				<?php echo esc_html($label); ?><br/>
 			</label>
 			<?php
 		endforeach;
@@ -141,22 +141,22 @@ 
 	 */
 	public function render_content() {
 
-		if ( empty( $this->choices ) ) {
+		if (empty($this->choices)) {
 			return;
 		}
 		?>
 		<label>
-			<?php if ( ! empty( $this->label ) ) : ?>
-				<span class="fields-control-title"><?php echo esc_html( $this->label ); ?></span>
+			<?php if ( ! empty($this->label)) : ?>
+				<span class="fields-control-title"><?php echo esc_html($this->label); ?></span>
 			<?php endif;
-			if ( ! empty( $this->description ) ) : ?>
+			if ( ! empty($this->description)) : ?>
 				<span class="description fields-control-description"><?php echo $this->description; ?></span>
 			<?php endif; ?>
 
 			<select <?php $this->link(); ?>>
 				<?php
-				foreach ( $this->choices as $value => $label )
-					echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+				foreach ($this->choices as $value => $label)
+					echo '<option value="'.esc_attr($value).'"'.selected($this->value(), $value, false).'>'.$label.'</option>';
 				?>
 			</select>
 		</label>
@@ -181,12 +181,12 @@ 
 	public function choices() {
 
 		$choices = array(
-			'0' => __( '&mdash; Select &mdash;' ),
+			'0' => __('&mdash; Select &mdash;'),
 		);
 
 		$pages = get_pages();
 
-		$choices = $this->get_page_choices_recurse( $choices, $pages );
+		$choices = $this->get_page_choices_recurse($choices, $pages);
 
 		return $choices;
 
@@ -202,17 +202,17 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_page_choices_recurse( $choices, $pages, $depth = 0, $parent = 0 ) {
+	public function get_page_choices_recurse($choices, $pages, $depth = 0, $parent = 0) {
 
-		$pad = str_repeat( '&nbsp;', $depth * 3 );
+		$pad = str_repeat('&nbsp;', $depth * 3);
 
-		foreach ( $pages as $page ) {
-			if ( $parent == $page->post_parent ) {
+		foreach ($pages as $page) {
+			if ($parent == $page->post_parent) {
 				$title = $page->post_title;
 
-				if ( '' === $title ) {
+				if ('' === $title) {
 					/* translators: %d: ID of a post */
-					$title = sprintf( __( '#%d (no title)' ), $page->ID );
+					$title = sprintf(__('#%d (no title)'), $page->ID);
 				}
 
 				/**
@@ -223,11 +223,11 @@ 
 				 * @param string $title Page title.
 				 * @param object $page  Page data object.
 				 */
-				$title = apply_filters( 'list_pages', $title, $page );
+				$title = apply_filters('list_pages', $title, $page);
 
-				$choices[ $page->ID ] = $pad . $title;
+				$choices[$page->ID] = $pad.$title;
 
-				$choices = $this->get_page_choices_recurse( $choices, $pages, $depth + 1, $page->ID );
+				$choices = $this->get_page_choices_recurse($choices, $pages, $depth + 1, $page->ID);
 			}
 		}
 
@@ -266,13 +266,13 @@ 
 	 * @param string               $id      Control ID.
 	 * @param array                $args    Optional. Arguments to override class property defaults.
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
+	public function __construct($manager, $id, $args = array()) {
 
 		$this->statuses = array(
-			'' => __( 'Default' ),
+			'' => __('Default'),
 		);
 
-		parent::__construct( $manager, $id, $args );
+		parent::__construct($manager, $id, $args);
 
 	}
 
@@ -282,8 +282,8 @@ 
 	 * @since 3.4.0
 	 */
 	public function enqueue() {
-		wp_enqueue_script( 'wp-color-picker' );
-		wp_enqueue_style( 'wp-color-picker' );
+		wp_enqueue_script('wp-color-picker');
+		wp_enqueue_style('wp-color-picker');
 	}
 
 	/**
@@ -335,7 +335,7 @@ 
 				<span class="description customize-control-description">{{{ data.description }}}</span>
 			<# } #>
 			<div class="customize-control-content">
-				<input class="color-picker-hex" type="text" maxlength="7" placeholder="<?php esc_attr_e( 'Hex Value' ); ?>" {{ defaultValue }} />
+				<input class="color-picker-hex" type="text" maxlength="7" placeholder="<?php esc_attr_e('Hex Value'); ?>" {{ defaultValue }} />
 			</div>
 		</label>
 		<?php
@@ -387,17 +387,17 @@ 
 	 * @param string               $id      Control ID.
 	 * @param array                $args    Optional. Arguments to override class property defaults.
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		parent::__construct( $manager, $id, $args );
+	public function __construct($manager, $id, $args = array()) {
+		parent::__construct($manager, $id, $args);
 
 		$this->button_labels = array(
-			'select'       => __( 'Select File' ),
-			'change'       => __( 'Change File' ),
-			'default'      => __( 'Default' ),
-			'remove'       => __( 'Remove' ),
-			'placeholder'  => __( 'No file selected' ),
-			'frame_title'  => __( 'Select File' ),
-			'frame_button' => __( 'Choose File' ),
+			'select'       => __('Select File'),
+			'change'       => __('Change File'),
+			'default'      => __('Default'),
+			'remove'       => __('Remove'),
+			'placeholder'  => __('No file selected'),
+			'frame_title'  => __('Select File'),
+			'frame_button' => __('Choose File'),
 		);
 	}
 
@@ -421,40 +421,40 @@ 
 	 */
 	public function to_json() {
 		parent::to_json();
-		$this->json['label'] = html_entity_decode( $this->label, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$this->json['label'] = html_entity_decode($this->label, ENT_QUOTES, get_bloginfo('charset'));
 		$this->json['mime_type'] = $this->mime_type;
 		$this->json['button_labels'] = $this->button_labels;
-		$this->json['canUpload'] = current_user_can( 'upload_files' );
+		$this->json['canUpload'] = current_user_can('upload_files');
 
 		$value = $this->value();
 
-		if ( is_object( $this->setting ) ) {
-			if ( $this->setting->default ) {
+		if (is_object($this->setting)) {
+			if ($this->setting->default) {
 				// Fake an attachment model - needs all fields used by template.
 				// Note that the default value must be a URL, NOT an attachment ID.
-				$type = in_array( substr( $this->setting->default, -3 ), array( 'jpg', 'png', 'gif', 'bmp' ) ) ? 'image' : 'document';
+				$type = in_array(substr($this->setting->default, -3), array('jpg', 'png', 'gif', 'bmp')) ? 'image' : 'document';
 				$default_attachment = array(
 					'id' => 1,
 					'url' => $this->setting->default,
 					'type' => $type,
-					'icon' => wp_mime_type_icon( $type ),
-					'title' => basename( $this->setting->default ),
+					'icon' => wp_mime_type_icon($type),
+					'title' => basename($this->setting->default),
 				);
 
-				if ( 'image' === $type ) {
+				if ('image' === $type) {
 					$default_attachment['sizes'] = array(
-						'full' => array( 'url' => $this->setting->default ),
+						'full' => array('url' => $this->setting->default),
 					);
 				}
 
 				$this->json['defaultAttachment'] = $default_attachment;
 			}
 
-			if ( $value && $this->setting->default && $value === $this->setting->default ) {
+			if ($value && $this->setting->default && $value === $this->setting->default) {
 				// Set the default as the attachment.
 				$this->json['attachment'] = $this->json['defaultAttachment'];
-			} elseif ( $value ) {
-				$this->json['attachment'] = wp_prepare_attachment_for_js( $value );
+			} elseif ($value) {
+				$this->json['attachment'] = wp_prepare_attachment_for_js($value);
 			}
 		}
 	}
@@ -585,11 +585,11 @@ 
 		parent::to_json();
 
 		$value = $this->value();
-		if ( $value ) {
+		if ($value) {
 			// Get the attachment model for the existing file.
-			$attachment_id = attachment_url_to_postid( $value );
-			if ( $attachment_id ) {
-				$this->json['attachment'] = wp_prepare_attachment_for_js( $attachment_id );
+			$attachment_id = attachment_url_to_postid($value);
+			if ($attachment_id) {
+				$this->json['attachment'] = wp_prepare_attachment_for_js($attachment_id);
 			}
 		}
 	}
@@ -616,17 +616,17 @@ 
 	 * @param string               $id      Control ID.
 	 * @param array                $args    Optional. Arguments to override class property defaults.
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		parent::__construct( $manager, $id, $args );
+	public function __construct($manager, $id, $args = array()) {
+		parent::__construct($manager, $id, $args);
 
 		$this->button_labels = array(
-			'select'       => __( 'Select Image' ),
-			'change'       => __( 'Change Image' ),
-			'remove'       => __( 'Remove' ),
-			'default'      => __( 'Default' ),
-			'placeholder'  => __( 'No image selected' ),
-			'frame_title'  => __( 'Select Image' ),
-			'frame_button' => __( 'Choose Image' ),
+			'select'       => __('Select Image'),
+			'change'       => __('Change Image'),
+			'remove'       => __('Remove'),
+			'default'      => __('Default'),
+			'placeholder'  => __('No image selected'),
+			'frame_title'  => __('Select Image'),
+			'frame_button' => __('Choose Image'),
 		);
 	}
 
@@ -644,7 +644,7 @@ 
 	 * @param string $label
 	 * @param mixed $callback
 	 */
-	public function add_tab( $id, $label, $callback ) {}
+	public function add_tab($id, $label, $callback) {}
 
 	/**
 	 * @since 3.4.0
@@ -652,7 +652,7 @@ 
 	 *
 	 * @param string $id
 	 */
-	public function remove_tab( $id ) {}
+	public function remove_tab($id) {}
 
 	/**
 	 * @since 3.4.0
@@ -661,5 +661,5 @@ 
 	 * @param string $url
 	 * @param string $thumbnail_url
 	 */
-	public function print_tab_image( $url, $thumbnail_url = null ) {}
+	public function print_tab_image($url, $thumbnail_url = null) {}
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -155,8 +155,9 @@
 
 			<select <?php $this->link(); ?>>
 				<?php
-				foreach ( $this->choices as $value => $label )
-					echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+				foreach ( $this->choices as $value => $label ) {
+									echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+				}
 				?>
 			</select>
 		</label>

includes/class-wp-fields-api-control.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Fields API Control Class
- *
- * @package WordPress
- * @subpackage Fields_API
- *
- * @property array $choices Key/Values used by Multiple choice control types
- */
+	 * Fields API Control Class
+	 *
+	 * @package WordPress
+	 * @subpackage Fields_API
+	 *
+	 * @property array $choices Key/Values used by Multiple choice control types
+	 */
 class WP_Fields_API_Control {
 
 	/**

Spacing +47 added lines, -47 removed lines

@@ -136,7 +136,7 @@ 
 
 		$args = func_get_args();
 
-		call_user_func_array( array( $this, 'init' ), $args );
+		call_user_func_array(array($this, 'init'), $args);
 
 	}
 
@@ -147,7 +147,7 @@ 
 	 * @param string $id            A specific ID of the control.
 	 * @param array  $args          Control arguments.
 	 */
-	public function init( $object_type, $id, $args = array() ) {
+	public function init($object_type, $id, $args = array()) {
 
 		/**
 		 * @var $wp_fields WP_Fields_API
@@ -156,7 +156,7 @@ 
 
 		$this->object_type = $object_type;
 
-		if ( is_array( $id ) ) {
+		if (is_array($id)) {
 			$args = $id;
 
 			$id = '';
@@ -164,11 +164,11 @@ 
 			$this->id = $id;
 		}
 
-		$keys = array_keys( get_object_vars( $this ) );
+		$keys = array_keys(get_object_vars($this));
 
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
@@ -176,24 +176,24 @@ 
 		$this->instance_number = self::$instance_count;
 
 		// Process fields.
-		if ( empty( $this->fields ) ) {
+		if (empty($this->fields)) {
 			$this->fields = $id;
 		}
 
 		$fields = array();
 
-		if ( is_array( $this->fields ) ) {
-			foreach ( $this->fields as $key => $field ) {
-				$field_obj = $wp_fields->get_field( $this->object_type, $field, $this->object_name );
+		if (is_array($this->fields)) {
+			foreach ($this->fields as $key => $field) {
+				$field_obj = $wp_fields->get_field($this->object_type, $field, $this->object_name);
 
-				if ( $field_obj ) {
-					$fields[ $key ] = $field_obj;
+				if ($field_obj) {
+					$fields[$key] = $field_obj;
 				}
 			}
 		} else {
-			$field_obj = $wp_fields->get_field( $this->object_type, $this->fields, $this->object_name );
+			$field_obj = $wp_fields->get_field($this->object_type, $this->fields, $this->object_name);
 
-			if ( $field_obj ) {
+			if ($field_obj) {
 				$this->field       = $field_obj;
 				$fields['default'] = $field_obj;
 			}
@@ -208,7 +208,7 @@ 
 	 */
 	public function setup_choices() {
 
-		if ( ! isset( $this->choices ) ) {
+		if ( ! isset($this->choices)) {
 			$choices = $this->choices();
 
 			$this->choices = $choices;
@@ -240,7 +240,7 @@ 
 	final public function active() {
 
 		$control = $this;
-		$active = call_user_func( $this->active_callback, $this );
+		$active = call_user_func($this->active_callback, $this);
 
 		/**
 		 * Filter response of WP_Fields_API_Control::active().
@@ -248,7 +248,7 @@ 
 		 * @param bool                  $active  Whether the Field control is active.
 		 * @param WP_Fields_API_Control $control WP_Fields_API_Control instance.
 		 */
-		$active = apply_filters( 'fields_control_active_' . $this->object_type, $active, $control );
+		$active = apply_filters('fields_control_active_'.$this->object_type, $active, $control);
 
 		return $active;
 
@@ -277,13 +277,13 @@ 
 	 * @param string $field_key
 	 * @return mixed The requested field's value, if the field exists.
 	 */
-	final public function value( $field_key = 'default' ) {
+	final public function value($field_key = 'default') {
 
-		if ( isset( $this->fields[ $field_key ] ) ) {
+		if (isset($this->fields[$field_key])) {
 			/**
 			 * @var $field WP_Fields_API_Field
 			 */
-			$field = $this->fields[ $field_key ];
+			$field = $this->fields[$field_key];
 
 			return $field->value();
 		}
@@ -301,7 +301,7 @@ 
 
 		$array = array();
 
-		$array['fields'] = wp_list_pluck( $this->fields, 'id' );
+		$array['fields'] = wp_list_pluck($this->fields, 'id');
 		$array['type'] = $this->type;
 		$array['priority'] = $this->priority;
 		$array['active'] = $this->active();
@@ -330,15 +330,15 @@ 
 		/**
 		 * @var $field WP_Fields_API_Field
 		 */
-		foreach ( $this->fields as $field ) {
-			if ( ! $field || ! $field->check_capabilities() ) {
+		foreach ($this->fields as $field) {
+			if ( ! $field || ! $field->check_capabilities()) {
 				return false;
 			}
 		}
 
-		$section = $wp_fields->get_section( $this->object_type, $this->section, $this->object_name );
+		$section = $wp_fields->get_section($this->object_type, $this->section, $this->object_name);
 
-		if ( isset( $section ) && ! $section->check_capabilities() ) {
+		if (isset($section) && ! $section->check_capabilities()) {
 			return false;
 		}
 
@@ -357,7 +357,7 @@ 
 
 		$this->maybe_render();
 
-		$template = trim( ob_get_clean() );
+		$template = trim(ob_get_clean());
 
 		return $template;
 
@@ -370,7 +370,7 @@ 
 	 */
 	final public function maybe_render() {
 
-		if ( ! $this->check_capabilities() ) {
+		if ( ! $this->check_capabilities()) {
 			return;
 		}
 
@@ -379,7 +379,7 @@ 
 		 *
 		 * @param WP_Fields_API_Control $this WP_Fields_API_Control instance.
 		 */
-		do_action( 'fields_render_control_' . $this->object_type, $this );
+		do_action('fields_render_control_'.$this->object_type, $this);
 
 		/**
 		 * Fires just before a specific control is rendered.
@@ -389,7 +389,7 @@ 
 		 *
 		 * @param WP_Fields_API_Control $this {@see WP_Fields_API_Control} instance.
 		 */
-		do_action( 'fields_render_control_' . $this->object_type . '_' . $this->object_name . '_' . $this->id, $this );
+		do_action('fields_render_control_'.$this->object_type.'_'.$this->object_name.'_'.$this->id, $this);
 
 		$this->render();
 
@@ -401,10 +401,10 @@ 
 	 */
 	protected function render() {
 
-		$id    = 'fields-control-' . str_replace( '[', '-', str_replace( ']', '', $this->id ) );
-		$class = 'fields-control fields-control-' . $this->type;
+		$id    = 'fields-control-'.str_replace('[', '-', str_replace(']', '', $this->id));
+		$class = 'fields-control fields-control-'.$this->type;
 
-		?><li id="<?php echo esc_attr( $id ); ?>" class="<?php echo esc_attr( $class ); ?>">
+		?><li id="<?php echo esc_attr($id); ?>" class="<?php echo esc_attr($class); ?>">
 			<?php $this->render_content(); ?>
 		</li><?php
 
@@ -417,13 +417,13 @@ 
 	 * @param string $field_key
 	 * @return string Data link parameter, if $field_key is a valid field, empty string otherwise.
 	 */
-	public function get_link( $field_key = 'default' ) {
+	public function get_link($field_key = 'default') {
 
-		if ( ! isset( $this->fields[ $field_key ] ) ) {
+		if ( ! isset($this->fields[$field_key])) {
 			return '';
 		}
 
-		return 'data-fields-field-link="' . esc_attr( $this->fields[ $field_key ]->id ) . '"';
+		return 'data-fields-field-link="'.esc_attr($this->fields[$field_key]->id).'"';
 
 	}
 
@@ -434,9 +434,9 @@ 
 	 *
 	 * @param string $field_key
 	 */
-	public function link( $field_key = 'default' ) {
+	public function link($field_key = 'default') {
 
-		echo $this->get_link( $field_key );
+		echo $this->get_link($field_key);
 
 	}
 
@@ -447,8 +447,8 @@ 
 	 */
 	public function input_attrs() {
 
-		foreach ( $this->input_attrs as $attr => $value ) {
-			echo $attr . '="' . esc_attr( $value ) . '" ';
+		foreach ($this->input_attrs as $attr => $value) {
+			echo $attr.'="'.esc_attr($value).'" ';
 		}
 
 	}
@@ -467,13 +467,13 @@ 
 
 		?>
 		<label>
-			<?php if ( ! empty( $this->label ) ) : ?>
-				<span class="fields-control-title"><?php echo esc_html( $this->label ); ?></span>
+			<?php if ( ! empty($this->label)) : ?>
+				<span class="fields-control-title"><?php echo esc_html($this->label); ?></span>
 			<?php endif;
-			if ( ! empty( $this->description ) ) : ?>
+			if ( ! empty($this->description)) : ?>
 				<span class="description fields-control-description"><?php echo $this->description; ?></span>
 			<?php endif; ?>
-			<input type="<?php echo esc_attr( $this->type ); ?>" <?php $this->input_attrs(); ?> value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->link(); ?> />
+			<input type="<?php echo esc_attr($this->type); ?>" <?php $this->input_attrs(); ?> value="<?php echo esc_attr($this->value()); ?>" <?php $this->link(); ?> />
 		</label>
 		<?php
 
@@ -491,7 +491,7 @@ 
 	public function print_template() {
 
 ?>
-    <script type="text/html" id="tmpl-fields-<?php echo esc_attr( $this->object_type ); ?>-control-<?php echo esc_attr( $this->type ); ?>-content">
+    <script type="text/html" id="tmpl-fields-<?php echo esc_attr($this->object_type); ?>-control-<?php echo esc_attr($this->type); ?>-content">
         <?php $this->content_template(); ?>
     </script>
 <?php
@@ -519,10 +519,10 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function &__get( $name ) {
+	public function &__get($name) {
 
 		// Map $this->choices to $this->choices() for dynamic choice handling
-		if ( 'choices' == $name ) {
+		if ('choices' == $name) {
 			$this->setup_choices();
 
 			return $this->choices;

tests/core/nav-menu-item-setting.php

Spacing +246 added lines, -246 removed lines

@@ -20,9 +20,9 @@ 
 	 */
 	function setUp() {
 		parent::setUp();
-		require_once( WP_FIELDS_API_DIR . 'implementation/wp-includes/class-wp-customize-manager.php' );
+		require_once(WP_FIELDS_API_DIR.'implementation/wp-includes/class-wp-customize-manager.php');
 		//require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
-		wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
+		wp_set_current_user($this->factory->user->create(array('role' => 'administrator')));
 
 		global $wp_customize;
 		$this->wp_customize = new WP_Customize_Manager();
@@ -44,8 +44,8 @@ 
 	 * @param object $menu_item Menu item.
 	 * @return object
 	 */
-	function filter_type_label( $menu_item ) {
-		if ( 'custom_type' === $menu_item->type ) {
+	function filter_type_label($menu_item) {
+		if ('custom_type' === $menu_item->type) {
 			$menu_item->type_label = 'Custom Label';
 		}
 
@@ -56,8 +56,8 @@ 
 	 * Test constants and statics.
 	 */
 	function test_constants() {
-		do_action( 'customize_register', $this->wp_customize );
-		$this->assertTrue( post_type_exists( WP_Customize_Nav_Menu_Item_Setting::POST_TYPE ) );
+		do_action('customize_register', $this->wp_customize);
+		$this->assertTrue(post_type_exists(WP_Customize_Nav_Menu_Item_Setting::POST_TYPE));
 	}
 
 	/**
@@ -66,16 +66,16 @@ 
 	 * @see WP_Customize_Nav_Menu_Item_Setting::__construct()
 	 */
 	function test_construct() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
-		$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, 'nav_menu_item[123]' );
-		$this->assertEquals( 'nav_menu_item', $setting->type );
-		$this->assertEquals( 'postMessage', $setting->transport );
-		$this->assertEquals( 123, $setting->post_id );
-		$this->assertNull( $setting->previous_post_id );
-		$this->assertNull( $setting->update_status );
-		$this->assertNull( $setting->update_error );
-		$this->assertInternalType( 'array', $setting->default );
+		$setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, 'nav_menu_item[123]');
+		$this->assertEquals('nav_menu_item', $setting->type);
+		$this->assertEquals('postMessage', $setting->transport);
+		$this->assertEquals(123, $setting->post_id);
+		$this->assertNull($setting->previous_post_id);
+		$this->assertNull($setting->update_status);
+		$this->assertNull($setting->update_error);
+		$this->assertInternalType('array', $setting->default);
 
 		$default = array(
 			'object_id' => 0,
@@ -94,34 +94,34 @@ 
 			'original_title' => '',
 			'nav_menu_term_id' => 0,
 		);
-		$this->assertEquals( $default, $setting->default );
+		$this->assertEquals($default, $setting->default);
 
 		$exception = null;
 		try {
-			$bad_setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, 'foo_bar_baz' );
-			unset( $bad_setting );
-		} catch ( Exception $e ) {
+			$bad_setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, 'foo_bar_baz');
+			unset($bad_setting);
+		} catch (Exception $e) {
 			$exception = $e;
 		}
-		$this->assertInstanceOf( 'Exception', $exception );
+		$this->assertInstanceOf('Exception', $exception);
 	}
 
 	/**
 	 * Test empty constructor.
 	 */
 	function test_construct_empty_menus() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 		$_wp_customize = $this->wp_customize;
 		unset($_wp_customize->nav_menus);
 
 		$exception = null;
 		try {
-			$bad_setting = new WP_Customize_Nav_Menu_Item_Setting( $_wp_customize, 'nav_menu_item[123]' );
-			unset( $bad_setting );
-		} catch ( Exception $e ) {
+			$bad_setting = new WP_Customize_Nav_Menu_Item_Setting($_wp_customize, 'nav_menu_item[123]');
+			unset($bad_setting);
+		} catch (Exception $e) {
 			$exception = $e;
 		}
-		$this->assertInstanceOf( 'Exception', $exception );
+		$this->assertInstanceOf('Exception', $exception);
 	}
 
 	/**
@@ -130,16 +130,16 @@ 
 	 * @see WP_Customize_Nav_Menu_Item_Setting::__construct()
 	 */
 	function test_construct_placeholder() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 		$default = array(
 			'title' => 'Lorem',
 			'description' => 'ipsum',
 			'menu_item_parent' => 123,
 		);
-		$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, 'nav_menu_item[-5]', compact( 'default' ) );
+		$setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, 'nav_menu_item[-5]', compact('default'));
 		$this->assertEquals( -5, $setting->post_id );
-		$this->assertNull( $setting->previous_post_id );
-		$this->assertEquals( $default, $setting->default );
+		$this->assertNull($setting->previous_post_id);
+		$this->assertEquals($default, $setting->default);
 	}
 
 	/**
@@ -148,41 +148,41 @@ 
 	 * @see WP_Customize_Nav_Menu_Item_Setting::value()
 	 */
 	function test_value_type_post_type() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
-		$post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
+		$post_id = $this->factory->post->create(array('post_title' => 'Hello World'));
 
-		$menu_id = wp_create_nav_menu( 'Menu' );
+		$menu_id = wp_create_nav_menu('Menu');
 		$item_title = 'Greetings';
-		$item_id = wp_update_nav_menu_item( $menu_id, 0, array(
+		$item_id = wp_update_nav_menu_item($menu_id, 0, array(
 			'menu-item-type' => 'post_type',
 			'menu-item-object' => 'post',
 			'menu-item-object-id' => $post_id,
 			'menu-item-title' => $item_title,
 			'menu-item-status' => 'publish',
-		) );
+		));
 
-		$post = get_post( $item_id );
-		$menu_item = wp_setup_nav_menu_item( $post );
-		$this->assertEquals( $item_title, $menu_item->title );
+		$post = get_post($item_id);
+		$menu_item = wp_setup_nav_menu_item($post);
+		$this->assertEquals($item_title, $menu_item->title);
 
 		$setting_id = "nav_menu_item[$item_id]";
-		$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, $setting_id );
+		$setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, $setting_id);
 
 		$value = $setting->value();
-		$this->assertEquals( $menu_item->title, $value['title'] );
-		$this->assertEquals( $menu_item->type, $value['type'] );
-		$this->assertEquals( $menu_item->object_id, $value['object_id'] );
-		$this->assertEquals( $menu_id, $value['nav_menu_term_id'] );
-		$this->assertEquals( 'Hello World', $value['original_title'] );
-
-		$other_menu_id = wp_create_nav_menu( 'Menu2' );
-		wp_update_nav_menu_item( $other_menu_id, $item_id, array(
+		$this->assertEquals($menu_item->title, $value['title']);
+		$this->assertEquals($menu_item->type, $value['type']);
+		$this->assertEquals($menu_item->object_id, $value['object_id']);
+		$this->assertEquals($menu_id, $value['nav_menu_term_id']);
+		$this->assertEquals('Hello World', $value['original_title']);
+
+		$other_menu_id = wp_create_nav_menu('Menu2');
+		wp_update_nav_menu_item($other_menu_id, $item_id, array(
 			'menu-item-title' => 'Hola',
-		) );
+		));
 		$value = $setting->value();
-		$this->assertEquals( 'Hola', $value['title'] );
-		$this->assertEquals( $other_menu_id, $value['nav_menu_term_id'] );
+		$this->assertEquals('Hola', $value['title']);
+		$this->assertEquals($other_menu_id, $value['nav_menu_term_id']);
 	}
 
 	/**
@@ -191,33 +191,33 @@ 
 	 * @see WP_Customize_Nav_Menu_Item_Setting::value()
 	 */
 	function test_value_type_taxonomy() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
-		$tax_id = $this->factory->category->create( array( 'name' => 'Salutations' ) );
+		$tax_id = $this->factory->category->create(array('name' => 'Salutations'));
 
-		$menu_id = wp_create_nav_menu( 'Menu' );
+		$menu_id = wp_create_nav_menu('Menu');
 		$item_title = 'Greetings';
-		$item_id = wp_update_nav_menu_item( $menu_id, 0, array(
+		$item_id = wp_update_nav_menu_item($menu_id, 0, array(
 			'menu-item-type' => 'taxonomy',
 			'menu-item-object' => 'category',
 			'menu-item-object-id' => $tax_id,
 			'menu-item-title' => $item_title,
 			'menu-item-status' => 'publish',
-		) );
+		));
 
-		$post = get_post( $item_id );
-		$menu_item = wp_setup_nav_menu_item( $post );
-		$this->assertEquals( $item_title, $menu_item->title );
+		$post = get_post($item_id);
+		$menu_item = wp_setup_nav_menu_item($post);
+		$this->assertEquals($item_title, $menu_item->title);
 
 		$setting_id = "nav_menu_item[$item_id]";
-		$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, $setting_id );
+		$setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, $setting_id);
 
 		$value = $setting->value();
-		$this->assertEquals( $menu_item->title, $value['title'] );
-		$this->assertEquals( $menu_item->type, $value['type'] );
-		$this->assertEquals( $menu_item->object_id, $value['object_id'] );
-		$this->assertEquals( $menu_id, $value['nav_menu_term_id'] );
-		$this->assertEquals( 'Salutations', $value['original_title'] );
+		$this->assertEquals($menu_item->title, $value['title']);
+		$this->assertEquals($menu_item->type, $value['type']);
+		$this->assertEquals($menu_item->object_id, $value['object_id']);
+		$this->assertEquals($menu_id, $value['nav_menu_term_id']);
+		$this->assertEquals('Salutations', $value['original_title']);
 	}
 
 	/**
@@ -226,26 +226,26 @@ 
 	 * @see WP_Customize_Nav_Menu_Item_Setting::value()
 	 */
 	function test_custom_type_label() {
-		do_action( 'customize_register', $this->wp_customize );
-		add_filter( 'wp_setup_nav_menu_item', array( $this, 'filter_type_label' ) );
+		do_action('customize_register', $this->wp_customize);
+		add_filter('wp_setup_nav_menu_item', array($this, 'filter_type_label'));
 
-		$menu_id = wp_create_nav_menu( 'Menu' );
-		$item_id = wp_update_nav_menu_item( $menu_id, 0, array(
+		$menu_id = wp_create_nav_menu('Menu');
+		$item_id = wp_update_nav_menu_item($menu_id, 0, array(
 			'menu-item-type'   => 'custom_type',
 			'menu-item-object' => 'custom_object',
 			'menu-item-title'  => 'Cool beans',
 			'menu-item-status' => 'publish',
-		) );
+		));
 
-		$post = get_post( $item_id );
-		$menu_item = wp_setup_nav_menu_item( $post );
+		$post = get_post($item_id);
+		$menu_item = wp_setup_nav_menu_item($post);
 
 		$setting_id = "nav_menu_item[$item_id]";
-		$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, $setting_id );
+		$setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, $setting_id);
 
 		$value = $setting->value();
-		$this->assertEquals( $menu_item->type_label, 'Custom Label' );
-		$this->assertEquals( $menu_item->type_label, $value['type_label'] );
+		$this->assertEquals($menu_item->type_label, 'Custom Label');
+		$this->assertEquals($menu_item->type_label, $value['type_label']);
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 	 * @see WP_Customize_Nav_Menu_Item_Setting::value()
 	 */
 	function test_value_nav_menu_term_id_returns_zero() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
 		$menu_id = -123;
 		$post_value = array(
@@ -264,29 +264,29 @@ 
 			'auto_add' => false,
 		);
 		$setting_id = "nav_menu[$menu_id]";
-		$menu = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, $setting_id );
+		$menu = new WP_Customize_Nav_Menu_Setting($this->wp_customize, $setting_id);
 
-		$this->wp_customize->set_post_value( $menu->id, $post_value );
+		$this->wp_customize->set_post_value($menu->id, $post_value);
 		$menu->preview();
 		$value = $menu->value();
-		$this->assertEquals( $post_value, $value );
+		$this->assertEquals($post_value, $value);
 
-		$post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
-		$item_id = wp_update_nav_menu_item( $menu_id, 0, array(
+		$post_id = $this->factory->post->create(array('post_title' => 'Hello World'));
+		$item_id = wp_update_nav_menu_item($menu_id, 0, array(
 			'menu-item-type' => 'post_type',
 			'menu-item-object' => 'post',
 			'menu-item-object-id' => $post_id,
 			'menu-item-title' => 'Hello World',
 			'menu-item-status' => 'publish',
-		) );
+		));
 
-		$post = get_post( $item_id );
-		$menu_item = wp_setup_nav_menu_item( $post );
+		$post = get_post($item_id);
+		$menu_item = wp_setup_nav_menu_item($post);
 
 		$setting_id = "nav_menu_item[$item_id]";
-		$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, $setting_id );
+		$setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, $setting_id);
 		$value = $setting->value();
-		$this->assertEquals( 0, $value['nav_menu_term_id'] );
+		$this->assertEquals(0, $value['nav_menu_term_id']);
 	}
 
 	/**
@@ -295,22 +295,22 @@ 
 	 * @see WP_Customize_Nav_Menu_Item_Setting::preview()
 	 */
 	function test_preview_updated() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
-		$first_post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
-		$second_post_id = $this->factory->post->create( array( 'post_title' => 'Hola Muno' ) );
+		$first_post_id = $this->factory->post->create(array('post_title' => 'Hello World'));
+		$second_post_id = $this->factory->post->create(array('post_title' => 'Hola Muno'));
 
-		$primary_menu_id = wp_create_nav_menu( 'Primary' );
-		$secondary_menu_id = wp_create_nav_menu( 'Secondary' );
+		$primary_menu_id = wp_create_nav_menu('Primary');
+		$secondary_menu_id = wp_create_nav_menu('Secondary');
 		$item_title = 'Greetings';
-		$item_id = wp_update_nav_menu_item( $primary_menu_id, 0, array(
+		$item_id = wp_update_nav_menu_item($primary_menu_id, 0, array(
 			'menu-item-type' => 'post_type',
 			'menu-item-object' => 'post',
 			'menu-item-object-id' => $first_post_id,
 			'menu-item-title' => $item_title,
 			'menu-item-status' => 'publish',
-		) );
-		$this->assertNotEmpty( wp_get_nav_menu_items( $primary_menu_id, array( 'post_status' => 'publish,draft' ) ) );
+		));
+		$this->assertNotEmpty(wp_get_nav_menu_items($primary_menu_id, array('post_status' => 'publish,draft')));
 
 		$post_value = array(
 			'type' => 'post_type',
@@ -321,22 +321,22 @@ 
 			'nav_menu_term_id' => $secondary_menu_id,
 		);
 		$setting_id = "nav_menu_item[$item_id]";
-		$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, $setting_id );
-		$this->wp_customize->set_post_value( $setting_id, $post_value );
-		unset( $post_value['nav_menu_term_id'] );
+		$setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, $setting_id);
+		$this->wp_customize->set_post_value($setting_id, $post_value);
+		unset($post_value['nav_menu_term_id']);
 		$setting->preview();
 
 		// Make sure the menu item appears in the new menu.
-		$this->assertNotContains( $item_id, wp_list_pluck( wp_get_nav_menu_items( $primary_menu_id ), 'db_id' ) );
-		$menu_items = wp_get_nav_menu_items( $secondary_menu_id );
-		$db_ids = wp_list_pluck( $menu_items, 'db_id' );
-		$this->assertContains( $item_id, $db_ids );
-		$i = array_search( $item_id, $db_ids );
-		$updated_item = $menu_items[ $i ];
+		$this->assertNotContains($item_id, wp_list_pluck(wp_get_nav_menu_items($primary_menu_id), 'db_id'));
+		$menu_items = wp_get_nav_menu_items($secondary_menu_id);
+		$db_ids = wp_list_pluck($menu_items, 'db_id');
+		$this->assertContains($item_id, $db_ids);
+		$i = array_search($item_id, $db_ids);
+		$updated_item = $menu_items[$i];
 		$post_value['post_status'] = $post_value['status'];
-		unset( $post_value['status'] );
-		foreach ( $post_value as $key => $value ) {
-			$this->assertEquals( $value, $updated_item->$key, "Key $key mismatch" );
+		unset($post_value['status']);
+		foreach ($post_value as $key => $value) {
+			$this->assertEquals($value, $updated_item->$key, "Key $key mismatch");
 		}
 	}
 
@@ -346,20 +346,20 @@ 
 	 * @see WP_Customize_Nav_Menu_Item_Setting::preview()
 	 */
 	function test_preview_inserted() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
-		$menu_id = wp_create_nav_menu( 'Primary' );
-		$post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
+		$menu_id = wp_create_nav_menu('Primary');
+		$post_id = $this->factory->post->create(array('post_title' => 'Hello World'));
 		$item_ids = array();
-		for ( $i = 0; $i < 5; $i += 1 ) {
-			$item_id = wp_update_nav_menu_item( $menu_id, 0, array(
+		for ($i = 0; $i < 5; $i += 1) {
+			$item_id = wp_update_nav_menu_item($menu_id, 0, array(
 				'menu-item-type' => 'post_type',
 				'menu-item-object' => 'post',
 				'menu-item-object-id' => $post_id,
 				'menu-item-title' => "Item $i",
 				'menu-item-status' => 'publish',
 				'menu-item-position' => $i + 1,
-			) );
+			));
 			$item_ids[] = $item_id;
 		}
 
@@ -370,28 +370,28 @@ 
 			'title' => 'Inserted item',
 			'status' => 'publish',
 			'nav_menu_term_id' => $menu_id,
-			'position' => count( $item_ids ) + 1,
+			'position' => count($item_ids) + 1,
 		);
 
 		$new_item_id = -10;
 		$setting_id = "nav_menu_item[$new_item_id]";
-		$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, $setting_id );
-		$this->wp_customize->set_post_value( $setting_id, $post_value );
-		unset( $post_value['nav_menu_term_id'] );
+		$setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, $setting_id);
+		$this->wp_customize->set_post_value($setting_id, $post_value);
+		unset($post_value['nav_menu_term_id']);
 
-		$current_items = wp_get_nav_menu_items( $menu_id );
+		$current_items = wp_get_nav_menu_items($menu_id);
 		$setting->preview();
-		$preview_items = wp_get_nav_menu_items( $menu_id );
-		$this->assertNotEquals( count( $current_items ), count( $preview_items ) );
+		$preview_items = wp_get_nav_menu_items($menu_id);
+		$this->assertNotEquals(count($current_items), count($preview_items));
 
-		$last_item = array_pop( $preview_items );
-		$this->assertEquals( $new_item_id, $last_item->db_id );
+		$last_item = array_pop($preview_items);
+		$this->assertEquals($new_item_id, $last_item->db_id);
 		$post_value['post_status'] = $post_value['status'];
-		unset( $post_value['status'] );
+		unset($post_value['status']);
 		$post_value['menu_order'] = $post_value['position'];
-		unset( $post_value['position'] );
-		foreach ( $post_value as $key => $value ) {
-			$this->assertEquals( $value, $last_item->$key, "Mismatch for $key property." );
+		unset($post_value['position']);
+		foreach ($post_value as $key => $value) {
+			$this->assertEquals($value, $last_item->$key, "Mismatch for $key property.");
 		}
 	}
 
@@ -401,34 +401,34 @@ 
 	 * @see WP_Customize_Nav_Menu_Item_Setting::preview()
 	 */
 	function test_preview_deleted() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
-		$menu_id = wp_create_nav_menu( 'Primary' );
-		$post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
+		$menu_id = wp_create_nav_menu('Primary');
+		$post_id = $this->factory->post->create(array('post_title' => 'Hello World'));
 		$item_ids = array();
-		for ( $i = 0; $i < 5; $i += 1 ) {
-			$item_id = wp_update_nav_menu_item( $menu_id, 0, array(
+		for ($i = 0; $i < 5; $i += 1) {
+			$item_id = wp_update_nav_menu_item($menu_id, 0, array(
 				'menu-item-type' => 'post_type',
 				'menu-item-object' => 'post',
 				'menu-item-object-id' => $post_id,
 				'menu-item-title' => "Item $i",
 				'menu-item-status' => 'publish',
 				'menu-item-position' => $i + 1,
-			) );
+			));
 			$item_ids[] = $item_id;
 		}
 
 		$delete_item_id = $item_ids[2];
 		$setting_id = "nav_menu_item[$delete_item_id]";
-		$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, $setting_id );
-		$this->wp_customize->set_post_value( $setting_id, false );
+		$setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, $setting_id);
+		$this->wp_customize->set_post_value($setting_id, false);
 
-		$current_items = wp_get_nav_menu_items( $menu_id );
-		$this->assertContains( $delete_item_id, wp_list_pluck( $current_items, 'db_id' ) );
+		$current_items = wp_get_nav_menu_items($menu_id);
+		$this->assertContains($delete_item_id, wp_list_pluck($current_items, 'db_id'));
 		$setting->preview();
-		$preview_items = wp_get_nav_menu_items( $menu_id );
-		$this->assertNotEquals( count( $current_items ), count( $preview_items ) );
-		$this->assertContains( $delete_item_id, wp_list_pluck( $current_items, 'db_id' ) );
+		$preview_items = wp_get_nav_menu_items($menu_id);
+		$this->assertNotEquals(count($current_items), count($preview_items));
+		$this->assertContains($delete_item_id, wp_list_pluck($current_items, 'db_id'));
 	}
 
 	/**
@@ -437,11 +437,11 @@ 
 	 * @see WP_Customize_Nav_Menu_Item_Setting::sanitize()
 	 */
 	function test_sanitize() {
-		do_action( 'customize_register', $this->wp_customize );
-		$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, 'nav_menu_item[123]' );
+		do_action('customize_register', $this->wp_customize);
+		$setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, 'nav_menu_item[123]');
 
-		$this->assertNull( $setting->sanitize( 'not an array' ) );
-		$this->assertNull( $setting->sanitize( 123 ) );
+		$this->assertNull($setting->sanitize('not an array'));
+		$this->assertNull($setting->sanitize(123));
 
 		$unsanitized = array(
 			'object_id' => 'bad',
@@ -461,24 +461,24 @@ 
 			'nav_menu_term_id' => 'heilo',
 		);
 
-		$sanitized = $setting->sanitize( $unsanitized );
-		$this->assertEqualSets( array_keys( $unsanitized ), array_keys( $sanitized ) );
-
-		$this->assertEquals( 0, $sanitized['object_id'] );
-		$this->assertEquals( 'bhellob', $sanitized['object'] );
-		$this->assertEquals( 0, $sanitized['menu_item_parent'] );
-		$this->assertEquals( 0, $sanitized['position'] );
-		$this->assertEquals( 'customb', $sanitized['type'] );
-		$this->assertEquals( 'Hi', $sanitized['title'] );
-		$this->assertEquals( '', $sanitized['url'] );
-		$this->assertEquals( 'onclick', $sanitized['target'] );
-		$this->assertEquals( 'evil', $sanitized['attr_title'] );
-		$this->assertEquals( 'Hello world', $sanitized['description'] );
-		$this->assertEquals( 'hello  inject', $sanitized['classes'] );
-		$this->assertEquals( 'hello  inject', $sanitized['xfn'] );
-		$this->assertEquals( 'publish', $sanitized['status'] );
-		$this->assertEquals( 'Hi', $sanitized['original_title'] );
-		$this->assertEquals( 0, $sanitized['nav_menu_term_id'] );
+		$sanitized = $setting->sanitize($unsanitized);
+		$this->assertEqualSets(array_keys($unsanitized), array_keys($sanitized));
+
+		$this->assertEquals(0, $sanitized['object_id']);
+		$this->assertEquals('bhellob', $sanitized['object']);
+		$this->assertEquals(0, $sanitized['menu_item_parent']);
+		$this->assertEquals(0, $sanitized['position']);
+		$this->assertEquals('customb', $sanitized['type']);
+		$this->assertEquals('Hi', $sanitized['title']);
+		$this->assertEquals('', $sanitized['url']);
+		$this->assertEquals('onclick', $sanitized['target']);
+		$this->assertEquals('evil', $sanitized['attr_title']);
+		$this->assertEquals('Hello world', $sanitized['description']);
+		$this->assertEquals('hello  inject', $sanitized['classes']);
+		$this->assertEquals('hello  inject', $sanitized['xfn']);
+		$this->assertEquals('publish', $sanitized['status']);
+		$this->assertEquals('Hi', $sanitized['original_title']);
+		$this->assertEquals(0, $sanitized['nav_menu_term_id']);
 	}
 
 	/**
@@ -487,22 +487,22 @@ 
 	 * @see WP_Customize_Nav_Menu_Item_Setting::update()
 	 */
 	function test_save_updated() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
-		$first_post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
-		$second_post_id = $this->factory->post->create( array( 'post_title' => 'Hola Muno' ) );
+		$first_post_id = $this->factory->post->create(array('post_title' => 'Hello World'));
+		$second_post_id = $this->factory->post->create(array('post_title' => 'Hola Muno'));
 
-		$primary_menu_id = wp_create_nav_menu( 'Primary' );
-		$secondary_menu_id = wp_create_nav_menu( 'Secondary' );
+		$primary_menu_id = wp_create_nav_menu('Primary');
+		$secondary_menu_id = wp_create_nav_menu('Secondary');
 		$item_title = 'Greetings';
-		$item_id = wp_update_nav_menu_item( $primary_menu_id, 0, array(
+		$item_id = wp_update_nav_menu_item($primary_menu_id, 0, array(
 			'menu-item-type' => 'post_type',
 			'menu-item-object' => 'post',
 			'menu-item-object-id' => $first_post_id,
 			'menu-item-title' => $item_title,
 			'menu-item-status' => 'publish',
-		) );
-		$this->assertNotEmpty( wp_get_nav_menu_items( $primary_menu_id, array( 'post_status' => 'publish,draft' ) ) );
+		));
+		$this->assertNotEmpty(wp_get_nav_menu_items($primary_menu_id, array('post_status' => 'publish,draft')));
 
 		$post_value = array(
 			'type' => 'post_type',
@@ -513,37 +513,37 @@ 
 			'nav_menu_term_id' => $secondary_menu_id,
 		);
 		$setting_id = "nav_menu_item[$item_id]";
-		$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, $setting_id );
-		$this->wp_customize->set_post_value( $setting_id, $post_value );
-		unset( $post_value['nav_menu_term_id'] );
+		$setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, $setting_id);
+		$this->wp_customize->set_post_value($setting_id, $post_value);
+		unset($post_value['nav_menu_term_id']);
 		$setting->save();
 
 		// Make sure the menu item appears in the new menu.
-		$this->assertNotContains( $item_id, wp_list_pluck( wp_get_nav_menu_items( $primary_menu_id ), 'db_id' ) );
-		$menu_items = wp_get_nav_menu_items( $secondary_menu_id );
-		$db_ids = wp_list_pluck( $menu_items, 'db_id' );
-		$this->assertContains( $item_id, $db_ids );
-		$i = array_search( $item_id, $db_ids );
-		$updated_item = $menu_items[ $i ];
+		$this->assertNotContains($item_id, wp_list_pluck(wp_get_nav_menu_items($primary_menu_id), 'db_id'));
+		$menu_items = wp_get_nav_menu_items($secondary_menu_id);
+		$db_ids = wp_list_pluck($menu_items, 'db_id');
+		$this->assertContains($item_id, $db_ids);
+		$i = array_search($item_id, $db_ids);
+		$updated_item = $menu_items[$i];
 		$post_value['post_status'] = $post_value['status'];
-		unset( $post_value['status'] );
-		foreach ( $post_value as $key => $value ) {
-			$this->assertEquals( $value, $updated_item->$key, "Key $key mismatch" );
+		unset($post_value['status']);
+		foreach ($post_value as $key => $value) {
+			$this->assertEquals($value, $updated_item->$key, "Key $key mismatch");
 		}
 
 		// Verify the Ajax responses is being amended.
-		$save_response = apply_filters( 'customize_save_response', array() );
-		$this->assertArrayHasKey( 'nav_menu_item_updates', $save_response );
-		$update_result = array_shift( $save_response['nav_menu_item_updates'] );
-		$this->assertArrayHasKey( 'post_id', $update_result );
-		$this->assertArrayHasKey( 'previous_post_id', $update_result );
-		$this->assertArrayHasKey( 'error', $update_result );
-		$this->assertArrayHasKey( 'status', $update_result );
-
-		$this->assertEquals( $item_id, $update_result['post_id'] );
-		$this->assertNull( $update_result['previous_post_id'] );
-		$this->assertNull( $update_result['error'] );
-		$this->assertEquals( 'updated', $update_result['status'] );
+		$save_response = apply_filters('customize_save_response', array());
+		$this->assertArrayHasKey('nav_menu_item_updates', $save_response);
+		$update_result = array_shift($save_response['nav_menu_item_updates']);
+		$this->assertArrayHasKey('post_id', $update_result);
+		$this->assertArrayHasKey('previous_post_id', $update_result);
+		$this->assertArrayHasKey('error', $update_result);
+		$this->assertArrayHasKey('status', $update_result);
+
+		$this->assertEquals($item_id, $update_result['post_id']);
+		$this->assertNull($update_result['previous_post_id']);
+		$this->assertNull($update_result['error']);
+		$this->assertEquals('updated', $update_result['status']);
 	}
 
 	/**
@@ -552,20 +552,20 @@ 
 	 * @see WP_Customize_Nav_Menu_Item_Setting::update()
 	 */
 	function test_save_inserted() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
-		$menu_id = wp_create_nav_menu( 'Primary' );
-		$post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
+		$menu_id = wp_create_nav_menu('Primary');
+		$post_id = $this->factory->post->create(array('post_title' => 'Hello World'));
 		$item_ids = array();
-		for ( $i = 0; $i < 5; $i += 1 ) {
-			$item_id = wp_update_nav_menu_item( $menu_id, 0, array(
+		for ($i = 0; $i < 5; $i += 1) {
+			$item_id = wp_update_nav_menu_item($menu_id, 0, array(
 				'menu-item-type' => 'post_type',
 				'menu-item-object' => 'post',
 				'menu-item-object-id' => $post_id,
 				'menu-item-title' => "Item $i",
 				'menu-item-status' => 'publish',
 				'menu-item-position' => $i + 1,
-			) );
+			));
 			$item_ids[] = $item_id;
 		}
 
@@ -576,43 +576,43 @@ 
 			'title' => 'Inserted item',
 			'status' => 'publish',
 			'nav_menu_term_id' => $menu_id,
-			'position' => count( $item_ids ) + 1,
+			'position' => count($item_ids) + 1,
 		);
 
 		$new_item_id = -10;
 		$setting_id = "nav_menu_item[$new_item_id]";
-		$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, $setting_id );
-		$this->wp_customize->set_post_value( $setting_id, $post_value );
-		unset( $post_value['nav_menu_term_id'] );
+		$setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, $setting_id);
+		$this->wp_customize->set_post_value($setting_id, $post_value);
+		unset($post_value['nav_menu_term_id']);
 
-		$current_items = wp_get_nav_menu_items( $menu_id );
+		$current_items = wp_get_nav_menu_items($menu_id);
 		$setting->save();
-		$preview_items = wp_get_nav_menu_items( $menu_id );
-		$this->assertNotEquals( count( $current_items ), count( $preview_items ) );
+		$preview_items = wp_get_nav_menu_items($menu_id);
+		$this->assertNotEquals(count($current_items), count($preview_items));
 
-		$last_item = array_pop( $preview_items );
-		$this->assertEquals( $setting->post_id, $last_item->db_id );
+		$last_item = array_pop($preview_items);
+		$this->assertEquals($setting->post_id, $last_item->db_id);
 		$post_value['post_status'] = $post_value['status'];
-		unset( $post_value['status'] );
+		unset($post_value['status']);
 		$post_value['menu_order'] = $post_value['position'];
-		unset( $post_value['position'] );
-		foreach ( $post_value as $key => $value ) {
-			$this->assertEquals( $value, $last_item->$key, "Mismatch for $key property." );
+		unset($post_value['position']);
+		foreach ($post_value as $key => $value) {
+			$this->assertEquals($value, $last_item->$key, "Mismatch for $key property.");
 		}
 
 		// Verify the Ajax responses is being amended.
-		$save_response = apply_filters( 'customize_save_response', array() );
-		$this->assertArrayHasKey( 'nav_menu_item_updates', $save_response );
-		$update_result = array_shift( $save_response['nav_menu_item_updates'] );
-		$this->assertArrayHasKey( 'post_id', $update_result );
-		$this->assertArrayHasKey( 'previous_post_id', $update_result );
-		$this->assertArrayHasKey( 'error', $update_result );
-		$this->assertArrayHasKey( 'status', $update_result );
-
-		$this->assertEquals( $setting->post_id, $update_result['post_id'] );
-		$this->assertEquals( $new_item_id, $update_result['previous_post_id'] );
-		$this->assertNull( $update_result['error'] );
-		$this->assertEquals( 'inserted', $update_result['status'] );
+		$save_response = apply_filters('customize_save_response', array());
+		$this->assertArrayHasKey('nav_menu_item_updates', $save_response);
+		$update_result = array_shift($save_response['nav_menu_item_updates']);
+		$this->assertArrayHasKey('post_id', $update_result);
+		$this->assertArrayHasKey('previous_post_id', $update_result);
+		$this->assertArrayHasKey('error', $update_result);
+		$this->assertArrayHasKey('status', $update_result);
+
+		$this->assertEquals($setting->post_id, $update_result['post_id']);
+		$this->assertEquals($new_item_id, $update_result['previous_post_id']);
+		$this->assertNull($update_result['error']);
+		$this->assertEquals('inserted', $update_result['status']);
 	}
 
 	/**
@@ -621,48 +621,48 @@ 
 	 * @see WP_Customize_Nav_Menu_Item_Setting::update()
 	 */
 	function test_save_deleted() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
-		$menu_id = wp_create_nav_menu( 'Primary' );
-		$post_id = $this->factory->post->create( array( 'post_title' => 'Hello World' ) );
+		$menu_id = wp_create_nav_menu('Primary');
+		$post_id = $this->factory->post->create(array('post_title' => 'Hello World'));
 		$item_ids = array();
-		for ( $i = 0; $i < 5; $i += 1 ) {
-			$item_id = wp_update_nav_menu_item( $menu_id, 0, array(
+		for ($i = 0; $i < 5; $i += 1) {
+			$item_id = wp_update_nav_menu_item($menu_id, 0, array(
 				'menu-item-type' => 'post_type',
 				'menu-item-object' => 'post',
 				'menu-item-object-id' => $post_id,
 				'menu-item-title' => "Item $i",
 				'menu-item-status' => 'publish',
 				'menu-item-position' => $i + 1,
-			) );
+			));
 			$item_ids[] = $item_id;
 		}
 
 		$delete_item_id = $item_ids[2];
 		$setting_id = "nav_menu_item[$delete_item_id]";
-		$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, $setting_id );
-		$this->wp_customize->set_post_value( $setting_id, false );
+		$setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, $setting_id);
+		$this->wp_customize->set_post_value($setting_id, false);
 
-		$current_items = wp_get_nav_menu_items( $menu_id );
-		$this->assertContains( $delete_item_id, wp_list_pluck( $current_items, 'db_id' ) );
+		$current_items = wp_get_nav_menu_items($menu_id);
+		$this->assertContains($delete_item_id, wp_list_pluck($current_items, 'db_id'));
 		$setting->save();
-		$preview_items = wp_get_nav_menu_items( $menu_id );
-		$this->assertNotEquals( count( $current_items ), count( $preview_items ) );
-		$this->assertContains( $delete_item_id, wp_list_pluck( $current_items, 'db_id' ) );
+		$preview_items = wp_get_nav_menu_items($menu_id);
+		$this->assertNotEquals(count($current_items), count($preview_items));
+		$this->assertContains($delete_item_id, wp_list_pluck($current_items, 'db_id'));
 
 		// Verify the Ajax responses is being amended.
-		$save_response = apply_filters( 'customize_save_response', array() );
-		$this->assertArrayHasKey( 'nav_menu_item_updates', $save_response );
-		$update_result = array_shift( $save_response['nav_menu_item_updates'] );
-		$this->assertArrayHasKey( 'post_id', $update_result );
-		$this->assertArrayHasKey( 'previous_post_id', $update_result );
-		$this->assertArrayHasKey( 'error', $update_result );
-		$this->assertArrayHasKey( 'status', $update_result );
-
-		$this->assertEquals( $delete_item_id, $update_result['post_id'] );
-		$this->assertNull( $update_result['previous_post_id'] );
-		$this->assertNull( $update_result['error'] );
-		$this->assertEquals( 'deleted', $update_result['status'] );
+		$save_response = apply_filters('customize_save_response', array());
+		$this->assertArrayHasKey('nav_menu_item_updates', $save_response);
+		$update_result = array_shift($save_response['nav_menu_item_updates']);
+		$this->assertArrayHasKey('post_id', $update_result);
+		$this->assertArrayHasKey('previous_post_id', $update_result);
+		$this->assertArrayHasKey('error', $update_result);
+		$this->assertArrayHasKey('status', $update_result);
+
+		$this->assertEquals($delete_item_id, $update_result['post_id']);
+		$this->assertNull($update_result['previous_post_id']);
+		$this->assertNull($update_result['error']);
+		$this->assertEquals('deleted', $update_result['status']);
 	}
 
 }