sc0ttkclark / wordpress-fields-api

includes/class-wp-fields-api.php

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/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']);
 	}
 
 }

tests/core/panel.php

Spacing +70 added lines, -70 removed lines

@@ -14,7 +14,7 @@ 
 
 	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' );
 		$GLOBALS['wp_customize'] = new WP_Customize_Manager();
 		$this->manager = $GLOBALS['wp_customize'];
@@ -23,7 +23,7 @@ 
 
 	function tearDown() {
 		$this->manager = null;
-		unset( $GLOBALS['wp_customize'] );
+		unset($GLOBALS['wp_customize']);
 		parent::tearDown();
 	}
 
@@ -31,18 +31,18 @@ 
 	 * @see WP_Customize_Panel::__construct()
 	 */
 	function test_construct_default_args() {
-		$panel = new WP_Customize_Panel( $this->manager, 'foo' );
-		$this->assertInternalType( 'int', $panel->instance_number );
-		$this->assertEquals( $this->manager, $panel->manager );
-		$this->assertEquals( 'foo', $panel->id );
-		$this->assertEquals( 160, $panel->priority );
-		$this->assertEquals( 'edit_theme_options', $panel->capability );
-		$this->assertEquals( '', $panel->theme_supports );
-		$this->assertEquals( '', $panel->title );
-		$this->assertEquals( '', $panel->description );
-		$this->assertEmpty( $panel->sections );
-		$this->assertEquals( 'default', $panel->type );
-		$this->assertEquals( array( $panel, 'active_callback' ), $panel->active_callback );
+		$panel = new WP_Customize_Panel($this->manager, 'foo');
+		$this->assertInternalType('int', $panel->instance_number);
+		$this->assertEquals($this->manager, $panel->manager);
+		$this->assertEquals('foo', $panel->id);
+		$this->assertEquals(160, $panel->priority);
+		$this->assertEquals('edit_theme_options', $panel->capability);
+		$this->assertEquals('', $panel->theme_supports);
+		$this->assertEquals('', $panel->title);
+		$this->assertEquals('', $panel->description);
+		$this->assertEmpty($panel->sections);
+		$this->assertEquals('default', $panel->type);
+		$this->assertEquals(array($panel, 'active_callback'), $panel->active_callback);
 	}
 
 	/**
@@ -59,9 +59,9 @@ 
 			'active_callback' => '__return_true',
 		);
 
-		$panel = new WP_Customize_Panel( $this->manager, 'foo', $args );
-		foreach ( $args as $key => $value ) {
-			$this->assertEquals( $value, $panel->$key );
+		$panel = new WP_Customize_Panel($this->manager, 'foo', $args);
+		foreach ($args as $key => $value) {
+			$this->assertEquals($value, $panel->$key);
 		}
 	}
 
@@ -69,8 +69,8 @@ 
 	 * @see WP_Customize_Panel::__construct()
 	 */
 	function test_construct_custom_type() {
-		$panel = new Custom_Panel_Test( $this->manager, 'foo' );
-		$this->assertEquals( 'titleless', $panel->type );
+		$panel = new Custom_Panel_Test($this->manager, 'foo');
+		$this->assertEquals('titleless', $panel->type);
 	}
 
 	/**
@@ -78,15 +78,15 @@ 
 	 * @see WP_Customize_Panel::active_callback()
 	 */
 	function test_active() {
-		$panel = new WP_Customize_Panel( $this->manager, 'foo' );
-		$this->assertTrue( $panel->active() );
+		$panel = new WP_Customize_Panel($this->manager, 'foo');
+		$this->assertTrue($panel->active());
 
-		$panel = new WP_Customize_Panel( $this->manager, 'foo', array(
+		$panel = new WP_Customize_Panel($this->manager, 'foo', array(
 			'active_callback' => '__return_false',
-		) );
-		$this->assertFalse( $panel->active() );
-		add_filter( 'customize_panel_active', array( $this, 'filter_active_test' ), 10, 2 );
-		$this->assertTrue( $panel->active() );
+		));
+		$this->assertFalse($panel->active());
+		add_filter('customize_panel_active', array($this, 'filter_active_test'), 10, 2);
+		$this->assertTrue($panel->active());
 	}
 
 	/**
@@ -94,9 +94,9 @@ 
 	 * @param WP_Customize_Panel $panel
 	 * @return bool
 	 */
-	function filter_active_test( $active, $panel ) {
-		$this->assertFalse( $active );
-		$this->assertInstanceOf( 'WP_Customize_Panel', $panel );
+	function filter_active_test($active, $panel) {
+		$this->assertFalse($active);
+		$this->assertInstanceOf('WP_Customize_Panel', $panel);
 		$active = true;
 		return $active;
 	}
@@ -114,105 +114,105 @@ 
 			'type' => 'horizontal',
 			'active_callback' => '__return_true',
 		);
-		$panel = new WP_Customize_Panel( $this->manager, 'foo', $args );
+		$panel = new WP_Customize_Panel($this->manager, 'foo', $args);
 		$data = $panel->json();
-		$this->assertEquals( 'foo', $data['id'] );
-		foreach ( array( 'title', 'description', 'priority', 'type' ) as $key ) {
-			$this->assertEquals( $args[ $key ], $data[ $key ] );
+		$this->assertEquals('foo', $data['id']);
+		foreach (array('title', 'description', 'priority', 'type') as $key) {
+			$this->assertEquals($args[$key], $data[$key]);
 		}
-		$this->assertEmpty( $data['content'] );
-		$this->assertTrue( $data['active'] );
-		$this->assertInternalType( 'int', $data['instanceNumber'] );
+		$this->assertEmpty($data['content']);
+		$this->assertTrue($data['active']);
+		$this->assertInternalType('int', $data['instanceNumber']);
 	}
 
 	/**
 	 * @see WP_Customize_Panel::check_capabilities()
 	 */
 	function test_check_capabilities() {
-		$user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
-		wp_set_current_user( $user_id );
+		$user_id = $this->factory->user->create(array('role' => 'administrator'));
+		wp_set_current_user($user_id);
 
-		$panel = new WP_Customize_Panel( $this->manager, 'foo' );
-		$this->assertTrue( $panel->check_capabilities() );
+		$panel = new WP_Customize_Panel($this->manager, 'foo');
+		$this->assertTrue($panel->check_capabilities());
 		$old_cap = $panel->capability;
 		$panel->capability = 'do_not_allow';
-		$this->assertFalse( $panel->check_capabilities() );
+		$this->assertFalse($panel->check_capabilities());
 		$panel->capability = $old_cap;
-		$this->assertTrue( $panel->check_capabilities() );
+		$this->assertTrue($panel->check_capabilities());
 		$panel->theme_supports = 'impossible_feature';
-		$this->assertFalse( $panel->check_capabilities() );
+		$this->assertFalse($panel->check_capabilities());
 	}
 
 	/**
 	 * @see WP_Customize_Panel::get_content()
 	 */
 	function test_get_content() {
-		$panel = new WP_Customize_Panel( $this->manager, 'foo' );
-		$this->assertEmpty( $panel->get_content() );
+		$panel = new WP_Customize_Panel($this->manager, 'foo');
+		$this->assertEmpty($panel->get_content());
 	}
 
 	/**
 	 * @see WP_Customize_Panel::maybe_render()
 	 */
 	function test_maybe_render() {
-		wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
-		$panel = new WP_Customize_Panel( $this->manager, 'bar' );
-		$customize_render_panel_count = did_action( 'customize_render_panel' );
-		add_action( 'customize_render_panel', array( $this, 'action_customize_render_panel_test' ) );
+		wp_set_current_user($this->factory->user->create(array('role' => 'administrator')));
+		$panel = new WP_Customize_Panel($this->manager, 'bar');
+		$customize_render_panel_count = did_action('customize_render_panel');
+		add_action('customize_render_panel', array($this, 'action_customize_render_panel_test'));
 		ob_start();
 		$panel->maybe_render();
 		$content = ob_get_clean();
-		$this->assertTrue( $panel->check_capabilities() );
-		$this->assertEmpty( $content );
-		$this->assertEquals( $customize_render_panel_count + 1, did_action( 'customize_render_panel' ), 'Unexpected did_action count for customize_render_panel' );
-		$this->assertEquals( 1, did_action( "customize_render_panel_{$panel->id}" ), "Unexpected did_action count for customize_render_panel_{$panel->id}" );
+		$this->assertTrue($panel->check_capabilities());
+		$this->assertEmpty($content);
+		$this->assertEquals($customize_render_panel_count + 1, did_action('customize_render_panel'), 'Unexpected did_action count for customize_render_panel');
+		$this->assertEquals(1, did_action("customize_render_panel_{$panel->id}"), "Unexpected did_action count for customize_render_panel_{$panel->id}");
 	}
 
 	/**
 	 * @see WP_Customize_Panel::maybe_render()
 	 * @param WP_Customize_Panel $panel
 	 */
-	function action_customize_render_panel_test( $panel ) {
-		$this->assertInstanceOf( 'WP_Customize_Panel', $panel );
+	function action_customize_render_panel_test($panel) {
+		$this->assertInstanceOf('WP_Customize_Panel', $panel);
 	}
 
 	/**
 	 * @see WP_Customize_Panel::print_template()
 	 */
 	function test_print_templates_standard() {
-		wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
+		wp_set_current_user($this->factory->user->create(array('role' => 'administrator')));
 
-		$panel = new WP_Customize_Panel( $this->manager, 'baz' );
+		$panel = new WP_Customize_Panel($this->manager, 'baz');
 		ob_start();
 		$panel->print_template();
 		$content = ob_get_clean();
-		$this->assertContains( '<script type="text/html" id="tmpl-customize-panel-default-content">', $content );
-		$this->assertContains( 'accordion-section-title', $content );
-		$this->assertContains( 'control-panel-content', $content );
-		$this->assertContains( '<script type="text/html" id="tmpl-customize-panel-default">', $content );
-		$this->assertContains( 'customize-panel-description', $content );
-		$this->assertContains( 'preview-notice', $content );
+		$this->assertContains('<script type="text/html" id="tmpl-customize-panel-default-content">', $content);
+		$this->assertContains('accordion-section-title', $content);
+		$this->assertContains('control-panel-content', $content);
+		$this->assertContains('<script type="text/html" id="tmpl-customize-panel-default">', $content);
+		$this->assertContains('customize-panel-description', $content);
+		$this->assertContains('preview-notice', $content);
 	}
 
 	/**
 	 * @see WP_Customize_Panel::print_template()
 	 */
 	function test_print_templates_custom() {
-		wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
+		wp_set_current_user($this->factory->user->create(array('role' => 'administrator')));
 
-		$panel = new Custom_Panel_Test( $this->manager, 'baz' );
+		$panel = new Custom_Panel_Test($this->manager, 'baz');
 		ob_start();
 		$panel->print_template();
 		$content = ob_get_clean();
-		$this->assertContains( '<script type="text/html" id="tmpl-customize-panel-titleless-content">', $content );
-		$this->assertNotContains( 'accordion-section-title', $content );
+		$this->assertContains('<script type="text/html" id="tmpl-customize-panel-titleless-content">', $content);
+		$this->assertNotContains('accordion-section-title', $content);
 
-		$this->assertContains( '<script type="text/html" id="tmpl-customize-panel-titleless">', $content );
-		$this->assertNotContains( 'preview-notice', $content );
+		$this->assertContains('<script type="text/html" id="tmpl-customize-panel-titleless">', $content);
+		$this->assertNotContains('preview-notice', $content);
 	}
 }
 
-require_once( WP_FIELDS_API_DIR . 'implementation/wp-includes/class-wp-customize-panel.php' );
+require_once(WP_FIELDS_API_DIR.'implementation/wp-includes/class-wp-customize-panel.php');
 //require_once ABSPATH . WPINC . '/class-wp-customize-panel.php';
 class Custom_Panel_Test extends WP_Customize_Panel {
 	public $type = 'titleless';

tests/core/setting.php

Spacing +178 added lines, -178 removed lines

@@ -19,7 +19,7 @@ 
 
 	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' );
 		$GLOBALS['wp_customize'] = new WP_Customize_Manager();
 		$this->manager = $GLOBALS['wp_customize'];
@@ -28,24 +28,24 @@ 
 
 	function tearDown() {
 		$this->manager = null;
-		unset( $GLOBALS['wp_customize'] );
+		unset($GLOBALS['wp_customize']);
 		parent::tearDown();
 	}
 
 	function test_constructor_without_args() {
-		$setting = new WP_Customize_Setting( $this->manager, 'foo' );
-		$this->assertEquals( $this->manager, $setting->manager );
-		$this->assertEquals( 'foo', $setting->id );
-		$this->assertEquals( 'theme_mod', $setting->type );
-		$this->assertEquals( 'edit_theme_options', $setting->capability );
-		$this->assertEquals( '', $setting->theme_supports );
-		$this->assertEquals( '', $setting->default );
-		$this->assertEquals( 'refresh', $setting->transport );
-		$this->assertEquals( '', $setting->sanitize_callback );
-		$this->assertEquals( '', $setting->sanitize_js_callback );
-		$this->assertFalse( has_filter( "customize_sanitize_{$setting->id}" ) );
-		$this->assertFalse( has_filter( "customize_sanitize_js_{$setting->id}" ) );
-		$this->assertEquals( false, $setting->dirty );
+		$setting = new WP_Customize_Setting($this->manager, 'foo');
+		$this->assertEquals($this->manager, $setting->manager);
+		$this->assertEquals('foo', $setting->id);
+		$this->assertEquals('theme_mod', $setting->type);
+		$this->assertEquals('edit_theme_options', $setting->capability);
+		$this->assertEquals('', $setting->theme_supports);
+		$this->assertEquals('', $setting->default);
+		$this->assertEquals('refresh', $setting->transport);
+		$this->assertEquals('', $setting->sanitize_callback);
+		$this->assertEquals('', $setting->sanitize_js_callback);
+		$this->assertFalse(has_filter("customize_sanitize_{$setting->id}"));
+		$this->assertFalse(has_filter("customize_sanitize_js_{$setting->id}"));
+		$this->assertEquals(false, $setting->dirty);
 	}
 
 	function test_constructor_with_args() {
@@ -55,16 +55,16 @@ 
 			'theme_supports' => 'widgets',
 			'default' => 'barbar',
 			'transport' => 'postMessage',
-			'sanitize_callback' => create_function( '$value', 'return $value . ":sanitize_callback";' ),
-			'sanitize_js_callback' => create_function( '$value', 'return $value . ":sanitize_js_callback";' ),
+			'sanitize_callback' => create_function('$value', 'return $value . ":sanitize_callback";'),
+			'sanitize_js_callback' => create_function('$value', 'return $value . ":sanitize_js_callback";'),
 		);
-		$setting = new WP_Customize_Setting( $this->manager, 'bar', $args );
-		$this->assertEquals( 'bar', $setting->id );
-		foreach ( $args as $key => $value ) {
-			$this->assertEquals( $value, $setting->$key );
+		$setting = new WP_Customize_Setting($this->manager, 'bar', $args);
+		$this->assertEquals('bar', $setting->id);
+		foreach ($args as $key => $value) {
+			$this->assertEquals($value, $setting->$key);
 		}
-		$this->assertEquals( 10, has_filter( "customize_sanitize_{$setting->id}", $args['sanitize_callback'] ) );
-		$this->assertEquals( 10, has_filter( "customize_sanitize_js_{$setting->id}" ), $args['sanitize_js_callback'] );
+		$this->assertEquals(10, has_filter("customize_sanitize_{$setting->id}", $args['sanitize_callback']));
+		$this->assertEquals(10, has_filter("customize_sanitize_js_{$setting->id}"), $args['sanitize_js_callback']);
 	}
 
 	public $post_data_overrides = array(
@@ -93,64 +93,64 @@ 
 	 * Run assertions on non-multidimensional standard settings.
 	 */
 	function test_preview_standard_types_non_multidimensional() {
-		$_POST['customized'] = wp_slash( wp_json_encode( $this->post_data_overrides ) );
+		$_POST['customized'] = wp_slash(wp_json_encode($this->post_data_overrides));
 
 		// Try non-multidimensional settings
-		foreach ( $this->standard_type_configs as $type => $type_options ) {
+		foreach ($this->standard_type_configs as $type => $type_options) {
 			// Non-multidimensional: See what effect the preview filter has on a non-existent setting (default value should be seen)
 			$name = "unset_{$type}_without_post_value";
 			$default = "default_value_{$name}";
-			$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );
-			$this->assertEquals( $this->undefined, call_user_func( $type_options['getter'], $name, $this->undefined ) );
-			$this->assertEquals( $default, $setting->value() );
+			$setting = new WP_Customize_Setting($this->manager, $name, compact('type', 'default'));
+			$this->assertEquals($this->undefined, call_user_func($type_options['getter'], $name, $this->undefined));
+			$this->assertEquals($default, $setting->value());
 			$setting->preview();
-			$this->assertEquals( $default, call_user_func( $type_options['getter'], $name, $this->undefined ), sprintf( 'Expected %s(%s) to return setting default: %s.', $type_options['getter'], $name, $default ) );
-			$this->assertEquals( $default, $setting->value() );
+			$this->assertEquals($default, call_user_func($type_options['getter'], $name, $this->undefined), sprintf('Expected %s(%s) to return setting default: %s.', $type_options['getter'], $name, $default));
+			$this->assertEquals($default, $setting->value());
 
 			// Non-multidimensional: See what effect the preview has on an extant setting (default value should not be seen)
 			$name = "set_{$type}_without_post_value";
 			$default = "default_value_{$name}";
 			$initial_value = "initial_value_{$name}";
-			call_user_func( $type_options['setter'], $name, $initial_value );
-			$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );
-			$this->assertEquals( $initial_value, call_user_func( $type_options['getter'], $name ) );
-			$this->assertEquals( $initial_value, $setting->value() );
+			call_user_func($type_options['setter'], $name, $initial_value);
+			$setting = new WP_Customize_Setting($this->manager, $name, compact('type', 'default'));
+			$this->assertEquals($initial_value, call_user_func($type_options['getter'], $name));
+			$this->assertEquals($initial_value, $setting->value());
 			$setting->preview();
-			$this->assertEquals( 0, did_action( "customize_preview_{$setting->id}" ) ); // only applicable for custom types (not options or theme_mods)
-			$this->assertEquals( 0, did_action( "customize_preview_{$setting->type}" ) ); // only applicable for custom types (not options or theme_mods)
-			$this->assertEquals( $initial_value, call_user_func( $type_options['getter'], $name ) );
-			$this->assertEquals( $initial_value, $setting->value() );
+			$this->assertEquals(0, did_action("customize_preview_{$setting->id}")); // only applicable for custom types (not options or theme_mods)
+			$this->assertEquals(0, did_action("customize_preview_{$setting->type}")); // only applicable for custom types (not options or theme_mods)
+			$this->assertEquals($initial_value, call_user_func($type_options['getter'], $name));
+			$this->assertEquals($initial_value, $setting->value());
 
 			// @todo What if we call the setter after preview() is called? If no post_value, should the new set value be stored? If that happens, then the following 3 assertions should be inverted
 			$overridden_value = "overridden_value_$name";
-			call_user_func( $type_options['setter'], $name, $overridden_value );
-			$this->assertEquals( $initial_value, call_user_func( $type_options['getter'], $name ) );
-			$this->assertEquals( $initial_value, $setting->value() );
-			$this->assertNotEquals( $overridden_value, $setting->value() );
+			call_user_func($type_options['setter'], $name, $overridden_value);
+			$this->assertEquals($initial_value, call_user_func($type_options['getter'], $name));
+			$this->assertEquals($initial_value, $setting->value());
+			$this->assertNotEquals($overridden_value, $setting->value());
 
 			// Non-multidimensional: Test unset setting being overridden by a post value
 			$name = "unset_{$type}_overridden";
 			$default = "default_value_{$name}";
-			$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );
-			$this->assertEquals( $this->undefined, call_user_func( $type_options['getter'], $name, $this->undefined ) );
-			$this->assertEquals( $default, $setting->value() );
+			$setting = new WP_Customize_Setting($this->manager, $name, compact('type', 'default'));
+			$this->assertEquals($this->undefined, call_user_func($type_options['getter'], $name, $this->undefined));
+			$this->assertEquals($default, $setting->value());
 			$setting->preview(); // activate post_data
-			$this->assertEquals( $this->post_data_overrides[ $name ], call_user_func( $type_options['getter'], $name, $this->undefined ) );
-			$this->assertEquals( $this->post_data_overrides[ $name ], $setting->value() );
+			$this->assertEquals($this->post_data_overrides[$name], call_user_func($type_options['getter'], $name, $this->undefined));
+			$this->assertEquals($this->post_data_overrides[$name], $setting->value());
 
 			// Non-multidimensional: Test set setting being overridden by a post value
 			$name = "set_{$type}_overridden";
 			$default = "default_value_{$name}";
 			$initial_value = "initial_value_{$name}";
-			call_user_func( $type_options['setter'], $name, $initial_value );
-			$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );
-			$this->assertEquals( $initial_value, call_user_func( $type_options['getter'], $name, $this->undefined ) );
-			$this->assertEquals( $initial_value, $setting->value() );
+			call_user_func($type_options['setter'], $name, $initial_value);
+			$setting = new WP_Customize_Setting($this->manager, $name, compact('type', 'default'));
+			$this->assertEquals($initial_value, call_user_func($type_options['getter'], $name, $this->undefined));
+			$this->assertEquals($initial_value, $setting->value());
 			$setting->preview(); // activate post_data
-			$this->assertEquals( 0, did_action( "customize_preview_{$setting->id}" ) ); // only applicable for custom types (not options or theme_mods)
-			$this->assertEquals( 0, did_action( "customize_preview_{$setting->type}" ) ); // only applicable for custom types (not options or theme_mods)
-			$this->assertEquals( $this->post_data_overrides[ $name ], call_user_func( $type_options['getter'], $name, $this->undefined ) );
-			$this->assertEquals( $this->post_data_overrides[ $name ], $setting->value() );
+			$this->assertEquals(0, did_action("customize_preview_{$setting->id}")); // only applicable for custom types (not options or theme_mods)
+			$this->assertEquals(0, did_action("customize_preview_{$setting->type}")); // only applicable for custom types (not options or theme_mods)
+			$this->assertEquals($this->post_data_overrides[$name], call_user_func($type_options['getter'], $name, $this->undefined));
+			$this->assertEquals($this->post_data_overrides[$name], $setting->value());
 		}
 	}
 
