sc0ttkclark / wordpress-fields-api

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);
 	}
 }

tests/bootstrap.php

Spacing +10 added lines, -10 removed lines

@@ -5,28 +5,28 @@
  * @package WordPress
  * @subpackage Fields API
 */
-define( 'WP_TESTS_FORCE_KNOWN_BUGS', true );
+define('WP_TESTS_FORCE_KNOWN_BUGS', true);
 
 // Support for:
 // 1. `WP_DEVELOP_DIR` environment variable
 // 2. Plugin installed inside of WordPress.org developer checkout
 // 3. Tests checked out to /tmp
 // 4. VVV tests
-if ( false !== getenv( 'WP_DEVELOP_DIR' ) ) {
-	$test_root = getenv( 'WP_DEVELOP_DIR' ) . '/tests/phpunit';
-} else if ( file_exists( '../../../../tests/phpunit/includes/bootstrap.php' ) ) {
+if (false !== getenv('WP_DEVELOP_DIR')) {
+	$test_root = getenv('WP_DEVELOP_DIR').'/tests/phpunit';
+} else if (file_exists('../../../../tests/phpunit/includes/bootstrap.php')) {
 	$test_root = '../../../../tests/phpunit';
-} else if ( file_exists( '/tmp/wordpress-tests-lib/includes/bootstrap.php' ) ) {
+} else if (file_exists('/tmp/wordpress-tests-lib/includes/bootstrap.php')) {
 	$test_root = '/tmp/wordpress-tests-lib';
-} else if ( file_exists( '/srv/www/wordpress-develop/tests/phpunit/includes/bootstrap.php' ) ) {
+} else if (file_exists('/srv/www/wordpress-develop/tests/phpunit/includes/bootstrap.php')) {
 	$test_root = '/srv/www/wordpress-develop/tests/phpunit';
 }
 
-require $test_root . '/includes/functions.php';
+require $test_root.'/includes/functions.php';
 
 function _manually_load_plugin() {
-	require dirname( __FILE__ ) . '/../wordpress-fields-api.php';
+	require dirname(__FILE__).'/../wordpress-fields-api.php';
 }
-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
+tests_add_filter('muplugins_loaded', '_manually_load_plugin');
 
-require $test_root . '/includes/bootstrap.php';
+require $test_root.'/includes/bootstrap.php';

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

Spacing +23 added lines, -23 removed lines

@@ -156,7 +156,7 @@ 
 
 		$args = func_get_args();
 
-		call_user_func_array( array( $this, 'init' ), $args );
+		call_user_func_array(array($this, 'init'), $args);
 
 	}
 
@@ -167,7 +167,7 @@ 
 	 * @param string $id            A specific ID of the section.
 	 * @param array  $args          Section arguments.
 	 */
-	public function init( $object_type, $id, $args = array() ) {
+	public function init($object_type, $id, $args = array()) {
 
 		/**
 		 * @var $wp_fields WP_Fields_API
@@ -176,7 +176,7 @@ 
 
 		$this->object_type = $object_type;
 
-		if ( is_array( $id ) ) {
+		if (is_array($id)) {
 			$args = $id;
 
 			$id = '';
@@ -184,19 +184,19 @@ 
 			$this->id = $id;
 		}
 
-		$keys = array_keys( get_object_vars( $this ) );
+		$keys = array_keys(get_object_vars($this));
 
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
 		self::$instance_count += 1;
 		$this->instance_number = self::$instance_count;
 
-		if ( empty( $this->active_callback ) ) {
-			$this->active_callback = array( $this, 'active_callback' );
+		if (empty($this->active_callback)) {
+			$this->active_callback = array($this, 'active_callback');
 		}
 
 		/*if ( $this->screen ) {
@@ -224,8 +224,8 @@ 
 		$section = $this;
 		$active = true;
 
-		if ( is_callable( $this->active_callback ) ) {
-			$active = call_user_func( $this->active_callback, $this );
+		if (is_callable($this->active_callback)) {
+			$active = call_user_func($this->active_callback, $this);
 		}
 
 		/**
@@ -234,7 +234,7 @@ 
 		 * @param bool                 $active  Whether the Fields API section is active.
 		 * @param WP_Fields_API_Section $section {@see WP_Fields_API_Section} instance.
 		 */
-		$active = apply_filters( 'fields_api_section_active_' . $this->object_type, $active, $section );
+		$active = apply_filters('fields_api_section_active_'.$this->object_type, $active, $section);
 
 		return $active;
 
@@ -264,8 +264,8 @@ 
 	 */
 	public function json() {
 
-		$array = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'screen', 'type' ) );
-		$array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$array = wp_array_slice_assoc((array) $this, array('id', 'description', 'priority', 'screen', 'type'));
+		$array['title'] = html_entity_decode($this->title, ENT_QUOTES, get_bloginfo('charset'));
 		$array['content'] = $this->get_content();
 		$array['active'] = $this->active();
 		$array['instanceNumber'] = $this->instance_number;
@@ -282,18 +282,18 @@ 
 	 */
 	public function check_capabilities() {
 
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) ) {
+		if ($this->capability && ! call_user_func_array('current_user_can', (array) $this->capability)) {
 			return false;
 		}
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) ) {
+		if ($this->theme_supports && ! call_user_func_array('current_theme_supports', (array) $this->theme_supports)) {
 			return false;
 		}
 
 		$access = true;
 
-		if ( is_callable( $this->capabilities_callback ) ) {
-			$access = call_user_func( $this->capabilities_callback, $this );
+		if (is_callable($this->capabilities_callback)) {
+			$access = call_user_func($this->capabilities_callback, $this);
 		}
 
 		return $access;
@@ -311,7 +311,7 @@ 
 
 		$this->maybe_render();
 
-		$template = trim( ob_get_contents() );
+		$template = trim(ob_get_contents());
 
 		ob_end_clean();
 
@@ -324,7 +324,7 @@ 
 	 */
 	final public function maybe_render() {
 
-		if ( ! $this->check_capabilities() ) {
+		if ( ! $this->check_capabilities()) {
 			return;
 		}
 
@@ -336,7 +336,7 @@ 
 		 *
 		 * @param WP_Fields_API_Section $this WP_Fields API_Section instance.
 		 */
-		do_action( "fields_api_render_section_{$this->object_type}", $this );
+		do_action("fields_api_render_section_{$this->object_type}", $this);
 
 		/**
 		 * Fires before rendering a specific Fields API section.
@@ -348,7 +348,7 @@ 
 		 * of the specific Fields API section to be rendered.
 		 *
 		 */
-		do_action( "fields_api_render_section_{$this->object_type}_{$this->object_name}_{$this->id}" );
+		do_action("fields_api_render_section_{$this->object_type}_{$this->object_name}_{$this->id}");
 
 		$this->render();
 
@@ -360,7 +360,7 @@ 
 	 * // @todo Merge render_template / print_template() from Customizer
 	 */
 	protected function render() {
-		echo esc_html( $this->title );
+		echo esc_html($this->title);
 	}
 
 	/**

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

Spacing +28 added lines, -28 removed lines

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