From f57e09f0fc6266eaa71da57d0714072fc578053d Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@git.wordpress.org>
Date: Sun, 6 Dec 2015 23:21:46 +0000
Subject: [PATCH] Customizer: Apply `customize_dynamic_setting_class` and
 `customize_dynamic_setting_args` filters in calls to
 `WP_Customize_Manager::add_setting( $id, $args )`.

Ensure that plugin filters apply as expected for any settings registered statically without passing in an explicit class instance to `WP_Customize_Manager::add_setting()`.

Fixes #34597.


git-svn-id: https://develop.svn.wordpress.org/trunk@35810 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../class-wp-customize-manager.php            | 10 ++-
 tests/phpunit/tests/customize/manager.php     | 63 ++++++++++++++++++-
 2 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/class-wp-customize-manager.php b/src/wp-includes/class-wp-customize-manager.php
index e95e115b6d..daa15e655f 100644
--- a/src/wp-includes/class-wp-customize-manager.php
+++ b/src/wp-includes/class-wp-customize-manager.php
@@ -1049,7 +1049,15 @@ final class WP_Customize_Manager {
 		if ( $id instanceof WP_Customize_Setting ) {
 			$setting = $id;
 		} else {
-			$setting = new WP_Customize_Setting( $this, $id, $args );
+			$class = 'WP_Customize_Setting';
+
+			/** This filter is documented in wp-includes/class-wp-customize-manager.php */
+			$args = apply_filters( 'customize_dynamic_setting_args', $args, $id );
+
+			/** This filter is documented in wp-includes/class-wp-customize-manager.php */
+			$class = apply_filters( 'customize_dynamic_setting_class', $class, $id, $args );
+
+			$setting = new $class( $this, $id, $args );
 		}
 
 		$this->settings[ $setting->id ] = $setting;
diff --git a/tests/phpunit/tests/customize/manager.php b/tests/phpunit/tests/customize/manager.php
index 272166be66..929df0a30c 100644
--- a/tests/phpunit/tests/customize/manager.php
+++ b/tests/phpunit/tests/customize/manager.php
@@ -245,7 +245,6 @@ class Tests_WP_Customize_Manager extends WP_UnitTestCase {
 	 * @return array
 	 */
 	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" );
@@ -541,6 +540,56 @@ class Tests_WP_Customize_Manager extends WP_UnitTestCase {
 		$this->assertEquals( $setting_id, $result_setting->id );
 	}
 
+	/**
+	 * @ticket 34597
+	 */
+	function test_add_setting_honoring_dynamic() {
+		$manager = new WP_Customize_Manager();
+
+		$setting_id = 'dynamic';
+		$setting = $manager->add_setting( $setting_id );
+		$this->assertEquals( 'WP_Customize_Setting', get_class( $setting ) );
+		$this->assertObjectNotHasAttribute( 'custom', $setting );
+		$manager->remove_setting( $setting_id );
+
+		add_filter( 'customize_dynamic_setting_class', array( $this, 'return_dynamic_customize_setting_class' ), 10, 3 );
+		add_filter( 'customize_dynamic_setting_args', array( $this, 'return_dynamic_customize_setting_args' ), 10, 2 );
+		$setting = $manager->add_setting( $setting_id );
+		$this->assertEquals( 'Test_Dynamic_Customize_Setting', get_class( $setting ) );
+		$this->assertObjectHasAttribute( 'custom', $setting );
+		$this->assertEquals( 'foo', $setting->custom );
+	}
+
+	/**
+	 * Return 'Test_Dynamic_Customize_Setting' in 'customize_dynamic_setting_class.
+	 *
+	 * @param string $class Setting class.
+	 * @param array  $args  Setting args.
+	 * @param string $id    Setting ID.
+	 * @return string       Setting class.
+	 */
+	function return_dynamic_customize_setting_class( $class, $id, $args ) {
+		unset( $args );
+		if ( 0 === strpos( $id, 'dynamic' ) ) {
+			$class = 'Test_Dynamic_Customize_Setting';
+		}
+		return $class;
+	}
+
+	/**
+	 * Return 'Test_Dynamic_Customize_Setting' in 'customize_dynamic_setting_class.
+	 *
+	 * @param array  $args Setting args.
+	 * @param string $id   Setting ID.
+	 * @return string      Setting args.
+	 */
+	function return_dynamic_customize_setting_args( $args, $id ) {
+		if ( 0 === strpos( $id, 'dynamic' ) ) {
+			$args['custom'] = 'foo';
+		}
+		return $args;
+	}
+
 	/**
 	 * @ticket 34596
 	 */
@@ -602,3 +651,15 @@ class Tests_WP_Customize_Manager extends WP_UnitTestCase {
 		$this->assertEquals( $control_id, $result_control->id );
 	}
 }
+
+require_once ABSPATH . WPINC . '/class-wp-customize-setting.php';
+
+/**
+ * Class Test_Dynamic_Customize_Setting
+ *
+ * @see Tests_WP_Customize_Manager::test_add_setting_honoring_dynamic()
+ */
+class Test_Dynamic_Customize_Setting extends WP_Customize_Setting {
+	public $type = 'dynamic';
+	public $custom;
+}