@@ -158,79 +158,79 @@ 
 	 * Run assertions on multidimensional standard settings.
 	 */
 	function test_preview_standard_types_multidimensional() {
-		$_POST['customized'] = wp_slash( wp_json_encode( $this->post_data_overrides ) );
+		$_POST['customized'] = wp_slash(wp_json_encode($this->post_data_overrides));
 
-		foreach ( $this->standard_type_configs as $type => $type_options ) {
+		foreach ($this->standard_type_configs as $type => $type_options) {
 			// Multidimensional: See what effect the preview filter has on a non-existent setting (default value should be seen)
 			$base_name = "unset_{$type}_multi";
-			$name = $base_name . '[foo]';
+			$name = $base_name.'[foo]';
 			$default = "default_value_{$name}";
-			$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );
-			$this->assertEquals( $this->undefined, call_user_func( $type_options['getter'], $base_name, $this->undefined ) );
-			$this->assertEquals( $default, $setting->value() );
+			$setting = new WP_Customize_Setting($this->manager, $name, compact('type', 'default'));
+			$this->assertEquals($this->undefined, call_user_func($type_options['getter'], $base_name, $this->undefined));
+			$this->assertEquals($default, $setting->value());
 			$setting->preview();
-			$base_value = call_user_func( $type_options['getter'], $base_name, $this->undefined );
-			$this->assertArrayHasKey( 'foo', $base_value );
-			$this->assertEquals( $default, $base_value['foo'] );
+			$base_value = call_user_func($type_options['getter'], $base_name, $this->undefined);
+			$this->assertArrayHasKey('foo', $base_value);
+			$this->assertEquals($default, $base_value['foo']);
 
 			// Multidimensional: See what effect the preview has on an extant setting (default value should not be seen)
 			$base_name = "set_{$type}_multi";
-			$name = $base_name . '[foo]';
+			$name = $base_name.'[foo]';
 			$default = "default_value_{$name}";
 			$initial_value = "initial_value_{$name}";
-			$base_initial_value = array( 'foo' => $initial_value, 'bar' => 'persisted' );
-			call_user_func( $type_options['setter'], $base_name, $base_initial_value );
-			$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );
-			$base_value = call_user_func( $type_options['getter'], $base_name, array() );
-			$this->assertEquals( $initial_value, $base_value['foo'] );
-			$this->assertEquals( $initial_value, $setting->value() );
+			$base_initial_value = array('foo' => $initial_value, 'bar' => 'persisted');
+			call_user_func($type_options['setter'], $base_name, $base_initial_value);
+			$setting = new WP_Customize_Setting($this->manager, $name, compact('type', 'default'));
+			$base_value = call_user_func($type_options['getter'], $base_name, array());
+			$this->assertEquals($initial_value, $base_value['foo']);
+			$this->assertEquals($initial_value, $setting->value());
 			$setting->preview();
-			$this->assertEquals( 0, did_action( "customize_preview_{$setting->id}" ) ); // only applicable for custom types (not options or theme_mods)
-			$this->assertEquals( 0, did_action( "customize_preview_{$setting->type}" ) ); // only applicable for custom types (not options or theme_mods)
-			$base_value = call_user_func( $type_options['getter'], $base_name, array() );
-			$this->assertEquals( $initial_value, $base_value['foo'] );
-			$this->assertEquals( $initial_value, $setting->value() );
+			$this->assertEquals(0, did_action("customize_preview_{$setting->id}")); // only applicable for custom types (not options or theme_mods)
+			$this->assertEquals(0, did_action("customize_preview_{$setting->type}")); // only applicable for custom types (not options or theme_mods)
+			$base_value = call_user_func($type_options['getter'], $base_name, array());
+			$this->assertEquals($initial_value, $base_value['foo']);
+			$this->assertEquals($initial_value, $setting->value());
 
 			// Multidimensional: Test unset setting being overridden by a post value
 			$base_name = "unset_{$type}_multi_overridden";
-			$name = $base_name . '[foo]';
+			$name = $base_name.'[foo]';
 			$default = "default_value_{$name}";
-			$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );
-			$this->assertEquals( $this->undefined, call_user_func( $type_options['getter'], $base_name, $this->undefined ) );
-			$this->assertEquals( $default, $setting->value() );
+			$setting = new WP_Customize_Setting($this->manager, $name, compact('type', 'default'));
+			$this->assertEquals($this->undefined, call_user_func($type_options['getter'], $base_name, $this->undefined));
+			$this->assertEquals($default, $setting->value());
 			$setting->preview();
-			$this->assertEquals( 0, did_action( "customize_preview_{$setting->id}" ) ); // only applicable for custom types (not options or theme_mods)
-			$this->assertEquals( 0, did_action( "customize_preview_{$setting->type}" ) ); // only applicable for custom types (not options or theme_mods)
-			$base_value = call_user_func( $type_options['getter'], $base_name, $this->undefined );
-			$this->assertArrayHasKey( 'foo', $base_value );
-			$this->assertEquals( $this->post_data_overrides[ $name ], $base_value['foo'] );
+			$this->assertEquals(0, did_action("customize_preview_{$setting->id}")); // only applicable for custom types (not options or theme_mods)
+			$this->assertEquals(0, did_action("customize_preview_{$setting->type}")); // only applicable for custom types (not options or theme_mods)
+			$base_value = call_user_func($type_options['getter'], $base_name, $this->undefined);
+			$this->assertArrayHasKey('foo', $base_value);
+			$this->assertEquals($this->post_data_overrides[$name], $base_value['foo']);
 
 			// Multidimemsional: Test set setting being overridden by a post value
 			$base_name = "set_{$type}_multi_overridden";
-			$name = $base_name . '[foo]';
+			$name = $base_name.'[foo]';
 			$default = "default_value_{$name}";
 			$initial_value = "initial_value_{$name}";
-			$base_initial_value = array( 'foo' => $initial_value, 'bar' => 'persisted' );
-			call_user_func( $type_options['setter'], $base_name, $base_initial_value );
-			$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );
-			$base_value = call_user_func( $type_options['getter'], $base_name, $this->undefined );
-			$this->arrayHasKey( 'foo', $base_value );
-			$this->arrayHasKey( 'bar', $base_value );
-			$this->assertEquals( $base_initial_value['foo'], $base_value['foo'] );
-
-			$getter = call_user_func( $type_options['getter'], $base_name, $this->undefined );
-			$this->assertEquals( $base_initial_value['bar'], $getter['bar'] );
-			$this->assertEquals( $initial_value, $setting->value() );
+			$base_initial_value = array('foo' => $initial_value, 'bar' => 'persisted');
+			call_user_func($type_options['setter'], $base_name, $base_initial_value);
+			$setting = new WP_Customize_Setting($this->manager, $name, compact('type', 'default'));
+			$base_value = call_user_func($type_options['getter'], $base_name, $this->undefined);
+			$this->arrayHasKey('foo', $base_value);
+			$this->arrayHasKey('bar', $base_value);
+			$this->assertEquals($base_initial_value['foo'], $base_value['foo']);
+
+			$getter = call_user_func($type_options['getter'], $base_name, $this->undefined);
+			$this->assertEquals($base_initial_value['bar'], $getter['bar']);
+			$this->assertEquals($initial_value, $setting->value());
 			$setting->preview();
-			$this->assertEquals( 0, did_action( "customize_preview_{$setting->id}" ) ); // only applicable for custom types (not options or theme_mods)
-			$this->assertEquals( 0, did_action( "customize_preview_{$setting->type}" ) ); // only applicable for custom types (not options or theme_mods)
-			$base_value = call_user_func( $type_options['getter'], $base_name, $this->undefined );
-			$this->assertArrayHasKey( 'foo', $base_value );
-			$this->assertEquals( $this->post_data_overrides[ $name ], $base_value['foo'] );
-			$this->arrayHasKey( 'bar', call_user_func( $type_options['getter'], $base_name, $this->undefined ) );
-
-			$getter = call_user_func( $type_options['getter'], $base_name, $this->undefined );
-			$this->assertEquals( $base_initial_value['bar'], $getter['bar'] );
+			$this->assertEquals(0, did_action("customize_preview_{$setting->id}")); // only applicable for custom types (not options or theme_mods)
+			$this->assertEquals(0, did_action("customize_preview_{$setting->type}")); // only applicable for custom types (not options or theme_mods)
+			$base_value = call_user_func($type_options['getter'], $base_name, $this->undefined);
+			$this->assertArrayHasKey('foo', $base_value);
+			$this->assertEquals($this->post_data_overrides[$name], $base_value['foo']);
+			$this->arrayHasKey('bar', call_user_func($type_options['getter'], $base_name, $this->undefined));
+
+			$getter = call_user_func($type_options['getter'], $base_name, $this->undefined);
+			$this->assertEquals($base_initial_value['bar'], $getter['bar']);
 		}
 	}
 
@@ -244,33 +244,33 @@ 
 	 */
 	protected $custom_type_data_previewed;
 
-	function custom_type_getter( $name, $default = null ) {
-		if ( did_action( "customize_preview_{$name}" ) && array_key_exists( $name, $this->custom_type_data_previewed ) ) {
-			$value = $this->custom_type_data_previewed[ $name ];
-		} else if ( array_key_exists( $name, $this->custom_type_data_saved ) ) {
-			$value = $this->custom_type_data_saved[ $name ];
+	function custom_type_getter($name, $default = null) {
+		if (did_action("customize_preview_{$name}") && array_key_exists($name, $this->custom_type_data_previewed)) {
+			$value = $this->custom_type_data_previewed[$name];
+		} else if (array_key_exists($name, $this->custom_type_data_saved)) {
+			$value = $this->custom_type_data_saved[$name];
 		} else {
 			$value = $default;
 		}
 		return $value;
 	}
 
-	function custom_type_setter( $name, $value ) {
-		$this->custom_type_data_saved[ $name ] = $value;
+	function custom_type_setter($name, $value) {
+		$this->custom_type_data_saved[$name] = $value;
 	}
 
-	function custom_type_value_filter( $default ) {
-		$name = preg_replace( '/^customize_value_/', '', current_filter() );
-		return $this->custom_type_getter( $name, $default );
+	function custom_type_value_filter($default) {
+		$name = preg_replace('/^customize_value_/', '', current_filter());
+		return $this->custom_type_getter($name, $default);
 	}
 
 	/**
 	 * @param WP_Customize_Setting $setting
 	 */
-	function custom_type_preview( $setting ) {
-		$previewed_value = $setting->post_value( $this->undefined );
-		if ( $this->undefined !== $previewed_value ) {
-			$this->custom_type_data_previewed[ $setting->id ] = $previewed_value;
+	function custom_type_preview($setting) {
+		$previewed_value = $setting->post_value($this->undefined);
+		if ($this->undefined !== $previewed_value) {
+			$this->custom_type_data_previewed[$setting->id] = $previewed_value;
 		}
 	}
 
@@ -280,74 +280,74 @@ 
 			"unset_{$type}_with_post_value" => "unset_{$type}_without_post_value",
 			"set_{$type}_with_post_value" => "set_{$type}_without_post_value",
 		);
-		$_POST['customized'] = wp_slash( wp_json_encode( $post_data_overrides ) );
+		$_POST['customized'] = wp_slash(wp_json_encode($post_data_overrides));
 
 		$this->custom_type_data_saved = array();
 		$this->custom_type_data_previewed = array();
 
-		add_action( "customize_preview_{$type}", array( $this, 'custom_type_preview' ) );
+		add_action("customize_preview_{$type}", array($this, 'custom_type_preview'));
 
 		// Custom type not existing and no post value override
 		$name = "unset_{$type}_without_post_value";
 		$default = "default_value_{$name}";
-		$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );
+		$setting = new WP_Customize_Setting($this->manager, $name, compact('type', 'default'));
 		// Note: #29316 will allow us to have one filter for all settings of a given type, which is what we need
-		add_filter( "customize_value_{$name}", array( $this, 'custom_type_value_filter' ) );
-		$this->assertEquals( $this->undefined, $this->custom_type_getter( $name, $this->undefined ) );
-		$this->assertEquals( $default, $setting->value() );
+		add_filter("customize_value_{$name}", array($this, 'custom_type_value_filter'));
+		$this->assertEquals($this->undefined, $this->custom_type_getter($name, $this->undefined));
+		$this->assertEquals($default, $setting->value());
 		$setting->preview();
-		$this->assertEquals( 1, did_action( "customize_preview_{$setting->id}" ) );
-		$this->assertEquals( 1, did_action( "customize_preview_{$setting->type}" ) );
-		$this->assertEquals( $this->undefined, $this->custom_type_getter( $name, $this->undefined ) ); // Note: for a non-custom type this is $default
-		$this->assertEquals( $default, $setting->value() ); // should be same as above
+		$this->assertEquals(1, did_action("customize_preview_{$setting->id}"));
+		$this->assertEquals(1, did_action("customize_preview_{$setting->type}"));
+		$this->assertEquals($this->undefined, $this->custom_type_getter($name, $this->undefined)); // Note: for a non-custom type this is $default
+		$this->assertEquals($default, $setting->value()); // should be same as above
 
 		// Custom type existing and no post value override
 		$name = "set_{$type}_without_post_value";
 		$default = "default_value_{$name}";
 		$initial_value = "initial_value_{$name}";
-		$this->custom_type_setter( $name, $initial_value );
-		$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );
+		$this->custom_type_setter($name, $initial_value);
+		$setting = new WP_Customize_Setting($this->manager, $name, compact('type', 'default'));
 		// Note: #29316 will allow us to have one filter for all settings of a given type, which is what we need
-		add_filter( "customize_value_{$name}", array( $this, 'custom_type_value_filter' ) );
-		$this->assertEquals( $initial_value, $this->custom_type_getter( $name, $this->undefined ) );
-		$this->assertEquals( $initial_value, $setting->value() );
+		add_filter("customize_value_{$name}", array($this, 'custom_type_value_filter'));
+		$this->assertEquals($initial_value, $this->custom_type_getter($name, $this->undefined));
+		$this->assertEquals($initial_value, $setting->value());
 		$setting->preview();
-		$this->assertEquals( 1, did_action( "customize_preview_{$setting->id}" ) );
-		$this->assertEquals( 2, did_action( "customize_preview_{$setting->type}" ) );
-		$this->assertEquals( $initial_value, $this->custom_type_getter( $name, $this->undefined ) ); // should be same as above
-		$this->assertEquals( $initial_value, $setting->value() ); // should be same as above
+		$this->assertEquals(1, did_action("customize_preview_{$setting->id}"));
+		$this->assertEquals(2, did_action("customize_preview_{$setting->type}"));
+		$this->assertEquals($initial_value, $this->custom_type_getter($name, $this->undefined)); // should be same as above
+		$this->assertEquals($initial_value, $setting->value()); // should be same as above
 
 		// Custom type not existing and with a post value override
 		$name = "unset_{$type}_with_post_value";
 		$default = "default_value_{$name}";
-		$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );
+		$setting = new WP_Customize_Setting($this->manager, $name, compact('type', 'default'));
 		// Note: #29316 will allow us to have one filter for all settings of a given type, which is what we need
-		add_filter( "customize_value_{$name}", array( $this, 'custom_type_value_filter' ) );
-		$this->assertEquals( $this->undefined, $this->custom_type_getter( $name, $this->undefined ) );
-		$this->assertEquals( $default, $setting->value() );
+		add_filter("customize_value_{$name}", array($this, 'custom_type_value_filter'));
+		$this->assertEquals($this->undefined, $this->custom_type_getter($name, $this->undefined));
+		$this->assertEquals($default, $setting->value());
 		$setting->preview();
-		$this->assertEquals( 1, did_action( "customize_preview_{$setting->id}" ) );
-		$this->assertEquals( 3, did_action( "customize_preview_{$setting->type}" ) );
-		$this->assertEquals( $post_data_overrides[ $name ], $this->custom_type_getter( $name, $this->undefined ) );
-		$this->assertEquals( $post_data_overrides[ $name ], $setting->value() );
+		$this->assertEquals(1, did_action("customize_preview_{$setting->id}"));
+		$this->assertEquals(3, did_action("customize_preview_{$setting->type}"));
+		$this->assertEquals($post_data_overrides[$name], $this->custom_type_getter($name, $this->undefined));
+		$this->assertEquals($post_data_overrides[$name], $setting->value());
 
 		// Custom type not existing and with a post value override
 		$name = "set_{$type}_with_post_value";
 		$default = "default_value_{$name}";
 		$initial_value = "initial_value_{$name}";
-		$this->custom_type_setter( $name, $initial_value );
-		$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );
+		$this->custom_type_setter($name, $initial_value);
+		$setting = new WP_Customize_Setting($this->manager, $name, compact('type', 'default'));
 		// Note: #29316 will allow us to have one filter for all settings of a given type, which is what we need
-		add_filter( "customize_value_{$name}", array( $this, 'custom_type_value_filter' ) );
-		$this->assertEquals( $initial_value, $this->custom_type_getter( $name, $this->undefined ) );
-		$this->assertEquals( $initial_value, $setting->value() );
+		add_filter("customize_value_{$name}", array($this, 'custom_type_value_filter'));
+		$this->assertEquals($initial_value, $this->custom_type_getter($name, $this->undefined));
+		$this->assertEquals($initial_value, $setting->value());
 		$setting->preview();
-		$this->assertEquals( 1, did_action( "customize_preview_{$setting->id}" ) );
-		$this->assertEquals( 4, did_action( "customize_preview_{$setting->type}" ) );
-		$this->assertEquals( $post_data_overrides[ $name ], $this->custom_type_getter( $name, $this->undefined ) );
-		$this->assertEquals( $post_data_overrides[ $name ], $setting->value() );
+		$this->assertEquals(1, did_action("customize_preview_{$setting->id}"));
+		$this->assertEquals(4, did_action("customize_preview_{$setting->type}"));
+		$this->assertEquals($post_data_overrides[$name], $this->custom_type_getter($name, $this->undefined));
+		$this->assertEquals($post_data_overrides[$name], $setting->value());
 
-		unset( $this->custom_type_data_previewed, $this->custom_type_data_saved );
+		unset($this->custom_type_data_previewed, $this->custom_type_data_saved);
 	}
 
 	/**
@@ -359,12 +359,12 @@ 
 		$type = 'option';
 		$name = 'unset_option_without_post_value';
 		$default = "default_value_{$name}";
-		$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type', 'default' ) );
-		$this->assertEquals( $this->undefined, get_option( $name, $this->undefined ) );
-		$this->assertEquals( $default, $setting->value() );
+		$setting = new WP_Customize_Setting($this->manager, $name, compact('type', 'default'));
+		$this->assertEquals($this->undefined, get_option($name, $this->undefined));
+		$this->assertEquals($default, $setting->value());
 		$setting->preview();
-		$this->assertEquals( $default, get_option( $name, $this->undefined ), sprintf( 'Expected get_option(%s) to return setting default: %s.', $name, $default ) );
-		$this->assertEquals( $default, $setting->value() );
+		$this->assertEquals($default, get_option($name, $this->undefined), sprintf('Expected get_option(%s) to return setting default: %s.', $name, $default));
+		$this->assertEquals($default, $setting->value());
 	}
 
 	/**
@@ -378,14 +378,14 @@ 
 		$type = 'option';
 		$name = 'blogname';
 		$post_value = rand_str();
-		$this->manager->set_post_value( $name, $post_value );
-		$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type' ) );
-		$this->assertFalse( $setting->is_current_blog_previewed() );
+		$this->manager->set_post_value($name, $post_value);
+		$setting = new WP_Customize_Setting($this->manager, $name, compact('type'));
+		$this->assertFalse($setting->is_current_blog_previewed());
 		$setting->preview();
-		$this->assertTrue( $setting->is_current_blog_previewed() );
+		$this->assertTrue($setting->is_current_blog_previewed());
 
-		$this->assertEquals( $post_value, $setting->value() );
-		$this->assertEquals( $post_value, get_option( $name ) );
+		$this->assertEquals($post_value, $setting->value());
+		$this->assertEquals($post_value, get_option($name));
 	}
 
 	/**
@@ -395,24 +395,24 @@ 
 	 * @group multisite
 	 */
 	function test_previewing_with_switch_to_blog() {
-		if ( ! is_multisite() ) {
-			$this->markTestSkipped( 'Cannot test WP_Customize_Setting::is_current_blog_previewed() with switch_to_blog() if not on multisite.' );
+		if ( ! is_multisite()) {
+			$this->markTestSkipped('Cannot test WP_Customize_Setting::is_current_blog_previewed() with switch_to_blog() if not on multisite.');
 		}
 
 		$type = 'option';
 		$name = 'blogdescription';
 		$post_value = rand_str();
-		$this->manager->set_post_value( $name, $post_value );
-		$setting = new WP_Customize_Setting( $this->manager, $name, compact( 'type' ) );
-		$this->assertFalse( $setting->is_current_blog_previewed() );
+		$this->manager->set_post_value($name, $post_value);
+		$setting = new WP_Customize_Setting($this->manager, $name, compact('type'));
+		$this->assertFalse($setting->is_current_blog_previewed());
 		$setting->preview();
-		$this->assertTrue( $setting->is_current_blog_previewed() );
+		$this->assertTrue($setting->is_current_blog_previewed());
 
 		$blog_id = $this->factory->blog->create();
-		switch_to_blog( $blog_id );
-		$this->assertFalse( $setting->is_current_blog_previewed() );
-		$this->assertNotEquals( $post_value, $setting->value() );
-		$this->assertNotEquals( $post_value, get_option( $name ) );
+		switch_to_blog($blog_id);
+		$this->assertFalse($setting->is_current_blog_previewed());
+		$this->assertNotEquals($post_value, $setting->value());
+		$this->assertNotEquals($post_value, get_option($name));
 		restore_current_blog();
 	}
 }

tests/core/nav-menus.php

Spacing +207 added lines, -207 removed lines

@@ -21,9 +21,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();
 		$wp_customize = $this->wp_customize;
@@ -44,7 +44,7 @@ 
 	 * @param array $items Menu item types.
 	 * @return array Menu item types.
 	 */
-	function filter_item_types( $items ) {
+	function filter_item_types($items) {
 		$items[] = array(
 			'title'  => 'Custom',
 			'type'   => 'custom_type',
@@ -62,14 +62,14 @@ 
 	 * @param string $object The object name (e.g. category).
 	 * @return array Menu items.
 	 */
-	function filter_items( $items, $type, $object ) {
+	function filter_items($items, $type, $object) {
 		$items[] = array(
 			'id'         => 'custom-1',
 			'title'      => 'Cool beans',
 			'type'       => $type,
 			'type_label' => 'Custom Label',
 			'object'     => $object,
-			'url'        => home_url( '/cool-beans/' ),
+			'url'        => home_url('/cool-beans/'),
 			'classes'    => 'custom-menu-item cool-beans',
 		);
 
@@ -82,9 +82,9 @@ 
 	 * @see WP_Customize_Nav_Menus::__construct()
 	 */
 	function test_construct() {
-		do_action( 'customize_register', $this->wp_customize );
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
-		$this->assertInstanceOf( 'WP_Customize_Manager', $menus->manager );
+		do_action('customize_register', $this->wp_customize);
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
+		$this->assertInstanceOf('WP_Customize_Manager', $menus->manager);
 	}
 
 	/**
@@ -93,17 +93,17 @@ 
 	 * @see WP_Customize_Nav_Menus::load_available_items_query()
 	 */
 	function test_load_available_items_query_returns_wp_error() {
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		// Invalid post type $obj_name.
-		$items = $menus->load_available_items_query( 'post_type', 'invalid' );
-		$this->assertInstanceOf( 'WP_Error', $items );
-		$this->assertEquals( 'nav_menus_invalid_post_type', $items->get_error_code() );
+		$items = $menus->load_available_items_query('post_type', 'invalid');
+		$this->assertInstanceOf('WP_Error', $items);
+		$this->assertEquals('nav_menus_invalid_post_type', $items->get_error_code());
 
 		// Invalid taxonomy $obj_name.
-		$items = $menus->load_available_items_query( 'taxonomy', 'invalid' );
-		$this->assertInstanceOf( 'WP_Error', $items );
-		$this->assertEquals( 'invalid_taxonomy', $items->get_error_code() );
+		$items = $menus->load_available_items_query('taxonomy', 'invalid');
+		$this->assertInstanceOf('WP_Error', $items);
+		$this->assertEquals('invalid_taxonomy', $items->get_error_code());
 	}
 
 	/**
@@ -112,29 +112,29 @@ 
 	 * @see WP_Customize_Nav_Menus::load_available_items_query()
 	 */
 	function test_load_available_items_query_maybe_returns_home() {
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		// Expected menu item array.
 		$expected = array(
 			'id'         => 'home',
-			'title'      => _x( 'Home', 'nav menu home label' ),
+			'title'      => _x('Home', 'nav menu home label'),
 			'type'       => 'custom',
-			'type_label' => __( 'Custom Link' ),
+			'type_label' => __('Custom Link'),
 			'object'     => '',
 			'url'        => home_url(),
 		);
 
 		// Create pages.
-		$this->factory->post->create_many( 15, array( 'post_type' => 'page' ) );
+		$this->factory->post->create_many(15, array('post_type' => 'page'));
 
 		// Home is included in menu items when page is zero.
-		$items = $menus->load_available_items_query( 'post_type', 'page', 0 );
-		$this->assertContains( $expected, $items );
+		$items = $menus->load_available_items_query('post_type', 'page', 0);
+		$this->assertContains($expected, $items);
 
 		// Home is not included in menu items when page is larger than zero.
-		$items = $menus->load_available_items_query( 'post_type', 'page', 1 );
-		$this->assertNotEmpty( $items );
-		$this->assertNotContains( $expected, $items );
+		$items = $menus->load_available_items_query('post_type', 'page', 1);
+		$this->assertNotEmpty($items);
+		$this->assertNotContains($expected, $items);
 	}
 
 	/**
@@ -143,13 +143,13 @@ 
 	 * @see WP_Customize_Nav_Menus::load_available_items_query()
 	 */
 	function test_load_available_items_query_returns_post_item_with_page_number() {
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		// Create page.
-		$post_id = $this->factory->post->create( array( 'post_title' => 'Post Title' ) );
+		$post_id = $this->factory->post->create(array('post_title' => 'Post Title'));
 
 		// Create pages.
-		$this->factory->post->create_many( 10 );
+		$this->factory->post->create_many(10);
 
 		// Expected menu item array.
 		$expected = array(
@@ -158,13 +158,13 @@ 
 			'type'       => 'post_type',
 			'type_label' => 'Post',
 			'object'     => 'post',
-			'object_id'  => intval( $post_id ),
-			'url'        => get_permalink( intval( $post_id ) ),
+			'object_id'  => intval($post_id),
+			'url'        => get_permalink(intval($post_id)),
 		);
 
 		// Offset the query and get the second page of menu items.
-		$items = $menus->load_available_items_query( 'post_type', 'post', 1 );
-		$this->assertContains( $expected, $items );
+		$items = $menus->load_available_items_query('post_type', 'post', 1);
+		$this->assertContains($expected, $items);
 	}
 
 	/**
@@ -173,10 +173,10 @@ 
 	 * @see WP_Customize_Nav_Menus::load_available_items_query()
 	 */
 	function test_load_available_items_query_returns_page_item() {
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		// Create page.
-		$page_id = $this->factory->post->create( array( 'post_title' => 'Page Title', 'post_type' => 'page' ) );
+		$page_id = $this->factory->post->create(array('post_title' => 'Page Title', 'post_type' => 'page'));
 
 		// Expected menu item array.
 		$expected = array(
@@ -185,12 +185,12 @@ 
 			'type'       => 'post_type',
 			'type_label' => 'Page',
 			'object'     => 'page',
-			'object_id'  => intval( $page_id ),
-			'url'        => get_permalink( intval( $page_id ) ),
+			'object_id'  => intval($page_id),
+			'url'        => get_permalink(intval($page_id)),
 		);
 
-		$items = $menus->load_available_items_query( 'post_type', 'page', 0 );
-		$this->assertContains( $expected, $items );
+		$items = $menus->load_available_items_query('post_type', 'page', 0);
+		$this->assertContains($expected, $items);
 	}
 
 	/**
@@ -199,10 +199,10 @@ 
 	 * @see WP_Customize_Nav_Menus::load_available_items_query()
 	 */
 	function test_load_available_items_query_returns_post_item() {
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		// Create post.
-		$post_id = $this->factory->post->create( array( 'post_title' => 'Post Title' ) );
+		$post_id = $this->factory->post->create(array('post_title' => 'Post Title'));
 
 		// Expected menu item array.
 		$expected = array(
@@ -211,12 +211,12 @@ 
 			'type'       => 'post_type',
 			'type_label' => 'Post',
 			'object'     => 'post',
-			'object_id'  => intval( $post_id ),
-			'url'        => get_permalink( intval( $post_id ) ),
+			'object_id'  => intval($post_id),
+			'url'        => get_permalink(intval($post_id)),
 		);
 
-		$items = $menus->load_available_items_query( 'post_type', 'post', 0 );
-		$this->assertContains( $expected, $items );
+		$items = $menus->load_available_items_query('post_type', 'post', 0);
+		$this->assertContains($expected, $items);
 	}
 
 	/**
@@ -225,10 +225,10 @@ 
 	 * @see WP_Customize_Nav_Menus::load_available_items_query()
 	 */
 	function test_load_available_items_query_returns_term_item() {
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		// Create term.
-		$term_id = $this->factory->category->create( array( 'name' => 'Term Title' ) );
+		$term_id = $this->factory->category->create(array('name' => 'Term Title'));
 
 		// Expected menu item array.
 		$expected = array(
@@ -237,12 +237,12 @@ 
 			'type'       => 'taxonomy',
 			'type_label' => 'Category',
 			'object'     => 'category',
-			'object_id'  => intval( $term_id ),
-			'url'        => get_term_link( intval( $term_id ), 'category' ),
+			'object_id'  => intval($term_id),
+			'url'        => get_term_link(intval($term_id), 'category'),
 		);
 
-		$items = $menus->load_available_items_query( 'taxonomy', 'category', 0 );
-		$this->assertContains( $expected, $items );
+		$items = $menus->load_available_items_query('taxonomy', 'category', 0);
+		$this->assertContains($expected, $items);
 	}
 
 	/**
@@ -251,9 +251,9 @@ 
 	 * @see WP_Customize_Nav_Menus::load_available_items_query()
 	 */
 	function test_load_available_items_query_returns_custom_item() {
-		add_filter( 'customize_nav_menu_available_item_types', array( $this, 'filter_item_types' ) );
-		add_filter( 'customize_nav_menu_available_items', array( $this, 'filter_items' ), 10, 4 );
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		add_filter('customize_nav_menu_available_item_types', array($this, 'filter_item_types'));
+		add_filter('customize_nav_menu_available_items', array($this, 'filter_items'), 10, 4);
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		// Expected menu item array.
 		$expected = array(
@@ -262,12 +262,12 @@ 
 			'type'       => 'custom_type',
 			'type_label' => 'Custom Label',
 			'object'     => 'custom_object',
-			'url'        => home_url( '/cool-beans/' ),
+			'url'        => home_url('/cool-beans/'),
 			'classes'    => 'custom-menu-item cool-beans',
 		);
 
-		$items = $menus->load_available_items_query( 'custom_type', 'custom_object', 0 );
-		$this->assertContains( $expected, $items );
+		$items = $menus->load_available_items_query('custom_type', 'custom_object', 0);
+		$this->assertContains($expected, $items);
 	}
 
 	/**
@@ -276,56 +276,56 @@ 
 	 * @see WP_Customize_Nav_Menus::search_available_items_query()
 	 */
 	function test_search_available_items_query() {
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		// Create posts
 		$post_ids = array();
-		$post_ids[] = $this->factory->post->create( array( 'post_title' => 'Search & Test' ) );
-		$post_ids[] = $this->factory->post->create( array( 'post_title' => 'Some Other Title' ) );
+		$post_ids[] = $this->factory->post->create(array('post_title' => 'Search & Test'));
+		$post_ids[] = $this->factory->post->create(array('post_title' => 'Some Other Title'));
 
 		// Create terms
 		$term_ids = array();
-		$term_ids[] = $this->factory->category->create( array( 'name' => 'Dogs Are Cool' ) );
-		$term_ids[] = $this->factory->category->create( array( 'name' => 'Cats Drool' ) );
+		$term_ids[] = $this->factory->category->create(array('name' => 'Dogs Are Cool'));
+		$term_ids[] = $this->factory->category->create(array('name' => 'Cats Drool'));
 
 		// Test empty results
 		$expected = array();
-		$results = $menus->search_available_items_query( array( 'pagenum' => 1, 's' => 'This Does NOT Exist' ) );
-		$this->assertEquals( $expected, $results );
+		$results = $menus->search_available_items_query(array('pagenum' => 1, 's' => 'This Does NOT Exist'));
+		$this->assertEquals($expected, $results);
 
 		// Test posts
-		foreach ( $post_ids as $post_id ) {
+		foreach ($post_ids as $post_id) {
 			$expected = array(
-				'id'         => 'post-' . $post_id,
-				'title'      => html_entity_decode( get_the_title( $post_id ) ),
+				'id'         => 'post-'.$post_id,
+				'title'      => html_entity_decode(get_the_title($post_id)),
 				'type'       => 'post_type',
-				'type_label' => get_post_type_object( 'post' )->labels->singular_name,
+				'type_label' => get_post_type_object('post')->labels->singular_name,
 				'object'     => 'post',
-				'object_id'  => intval( $post_id ),
-				'url'        => get_permalink( intval( $post_id ) ),
+				'object_id'  => intval($post_id),
+				'url'        => get_permalink(intval($post_id)),
 			);
-			wp_set_object_terms( $post_id, $term_ids, 'category' );
+			wp_set_object_terms($post_id, $term_ids, 'category');
 			$search = $post_id === $post_ids[0] ? 'test & search' : 'other title';
-			$s = sanitize_text_field( wp_unslash( $search ) );
-			$results = $menus->search_available_items_query( array( 'pagenum' => 1, 's' => $s ) );
-			$this->assertEquals( $expected, $results[0] );
+			$s = sanitize_text_field(wp_unslash($search));
+			$results = $menus->search_available_items_query(array('pagenum' => 1, 's' => $s));
+			$this->assertEquals($expected, $results[0]);
 		}
 
 		// Test terms
-		foreach ( $term_ids as $term_id ) {
-			$term = get_term_by( 'id', $term_id, 'category' );
+		foreach ($term_ids as $term_id) {
+			$term = get_term_by('id', $term_id, 'category');
 			$expected = array(
-				'id'         => 'term-' . $term_id,
+				'id'         => 'term-'.$term_id,
 				'title'      => $term->name,
 				'type'       => 'taxonomy',
-				'type_label' => get_taxonomy( 'category' )->labels->singular_name,
+				'type_label' => get_taxonomy('category')->labels->singular_name,
 				'object'     => 'category',
-				'object_id'  => intval( $term_id ),
-				'url'        => get_term_link( intval( $term_id ), 'category' ),
+				'object_id'  => intval($term_id),
+				'url'        => get_term_link(intval($term_id), 'category'),
 			);
-			$s = sanitize_text_field( wp_unslash( $term->name ) );
-			$results = $menus->search_available_items_query( array( 'pagenum' => 1, 's' => $s ) );
-			$this->assertEquals( $expected, $results[0] );
+			$s = sanitize_text_field(wp_unslash($term->name));
+			$results = $menus->search_available_items_query(array('pagenum' => 1, 's' => $s));
+			$this->assertEquals($expected, $results[0]);
 		}
 	}
 
@@ -335,10 +335,10 @@ 
 	 * @see WP_Customize_Nav_Menus::enqueue_scripts()
 	 */
 	function test_enqueue_scripts() {
-		do_action( 'customize_register', $this->wp_customize );
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 		$menus->enqueue_scripts();
-		$this->assertTrue( wp_script_is( 'customize-nav-menus' ) );
+		$this->assertTrue(wp_script_is('customize-nav-menus'));
 	}
 
 	/**
@@ -347,15 +347,15 @@ 
 	 * @see WP_Customize_Nav_Menus::filter_dynamic_setting_args()
 	 */
 	function test_filter_dynamic_setting_args() {
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
-		$expected = array( 'type' => 'nav_menu_item' );
-		$results = $menus->filter_dynamic_setting_args( $this->wp_customize, 'nav_menu_item[123]' );
-		$this->assertEquals( $expected, $results );
+		$expected = array('type' => 'nav_menu_item');
+		$results = $menus->filter_dynamic_setting_args($this->wp_customize, 'nav_menu_item[123]');
+		$this->assertEquals($expected, $results);
 
-		$expected = array( 'type' => 'nav_menu' );
-		$results = $menus->filter_dynamic_setting_args( $this->wp_customize, 'nav_menu[123]' );
-		$this->assertEquals( $expected, $results );
+		$expected = array('type' => 'nav_menu');
+		$results = $menus->filter_dynamic_setting_args($this->wp_customize, 'nav_menu[123]');
+		$this->assertEquals($expected, $results);
 	}
 
 	/**
@@ -364,16 +364,16 @@ 
 	 * @see WP_Customize_Nav_Menus::filter_dynamic_setting_class()
 	 */
 	function test_filter_dynamic_setting_class() {
-		do_action( 'customize_register', $this->wp_customize );
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		$expected = 'WP_Customize_Nav_Menu_Item_Setting';
-		$results = $menus->filter_dynamic_setting_class( 'WP_Customize_Setting', 'nav_menu_item[123]', array( 'type' => 'nav_menu_item' ) );
-		$this->assertEquals( $expected, $results );
+		$results = $menus->filter_dynamic_setting_class('WP_Customize_Setting', 'nav_menu_item[123]', array('type' => 'nav_menu_item'));
+		$this->assertEquals($expected, $results);
 
 		$expected = 'WP_Customize_Nav_Menu_Setting';
-		$results = $menus->filter_dynamic_setting_class( 'WP_Customize_Setting', 'nav_menu[123]', array( 'type' => 'nav_menu' ) );
-		$this->assertEquals( $expected, $results );
+		$results = $menus->filter_dynamic_setting_class('WP_Customize_Setting', 'nav_menu[123]', array('type' => 'nav_menu'));
+		$this->assertEquals($expected, $results);
 	}
 
 	/**
@@ -382,20 +382,20 @@ 
 	 * @see WP_Customize_Nav_Menus::customize_register()
 	 */
 	function test_customize_register() {
-		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' ) );
-		$item_id = wp_update_nav_menu_item( $menu_id, 0, array(
+		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'));
+		$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',
-		) );
-		$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, "nav_menu_item[$item_id]" );
-		do_action( 'customize_register', $this->wp_customize );
-		$this->assertEquals( 'Primary', $this->wp_customize->get_section( "nav_menu[$menu_id]" )->title );
-		$this->assertEquals( 'Hello World', $this->wp_customize->get_control( "nav_menu_item[$item_id]" )->label );
+		));
+		$setting = new WP_Customize_Nav_Menu_Item_Setting($this->wp_customize, "nav_menu_item[$item_id]");
+		do_action('customize_register', $this->wp_customize);
+		$this->assertEquals('Primary', $this->wp_customize->get_section("nav_menu[$menu_id]")->title);
+		$this->assertEquals('Hello World', $this->wp_customize->get_control("nav_menu_item[$item_id]")->label);
 	}
 
 	/**
@@ -405,16 +405,16 @@ 
 	 */
 	function test_intval_base10() {
 
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
-		$this->assertEquals( 2, $menus->intval_base10( 2 ) );
-		$this->assertEquals( 4, $menus->intval_base10( 4.1 ) );
-		$this->assertEquals( 4, $menus->intval_base10( '4' ) );
-		$this->assertEquals( 4, $menus->intval_base10( '04' ) );
-		$this->assertEquals( 42, $menus->intval_base10( +42 ) );
+		$this->assertEquals(2, $menus->intval_base10(2));
+		$this->assertEquals(4, $menus->intval_base10(4.1));
+		$this->assertEquals(4, $menus->intval_base10('4'));
+		$this->assertEquals(4, $menus->intval_base10('04'));
+		$this->assertEquals(42, $menus->intval_base10( +42 ));
 		$this->assertEquals( -42, $menus->intval_base10( -42 ) );
-		$this->assertEquals( 26, $menus->intval_base10( 0x1A ) );
-		$this->assertEquals( 0, $menus->intval_base10( array() ) );
+		$this->assertEquals(26, $menus->intval_base10(0x1A));
+		$this->assertEquals(0, $menus->intval_base10(array()));
 	}
 
 	/**
@@ -424,31 +424,31 @@ 
 	 */
 	function test_available_item_types() {
 
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		$expected = array(
-			array( 'title' => 'Post', 'type' => 'post_type', 'object' => 'post' ),
-			array( 'title' => 'Page', 'type' => 'post_type', 'object' => 'page' ),
-			array( 'title' => 'Category', 'type' => 'taxonomy', 'object' => 'category' ),
-			array( 'title' => 'Tag', 'type' => 'taxonomy', 'object' => 'post_tag' ),
+			array('title' => 'Post', 'type' => 'post_type', 'object' => 'post'),
+			array('title' => 'Page', 'type' => 'post_type', 'object' => 'page'),
+			array('title' => 'Category', 'type' => 'taxonomy', 'object' => 'category'),
+			array('title' => 'Tag', 'type' => 'taxonomy', 'object' => 'post_tag'),
 		);
 
-		if ( current_theme_supports( 'post-formats' ) ) {
-			$expected[] = array( 'title' => 'Format', 'type' => 'taxonomy', 'object' => 'post_format' );
+		if (current_theme_supports('post-formats')) {
+			$expected[] = array('title' => 'Format', 'type' => 'taxonomy', 'object' => 'post_format');
 		}
 
-		$this->assertEquals( $expected, $menus->available_item_types() );
+		$this->assertEquals($expected, $menus->available_item_types());
 
-		register_taxonomy( 'wptests_tax', array( 'post' ), array( 'labels' => array( 'name' => 'Foo' ) ) );
-		$expected[] = array( 'title' => 'Foo', 'type' => 'taxonomy', 'object' => 'wptests_tax' );
+		register_taxonomy('wptests_tax', array('post'), array('labels' => array('name' => 'Foo')));
+		$expected[] = array('title' => 'Foo', 'type' => 'taxonomy', 'object' => 'wptests_tax');
 
-		$this->assertEquals( $expected, $menus->available_item_types() );
+		$this->assertEquals($expected, $menus->available_item_types());
 
-		$expected[] = array( 'title' => 'Custom', 'type' => 'custom_type', 'object' => 'custom_object' );
+		$expected[] = array('title' => 'Custom', 'type' => 'custom_type', 'object' => 'custom_object');
 
-		add_filter( 'customize_nav_menu_available_item_types', array( $this, 'filter_item_types' ) );
-		$this->assertEquals( $expected, $menus->available_item_types() );
-		remove_filter( 'customize_nav_menu_available_item_types', array( $this, 'filter_item_types' ) );
+		add_filter('customize_nav_menu_available_item_types', array($this, 'filter_item_types'));
+		$this->assertEquals($expected, $menus->available_item_types());
+		remove_filter('customize_nav_menu_available_item_types', array($this, 'filter_item_types'));
 
 	}
 
@@ -458,8 +458,8 @@ 
 	 * @see WP_Customize_Nav_Menus::print_templates()
 	 */
 	function test_print_templates() {
-		do_action( 'customize_register', $this->wp_customize );
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		ob_start();
 		$menus->print_templates();
@@ -467,13 +467,13 @@ 
 
 		$expected = sprintf(
 			'<button type="button" class="menus-move-up">%1$s</button><button type="button" class="menus-move-down">%2$s</button><button type="button" class="menus-move-left">%3$s</button><button type="button" class="menus-move-right">%4$s</button>',
-			esc_html( 'Move up' ),
-			esc_html( 'Move down' ),
-			esc_html( 'Move one level up' ),
-			esc_html( 'Move one level down' )
+			esc_html('Move up'),
+			esc_html('Move down'),
+			esc_html('Move one level up'),
+			esc_html('Move one level down')
 		);
 
-		$this->assertContains( $expected, $template );
+		$this->assertContains($expected, $template);
 	}
 
 	/**
@@ -482,42 +482,42 @@ 
 	 * @see WP_Customize_Nav_Menus::available_items_template()
 	 */
 	function test_available_items_template() {
-		add_filter( 'customize_nav_menu_available_item_types', array( $this, 'filter_item_types' ) );
-		do_action( 'customize_register', $this->wp_customize );
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		add_filter('customize_nav_menu_available_item_types', array($this, 'filter_item_types'));
+		do_action('customize_register', $this->wp_customize);
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		ob_start();
 		$menus->available_items_template();
 		$template = ob_get_clean();
 
-		$expected = sprintf( 'Customizing &#9656; %s', esc_html( $this->wp_customize->get_panel( 'nav_menus' )->title ) );
+		$expected = sprintf('Customizing &#9656; %s', esc_html($this->wp_customize->get_panel('nav_menus')->title));
 
-		$this->assertContains( $expected, $template );
+		$this->assertContains($expected, $template);
 
-		$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
-		if ( $post_types ) {
-			foreach ( $post_types as $type ) {
-				$this->assertContains( 'available-menu-items-post_type-' . esc_attr( $type->name ), $template );
-				$this->assertRegExp( '#<h4 class="accordion-section-title".*>\s*' . esc_html( $type->labels->singular_name ) . '#', $template );
-				$this->assertContains( 'data-type="post_type"', $template );
-				$this->assertContains( 'data-object="' . esc_attr( $type->name ) . '"', $template );
+		$post_types = get_post_types(array('show_in_nav_menus' => true), 'object');
+		if ($post_types) {
+			foreach ($post_types as $type) {
+				$this->assertContains('available-menu-items-post_type-'.esc_attr($type->name), $template);
+				$this->assertRegExp('#<h4 class="accordion-section-title".*>\s*'.esc_html($type->labels->singular_name).'#', $template);
+				$this->assertContains('data-type="post_type"', $template);
+				$this->assertContains('data-object="'.esc_attr($type->name).'"', $template);
 			}
 		}
 
-		$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
-		if ( $taxonomies ) {
-			foreach ( $taxonomies as $tax ) {
-				$this->assertContains( 'available-menu-items-taxonomy-' . esc_attr( $tax->name ), $template );
-				$this->assertRegExp( '#<h4 class="accordion-section-title".*>\s*' . esc_html( $tax->labels->singular_name ) . '#', $template );
-				$this->assertContains( 'data-type="taxonomy"', $template );
-				$this->assertContains( 'data-object="' . esc_attr( $tax->name ) . '"', $template );
+		$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'object');
+		if ($taxonomies) {
+			foreach ($taxonomies as $tax) {
+				$this->assertContains('available-menu-items-taxonomy-'.esc_attr($tax->name), $template);
+				$this->assertRegExp('#<h4 class="accordion-section-title".*>\s*'.esc_html($tax->labels->singular_name).'#', $template);
+				$this->assertContains('data-type="taxonomy"', $template);
+				$this->assertContains('data-object="'.esc_attr($tax->name).'"', $template);
 			}
 		}
 
-		$this->assertContains( 'available-menu-items-custom_type', $template );
-		$this->assertRegExp( '#<h4 class="accordion-section-title".*>\s*Custom#', $template );
-		$this->assertContains( 'data-type="custom_type"', $template );
-		$this->assertContains( 'data-object="custom_object"', $template );
+		$this->assertContains('available-menu-items-custom_type', $template);
+		$this->assertRegExp('#<h4 class="accordion-section-title".*>\s*Custom#', $template);
+		$this->assertContains('data-type="custom_type"', $template);
+		$this->assertContains('data-object="custom_object"', $template);
 	}
 
 	/**
@@ -526,16 +526,16 @@ 
 	 * @see WP_Customize_Nav_Menus::customize_preview_init()
 	 */
 	function test_customize_preview_init() {
-		do_action( 'customize_register', $this->wp_customize );
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		$menus->customize_preview_init();
-		$this->assertEquals( 10, has_action( 'template_redirect', array( $menus, 'render_menu' ) ) );
-		$this->assertEquals( 10, has_action( 'wp_enqueue_scripts', array( $menus, 'customize_preview_enqueue_deps' ) ) );
+		$this->assertEquals(10, has_action('template_redirect', array($menus, 'render_menu')));
+		$this->assertEquals(10, has_action('wp_enqueue_scripts', array($menus, 'customize_preview_enqueue_deps')));
 
-		if ( ! isset( $_REQUEST[ WP_Customize_Nav_Menus::RENDER_QUERY_VAR ] ) ) {
-			$this->assertEquals( 1000, has_filter( 'wp_nav_menu_args', array( $menus, 'filter_wp_nav_menu_args' ) ) );
-			$this->assertEquals( 10, has_filter( 'wp_nav_menu', array( $menus, 'filter_wp_nav_menu' ) ) );
+		if ( ! isset($_REQUEST[WP_Customize_Nav_Menus::RENDER_QUERY_VAR])) {
+			$this->assertEquals(1000, has_filter('wp_nav_menu_args', array($menus, 'filter_wp_nav_menu_args')));
+			$this->assertEquals(10, has_filter('wp_nav_menu', array($menus, 'filter_wp_nav_menu')));
 		}
 	}
 
@@ -545,16 +545,16 @@ 
 	 * @see WP_Customize_Nav_Menus::filter_wp_nav_menu_args()
 	 */
 	function test_filter_wp_nav_menu_args() {
-		do_action( 'customize_register', $this->wp_customize );
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
-		$results = $menus->filter_wp_nav_menu_args( array(
+		$results = $menus->filter_wp_nav_menu_args(array(
 			'echo'            => true,
 			'fallback_cb'     => 'wp_page_menu',
 			'walker'          => '',
-			'menu'            => wp_create_nav_menu( 'Foo' ),
-		) );
-		$this->assertEquals( 1, $results['can_partial_refresh'] );
+			'menu'            => wp_create_nav_menu('Foo'),
+		));
+		$this->assertEquals(1, $results['can_partial_refresh']);
 
 		$expected = array(
 			'echo',
@@ -563,20 +563,20 @@ 
 			'instance_number',
 			'walker',
 		);
-		$results = $menus->filter_wp_nav_menu_args( array(
+		$results = $menus->filter_wp_nav_menu_args(array(
 			'echo'            => false,
 			'fallback_cb'     => 'wp_page_menu',
 			'walker'          => new Walker_Nav_Menu(),
-		) );
-		$this->assertEqualSets( $expected, array_keys( $results ) );
-		$this->assertEquals( 'wp_page_menu', $results['fallback_cb'] );
-		$this->assertEquals( 0, $results['can_partial_refresh'] );
-
-		$this->assertNotEmpty( $menus->preview_nav_menu_instance_args[ $results['instance_number'] ] );
-		$preview_nav_menu_instance_args = $menus->preview_nav_menu_instance_args[ $results['instance_number'] ];
-		$this->assertEquals( '', $preview_nav_menu_instance_args['fallback_cb'] );
-		$this->assertEquals( '', $preview_nav_menu_instance_args['walker'] );
-		$this->assertNotEmpty( $preview_nav_menu_instance_args['args_hash'] );
+		));
+		$this->assertEqualSets($expected, array_keys($results));
+		$this->assertEquals('wp_page_menu', $results['fallback_cb']);
+		$this->assertEquals(0, $results['can_partial_refresh']);
+
+		$this->assertNotEmpty($menus->preview_nav_menu_instance_args[$results['instance_number']]);
+		$preview_nav_menu_instance_args = $menus->preview_nav_menu_instance_args[$results['instance_number']];
+		$this->assertEquals('', $preview_nav_menu_instance_args['fallback_cb']);
+		$this->assertEquals('', $preview_nav_menu_instance_args['walker']);
+		$this->assertNotEmpty($preview_nav_menu_instance_args['args_hash']);
 	}
 
 	/**
@@ -585,27 +585,27 @@ 
 	 * @see WP_Customize_Nav_Menus::filter_wp_nav_menu()
 	 */
 	function test_filter_wp_nav_menu() {
-		do_action( 'customize_register', $this->wp_customize );
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
-		$args = $menus->filter_wp_nav_menu_args( array(
+		$args = $menus->filter_wp_nav_menu_args(array(
 			'echo'        => true,
-			'menu'        => wp_create_nav_menu( 'Foo' ),
+			'menu'        => wp_create_nav_menu('Foo'),
 			'fallback_cb' => 'wp_page_menu',
 			'walker'      => '',
-		) );
+		));
 
 		ob_start();
-		wp_nav_menu( $args );
+		wp_nav_menu($args);
 		$nav_menu_content = ob_get_clean();
 
-		$object_args = json_decode( json_encode( $args ), false );
-		$result = $menus->filter_wp_nav_menu( $nav_menu_content, $object_args );
+		$object_args = json_decode(json_encode($args), false);
+		$result = $menus->filter_wp_nav_menu($nav_menu_content, $object_args);
 		$expected = sprintf(
 			'<div class="partial-refreshable-nav-menu partial-refreshable-nav-menu-%1$d menu">',
 			$args['instance_number']
 		);
-		$this->assertStringStartsWith( $expected, $result );
+		$this->assertStringStartsWith($expected, $result);
 	}
 
 	/**
@@ -614,13 +614,13 @@ 
 	 * @see WP_Customize_Nav_Menus::customize_preview_enqueue_deps()
 	 */
 	function test_customize_preview_enqueue_deps() {
-		do_action( 'customize_register', $this->wp_customize );
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		$menus->customize_preview_enqueue_deps();
 
-		$this->assertTrue( wp_script_is( 'customize-preview-nav-menus' ) );
-		$this->assertEquals( 10, has_action( 'wp_print_footer_scripts', array( $menus, 'export_preview_data' ) ) );
+		$this->assertTrue(wp_script_is('customize-preview-nav-menus'));
+		$this->assertEquals(10, has_action('wp_print_footer_scripts', array($menus, 'export_preview_data')));
 	}
 
 	/**
@@ -629,8 +629,8 @@ 
 	 * @see WP_Customize_Nav_Menus::export_preview_data()
 	 */
 	function test_export_preview_data() {
-		do_action( 'customize_register', $this->wp_customize );
-		$menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
+		$menus = new WP_Customize_Nav_Menus($this->wp_customize);
 
 		$request_uri = $_SERVER['REQUEST_URI'];
 
@@ -641,15 +641,15 @@ 
 
 		$_SERVER['REQUEST_URI'] = $request_uri;
 
-		$this->assertContains( '_wpCustomizePreviewNavMenusExports', $data );
-		$this->assertContains( 'renderQueryVar', $data );
-		$this->assertContains( 'renderNonceValue', $data );
-		$this->assertContains( 'renderNoncePostKey', $data );
-		$this->assertContains( 'requestUri', $data );
-		$this->assertContains( 'theme', $data );
-		$this->assertContains( 'previewCustomizeNonce', $data );
-		$this->assertContains( 'navMenuInstanceArgs', $data );
-		$this->assertContains( 'requestUri', $data );
+		$this->assertContains('_wpCustomizePreviewNavMenusExports', $data);
+		$this->assertContains('renderQueryVar', $data);
+		$this->assertContains('renderNonceValue', $data);
+		$this->assertContains('renderNoncePostKey', $data);
+		$this->assertContains('requestUri', $data);
+		$this->assertContains('theme', $data);
+		$this->assertContains('previewCustomizeNonce', $data);
+		$this->assertContains('navMenuInstanceArgs', $data);
+		$this->assertContains('requestUri', $data);
 
 	}
 

tests/core/manager.php

Spacing +47 added lines, -47 removed lines

@@ -9,7 +9,7 @@ 
 
 	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' );
 		$GLOBALS['wp_customize'] = new WP_Customize_Manager();
 		$this->manager = $GLOBALS['wp_customize'];
@@ -18,7 +18,7 @@ 
 
 	function tearDown() {
 		$this->manager = null;
-		unset( $GLOBALS['wp_customize'] );
+		unset($GLOBALS['wp_customize']);
 		parent::tearDown();
 	}
 
@@ -38,28 +38,28 @@ 
 	 * @group ajax
 	 */
 	function test_doing_ajax() {
-		if ( ! defined( 'DOING_AJAX' ) ) {
-			define( 'DOING_AJAX', true );
+		if ( ! defined('DOING_AJAX')) {
+			define('DOING_AJAX', true);
 		}
 
 		$manager = $this->instantiate();
-		$this->assertTrue( $manager->doing_ajax() );
+		$this->assertTrue($manager->doing_ajax());
 
 		$_REQUEST['action'] = 'customize_save';
-		$this->assertTrue( $manager->doing_ajax( 'customize_save' ) );
-		$this->assertFalse( $manager->doing_ajax( 'update-widget' ) );
+		$this->assertTrue($manager->doing_ajax('customize_save'));
+		$this->assertFalse($manager->doing_ajax('update-widget'));
 	}
 
 	/**
 	 * Test ! WP_Customize_Manager::doing_ajax().
 	 */
 	function test_not_doing_ajax() {
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-			$this->markTestSkipped( 'Cannot test when DOING_AJAX' );
+		if (defined('DOING_AJAX') && DOING_AJAX) {
+			$this->markTestSkipped('Cannot test when DOING_AJAX');
 		}
 
 		$manager = $this->instantiate();
-		$this->assertFalse( $manager->doing_ajax() );
+		$this->assertFalse($manager->doing_ajax());
 	}
 
 	/**
@@ -74,9 +74,9 @@ 
 			'foo' => 'bar',
 			'baz[quux]' => 123,
 		);
-		$_POST['customized'] = wp_slash( wp_json_encode( $customized ) );
+		$_POST['customized'] = wp_slash(wp_json_encode($customized));
 		$post_values = $manager->unsanitized_post_values();
-		$this->assertEquals( $customized, $post_values );
+		$this->assertEquals($customized, $post_values);
 	}
 
 	/**
@@ -88,18 +88,18 @@ 
 		$posted_settings = array(
 			'foo' => 'OOF',
 		);
-		$_POST['customized'] = wp_slash( wp_json_encode( $posted_settings ) );
+		$_POST['customized'] = wp_slash(wp_json_encode($posted_settings));
 
 		$manager = $this->instantiate();
 
-		$manager->add_setting( 'foo', array( 'default' => 'foo_default' ) );
-		$foo_setting = $manager->get_setting( 'foo' );
-		$this->assertEquals( 'foo_default', $manager->get_setting( 'foo' )->value(), 'Expected non-previewed setting to return default when value() method called.' );
-		$this->assertEquals( $posted_settings['foo'], $manager->post_value( $foo_setting, 'post_value_foo_default' ), 'Expected post_value($foo_setting) to return value supplied in $_POST[customized][foo]' );
+		$manager->add_setting('foo', array('default' => 'foo_default'));
+		$foo_setting = $manager->get_setting('foo');
+		$this->assertEquals('foo_default', $manager->get_setting('foo')->value(), 'Expected non-previewed setting to return default when value() method called.');
+		$this->assertEquals($posted_settings['foo'], $manager->post_value($foo_setting, 'post_value_foo_default'), 'Expected post_value($foo_setting) to return value supplied in $_POST[customized][foo]');
 
-		$manager->add_setting( 'bar', array( 'default' => 'bar_default' ) );
-		$bar_setting = $manager->get_setting( 'bar' );
-		$this->assertEquals( 'post_value_bar_default', $manager->post_value( $bar_setting, 'post_value_bar_default' ), 'Expected post_value($bar_setting, $default) to return $default since no value supplied in $_POST[customized][bar]' );
+		$manager->add_setting('bar', array('default' => 'bar_default'));
+		$bar_setting = $manager->get_setting('bar');
+		$this->assertEquals('post_value_bar_default', $manager->post_value($bar_setting, 'post_value_bar_default'), 'Expected post_value($bar_setting, $default) to return $default since no value supplied in $_POST[customized][bar]');
 	}
 
 	/**
@@ -109,17 +109,17 @@ 
 	 */
 	function test_add_dynamic_settings() {
 		$manager = $this->instantiate();
-		$setting_ids = array( 'foo', 'bar' );
-		$manager->add_setting( 'foo', array( 'default' => 'foo_default' ) );
-		$this->assertEmpty( $manager->get_setting( 'bar' ), 'Expected there to not be a bar setting up front.' );
-		$manager->add_dynamic_settings( $setting_ids );
-		$this->assertEmpty( $manager->get_setting( 'bar' ), 'Expected the bar setting to remain absent since filters not added.' );
+		$setting_ids = array('foo', 'bar');
+		$manager->add_setting('foo', array('default' => 'foo_default'));
+		$this->assertEmpty($manager->get_setting('bar'), 'Expected there to not be a bar setting up front.');
+		$manager->add_dynamic_settings($setting_ids);
+		$this->assertEmpty($manager->get_setting('bar'), 'Expected the bar setting to remain absent since filters not added.');
 
 		$this->action_customize_register_for_dynamic_settings();
-		$manager->add_dynamic_settings( $setting_ids );
-		$this->assertNotEmpty( $manager->get_setting( 'bar' ), 'Expected bar setting to be created since filters were added.' );
-		$this->assertEquals( 'foo_default', $manager->get_setting( 'foo' )->default, 'Expected static foo setting to not get overridden by dynamic setting.' );
-		$this->assertEquals( 'dynamic_bar_default', $manager->get_setting( 'bar' )->default, 'Expected dynamic setting bar to have default providd by filter.' );
+		$manager->add_dynamic_settings($setting_ids);
+		$this->assertNotEmpty($manager->get_setting('bar'), 'Expected bar setting to be created since filters were added.');
+		$this->assertEquals('foo_default', $manager->get_setting('foo')->default, 'Expected static foo setting to not get overridden by dynamic setting.');
+		$this->assertEquals('dynamic_bar_default', $manager->get_setting('bar')->default, 'Expected dynamic setting bar to have default providd by filter.');
 	}
 
 	/**
@@ -134,35 +134,35 @@ 
 			'foo' => 'OOF',
 			'bar' => 'RAB',
 		);
-		$_POST['customized'] = wp_slash( wp_json_encode( $posted_settings ) );
+		$_POST['customized'] = wp_slash(wp_json_encode($posted_settings));
 
-		add_action( 'customize_register', array( $this, 'action_customize_register_for_dynamic_settings' ) );
+		add_action('customize_register', array($this, 'action_customize_register_for_dynamic_settings'));
 
 		$manager = $this->instantiate();
-		$manager->add_setting( 'foo', array( 'default' => 'foo_default' ) );
+		$manager->add_setting('foo', array('default' => 'foo_default'));
 
-		$this->assertEmpty( $manager->get_setting( 'bar' ), 'Expected dynamic setting "bar" to not be registered.' );
-		do_action( 'customize_register', $manager );
-		$this->assertNotEmpty( $manager->get_setting( 'bar' ), 'Expected dynamic setting "bar" to be automatically registered after customize_register action.' );
-		$this->assertEmpty( $manager->get_setting( 'baz' ), 'Expected unrecognized dynamic setting "baz" to remain unregistered.' );
+		$this->assertEmpty($manager->get_setting('bar'), 'Expected dynamic setting "bar" to not be registered.');
+		do_action('customize_register', $manager);
+		$this->assertNotEmpty($manager->get_setting('bar'), 'Expected dynamic setting "bar" to be automatically registered after customize_register action.');
+		$this->assertEmpty($manager->get_setting('baz'), 'Expected unrecognized dynamic setting "baz" to remain unregistered.');
 	}
 
 	/**
 	 * In lieu of closures, callback for customize_register action added in test_register_dynamic_settings().
 	 */
 	function action_customize_register_for_dynamic_settings() {
-		add_filter( 'customize_dynamic_setting_args', array( $this, 'filter_customize_dynamic_setting_args_for_test_dynamic_settings' ), 10, 2 );
-		add_filter( 'customize_dynamic_setting_class', array( $this, 'filter_customize_dynamic_setting_class_for_test_dynamic_settings' ), 10, 3 );
+		add_filter('customize_dynamic_setting_args', array($this, 'filter_customize_dynamic_setting_args_for_test_dynamic_settings'), 10, 2);
+		add_filter('customize_dynamic_setting_class', array($this, 'filter_customize_dynamic_setting_class_for_test_dynamic_settings'), 10, 3);
 	}
 
 	/**
 	 * In lieu of closures, callback for customize_dynamic_setting_args filter added for test_register_dynamic_settings().
 	 */
-	function filter_customize_dynamic_setting_args_for_test_dynamic_settings( $setting_args, $setting_id ) {
-		$this->assertEquals( false, $setting_args, 'Expected $setting_args to be false by default.' );
-		$this->assertInternalType( 'string', $setting_id );
-		if ( in_array( $setting_id, array( 'foo', 'bar' ) ) ) {
-			$setting_args = array( 'default' => "dynamic_{$setting_id}_default" );
+	function filter_customize_dynamic_setting_args_for_test_dynamic_settings($setting_args, $setting_id) {
+		$this->assertEquals(false, $setting_args, 'Expected $setting_args to be false by default.');
+		$this->assertInternalType('string', $setting_id);
+		if (in_array($setting_id, array('foo', 'bar'))) {
+			$setting_args = array('default' => "dynamic_{$setting_id}_default");
 		}
 		return $setting_args;
 	}
@@ -170,10 +170,10 @@ 
 	/**
 	 * In lieu of closures, callback for customize_dynamic_setting_class filter added for test_register_dynamic_settings().
 	 */
-	function filter_customize_dynamic_setting_class_for_test_dynamic_settings( $setting_class, $setting_id, $setting_args ) {
-		$this->assertEquals( 'WP_Customize_Setting', $setting_class );
-		$this->assertInternalType( 'string', $setting_id );
-		$this->assertInternalType( 'array', $setting_args );
+	function filter_customize_dynamic_setting_class_for_test_dynamic_settings($setting_class, $setting_id, $setting_args) {
+		$this->assertEquals('WP_Customize_Setting', $setting_class);
+		$this->assertInternalType('string', $setting_id);
+		$this->assertInternalType('array', $setting_args);
 		return $setting_class;
 	}
 }

tests/core/section.php

Spacing +68 added lines, -68 removed lines

@@ -14,7 +14,7 @@ 
 
 	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' );
 		$GLOBALS['wp_customize'] = new WP_Customize_Manager();
 		$this->manager = $GLOBALS['wp_customize'];
@@ -23,7 +23,7 @@ 
 
 	function tearDown() {
 		$this->manager = null;
-		unset( $GLOBALS['wp_customize'] );
+		unset($GLOBALS['wp_customize']);
 		parent::tearDown();
 	}
 
@@ -31,18 +31,18 @@ 
 	 * @see WP_Customize_Section::__construct()
 	 */
 	function test_construct_default_args() {
-		$section = new WP_Customize_Section( $this->manager, 'foo' );
-		$this->assertInternalType( 'int', $section->instance_number );
-		$this->assertEquals( $this->manager, $section->manager );
-		$this->assertEquals( 'foo', $section->id );
-		$this->assertEquals( 160, $section->priority );
-		$this->assertEquals( 'edit_theme_options', $section->capability );
-		$this->assertEquals( '', $section->theme_supports );
-		$this->assertEquals( '', $section->title );
-		$this->assertEquals( '', $section->description );
-		$this->assertEmpty( $section->panel );
-		$this->assertEquals( 'default', $section->type );
-		$this->assertEquals( array( $section, 'active_callback' ), $section->active_callback );
+		$section = new WP_Customize_Section($this->manager, 'foo');
+		$this->assertInternalType('int', $section->instance_number);
+		$this->assertEquals($this->manager, $section->manager);
+		$this->assertEquals('foo', $section->id);
+		$this->assertEquals(160, $section->priority);
+		$this->assertEquals('edit_theme_options', $section->capability);
+		$this->assertEquals('', $section->theme_supports);
+		$this->assertEquals('', $section->title);
+		$this->assertEquals('', $section->description);
+		$this->assertEmpty($section->panel);
+		$this->assertEquals('default', $section->type);
+		$this->assertEquals(array($section, 'active_callback'), $section->active_callback);
 	}
 
 	/**
@@ -60,11 +60,11 @@ 
 			'panel' => 'bar',
 		);
 
-		$this->manager->add_panel( 'bar' );
+		$this->manager->add_panel('bar');
 
-		$section = new WP_Customize_Section( $this->manager, 'foo', $args );
-		foreach ( $args as $key => $value ) {
-			$this->assertEquals( $value, $section->$key );
+		$section = new WP_Customize_Section($this->manager, 'foo', $args);
+		foreach ($args as $key => $value) {
+			$this->assertEquals($value, $section->$key);
 		}
 	}
 
@@ -72,8 +72,8 @@ 
 	 * @see WP_Customize_Section::__construct()
 	 */
 	function test_construct_custom_type() {
-		$section = new Custom_Section_Test( $this->manager, 'foo' );
-		$this->assertEquals( 'titleless', $section->type );
+		$section = new Custom_Section_Test($this->manager, 'foo');
+		$this->assertEquals('titleless', $section->type);
 	}
 
 	/**
@@ -81,15 +81,15 @@ 
 	 * @see WP_Customize_Section::active_callback()
 	 */
 	function test_active() {
-		$section = new WP_Customize_Section( $this->manager, 'foo' );
-		$this->assertTrue( $section->active() );
+		$section = new WP_Customize_Section($this->manager, 'foo');
+		$this->assertTrue($section->active());
 
-		$section = new WP_Customize_Section( $this->manager, 'foo', array(
+		$section = new WP_Customize_Section($this->manager, 'foo', array(
 			'active_callback' => '__return_false',
-		) );
-		$this->assertFalse( $section->active() );
-		add_filter( 'customize_section_active', array( $this, 'filter_active_test' ), 10, 2 );
-		$this->assertTrue( $section->active() );
+		));
+		$this->assertFalse($section->active());
+		add_filter('customize_section_active', array($this, 'filter_active_test'), 10, 2);
+		$this->assertTrue($section->active());
 	}
 
 	/**
@@ -97,9 +97,9 @@ 
 	 * @param WP_Customize_Section $section
 	 * @return bool
 	 */
-	function filter_active_test( $active, $section ) {
-		$this->assertFalse( $active );
-		$this->assertInstanceOf( 'WP_Customize_Section', $section );
+	function filter_active_test($active, $section) {
+		$this->assertFalse($active);
+		$this->assertInstanceOf('WP_Customize_Section', $section);
 		$active = true;
 		return $active;
 	}
@@ -119,102 +119,102 @@ 
 			'active_callback' => '__return_true',
 		);
 
-		$this->manager->add_panel( 'bar' );
+		$this->manager->add_panel('bar');
 
-		$section = new WP_Customize_Section( $this->manager, 'foo', $args );
+		$section = new WP_Customize_Section($this->manager, 'foo', $args);
 		$data = $section->json();
-		$this->assertEquals( 'foo', $data['id'] );
-		foreach ( array( 'title', 'description', 'priority', 'panel', 'type' ) as $key ) {
-			$this->assertEquals( $args[ $key ], $data[ $key ] );
+		$this->assertEquals('foo', $data['id']);
+		foreach (array('title', 'description', 'priority', 'panel', 'type') as $key) {
+			$this->assertEquals($args[$key], $data[$key]);
 		}
-		$this->assertEmpty( $data['content'] );
-		$this->assertTrue( $data['active'] );
-		$this->assertInternalType( 'int', $data['instanceNumber'] );
+		$this->assertEmpty($data['content']);
+		$this->assertTrue($data['active']);
+		$this->assertInternalType('int', $data['instanceNumber']);
 	}
 
 	/**
 	 * @see WP_Customize_Section::check_capabilities()
 	 */
 	function test_check_capabilities() {
-		$user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
-		wp_set_current_user( $user_id );
+		$user_id = $this->factory->user->create(array('role' => 'administrator'));
+		wp_set_current_user($user_id);
 
-		$section = new WP_Customize_Section( $this->manager, 'foo' );
-		$this->assertTrue( $section->check_capabilities() );
+		$section = new WP_Customize_Section($this->manager, 'foo');
+		$this->assertTrue($section->check_capabilities());
 		$old_cap = $section->capability;
 		$section->capability = 'do_not_allow';
-		$this->assertFalse( $section->check_capabilities() );
+		$this->assertFalse($section->check_capabilities());
 		$section->capability = $old_cap;
-		$this->assertTrue( $section->check_capabilities() );
+		$this->assertTrue($section->check_capabilities());
 		$section->theme_supports = 'impossible_feature';
-		$this->assertFalse( $section->check_capabilities() );
+		$this->assertFalse($section->check_capabilities());
 	}
 
 	/**
 	 * @see WP_Customize_Section::get_content()
 	 */
 	function test_get_content() {
-		$section = new WP_Customize_Section( $this->manager, 'foo' );
-		$this->assertEmpty( $section->get_content() );
+		$section = new WP_Customize_Section($this->manager, 'foo');
+		$this->assertEmpty($section->get_content());
 	}
 
 	/**
 	 * @see WP_Customize_Section::maybe_render()
 	 */
 	function test_maybe_render() {
-		wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
-		$section = new WP_Customize_Section( $this->manager, 'bar' );
-		$customize_render_section_count = did_action( 'customize_render_section' );
-		add_action( 'customize_render_section', array( $this, 'action_customize_render_section_test' ) );
+		wp_set_current_user($this->factory->user->create(array('role' => 'administrator')));
+		$section = new WP_Customize_Section($this->manager, 'bar');
+		$customize_render_section_count = did_action('customize_render_section');
+		add_action('customize_render_section', array($this, 'action_customize_render_section_test'));
 		ob_start();
 		$section->maybe_render();
 		$content = ob_get_clean();
-		$this->assertTrue( $section->check_capabilities() );
-		$this->assertEmpty( $content );
-		$this->assertEquals( $customize_render_section_count + 1, did_action( 'customize_render_section' ), 'Unexpected did_action count for customize_render_section' );
-		$this->assertEquals( 1, did_action( "customize_render_section_{$section->id}" ), "Unexpected did_action count for customize_render_section_{$section->id}" );
+		$this->assertTrue($section->check_capabilities());
+		$this->assertEmpty($content);
+		$this->assertEquals($customize_render_section_count + 1, did_action('customize_render_section'), 'Unexpected did_action count for customize_render_section');
+		$this->assertEquals(1, did_action("customize_render_section_{$section->id}"), "Unexpected did_action count for customize_render_section_{$section->id}");
 	}
 
 	/**
 	 * @see WP_Customize_Section::maybe_render()
 	 * @param WP_Customize_Section $section
 	 */
-	function action_customize_render_section_test( $section ) {
-		$this->assertInstanceOf( 'WP_Customize_Section', $section );
+	function action_customize_render_section_test($section) {
+		$this->assertInstanceOf('WP_Customize_Section', $section);
 	}
 
 	/**
 	 * @see WP_Customize_Section::print_template()
 	 */
 	function test_print_templates_standard() {
-		wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
+		wp_set_current_user($this->factory->user->create(array('role' => 'administrator')));
 
-		$section = new WP_Customize_Section( $this->manager, 'baz' );
+		$section = new WP_Customize_Section($this->manager, 'baz');
 		ob_start();
 		$section->print_template();
 		$content = ob_get_clean();
-		$this->assertContains( '<script type="text/html" id="tmpl-customize-section-default">', $content );
-		$this->assertContains( 'accordion-section-title', $content );
-		$this->assertContains( 'accordion-section-content', $content );
+		$this->assertContains('<script type="text/html" id="tmpl-customize-section-default">', $content);
+		$this->assertContains('accordion-section-title', $content);
+		$this->assertContains('accordion-section-content', $content);
 	}
 
 	/**
 	 * @see WP_Customize_Section::print_template()
 	 */
 	function test_print_templates_custom() {
-		wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
+		wp_set_current_user($this->factory->user->create(array('role' => 'administrator')));
 
-		$section = new Custom_Section_Test( $this->manager, 'baz' );
+		$section = new Custom_Section_Test($this->manager, 'baz');
 		ob_start();
 		$section->print_template();
 		$content = ob_get_clean();
-		$this->assertContains( '<script type="text/html" id="tmpl-customize-section-titleless">', $content );
-		$this->assertNotContains( 'accordion-section-title', $content );
-		$this->assertContains( 'accordion-section-content', $content );
+		$this->assertContains('<script type="text/html" id="tmpl-customize-section-titleless">', $content);
+		$this->assertNotContains('accordion-section-title', $content);
+		$this->assertContains('accordion-section-content', $content);
 	}
 }
 
-require_once( WP_FIELDS_API_DIR . 'implementation/wp-includes/class-wp-customize-section.php' );
+require_once(WP_FIELDS_API_DIR.'implementation/wp-includes/class-wp-customize-section.php');
 //require_once ABSPATH . WPINC . '/class-wp-customize-section.php';
 class Custom_Section_Test extends WP_Customize_Section {
 	public $type = 'titleless';

tests/core/nav-menu-setting.php

Spacing +201 added lines, -201 removed lines

@@ -21,9 +21,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();
@@ -45,15 +45,15 @@ 
 	 * @return array
 	 */
 	function get_nav_menu_items_option() {
-		return get_option( 'nav_menu_options', array( 'auto_add' => array() ) );
+		return get_option('nav_menu_options', array('auto_add' => array()));
 	}
 
 	/**
 	 * Test constants and statics.
 	 */
 	function test_constants() {
-		do_action( 'customize_register', $this->wp_customize );
-		$this->assertTrue( taxonomy_exists( WP_Customize_Nav_Menu_Setting::TAXONOMY ) );
+		do_action('customize_register', $this->wp_customize);
+		$this->assertTrue(taxonomy_exists(WP_Customize_Nav_Menu_Setting::TAXONOMY));
 	}
 
 	/**
@@ -62,49 +62,49 @@ 
 	 * @see WP_Customize_Nav_Menu_Setting::__construct()
 	 */
 	function test_construct() {
-		do_action( 'customize_register', $this->wp_customize );
-
-		$setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, 'nav_menu[123]' );
-		$this->assertEquals( 'nav_menu', $setting->type );
-		$this->assertEquals( 'postMessage', $setting->transport );
-		$this->assertEquals( 123, $setting->term_id );
-		$this->assertNull( $setting->previous_term_id );
-		$this->assertNull( $setting->update_status );
-		$this->assertNull( $setting->update_error );
-		$this->assertInternalType( 'array', $setting->default );
-		foreach ( array( 'name', 'description', 'parent' ) as $key ) {
-			$this->assertArrayHasKey( $key, $setting->default );
+		do_action('customize_register', $this->wp_customize);
+
+		$setting = new WP_Customize_Nav_Menu_Setting($this->wp_customize, 'nav_menu[123]');
+		$this->assertEquals('nav_menu', $setting->type);
+		$this->assertEquals('postMessage', $setting->transport);
+		$this->assertEquals(123, $setting->term_id);
+		$this->assertNull($setting->previous_term_id);
+		$this->assertNull($setting->update_status);
+		$this->assertNull($setting->update_error);
+		$this->assertInternalType('array', $setting->default);
+		foreach (array('name', 'description', 'parent') as $key) {
+			$this->assertArrayHasKey($key, $setting->default);
 		}
-		$this->assertEquals( '', $setting->default['name'] );
-		$this->assertEquals( '', $setting->default['description'] );
-		$this->assertEquals( 0, $setting->default['parent'] );
+		$this->assertEquals('', $setting->default['name']);
+		$this->assertEquals('', $setting->default['description']);
+		$this->assertEquals(0, $setting->default['parent']);
 
 		$exception = null;
 		try {
-			$bad_setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, 'foo_bar_baz' );
-			unset( $bad_setting );
-		} catch ( Exception $e ) {
+			$bad_setting = new WP_Customize_Nav_Menu_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 );
+		unset($_wp_customize->nav_menus);
 
 		$exception = null;
 		try {
-			$bad_setting = new WP_Customize_Nav_Menu_Setting( $_wp_customize, 'nav_menu_item[123]' );
-			unset( $bad_setting );
-		} catch ( Exception $e ) {
+			$bad_setting = new WP_Customize_Nav_Menu_Setting($_wp_customize, 'nav_menu_item[123]');
+			unset($bad_setting);
+		} catch (Exception $e) {
 			$exception = $e;
 		}
-		$this->assertInstanceOf( 'Exception', $exception );
+		$this->assertInstanceOf('Exception', $exception);
 	}
 
 	/**
@@ -113,15 +113,15 @@ 
 	 * @see WP_Customize_Nav_Menu_Setting::__construct()
 	 */
 	function test_construct_placeholder() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 		$default = array(
 			'name' => 'Lorem',
 			'description' => 'ipsum',
 			'parent' => 123,
 		);
-		$setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, 'nav_menu[-5]', compact( 'default' ) );
+		$setting = new WP_Customize_Nav_Menu_Setting($this->wp_customize, 'nav_menu[-5]', compact('default'));
 		$this->assertEquals( -5, $setting->term_id );
-		$this->assertEquals( $default, $setting->default );
+		$this->assertEquals($default, $setting->default);
 	}
 
 	/**
@@ -130,33 +130,33 @@ 
 	 * @see WP_Customize_Nav_Menu_Setting::value()
 	 */
 	function test_value() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
 		$menu_name = 'Test 123';
-		$parent_menu_id = wp_create_nav_menu( "Parent $menu_name" );
+		$parent_menu_id = wp_create_nav_menu("Parent $menu_name");
 		$description = 'Hello my world.';
-		$menu_id = wp_update_nav_menu_object( 0, array(
+		$menu_id = wp_update_nav_menu_object(0, array(
 			'menu-name' => $menu_name,
 			'parent' => $parent_menu_id,
 			'description' => $description,
-		) );
+		));
 
 		$setting_id = "nav_menu[$menu_id]";
-		$setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, $setting_id );
+		$setting = new WP_Customize_Nav_Menu_Setting($this->wp_customize, $setting_id);
 
 		$value = $setting->value();
-		$this->assertInternalType( 'array', $value );
-		foreach ( array( 'name', 'description', 'parent' ) as $key ) {
-			$this->assertArrayHasKey( $key, $value );
+		$this->assertInternalType('array', $value);
+		foreach (array('name', 'description', 'parent') as $key) {
+			$this->assertArrayHasKey($key, $value);
 		}
-		$this->assertEquals( $menu_name, $value['name'] );
-		$this->assertEquals( $description, $value['description'] );
-		$this->assertEquals( $parent_menu_id, $value['parent'] );
+		$this->assertEquals($menu_name, $value['name']);
+		$this->assertEquals($description, $value['description']);
+		$this->assertEquals($parent_menu_id, $value['parent']);
 
 		$new_menu_name = 'Foo';
-		wp_update_nav_menu_object( $menu_id, array( 'menu-name' => $new_menu_name ) );
+		wp_update_nav_menu_object($menu_id, array('menu-name' => $new_menu_name));
 		$updated_value = $setting->value();
-		$this->assertEquals( $new_menu_name, $updated_value['name'] );
+		$this->assertEquals($new_menu_name, $updated_value['name']);
 	}
 
 	/**
@@ -165,18 +165,18 @@ 
 	 * @see WP_Customize_Nav_Menu_Setting::preview()
 	 */
 	function test_preview_updated() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
-		$menu_id = wp_update_nav_menu_object( 0, array(
+		$menu_id = wp_update_nav_menu_object(0, array(
 			'menu-name' => 'Name 1',
 			'description' => 'Description 1',
 			'parent' => 0,
-		) );
+		));
 		$setting_id = "nav_menu[$menu_id]";
-		$setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, $setting_id );
+		$setting = new WP_Customize_Nav_Menu_Setting($this->wp_customize, $setting_id);
 
 		$nav_menu_options = $this->get_nav_menu_items_option();
-		$this->assertNotContains( $menu_id, $nav_menu_options['auto_add'] );
+		$this->assertNotContains($menu_id, $nav_menu_options['auto_add']);
 
 		$post_value = array(
 			'name' => 'Name 2',
@@ -184,41 +184,41 @@ 
 			'parent' => 1,
 			'auto_add' => true,
 		);
-		$this->wp_customize->set_post_value( $setting_id, $post_value );
+		$this->wp_customize->set_post_value($setting_id, $post_value);
 
 		$value = $setting->value();
-		$this->assertEquals( 'Name 1', $value['name'] );
-		$this->assertEquals( 'Description 1', $value['description'] );
-		$this->assertEquals( 0, $value['parent'] );
+		$this->assertEquals('Name 1', $value['name']);
+		$this->assertEquals('Description 1', $value['description']);
+		$this->assertEquals(0, $value['parent']);
 
-		$term = (array) wp_get_nav_menu_object( $menu_id );
+		$term = (array) wp_get_nav_menu_object($menu_id);
 
 		$this->assertEqualSets(
-			wp_array_slice_assoc( $value, array( 'name', 'description', 'parent' ) ),
-			wp_array_slice_assoc( $term, array( 'name', 'description', 'parent' ) )
+			wp_array_slice_assoc($value, array('name', 'description', 'parent')),
+			wp_array_slice_assoc($term, array('name', 'description', 'parent'))
 		);
 
 		$setting->preview();
 		$value = $setting->value();
-		$this->assertEquals( 'Name 2', $value['name'] );
-		$this->assertEquals( 'Description 2', $value['description'] );
-		$this->assertEquals( 1, $value['parent'] );
-		$term = (array) wp_get_nav_menu_object( $menu_id );
-		$this->assertEqualSets( $value, wp_array_slice_assoc( $term, array_keys( $value ) ) );
+		$this->assertEquals('Name 2', $value['name']);
+		$this->assertEquals('Description 2', $value['description']);
+		$this->assertEquals(1, $value['parent']);
+		$term = (array) wp_get_nav_menu_object($menu_id);
+		$this->assertEqualSets($value, wp_array_slice_assoc($term, array_keys($value)));
 
-		$menu_object = wp_get_nav_menu_object( $menu_id );
-		$this->assertEquals( (object) $term, $menu_object );
-		$this->assertEquals( $post_value['name'], $menu_object->name );
+		$menu_object = wp_get_nav_menu_object($menu_id);
+		$this->assertEquals((object) $term, $menu_object);
+		$this->assertEquals($post_value['name'], $menu_object->name);
 
-		$nav_menu_options = get_option( 'nav_menu_options', array( 'auto_add' => array() ) );
-		$this->assertContains( $menu_id, $nav_menu_options['auto_add'] );
+		$nav_menu_options = get_option('nav_menu_options', array('auto_add' => array()));
+		$this->assertContains($menu_id, $nav_menu_options['auto_add']);
 
 		$menus = wp_get_nav_menus();
-		$menus_ids = wp_list_pluck( $menus, 'term_id' );
-		$i = array_search( $menu_id, $menus_ids );
-		$this->assertInternalType( 'int', $i, 'Update-previewed menu does not appear in wp_get_nav_menus()' );
-		$filtered_menu = $menus[ $i ];
-		$this->assertEquals( 'Name 2', $filtered_menu->name );
+		$menus_ids = wp_list_pluck($menus, 'term_id');
+		$i = array_search($menu_id, $menus_ids);
+		$this->assertInternalType('int', $i, 'Update-previewed menu does not appear in wp_get_nav_menus()');
+		$filtered_menu = $menus[$i];
+		$this->assertEquals('Name 2', $filtered_menu->name);
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	 * @see WP_Customize_Nav_Menu_Setting::preview()
 	 */
 	function test_preview_inserted() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
 		$menu_id = -123;
 		$post_value = array(
@@ -237,33 +237,33 @@ 
 			'auto_add' => false,
 		);
 		$setting_id = "nav_menu[$menu_id]";
-		$setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, $setting_id );
+		$setting = new WP_Customize_Nav_Menu_Setting($this->wp_customize, $setting_id);
 
-		$this->wp_customize->set_post_value( $setting->id, $post_value );
+		$this->wp_customize->set_post_value($setting->id, $post_value);
 		$setting->preview();
 		$value = $setting->value();
-		$this->assertEquals( $post_value, $value );
+		$this->assertEquals($post_value, $value);
 
-		$term = (array) wp_get_nav_menu_object( $menu_id );
-		$this->assertNotEmpty( $term );
-		$this->assertNotInstanceOf( 'WP_Error', $term );
-		$this->assertEqualSets( $post_value, wp_array_slice_assoc( $term, array_keys( $value ) ) );
-		$this->assertEquals( $menu_id, $term['term_id'] );
-		$this->assertEquals( $menu_id, $term['term_taxonomy_id'] );
+		$term = (array) wp_get_nav_menu_object($menu_id);
+		$this->assertNotEmpty($term);
+		$this->assertNotInstanceOf('WP_Error', $term);
+		$this->assertEqualSets($post_value, wp_array_slice_assoc($term, array_keys($value)));
+		$this->assertEquals($menu_id, $term['term_id']);
+		$this->assertEquals($menu_id, $term['term_taxonomy_id']);
 
-		$menu_object = wp_get_nav_menu_object( $menu_id );
-		$this->assertEquals( (object) $term, $menu_object );
-		$this->assertEquals( $post_value['name'], $menu_object->name );
+		$menu_object = wp_get_nav_menu_object($menu_id);
+		$this->assertEquals((object) $term, $menu_object);
+		$this->assertEquals($post_value['name'], $menu_object->name);
 
 		$nav_menu_options = $this->get_nav_menu_items_option();
-		$this->assertNotContains( $menu_id, $nav_menu_options['auto_add'] );
+		$this->assertNotContains($menu_id, $nav_menu_options['auto_add']);
 
 		$menus = wp_get_nav_menus();
-		$menus_ids = wp_list_pluck( $menus, 'term_id' );
-		$i = array_search( $menu_id, $menus_ids );
-		$this->assertInternalType( 'int', $i, 'Insert-previewed menu was not injected into wp_get_nav_menus()' );
-		$filtered_menu = $menus[ $i ];
-		$this->assertEquals( 'New Menu Name 1', $filtered_menu->name );
+		$menus_ids = wp_list_pluck($menus, 'term_id');
+		$i = array_search($menu_id, $menus_ids);
+		$this->assertInternalType('int', $i, 'Insert-previewed menu was not injected into wp_get_nav_menus()');
+		$filtered_menu = $menus[$i];
+		$this->assertEquals('New Menu Name 1', $filtered_menu->name);
 	}
 
 	/**
@@ -272,32 +272,32 @@ 
 	 * @see WP_Customize_Nav_Menu_Setting::preview()
 	 */
 	function test_preview_deleted() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
-		$menu_id = wp_update_nav_menu_object( 0, array(
+		$menu_id = wp_update_nav_menu_object(0, array(
 			'menu-name' => 'Name 1',
 			'description' => 'Description 1',
 			'parent' => 0,
-		) );
+		));
 		$setting_id = "nav_menu[$menu_id]";
-		$setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, $setting_id );
+		$setting = new WP_Customize_Nav_Menu_Setting($this->wp_customize, $setting_id);
 		$nav_menu_options = $this->get_nav_menu_items_option();
 		$nav_menu_options['auto_add'][] = $menu_id;
-		update_option( 'nav_menu_options', $nav_menu_options );
+		update_option('nav_menu_options', $nav_menu_options);
 
 		$nav_menu_options = $this->get_nav_menu_items_option();
-		$this->assertContains( $menu_id, $nav_menu_options['auto_add'] );
+		$this->assertContains($menu_id, $nav_menu_options['auto_add']);
 
-		$this->wp_customize->set_post_value( $setting_id, false );
+		$this->wp_customize->set_post_value($setting_id, false);
 
-		$this->assertInternalType( 'array', $setting->value() );
-		$this->assertInternalType( 'object', wp_get_nav_menu_object( $menu_id ) );
+		$this->assertInternalType('array', $setting->value());
+		$this->assertInternalType('object', wp_get_nav_menu_object($menu_id));
 		$setting->preview();
-		$this->assertFalse( $setting->value() );
-		$this->assertFalse( wp_get_nav_menu_object( $menu_id ) );
+		$this->assertFalse($setting->value());
+		$this->assertFalse(wp_get_nav_menu_object($menu_id));
 
 		$nav_menu_options = $this->get_nav_menu_items_option();
-		$this->assertNotContains( $menu_id, $nav_menu_options['auto_add'] );
+		$this->assertNotContains($menu_id, $nav_menu_options['auto_add']);
 	}
 
 	/**
@@ -306,11 +306,11 @@ 
 	 * @see WP_Customize_Nav_Menu_Setting::sanitize()
 	 */
 	function test_sanitize() {
-		do_action( 'customize_register', $this->wp_customize );
-		$setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, 'nav_menu[123]' );
+		do_action('customize_register', $this->wp_customize);
+		$setting = new WP_Customize_Nav_Menu_Setting($this->wp_customize, 'nav_menu[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));
 
 		$value = array(
 			'name' => ' Hello <b>world</b> ',
@@ -319,16 +319,16 @@ 
 			'auto_add' => true,
 			'extra' => 'ignored',
 		);
-		$sanitized = $setting->sanitize( $value );
-		$this->assertEquals( 'Hello &lt;b&gt;world&lt;/b&gt;', $sanitized['name'] );
-		$this->assertEquals( 'New line', $sanitized['description'] );
-		$this->assertEquals( 0, $sanitized['parent'] );
-		$this->assertEquals( true, $sanitized['auto_add'] );
-		$this->assertEqualSets( array( 'name', 'description', 'parent', 'auto_add' ), array_keys( $sanitized ) );
+		$sanitized = $setting->sanitize($value);
+		$this->assertEquals('Hello &lt;b&gt;world&lt;/b&gt;', $sanitized['name']);
+		$this->assertEquals('New line', $sanitized['description']);
+		$this->assertEquals(0, $sanitized['parent']);
+		$this->assertEquals(true, $sanitized['auto_add']);
+		$this->assertEqualSets(array('name', 'description', 'parent', 'auto_add'), array_keys($sanitized));
 
 		$value['name'] = '    '; // Blank spaces.
-		$sanitized = $setting->sanitize( $value );
-		$this->assertEquals( '(unnamed)', $sanitized['name'] );
+		$sanitized = $setting->sanitize($value);
+		$this->assertEquals('(unnamed)', $sanitized['name']);
 	}
 
 	/**
@@ -337,19 +337,19 @@ 
 	 * @see WP_Customize_Nav_Menu_Setting::update()
 	 */
 	function test_save_updated() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
-		$menu_id = wp_update_nav_menu_object( 0, array(
+		$menu_id = wp_update_nav_menu_object(0, array(
 			'menu-name' => 'Name 1',
 			'description' => 'Description 1',
 			'parent' => 0,
-		) );
+		));
 		$nav_menu_options = $this->get_nav_menu_items_option();
 		$nav_menu_options['auto_add'][] = $menu_id;
-		update_option( 'nav_menu_options', $nav_menu_options );
+		update_option('nav_menu_options', $nav_menu_options);
 
 		$setting_id = "nav_menu[$menu_id]";
-		$setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, $setting_id );
+		$setting = new WP_Customize_Nav_Menu_Setting($this->wp_customize, $setting_id);
 
 		$auto_add = false;
 		$new_value = array(
@@ -359,36 +359,36 @@ 
 			'auto_add' => $auto_add,
 		);
 
-		$this->wp_customize->set_post_value( $setting_id, $new_value );
+		$this->wp_customize->set_post_value($setting_id, $new_value);
 		$setting->save();
 
-		$menu_object = wp_get_nav_menu_object( $menu_id );
-		foreach ( array( 'name', 'description', 'parent' ) as $key ) {
-			$this->assertEquals( $new_value[ $key ], $menu_object->$key );
+		$menu_object = wp_get_nav_menu_object($menu_id);
+		foreach (array('name', 'description', 'parent') as $key) {
+			$this->assertEquals($new_value[$key], $menu_object->$key);
 		}
 		$this->assertEqualSets(
-			wp_array_slice_assoc( $new_value, array( 'name', 'description', 'parent' ) ),
-			wp_array_slice_assoc( (array) $menu_object, array( 'name', 'description', 'parent' ) )
+			wp_array_slice_assoc($new_value, array('name', 'description', 'parent')),
+			wp_array_slice_assoc((array) $menu_object, array('name', 'description', 'parent'))
 		);
-		$this->assertEquals( $new_value, $setting->value() );
-
-		$save_response = apply_filters( 'customize_save_response', array() );
-		$this->assertArrayHasKey( 'nav_menu_updates', $save_response );
-		$update_result = array_shift( $save_response['nav_menu_updates'] );
-		$this->assertArrayHasKey( 'term_id', $update_result );
-		$this->assertArrayHasKey( 'previous_term_id', $update_result );
-		$this->assertArrayHasKey( 'error', $update_result );
-		$this->assertArrayHasKey( 'status', $update_result );
-		$this->assertArrayHasKey( 'saved_value', $update_result );
-		$this->assertEquals( $new_value, $update_result['saved_value'] );
-
-		$this->assertEquals( $menu_id, $update_result['term_id'] );
-		$this->assertNull( $update_result['previous_term_id'] );
-		$this->assertNull( $update_result['error'] );
-		$this->assertEquals( 'updated', $update_result['status'] );
+		$this->assertEquals($new_value, $setting->value());
+
+		$save_response = apply_filters('customize_save_response', array());
+		$this->assertArrayHasKey('nav_menu_updates', $save_response);
+		$update_result = array_shift($save_response['nav_menu_updates']);
+		$this->assertArrayHasKey('term_id', $update_result);
+		$this->assertArrayHasKey('previous_term_id', $update_result);
+		$this->assertArrayHasKey('error', $update_result);
+		$this->assertArrayHasKey('status', $update_result);
+		$this->assertArrayHasKey('saved_value', $update_result);
+		$this->assertEquals($new_value, $update_result['saved_value']);
+
+		$this->assertEquals($menu_id, $update_result['term_id']);
+		$this->assertNull($update_result['previous_term_id']);
+		$this->assertNull($update_result['error']);
+		$this->assertEquals('updated', $update_result['status']);
 
 		$nav_menu_options = $this->get_nav_menu_items_option();
-		$this->assertNotContains( $menu_id, $nav_menu_options['auto_add'] );
+		$this->assertNotContains($menu_id, $nav_menu_options['auto_add']);
 	}
 
 	/**
@@ -397,7 +397,7 @@ 
 	 * @see WP_Customize_Nav_Menu_Setting::update()
 	 */
 	function test_save_inserted() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
 		$menu_id = -123;
 		$post_value = array(
@@ -407,37 +407,37 @@ 
 			'auto_add' => true,
 		);
 		$setting_id = "nav_menu[$menu_id]";
-		$setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, $setting_id );
+		$setting = new WP_Customize_Nav_Menu_Setting($this->wp_customize, $setting_id);
 
-		$this->wp_customize->set_post_value( $setting->id, $post_value );
+		$this->wp_customize->set_post_value($setting->id, $post_value);
 
-		$this->assertNull( $setting->previous_term_id );
-		$this->assertLessThan( 0, $setting->term_id );
+		$this->assertNull($setting->previous_term_id);
+		$this->assertLessThan(0, $setting->term_id);
 		$setting->save();
-		$this->assertEquals( $menu_id, $setting->previous_term_id );
-		$this->assertGreaterThan( 0, $setting->term_id );
+		$this->assertEquals($menu_id, $setting->previous_term_id);
+		$this->assertGreaterThan(0, $setting->term_id);
 
 		$nav_menu_options = $this->get_nav_menu_items_option();
-		$this->assertContains( $setting->term_id, $nav_menu_options['auto_add'] );
-
-		$menu = wp_get_nav_menu_object( $setting->term_id );
-		unset( $post_value['auto_add'] );
-		$this->assertEqualSets( $post_value, wp_array_slice_assoc( (array) $menu, array_keys( $post_value ) ) );
-
-		$save_response = apply_filters( 'customize_save_response', array() );
-		$this->assertArrayHasKey( 'nav_menu_updates', $save_response );
-		$update_result = array_shift( $save_response['nav_menu_updates'] );
-		$this->assertArrayHasKey( 'term_id', $update_result );
-		$this->assertArrayHasKey( 'previous_term_id', $update_result );
-		$this->assertArrayHasKey( 'error', $update_result );
-		$this->assertArrayHasKey( 'status', $update_result );
-		$this->assertArrayHasKey( 'saved_value', $update_result );
-		$this->assertEquals( $setting->value(), $update_result['saved_value'] );
-
-		$this->assertEquals( $menu->term_id, $update_result['term_id'] );
-		$this->assertEquals( $menu_id, $update_result['previous_term_id'] );
-		$this->assertNull( $update_result['error'] );
-		$this->assertEquals( 'inserted', $update_result['status'] );
+		$this->assertContains($setting->term_id, $nav_menu_options['auto_add']);
+
+		$menu = wp_get_nav_menu_object($setting->term_id);
+		unset($post_value['auto_add']);
+		$this->assertEqualSets($post_value, wp_array_slice_assoc((array) $menu, array_keys($post_value)));
+
+		$save_response = apply_filters('customize_save_response', array());
+		$this->assertArrayHasKey('nav_menu_updates', $save_response);
+		$update_result = array_shift($save_response['nav_menu_updates']);
+		$this->assertArrayHasKey('term_id', $update_result);
+		$this->assertArrayHasKey('previous_term_id', $update_result);
+		$this->assertArrayHasKey('error', $update_result);
+		$this->assertArrayHasKey('status', $update_result);
+		$this->assertArrayHasKey('saved_value', $update_result);
+		$this->assertEquals($setting->value(), $update_result['saved_value']);
+
+		$this->assertEquals($menu->term_id, $update_result['term_id']);
+		$this->assertEquals($menu_id, $update_result['previous_term_id']);
+		$this->assertNull($update_result['error']);
+		$this->assertEquals('inserted', $update_result['status']);
 	}
 
 	/**
@@ -446,23 +446,23 @@ 
 	 * @see WP_Customize_Nav_Menu_Setting::update()
 	 */
 	function test_save_inserted_conflicted_name() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
 		$menu_name = 'Foo';
-		wp_update_nav_menu_object( 0, array( 'menu-name' => $menu_name ) );
+		wp_update_nav_menu_object(0, array('menu-name' => $menu_name));
 
 		$menu_id = -123;
 		$setting_id = "nav_menu[$menu_id]";
-		$setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, $setting_id );
-		$this->wp_customize->set_post_value( $setting->id, array( 'name' => $menu_name ) );
+		$setting = new WP_Customize_Nav_Menu_Setting($this->wp_customize, $setting_id);
+		$this->wp_customize->set_post_value($setting->id, array('name' => $menu_name));
 		$setting->save();
 
 		$expected_resolved_menu_name = "$menu_name (2)";
-		$new_menu = wp_get_nav_menu_object( $setting->term_id );
-		$this->assertEquals( $expected_resolved_menu_name, $new_menu->name );
+		$new_menu = wp_get_nav_menu_object($setting->term_id);
+		$this->assertEquals($expected_resolved_menu_name, $new_menu->name);
 
-		$save_response = apply_filters( 'customize_save_response', array() );
-		$this->assertEquals( $expected_resolved_menu_name, $save_response['nav_menu_updates'][0]['saved_value']['name'] );
+		$save_response = apply_filters('customize_save_response', array());
+		$this->assertEquals($expected_resolved_menu_name, $save_response['nav_menu_updates'][0]['saved_value']['name']);
 	}
 
 	/**
@@ -471,41 +471,41 @@ 
 	 * @see WP_Customize_Nav_Menu_Setting::update()
 	 */
 	function test_save_deleted() {
-		do_action( 'customize_register', $this->wp_customize );
+		do_action('customize_register', $this->wp_customize);
 
 		$menu_name = 'Lorem Ipsum';
-		$menu_id = wp_create_nav_menu( $menu_name );
+		$menu_id = wp_create_nav_menu($menu_name);
 		$setting_id = "nav_menu[$menu_id]";
-		$setting = new WP_Customize_Nav_Menu_Setting( $this->wp_customize, $setting_id );
+		$setting = new WP_Customize_Nav_Menu_Setting($this->wp_customize, $setting_id);
 		$nav_menu_options = $this->get_nav_menu_items_option();
 		$nav_menu_options['auto_add'][] = $menu_id;
-		update_option( 'nav_menu_options', $nav_menu_options );
+		update_option('nav_menu_options', $nav_menu_options);
 
-		$menu = wp_get_nav_menu_object( $menu_id );
-		$this->assertEquals( $menu_name, $menu->name );
+		$menu = wp_get_nav_menu_object($menu_id);
+		$this->assertEquals($menu_name, $menu->name);
 
-		$this->wp_customize->set_post_value( $setting_id, false );
+		$this->wp_customize->set_post_value($setting_id, false);
 		$setting->save();
 
-		$this->assertFalse( wp_get_nav_menu_object( $menu_id ) );
+		$this->assertFalse(wp_get_nav_menu_object($menu_id));
 
-		$save_response = apply_filters( 'customize_save_response', array() );
-		$this->assertArrayHasKey( 'nav_menu_updates', $save_response );
-		$update_result = array_shift( $save_response['nav_menu_updates'] );
-		$this->assertArrayHasKey( 'term_id', $update_result );
-		$this->assertArrayHasKey( 'previous_term_id', $update_result );
-		$this->assertArrayHasKey( 'error', $update_result );
-		$this->assertArrayHasKey( 'status', $update_result );
-		$this->assertArrayHasKey( 'saved_value', $update_result );
-		$this->assertNull( $update_result['saved_value'] );
+		$save_response = apply_filters('customize_save_response', array());
+		$this->assertArrayHasKey('nav_menu_updates', $save_response);
+		$update_result = array_shift($save_response['nav_menu_updates']);
+		$this->assertArrayHasKey('term_id', $update_result);
+		$this->assertArrayHasKey('previous_term_id', $update_result);
+		$this->assertArrayHasKey('error', $update_result);
+		$this->assertArrayHasKey('status', $update_result);
+		$this->assertArrayHasKey('saved_value', $update_result);
+		$this->assertNull($update_result['saved_value']);
 
-		$this->assertEquals( $menu_id, $update_result['term_id'] );
-		$this->assertNull( $update_result['previous_term_id'] );
-		$this->assertNull( $update_result['error'] );
-		$this->assertEquals( 'deleted', $update_result['status'] );
+		$this->assertEquals($menu_id, $update_result['term_id']);
+		$this->assertNull($update_result['previous_term_id']);
+		$this->assertNull($update_result['error']);
+		$this->assertEquals('deleted', $update_result['status']);
 
 		$nav_menu_options = $this->get_nav_menu_items_option();
-		$this->assertNotContains( $menu_id, $nav_menu_options['auto_add'] );
+		$this->assertNotContains($menu_id, $nav_menu_options['auto_add']);
 	}
 
 }

tests/core/widgets.php

Spacing +70 added lines, -70 removed lines

@@ -14,54 +14,54 @@ 
 
 	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' );
 		$GLOBALS['wp_customize'] = new WP_Customize_Manager();
 		$this->manager = $GLOBALS['wp_customize'];
 
-		unset( $GLOBALS['_wp_sidebars_widgets'] ); // clear out cache set by wp_get_sidebars_widgets()
+		unset($GLOBALS['_wp_sidebars_widgets']); // clear out cache set by wp_get_sidebars_widgets()
 		$sidebars_widgets = wp_get_sidebars_widgets();
-		$this->assertEqualSets( array( 'wp_inactive_widgets', 'sidebar-1' ), array_keys( wp_get_sidebars_widgets() ) );
-		$this->assertContains( 'search-2', $sidebars_widgets['sidebar-1'] );
-		$this->assertContains( 'categories-2', $sidebars_widgets['sidebar-1'] );
-		$this->assertArrayHasKey( 2, get_option( 'widget_search' ) );
-		$widget_categories = get_option( 'widget_categories' );
-		$this->assertArrayHasKey( 2, $widget_categories );
-		$this->assertEquals( '', $widget_categories[2]['title'] );
-
-		remove_action( 'after_setup_theme', 'twentyfifteen_setup' ); // @todo We should not be including a theme anyway
-
-		$user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
-		wp_set_current_user( $user_id );
+		$this->assertEqualSets(array('wp_inactive_widgets', 'sidebar-1'), array_keys(wp_get_sidebars_widgets()));
+		$this->assertContains('search-2', $sidebars_widgets['sidebar-1']);
+		$this->assertContains('categories-2', $sidebars_widgets['sidebar-1']);
+		$this->assertArrayHasKey(2, get_option('widget_search'));
+		$widget_categories = get_option('widget_categories');
+		$this->assertArrayHasKey(2, $widget_categories);
+		$this->assertEquals('', $widget_categories[2]['title']);
+
+		remove_action('after_setup_theme', 'twentyfifteen_setup'); // @todo We should not be including a theme anyway
+
+		$user_id = $this->factory->user->create(array('role' => 'administrator'));
+		wp_set_current_user($user_id);
 	}
 
 	function tearDown() {
 		$this->manager = null;
-		unset( $GLOBALS['wp_customize'] );
-		unset( $GLOBALS['wp_scripts'] );
+		unset($GLOBALS['wp_customize']);
+		unset($GLOBALS['wp_scripts']);
 		parent::tearDown();
 	}
 
-	function set_customized_post_data( $customized ) {
-		$_POST['customized'] = wp_slash( wp_json_encode( $customized ) );
+	function set_customized_post_data($customized) {
+		$_POST['customized'] = wp_slash(wp_json_encode($customized));
 	}
 
 	function do_customize_boot_actions() {
 		$_SERVER['REQUEST_METHOD'] = 'POST';
-		do_action( 'setup_theme' );
-		$_REQUEST['nonce'] = wp_create_nonce( 'preview-customize_' . $this->manager->theme()->get_stylesheet() );
-		do_action( 'after_setup_theme' );
-		do_action( 'init' );
-		do_action( 'wp_loaded' );
-		do_action( 'wp', $GLOBALS['wp'] );
+		do_action('setup_theme');
+		$_REQUEST['nonce'] = wp_create_nonce('preview-customize_'.$this->manager->theme()->get_stylesheet());
+		do_action('after_setup_theme');
+		do_action('init');
+		do_action('wp_loaded');
+		do_action('wp', $GLOBALS['wp']);
 	}
 
 	/**
 	 * Test WP_Customize_Widgets::__construct()
 	 */
 	function test_construct() {
-		$this->assertInstanceOf( 'WP_Customize_Widgets', $this->manager->widgets );
-		$this->assertEquals( $this->manager, $this->manager->widgets->manager );
+		$this->assertInstanceOf('WP_Customize_Widgets', $this->manager->widgets);
+		$this->assertEquals($this->manager, $this->manager->widgets->manager);
 	}
 
 	/**
@@ -83,20 +83,20 @@ 
 			),
 		);
 		$customized = array();
-		foreach ( $raw_widget_customized as $setting_id => $instance ) {
-			$customized[ $setting_id ] = $this->manager->widgets->sanitize_widget_js_instance( $instance );
+		foreach ($raw_widget_customized as $setting_id => $instance) {
+			$customized[$setting_id] = $this->manager->widgets->sanitize_widget_js_instance($instance);
 		}
 
-		$this->set_customized_post_data( $customized );
+		$this->set_customized_post_data($customized);
 		$this->do_customize_boot_actions();
-		$this->assertTrue( is_customize_preview() );
+		$this->assertTrue(is_customize_preview());
 
-		$this->assertNotEmpty( $this->manager->get_setting( 'widget_categories[2]' ), 'Expected setting for pre-existing widget category-2, being customized.' );
-		$this->assertNotEmpty( $this->manager->get_setting( 'widget_search[2]' ), 'Expected setting for pre-existing widget search-2, not being customized.' );
-		$this->assertNotEmpty( $this->manager->get_setting( 'widget_search[3]' ), 'Expected dynamic setting for non-existing widget search-3, being customized.' );
+		$this->assertNotEmpty($this->manager->get_setting('widget_categories[2]'), 'Expected setting for pre-existing widget category-2, being customized.');
+		$this->assertNotEmpty($this->manager->get_setting('widget_search[2]'), 'Expected setting for pre-existing widget search-2, not being customized.');
+		$this->assertNotEmpty($this->manager->get_setting('widget_search[3]'), 'Expected dynamic setting for non-existing widget search-3, being customized.');
 
-		$widget_categories = get_option( 'widget_categories' );
-		$this->assertEquals( $raw_widget_customized['widget_categories[2]'], $widget_categories[2], 'Expected $wp_customize->get_setting(widget_categories[2])->preview() to have been called.' );
+		$widget_categories = get_option('widget_categories');
+		$this->assertEquals($raw_widget_customized['widget_categories[2]'], $widget_categories[2], 'Expected $wp_customize->get_setting(widget_categories[2])->preview() to have been called.');
 	}
 
 	/**
@@ -104,68 +104,68 @@ 
 	 */
 	function test_get_setting_args() {
 
-		add_filter( 'widget_customizer_setting_args', array( $this, 'filter_widget_customizer_setting_args' ), 10, 2 );
+		add_filter('widget_customizer_setting_args', array($this, 'filter_widget_customizer_setting_args'), 10, 2);
 
 		$default_args = array(
 			'type' => 'option',
 			'capability' => 'edit_theme_options',
 			'transport' => 'refresh',
 			'default' => array(),
-			'sanitize_callback' => array( $this->manager->widgets, 'sanitize_widget_instance' ),
-			'sanitize_js_callback' => array( $this->manager->widgets, 'sanitize_widget_js_instance' ),
+			'sanitize_callback' => array($this->manager->widgets, 'sanitize_widget_instance'),
+			'sanitize_js_callback' => array($this->manager->widgets, 'sanitize_widget_js_instance'),
 		);
 
-		$args = $this->manager->widgets->get_setting_args( 'widget_foo[2]' );
-		foreach ( $default_args as $key => $default_value ) {
-			$this->assertEquals( $default_value, $args[ $key ] );
+		$args = $this->manager->widgets->get_setting_args('widget_foo[2]');
+		foreach ($default_args as $key => $default_value) {
+			$this->assertEquals($default_value, $args[$key]);
 		}
-		$this->assertEquals( 'WIDGET_FOO[2]', $args['uppercase_id_set_by_filter'] );
+		$this->assertEquals('WIDGET_FOO[2]', $args['uppercase_id_set_by_filter']);
 
 		$override_args = array(
 			'type' => 'theme_mod',
 			'capability' => 'edit_posts',
 			'transport' => 'postMessage',
-			'default' => array( 'title' => 'asd' ),
+			'default' => array('title' => 'asd'),
 			'sanitize_callback' => '__return_empty_array',
 			'sanitize_js_callback' => '__return_empty_array',
 		);
-		$args = $this->manager->widgets->get_setting_args( 'widget_bar[3]', $override_args );
-		foreach ( $override_args as $key => $override_value ) {
-			$this->assertEquals( $override_value, $args[ $key ] );
+		$args = $this->manager->widgets->get_setting_args('widget_bar[3]', $override_args);
+		foreach ($override_args as $key => $override_value) {
+			$this->assertEquals($override_value, $args[$key]);
 		}
-		$this->assertEquals( 'WIDGET_BAR[3]', $args['uppercase_id_set_by_filter'] );
+		$this->assertEquals('WIDGET_BAR[3]', $args['uppercase_id_set_by_filter']);
 
 		$default_args = array(
 			'type' => 'option',
 			'capability' => 'edit_theme_options',
 			'transport' => 'refresh',
 			'default' => array(),
-			'sanitize_callback' => array( $this->manager->widgets, 'sanitize_sidebar_widgets' ),
-			'sanitize_js_callback' => array( $this->manager->widgets, 'sanitize_sidebar_widgets_js_instance' ),
+			'sanitize_callback' => array($this->manager->widgets, 'sanitize_sidebar_widgets'),
+			'sanitize_js_callback' => array($this->manager->widgets, 'sanitize_sidebar_widgets_js_instance'),
 		);
-		$args = $this->manager->widgets->get_setting_args( 'sidebars_widgets[sidebar-1]' );
-		foreach ( $default_args as $key => $default_value ) {
-			$this->assertEquals( $default_value, $args[ $key ] );
+		$args = $this->manager->widgets->get_setting_args('sidebars_widgets[sidebar-1]');
+		foreach ($default_args as $key => $default_value) {
+			$this->assertEquals($default_value, $args[$key]);
 		}
-		$this->assertEquals( 'SIDEBARS_WIDGETS[SIDEBAR-1]', $args['uppercase_id_set_by_filter'] );
+		$this->assertEquals('SIDEBARS_WIDGETS[SIDEBAR-1]', $args['uppercase_id_set_by_filter']);
 
 		$override_args = array(
 			'type' => 'theme_mod',
 			'capability' => 'edit_posts',
 			'transport' => 'postMessage',
-			'default' => array( 'title' => 'asd' ),
+			'default' => array('title' => 'asd'),
 			'sanitize_callback' => '__return_empty_array',
 			'sanitize_js_callback' => '__return_empty_array',
 		);
-		$args = $this->manager->widgets->get_setting_args( 'sidebars_widgets[sidebar-2]', $override_args );
-		foreach ( $override_args as $key => $override_value ) {
-			$this->assertEquals( $override_value, $args[ $key ] );
+		$args = $this->manager->widgets->get_setting_args('sidebars_widgets[sidebar-2]', $override_args);
+		foreach ($override_args as $key => $override_value) {
+			$this->assertEquals($override_value, $args[$key]);
 		}
-		$this->assertEquals( 'SIDEBARS_WIDGETS[SIDEBAR-2]', $args['uppercase_id_set_by_filter'] );
+		$this->assertEquals('SIDEBARS_WIDGETS[SIDEBAR-2]', $args['uppercase_id_set_by_filter']);
 	}
 
-	function filter_widget_customizer_setting_args( $args, $id ) {
-		$args['uppercase_id_set_by_filter'] = strtoupper( $id );
+	function filter_widget_customizer_setting_args($args, $id) {
+		$args['uppercase_id_set_by_filter'] = strtoupper($id);
 		return $args;
 	}
 
@@ -182,18 +182,18 @@ 
 			'dropdown' => '1',
 		);
 
-		$sanitized_for_js = $this->manager->widgets->sanitize_widget_js_instance( $new_categories_instance );
-		$this->assertArrayHasKey( 'encoded_serialized_instance', $sanitized_for_js );
-		$this->assertTrue( is_serialized( base64_decode( $sanitized_for_js['encoded_serialized_instance'] ), true ) );
-		$this->assertEquals( $new_categories_instance['title'], $sanitized_for_js['title'] );
-		$this->assertTrue( $sanitized_for_js['is_widget_customizer_js_value'] );
-		$this->assertArrayHasKey( 'instance_hash_key', $sanitized_for_js );
+		$sanitized_for_js = $this->manager->widgets->sanitize_widget_js_instance($new_categories_instance);
+		$this->assertArrayHasKey('encoded_serialized_instance', $sanitized_for_js);
+		$this->assertTrue(is_serialized(base64_decode($sanitized_for_js['encoded_serialized_instance']), true));
+		$this->assertEquals($new_categories_instance['title'], $sanitized_for_js['title']);
+		$this->assertTrue($sanitized_for_js['is_widget_customizer_js_value']);
+		$this->assertArrayHasKey('instance_hash_key', $sanitized_for_js);
 
 		$corrupted_sanitized_for_js = $sanitized_for_js;
-		$corrupted_sanitized_for_js['encoded_serialized_instance'] = base64_encode( serialize( array( 'title' => 'EVIL' ) ) );
-		$this->assertNull( $this->manager->widgets->sanitize_widget_instance( $corrupted_sanitized_for_js ), 'Expected sanitize_widget_instance to reject corrupted data.' );
+		$corrupted_sanitized_for_js['encoded_serialized_instance'] = base64_encode(serialize(array('title' => 'EVIL')));
+		$this->assertNull($this->manager->widgets->sanitize_widget_instance($corrupted_sanitized_for_js), 'Expected sanitize_widget_instance to reject corrupted data.');
 
-		$unsanitized_from_js = $this->manager->widgets->sanitize_widget_instance( $sanitized_for_js );
-		$this->assertEquals( $unsanitized_from_js, $new_categories_instance );
+		$unsanitized_from_js = $this->manager->widgets->sanitize_widget_instance($sanitized_for_js);
+		$this->assertEquals($unsanitized_from_js, $new_categories_instance);
 	}
 }