From c1565016560ec3dcb41e645fab282c6dfb131834 Mon Sep 17 00:00:00 2001
From: ThierryA <thierry@getbeans.io>
Date: Thu, 23 Nov 2017 09:56:18 +0100
Subject: [PATCH 01/21] Add Settings menu and page

---
 includes/settings/class-amp-settings.php |  93 ++++++++++++++++++++
 templates/admin/settings/screen.php      |  23 +++++
 tests/test-class-amp-settings.php        | 103 +++++++++++++++++++++++
 3 files changed, 219 insertions(+)
 create mode 100644 includes/settings/class-amp-settings.php
 create mode 100644 templates/admin/settings/screen.php
 create mode 100644 tests/test-class-amp-settings.php

diff --git a/includes/settings/class-amp-settings.php b/includes/settings/class-amp-settings.php
new file mode 100644
index 00000000000..88c7db3eacd
--- /dev/null
+++ b/includes/settings/class-amp-settings.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * AMP Settings.
+ *
+ * @package AMP
+ */
+
+/**
+ * Settings class.
+ */
+class AMP_Settings {
+
+	/**
+	 * Menu slug.
+	 *
+	 * @const string
+	 */
+	const MENU_SLUG = 'amp_settings';
+
+	/**
+	 * Settings key.
+	 *
+	 * @const string
+	 */
+	const SETTINGS_KEY = 'amp';
+
+	/**
+	 * Initialize.
+	 */
+	public function init() {
+		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+	}
+
+	/**
+	 * Add admin menu.
+	 */
+	public function admin_menu() {
+		add_menu_page(
+			__( 'AMP', 'amp' ),
+			__( 'AMP', 'amp' ),
+			'manage_options',
+			self::MENU_SLUG,
+			'__return_false',
+			$this->get_svg_icon()
+		);
+		add_submenu_page(
+			self::MENU_SLUG,
+			__( 'AMP Settings', 'amp' ),
+			__( 'Settings', 'amp' ),
+			'manage_options',
+			self::MENU_SLUG,
+			array( $this, 'render_screen' )
+		);
+	}
+
+	/**
+	 * Display Settings.
+	 *
+	 * @return void Void on user capabilities check failure.
+	 */
+	public function render_screen() {
+		if ( ! current_user_can( 'manage_options' ) ) {
+			return;
+		}
+
+		include_once AMP__DIR__ . '/templates/admin/settings/screen.php';
+	}
+
+	/**
+	 * Getter for the AMP svg menu icon.
+	 *
+	 * @return object The AMP svg menu icon.
+	 */
+	public function get_svg_icon() {
+		return 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB3aWR0aD0iNjJweCIgaGVpZ2h0PSI2MnB4IiB2aWV3Qm94PSIwIDAgNjIgNjIiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+QU1QLUJyYW5kLUJsYWNrLUljb248L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iYW1wLWxvZ28taW50ZXJuYWwtc2l0ZSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgICAgICA8ZyBpZD0iQU1QLUJyYW5kLUJsYWNrLUljb24iIGZpbGw9IiMwMDAwMDAiPiAgICAgICAgICAgIDxwYXRoIGQ9Ik00MS42Mjg4NjY3LDI4LjE2MTQzMzMgTDI4LjYyNDM2NjcsNDkuODAzNTY2NyBMMjYuMjY4MzY2Nyw0OS44MDM1NjY3IEwyOC41OTc1LDM1LjcwMTY2NjcgTDIxLjM4MzgsMzUuNzEwOTY2NyBDMjEuMzgzOCwzNS43MTA5NjY3IDIxLjMxNTYsMzUuNzEzMDMzMyAyMS4yODM1NjY3LDM1LjcxMzAzMzMgQzIwLjYzMzYsMzUuNzEzMDMzMyAyMC4xMDc2MzMzLDM1LjE4NzA2NjcgMjAuMTA3NjMzMywzNC41MzcxIEMyMC4xMDc2MzMzLDM0LjI1ODEgMjAuMzY3LDMzLjc4NTg2NjcgMjAuMzY3LDMzLjc4NTg2NjcgTDMzLjMyOTEzMzMsMTIuMTY5NTY2NyBMMzUuNzI0NCwxMi4xNzk5IEwzMy4zMzYzNjY3LDI2LjMwMzUgTDQwLjU4NzI2NjcsMjYuMjk0MiBDNDAuNTg3MjY2NywyNi4yOTQyIDQwLjY2NDc2NjcsMjYuMjkzMTY2NyA0MC43MDE5NjY3LDI2LjI5MzE2NjcgQzQxLjM1MTkzMzMsMjYuMjkzMTY2NyA0MS44Nzc5LDI2LjgxOTEzMzMgNDEuODc3OSwyNy40NjkxIEM0MS44Nzc5LDI3LjczMjYgNDEuNzc0NTY2NywyNy45NjQwNjY3IDQxLjYyNzgzMzMsMjguMTYwNCBMNDEuNjI4ODY2NywyOC4xNjE0MzMzIFogTTMxLDAgQzEzLjg3ODcsMCAwLDEzLjg3OTczMzMgMCwzMSBDMCw0OC4xMjEzIDEzLjg3ODcsNjIgMzEsNjIgQzQ4LjEyMDI2NjcsNjIgNjIsNDguMTIxMyA2MiwzMSBDNjIsMTMuODc5NzMzMyA0OC4xMjAyNjY3LDAgMzEsMCBMMzEsMCBaIiBpZD0iRmlsbC0xIj48L3BhdGg+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=';
+	}
+
+	/**
+	 * Get the instance of AMP_Settings.
+	 *
+	 * @return object $instance AMP_Settings instance.
+	 */
+	public static function get_instance() {
+		static $instance;
+
+		if ( ! $instance instanceof AMP_Settings ) {
+			$instance = new AMP_Settings();
+		}
+
+		return $instance;
+	}
+
+}
diff --git a/templates/admin/settings/screen.php b/templates/admin/settings/screen.php
new file mode 100644
index 00000000000..280bd88f8c9
--- /dev/null
+++ b/templates/admin/settings/screen.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Settings template.
+ *
+ * @package AMP
+ */
+
+// Check referrer.
+if ( ! $this instanceof AMP_Settings ) {
+	return;
+}
+?>
+<div class="wrap">
+	<h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
+	<?php settings_errors(); ?>
+	<form action="options.php" method="post">
+		<?php
+		settings_fields( AMP_Settings::SETTINGS_KEY );
+		do_settings_sections( AMP_Settings::MENU_SLUG );
+		submit_button();
+		?>
+	</form>
+</div>
diff --git a/tests/test-class-amp-settings.php b/tests/test-class-amp-settings.php
new file mode 100644
index 00000000000..5dc682fa40b
--- /dev/null
+++ b/tests/test-class-amp-settings.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Tests for AMP_Settings.
+ *
+ * @package AMP
+ */
+
+/**
+ * Tests for AMP_Settings.
+ */
+class Test_AMP_Settings extends WP_UnitTestCase {
+
+	/**
+	 * Instance of AMP_Settings
+	 *
+	 * @var AMP_Settings
+	 */
+	public $instance;
+
+	/**
+	 * Setup.
+	 *
+	 * @inheritdoc
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->instance = AMP_Settings::get_instance();
+	}
+
+	/**
+	 * Test init.
+	 *
+	 * @see AMP_Settings::init()
+	 */
+	public function test_init() {
+		$this->instance->init();
+		$this->assertEquals( 10, has_action( 'admin_menu', array( $this->instance, 'admin_menu' ) ) );
+	}
+
+	/**
+	 * Test admin_menu.
+	 *
+	 * @see AMP_Settings::admin_menu()
+	 */
+	public function test_admin_menu() {
+		global $_parent_pages, $submenu;
+
+		wp_set_current_user( $this->factory->user->create( array(
+			'role' => 'administrator',
+		) ) );
+
+		$this->instance->admin_menu();
+		$this->arrayHasKey( 'amp_settings', $_parent_pages );
+		$this->arrayHasKey( 'amp_settings', $submenu );
+	}
+
+	/**
+	 * Test render_screen for non admin users.
+	 *
+	 * @see AMP_Settings::render_screen()
+	 */
+	public function test_render_screen_for_non_admin_user() {
+		wp_set_current_user( $this->factory->user->create( array(
+			'role' => 'subscriber',
+		) ) );
+
+		$this->assertEmpty( $this->instance->render_screen() );
+	}
+
+	/**
+	 * Test render_screen for admin users.
+	 *
+	 * @see AMP_Settings::render_screen()
+	 */
+	public function test_render_screen_for_admin_user() {
+		wp_set_current_user( $this->factory->user->create( array(
+			'role' => 'administrator',
+		) ) );
+
+		ob_start();
+		$this->instance->render_screen();
+		$this->assertContains( '<div class="wrap">', ob_get_clean() );
+	}
+
+	/**
+	 * Test get_svg_icon.
+	 *
+	 * @see AMP_Settings::get_svg_icon()
+	 */
+	public function test_get_svg_icon() {
+		$this->assertEquals( $this->instance->get_svg_icon(), 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB3aWR0aD0iNjJweCIgaGVpZ2h0PSI2MnB4IiB2aWV3Qm94PSIwIDAgNjIgNjIiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+QU1QLUJyYW5kLUJsYWNrLUljb248L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iYW1wLWxvZ28taW50ZXJuYWwtc2l0ZSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgICAgICA8ZyBpZD0iQU1QLUJyYW5kLUJsYWNrLUljb24iIGZpbGw9IiMwMDAwMDAiPiAgICAgICAgICAgIDxwYXRoIGQ9Ik00MS42Mjg4NjY3LDI4LjE2MTQzMzMgTDI4LjYyNDM2NjcsNDkuODAzNTY2NyBMMjYuMjY4MzY2Nyw0OS44MDM1NjY3IEwyOC41OTc1LDM1LjcwMTY2NjcgTDIxLjM4MzgsMzUuNzEwOTY2NyBDMjEuMzgzOCwzNS43MTA5NjY3IDIxLjMxNTYsMzUuNzEzMDMzMyAyMS4yODM1NjY3LDM1LjcxMzAzMzMgQzIwLjYzMzYsMzUuNzEzMDMzMyAyMC4xMDc2MzMzLDM1LjE4NzA2NjcgMjAuMTA3NjMzMywzNC41MzcxIEMyMC4xMDc2MzMzLDM0LjI1ODEgMjAuMzY3LDMzLjc4NTg2NjcgMjAuMzY3LDMzLjc4NTg2NjcgTDMzLjMyOTEzMzMsMTIuMTY5NTY2NyBMMzUuNzI0NCwxMi4xNzk5IEwzMy4zMzYzNjY3LDI2LjMwMzUgTDQwLjU4NzI2NjcsMjYuMjk0MiBDNDAuNTg3MjY2NywyNi4yOTQyIDQwLjY2NDc2NjcsMjYuMjkzMTY2NyA0MC43MDE5NjY3LDI2LjI5MzE2NjcgQzQxLjM1MTkzMzMsMjYuMjkzMTY2NyA0MS44Nzc5LDI2LjgxOTEzMzMgNDEuODc3OSwyNy40NjkxIEM0MS44Nzc5LDI3LjczMjYgNDEuNzc0NTY2NywyNy45NjQwNjY3IDQxLjYyNzgzMzMsMjguMTYwNCBMNDEuNjI4ODY2NywyOC4xNjE0MzMzIFogTTMxLDAgQzEzLjg3ODcsMCAwLDEzLjg3OTczMzMgMCwzMSBDMCw0OC4xMjEzIDEzLjg3ODcsNjIgMzEsNjIgQzQ4LjEyMDI2NjcsNjIgNjIsNDguMTIxMyA2MiwzMSBDNjIsMTMuODc5NzMzMyA0OC4xMjAyNjY3LDAgMzEsMCBMMzEsMCBaIiBpZD0iRmlsbC0xIj48L3BhdGg+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=' );
+	}
+
+	/**
+	 * Test get_instance.
+	 *
+	 * @see AMP_Settings::get_instance()
+	 */
+	public function test_get_instance() {
+		$this->assertInstanceOf( 'AMP_Settings', AMP_Settings::get_instance() );
+	}
+
+}

From 5499ba601757de757299e7247cddbfc2133544ca Mon Sep 17 00:00:00 2001
From: ThierryA <thierry@getbeans.io>
Date: Thu, 23 Nov 2017 09:57:06 +0100
Subject: [PATCH 02/21] Add post types settings

---
 .../class-amp-settings-post-types.php         | 163 ++++++++++++++++++
 .../settings/fields/checkbox-post-types.php   |  21 +++
 tests/test-class-amp-settings-post-types.php  | 149 ++++++++++++++++
 3 files changed, 333 insertions(+)
 create mode 100644 includes/settings/class-amp-settings-post-types.php
 create mode 100644 templates/admin/settings/fields/checkbox-post-types.php
 create mode 100644 tests/test-class-amp-settings-post-types.php

diff --git a/includes/settings/class-amp-settings-post-types.php b/includes/settings/class-amp-settings-post-types.php
new file mode 100644
index 00000000000..98843200b27
--- /dev/null
+++ b/includes/settings/class-amp-settings-post-types.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * Post types settings.
+ *
+ * @package AMP
+ */
+
+/**
+ * Settings post types class.
+ */
+class AMP_Settings_Post_Types {
+
+	/**
+	 * Settings section id.
+	 *
+	 * @var string
+	 */
+	protected $section_id = 'post_types';
+
+	/**
+	 * Settings config.
+	 *
+	 * @var array
+	 */
+	protected $setting = array();
+
+	/**
+	 * List of post types which are always AMPlified.
+	 *
+	 * @var array
+	 */
+	protected $always_on = array( 'post' );
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		$this->setting = array(
+			'id'          => 'post_types_support',
+			'label'       => __( 'Post Types Support', 'amp' ),
+			'description' => __( 'Enable/disable AMP post type(s) support', 'amp' ),
+		);
+	}
+
+	/**
+	 * Initialize.
+	 */
+	public function init() {
+		add_action( 'admin_init', array( $this, 'register_settings' ) );
+		add_action( 'update_option_' . AMP_Settings::SETTINGS_KEY, 'flush_rewrite_rules' );
+	}
+
+	/**
+	 * Register the current page settings.
+	 */
+	public function register_settings() {
+		register_setting( AMP_Settings::SETTINGS_KEY, AMP_Settings::SETTINGS_KEY );
+		add_settings_section(
+			$this->section_id,
+			false,
+			'__return_false',
+			AMP_Settings::MENU_SLUG
+		);
+		add_settings_field(
+			$this->setting['id'],
+			$this->setting['label'],
+			array( $this, 'render_setting' ),
+			AMP_Settings::MENU_SLUG,
+			$this->section_id
+		);
+	}
+
+	/**
+	 * Getter for settings value.
+	 *
+	 * @param string $post_type The post type name.
+	 * @return bool|array Return true if the post type is always on; the setting value otherwise.
+	 */
+	public function get_settings_value( $post_type = false ) {
+		$settings = get_option( AMP_Settings::SETTINGS_KEY, array() );
+
+		if ( false !== $post_type ) {
+			// Always return true if the post type is always on.
+			if ( true == $this->is_always_on( $post_type ) ) {
+				return true;
+			}
+
+			if ( isset( $settings[ $this->setting['id'] ][ $post_type ] ) ) {
+				return (bool) $settings[ $this->setting['id'] ][ $post_type ];
+			}
+
+			return false;
+		}
+
+		if ( empty( $settings[ $this->setting['id'] ] ) || ! is_array( $settings[ $this->setting['id'] ] ) ) {
+			return array();
+		}
+
+		return array_map( 'boolval', $settings[ $this->setting['id'] ] );
+	}
+
+	/**
+	 * Getter for the supported post types.
+	 *
+	 * @return object Supported post types list.
+	 */
+	public function get_supported_post_types() {
+		$core = get_post_types( array(
+			'name' => 'post',
+		), 'objects' );
+		$cpt = get_post_types( array(
+			'public'   => true,
+			'_builtin' => false,
+		), 'objects' );
+
+		return $core + $cpt;
+	}
+
+	/**
+	 * Getter for the setting HTML input name attribute.
+	 *
+	 * @param string $post_type The post type name.
+	 * @return object The setting HTML input name attribute.
+	 */
+	public function get_setting_name( $post_type ) {
+		$id = $this->setting['id'];
+
+		return AMP_Settings::SETTINGS_KEY . "[{$id}][{$post_type}]";
+	}
+
+	/**
+	 * Check if a post type is always on.
+	 *
+	 * @param string $post_type The post type name.
+	 * @return bool True if the post type is always on; false otherwise.
+	 */
+	public function is_always_on( $post_type ) {
+		return in_array( $post_type, $this->always_on, true );
+	}
+
+	/**
+	 * Setting renderer.
+	 */
+	public function render_setting() {
+		require_once AMP__DIR__ . '/templates/admin/settings/fields/checkbox-post-types.php';
+	}
+
+	/**
+	 * Get the instance of AMP_Settings_Post_Types.
+	 *
+	 * @return object $instance AMP_Settings_Post_Types instance.
+	 */
+	public static function get_instance() {
+		static $instance;
+
+		if ( ! $instance instanceof AMP_Settings_Post_Types ) {
+			$instance = new AMP_Settings_Post_Types();
+		}
+
+		return $instance;
+	}
+
+}
diff --git a/templates/admin/settings/fields/checkbox-post-types.php b/templates/admin/settings/fields/checkbox-post-types.php
new file mode 100644
index 00000000000..76b17c4a63f
--- /dev/null
+++ b/templates/admin/settings/fields/checkbox-post-types.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Settings post types checkbox template.
+ *
+ * @package AMP
+ */
+
+// Check referrer.
+if ( ! $this instanceof AMP_Settings_Post_Types ) {
+	return;
+}
+?>
+<fieldset>
+	<?php foreach ( $this->get_supported_post_types() as $post_type ) : ?>
+		<label>
+			<input type="checkbox" value="1" name="<?php echo esc_attr( $this->get_setting_name( $post_type->name ) ); ?>"<?php checked( true, $this->get_settings_value( $post_type->name ) ); ?><?php disabled( true, $this->is_always_on( $post_type->name ) ); ?>> <?php echo esc_html( $post_type->label ); ?>
+		</label>
+		<br>
+	<?php endforeach; ?>
+	<p class="description"><?php echo esc_html( $this->setting['description'] ); ?></p>
+</fieldset>
diff --git a/tests/test-class-amp-settings-post-types.php b/tests/test-class-amp-settings-post-types.php
new file mode 100644
index 00000000000..84a99727ff4
--- /dev/null
+++ b/tests/test-class-amp-settings-post-types.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Tests for AMP_Settings_Post_Types.
+ *
+ * @package AMP
+ */
+
+/**
+ * Tests for AMP_Settings_Post_Types.
+ */
+class Test_AMP_Settings_Post_Types extends WP_UnitTestCase {
+
+	/**
+	 * Instance of AMP_Settings_Post_Types
+	 *
+	 * @var AMP_Settings_Post_Types
+	 */
+	public $instance;
+
+	/**
+	 * Setup.
+	 *
+	 * @inheritdoc
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->instance = AMP_Settings_Post_Types::get_instance();
+	}
+
+	/**
+	 * Test init.
+	 *
+	 * @see AMP_Settings_Post_Types::init()
+	 */
+	public function test_init() {
+		$this->instance->init();
+		$this->assertEquals( 10, has_action( 'admin_init', array( $this->instance, 'register_settings' ) ) );
+		$this->assertEquals( 10, has_action( 'update_option_' . AMP_Settings::SETTINGS_KEY, 'flush_rewrite_rules' ) );
+	}
+
+	/**
+	 * Test register_settings.
+	 *
+	 * @see AMP_Settings_Post_Types::register_settings()
+	 */
+	public function test_register_settings() {
+		global $wp_settings_sections, $wp_settings_fields;
+
+		$menu_slug = AMP_Settings::MENU_SLUG;
+		$option_group = AMP_Settings::SETTINGS_KEY;
+		$section_id = 'post_types';
+		$setting_id = 'post_types_support';
+
+		$this->instance->register_settings();
+		$this->assertArrayHasKey( $menu_slug, $wp_settings_sections );
+
+		if ( ! isset( $wp_settings_sections[ $menu_slug ] ) ) {
+			$this->markTestIncomplete( 'Setting sections page could not be found.' );
+		}
+
+		$sections = $wp_settings_sections[ $menu_slug ];
+		$this->assertArrayHasKey( $section_id, $sections );
+
+		if ( ! isset( $sections[ $section_id ] ) ) {
+			$this->markTestIncomplete( 'Settings section could not be found.' );
+		}
+
+		$this->assertEquals( $section_id, $sections[ $section_id ]['id'] );
+
+		if ( ! isset( $wp_settings_fields[ $menu_slug ][ $section_id ][ $setting_id ] ) ) {
+			$this->markTestIncomplete( 'Settings field could not be found.' );
+		}
+
+		$this->assertEquals( 'post_types_support', $wp_settings_fields[ $menu_slug ][ $section_id ][ $setting_id ]['id'] );
+	}
+
+	/**
+	 * Test get_settings_value.
+	 *
+	 * @see AMP_Settings_Post_Types::get_settings_value()
+	 */
+	public function test_get_settings_value() {
+		$this->assertEmpty( $this->instance->get_settings_value() );
+		$this->assertInternalType( 'array', $this->instance->get_settings_value() );
+		$this->assertFalse( $this->instance->get_settings_value( 'foo' ) );
+
+		update_option( AMP_Settings::SETTINGS_KEY, array(
+			'post_types_support' => array(
+				'post' => true,
+			),
+		) );
+
+		$this->assertContains( 'post', $this->instance->get_settings_value() );
+		$this->assertInternalType( 'array', $this->instance->get_settings_value() );
+		$this->assertTrue( $this->instance->get_settings_value( 'post' ) );
+
+		// Cleanup.
+		delete_option( AMP_Settings::SETTINGS_KEY );
+	}
+
+	/**
+	 * Test get_supported_post_types.
+	 *
+	 * @see AMP_Settings_Post_Types::get_supported_post_types()
+	 */
+	public function test_get_supported_post_types() {
+		// It would be redundant to add further test already covered in Core.
+		$this->assertInternalType( 'array', $this->instance->get_supported_post_types() );
+	}
+
+	/**
+	 * Test get_setting_name.
+	 *
+	 * @see AMP_Settings_Post_Types::get_setting_name()
+	 */
+	public function test_get_setting_name() {
+		$this->assertEquals( AMP_Settings::SETTINGS_KEY . '[post_types_support][post]', $this->instance->get_setting_name( 'post' ) );
+	}
+
+	/**
+	 * Test is_always_on.
+	 *
+	 * @see AMP_Settings_Post_Types::is_always_on()
+	 */
+	public function test_is_always_on() {
+		$this->assertTrue( $this->instance->is_always_on( 'post' ) );
+	}
+
+	/**
+	 * Test render_setting.
+	 *
+	 * @see AMP_Settings_Post_Types::render_setting()
+	 */
+	public function test_render_setting() {
+		ob_start();
+		$this->instance->render_setting();
+		$this->assertContains( '<fieldset>', ob_get_clean() );
+	}
+
+	/**
+	 * Test get_instance.
+	 *
+	 * @see AMP_Settings_Post_Types::get_instance()
+	 */
+	public function test_get_instance() {
+		$this->assertInstanceOf( 'AMP_Settings_Post_Types', AMP_Settings_Post_Types::get_instance() );
+	}
+
+}

From c5d0c99e989e8ba6c51a024f1b2cb53bd1c424e5 Mon Sep 17 00:00:00 2001
From: ThierryA <thierry@getbeans.io>
Date: Thu, 23 Nov 2017 09:57:58 +0100
Subject: [PATCH 03/21] Remove legacy option code

---
 includes/options/class-amp-options-menu.php   | 42 +------------------
 .../views/class-amp-options-menu-page.php     | 17 --------
 2 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 includes/options/views/class-amp-options-menu-page.php

diff --git a/includes/options/class-amp-options-menu.php b/includes/options/class-amp-options-menu.php
index 15494fd209c..50b725c5272 100644
--- a/includes/options/class-amp-options-menu.php
+++ b/includes/options/class-amp-options-menu.php
@@ -1,54 +1,16 @@
 <?php
 
 require_once( AMP__DIR__ . '/includes/options/class-amp-analytics-options-submenu.php' );
-require_once( AMP__DIR__ . '/includes/options/views/class-amp-options-menu-page.php' );
 require_once( AMP__DIR__ . '/includes/options/views/class-amp-options-manager.php' );
 
 class AMP_Options_Menu {
-	const ICON_BASE64_SVG = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB3aWR0aD0iNjJweCIgaGVpZ2h0PSI2MnB4IiB2aWV3Qm94PSIwIDAgNjIgNjIiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+QU1QLUJyYW5kLUJsYWNrLUljb248L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iYW1wLWxvZ28taW50ZXJuYWwtc2l0ZSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgICAgICA8ZyBpZD0iQU1QLUJyYW5kLUJsYWNrLUljb24iIGZpbGw9IiMwMDAwMDAiPiAgICAgICAgICAgIDxwYXRoIGQ9Ik00MS42Mjg4NjY3LDI4LjE2MTQzMzMgTDI4LjYyNDM2NjcsNDkuODAzNTY2NyBMMjYuMjY4MzY2Nyw0OS44MDM1NjY3IEwyOC41OTc1LDM1LjcwMTY2NjcgTDIxLjM4MzgsMzUuNzEwOTY2NyBDMjEuMzgzOCwzNS43MTA5NjY3IDIxLjMxNTYsMzUuNzEzMDMzMyAyMS4yODM1NjY3LDM1LjcxMzAzMzMgQzIwLjYzMzYsMzUuNzEzMDMzMyAyMC4xMDc2MzMzLDM1LjE4NzA2NjcgMjAuMTA3NjMzMywzNC41MzcxIEMyMC4xMDc2MzMzLDM0LjI1ODEgMjAuMzY3LDMzLjc4NTg2NjcgMjAuMzY3LDMzLjc4NTg2NjcgTDMzLjMyOTEzMzMsMTIuMTY5NTY2NyBMMzUuNzI0NCwxMi4xNzk5IEwzMy4zMzYzNjY3LDI2LjMwMzUgTDQwLjU4NzI2NjcsMjYuMjk0MiBDNDAuNTg3MjY2NywyNi4yOTQyIDQwLjY2NDc2NjcsMjYuMjkzMTY2NyA0MC43MDE5NjY3LDI2LjI5MzE2NjcgQzQxLjM1MTkzMzMsMjYuMjkzMTY2NyA0MS44Nzc5LDI2LjgxOTEzMzMgNDEuODc3OSwyNy40NjkxIEM0MS44Nzc5LDI3LjczMjYgNDEuNzc0NTY2NywyNy45NjQwNjY3IDQxLjYyNzgzMzMsMjguMTYwNCBMNDEuNjI4ODY2NywyOC4xNjE0MzMzIFogTTMxLDAgQzEzLjg3ODcsMCAwLDEzLjg3OTczMzMgMCwzMSBDMCw0OC4xMjEzIDEzLjg3ODcsNjIgMzEsNjIgQzQ4LjEyMDI2NjcsNjIgNjIsNDguMTIxMyA2MiwzMSBDNjIsMTMuODc5NzMzMyA0OC4xMjAyNjY3LDAgMzEsMCBMMzEsMCBaIiBpZD0iRmlsbC0xIj48L3BhdGg+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=';
-
-	private $menu_page;
-	private $menu_slug;
-
-	public function __construct() {
-		$this->menu_page = new AMP_Options_Menu_Page();
-		$this->menu_slug = 'amp-plugin-options';
-	}
-
 	public function init() {
 		add_action( 'admin_post_amp_analytics_options', 'AMP_Options_Manager::handle_analytics_submit' );
-
 		add_action( 'admin_menu', array( $this, 'add_menu_items' ) );
 	}
 
 	public function add_menu_items() {
-		add_menu_page(
-			__( 'AMP Options', 'amp' ),
-			__( 'AMP', 'amp' ),
-			'manage_options',
-			$this->menu_slug,
-			array( $this->menu_page, 'render' ),
-			self::ICON_BASE64_SVG
-		);
-
-		$submenus = array(
-			new AMP_Analytics_Options_Submenu( $this->menu_slug ),
-		);
-
-		// Create submenu items and calls on the Submenu Page object to render the actual contents of the page.
-		foreach ( $submenus as $submenu ) {
-			$submenu->init( $this->menu_slug );
-		}
-
-		$this->remove_toplevel_menu_item();
-	}
-
-	// Helper function to avoid having the top-level menu as
-	// the first menu item
-	function remove_toplevel_menu_item() {
-		global $submenu;
-		if ( isset( $submenu['amp-plugin-options'][0] ) ) {
-			unset( $submenu['amp-plugin-options'][0] );
-		}
+		$submenu = new AMP_Analytics_Options_Submenu( AMP_Settings::MENU_SLUG );
+		$submenu->init( AMP_Settings::MENU_SLUG );
 	}
 }
diff --git a/includes/options/views/class-amp-options-menu-page.php b/includes/options/views/class-amp-options-menu-page.php
deleted file mode 100644
index 1a729a3f65f..00000000000
--- a/includes/options/views/class-amp-options-menu-page.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-class AMP_Options_Menu_Page {
-	public function render() {
-		?>
-		<div class="ampoptions-admin-page">
-			<h1><?php echo __( 'AMP Plugin Options', 'amp' ) ?></h1>
-				<p>
-					<?php
-						__( 'This admin panel menu contains configuration options for the AMP Plugin.',
-							'amp' );
-					?>
-				</p>
-		</div>
-		<?php
-	}
-}

From 1b63cd5670768e8acce78d0787e9e2cb39058172 Mon Sep 17 00:00:00 2001
From: ThierryA <thierry@getbeans.io>
Date: Thu, 23 Nov 2017 09:58:44 +0100
Subject: [PATCH 04/21] Load new settings and add listener

---
 amp.php                      | 11 +++++++++++
 includes/admin/functions.php | 16 +++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/amp.php b/amp.php
index 1cbd389113c..46070ea713b 100644
--- a/amp.php
+++ b/amp.php
@@ -21,6 +21,8 @@
 require_once( AMP__DIR__ . '/includes/admin/class-amp-customizer.php' );
 require_once( AMP__DIR__ . '/includes/settings/class-amp-customizer-settings.php' );
 require_once( AMP__DIR__ . '/includes/settings/class-amp-customizer-design-settings.php' );
+require_once( AMP__DIR__ . '/includes/settings/class-amp-settings.php' );
+require_once( AMP__DIR__ . '/includes/settings/class-amp-settings-post-types.php' );
 
 require_once( AMP__DIR__ . '/includes/actions/class-amp-frontend-actions.php' );
 require_once( AMP__DIR__ . '/includes/actions/class-amp-paired-post-actions.php' );
@@ -62,6 +64,15 @@ function amp_init() {
 	add_rewrite_endpoint( AMP_QUERY_VAR, EP_PERMALINK );
 	add_post_type_support( 'post', AMP_QUERY_VAR );
 
+	// Listen to post types settings.
+	$post_types_supported = AMP_Settings_Post_Types::get_instance()->get_settings_value();
+
+	foreach ( $post_types_supported as $post_type_name => $enabled ) {
+		if ( true === $enabled ) {
+			add_post_type_support( $post_type_name, AMP_QUERY_VAR );
+		}
+	}
+
 	add_filter( 'request', 'amp_force_query_var_value' );
 	add_action( 'wp', 'amp_maybe_add_actions' );
 
diff --git a/includes/admin/functions.php b/includes/admin/functions.php
index fd21e348385..4a2e7fba207 100644
--- a/includes/admin/functions.php
+++ b/includes/admin/functions.php
@@ -80,18 +80,28 @@ function amp_add_customizer_link() {
 }
 
 /**
- * Registers a top-level menu for AMP configuration options
+ * Registers AMP settings.
  */
 function amp_add_options_menu() {
 	if ( ! is_admin() ) {
 		return;
 	}
 
-	$show_options_menu = apply_filters( 'amp_options_menu_is_enabled', true );
-	if ( true !== $show_options_menu ) {
+	/**
+	 * Filter whether to enable the AMP settings.
+	 *
+	 * @param bool $enable Whether to enable the AMP settings. Default true.
+	 */
+	$short_circuit = apply_filters( 'amp_options_menu_is_enabled', true );
+
+	if ( true !== $short_circuit ) {
 		return;
 	}
 
+	// Initialize settings.
+	AMP_Settings::get_instance()->init();
+	AMP_Settings_Post_Types::get_instance()->init();
+
 	$amp_options = new AMP_Options_Menu();
 	$amp_options->init();
 }

From 2949f25434e2f5a4e0aea9c48d3fe41a771360ef Mon Sep 17 00:00:00 2001
From: ThierryA <thierry@getbeans.io>
Date: Thu, 23 Nov 2017 10:10:14 +0100
Subject: [PATCH 05/21] WPCS compliancy

---
 amp.php                                       | 21 +++++++++----------
 includes/options/class-amp-options-menu.php   | 21 +++++++++++++++++--
 .../class-amp-settings-post-types.php         |  4 ++--
 tests/test-class-amp-settings-post-types.php  |  6 +++---
 4 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/amp.php b/amp.php
index 46070ea713b..8a032d0d31e 100644
--- a/amp.php
+++ b/amp.php
@@ -15,17 +15,16 @@
 define( 'AMP__DIR__', dirname( __FILE__ ) );
 define( 'AMP__VERSION', '0.5.1' );
 
-require_once( AMP__DIR__ . '/back-compat/back-compat.php' );
-require_once( AMP__DIR__ . '/includes/amp-helper-functions.php' );
-require_once( AMP__DIR__ . '/includes/admin/functions.php' );
-require_once( AMP__DIR__ . '/includes/admin/class-amp-customizer.php' );
-require_once( AMP__DIR__ . '/includes/settings/class-amp-customizer-settings.php' );
-require_once( AMP__DIR__ . '/includes/settings/class-amp-customizer-design-settings.php' );
-require_once( AMP__DIR__ . '/includes/settings/class-amp-settings.php' );
-require_once( AMP__DIR__ . '/includes/settings/class-amp-settings-post-types.php' );
-
-require_once( AMP__DIR__ . '/includes/actions/class-amp-frontend-actions.php' );
-require_once( AMP__DIR__ . '/includes/actions/class-amp-paired-post-actions.php' );
+require_once AMP__DIR__ . '/back-compat/back-compat.php';
+require_once AMP__DIR__ . '/includes/amp-helper-functions.php';
+require_once AMP__DIR__ . '/includes/admin/functions.php';
+require_once AMP__DIR__ . '/includes/admin/class-amp-customizer.php';
+require_once AMP__DIR__ . '/includes/settings/class-amp-customizer-settings.php';
+require_once AMP__DIR__ . '/includes/settings/class-amp-customizer-design-settings.php';
+require_once AMP__DIR__ . '/includes/settings/class-amp-settings.php';
+require_once AMP__DIR__ . '/includes/settings/class-amp-settings-post-types.php';
+require_once AMP__DIR__ . '/includes/actions/class-amp-frontend-actions.php';
+require_once AMP__DIR__ . '/includes/actions/class-amp-paired-post-actions.php';
 
 register_activation_hook( __FILE__, 'amp_activate' );
 function amp_activate() {
diff --git a/includes/options/class-amp-options-menu.php b/includes/options/class-amp-options-menu.php
index 50b725c5272..6acea40d8d6 100644
--- a/includes/options/class-amp-options-menu.php
+++ b/includes/options/class-amp-options-menu.php
@@ -1,16 +1,33 @@
 <?php
+/**
+ * AMP Options.
+ *
+ * @package AMP
+ */
 
-require_once( AMP__DIR__ . '/includes/options/class-amp-analytics-options-submenu.php' );
-require_once( AMP__DIR__ . '/includes/options/views/class-amp-options-manager.php' );
+// Includes.
+require_once AMP__DIR__ . '/includes/options/class-amp-analytics-options-submenu.php';
+require_once AMP__DIR__ . '/includes/options/views/class-amp-options-manager.php';
 
+/**
+ * AMP_Options_Menu class.
+ */
 class AMP_Options_Menu {
+
+	/**
+	 * Initialize.
+	 */
 	public function init() {
 		add_action( 'admin_post_amp_analytics_options', 'AMP_Options_Manager::handle_analytics_submit' );
 		add_action( 'admin_menu', array( $this, 'add_menu_items' ) );
 	}
 
+	/**
+	 * Add menu.
+	 */
 	public function add_menu_items() {
 		$submenu = new AMP_Analytics_Options_Submenu( AMP_Settings::MENU_SLUG );
 		$submenu->init( AMP_Settings::MENU_SLUG );
 	}
+
 }
diff --git a/includes/settings/class-amp-settings-post-types.php b/includes/settings/class-amp-settings-post-types.php
index 98843200b27..d2f818680e0 100644
--- a/includes/settings/class-amp-settings-post-types.php
+++ b/includes/settings/class-amp-settings-post-types.php
@@ -81,7 +81,7 @@ public function get_settings_value( $post_type = false ) {
 
 		if ( false !== $post_type ) {
 			// Always return true if the post type is always on.
-			if ( true == $this->is_always_on( $post_type ) ) {
+			if ( true === $this->is_always_on( $post_type ) ) {
 				return true;
 			}
 
@@ -108,7 +108,7 @@ public function get_supported_post_types() {
 		$core = get_post_types( array(
 			'name' => 'post',
 		), 'objects' );
-		$cpt = get_post_types( array(
+		$cpt  = get_post_types( array(
 			'public'   => true,
 			'_builtin' => false,
 		), 'objects' );
diff --git a/tests/test-class-amp-settings-post-types.php b/tests/test-class-amp-settings-post-types.php
index 84a99727ff4..c4f25b0112e 100644
--- a/tests/test-class-amp-settings-post-types.php
+++ b/tests/test-class-amp-settings-post-types.php
@@ -46,10 +46,10 @@ public function test_init() {
 	public function test_register_settings() {
 		global $wp_settings_sections, $wp_settings_fields;
 
-		$menu_slug = AMP_Settings::MENU_SLUG;
+		$menu_slug    = AMP_Settings::MENU_SLUG;
 		$option_group = AMP_Settings::SETTINGS_KEY;
-		$section_id = 'post_types';
-		$setting_id = 'post_types_support';
+		$section_id   = 'post_types';
+		$setting_id   = 'post_types_support';
 
 		$this->instance->register_settings();
 		$this->assertArrayHasKey( $menu_slug, $wp_settings_sections );

From d66bc621699fb475388624b81f777122e693835b Mon Sep 17 00:00:00 2001
From: ThierryA <thierry@getbeans.io>
Date: Thu, 23 Nov 2017 10:55:47 +0100
Subject: [PATCH 06/21] Move sanitization

---
 amp.php                                                 | 2 +-
 includes/settings/class-amp-settings-post-types.php     | 6 ++++--
 templates/admin/settings/fields/checkbox-post-types.php | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/amp.php b/amp.php
index 8a032d0d31e..5e9d6acd192 100644
--- a/amp.php
+++ b/amp.php
@@ -67,7 +67,7 @@ function amp_init() {
 	$post_types_supported = AMP_Settings_Post_Types::get_instance()->get_settings_value();
 
 	foreach ( $post_types_supported as $post_type_name => $enabled ) {
-		if ( true === $enabled ) {
+		if ( true === (bool) $enabled ) {
 			add_post_type_support( $post_type_name, AMP_QUERY_VAR );
 		}
 	}
diff --git a/includes/settings/class-amp-settings-post-types.php b/includes/settings/class-amp-settings-post-types.php
index d2f818680e0..0ce2050c861 100644
--- a/includes/settings/class-amp-settings-post-types.php
+++ b/includes/settings/class-amp-settings-post-types.php
@@ -73,6 +73,8 @@ public function register_settings() {
 	/**
 	 * Getter for settings value.
 	 *
+	 * The value(s) return are not sanitized.
+	 *
 	 * @param string $post_type The post type name.
 	 * @return bool|array Return true if the post type is always on; the setting value otherwise.
 	 */
@@ -86,7 +88,7 @@ public function get_settings_value( $post_type = false ) {
 			}
 
 			if ( isset( $settings[ $this->setting['id'] ][ $post_type ] ) ) {
-				return (bool) $settings[ $this->setting['id'] ][ $post_type ];
+				return $settings[ $this->setting['id'] ][ $post_type ];
 			}
 
 			return false;
@@ -96,7 +98,7 @@ public function get_settings_value( $post_type = false ) {
 			return array();
 		}
 
-		return array_map( 'boolval', $settings[ $this->setting['id'] ] );
+		return $settings[ $this->setting['id'] ];
 	}
 
 	/**
diff --git a/templates/admin/settings/fields/checkbox-post-types.php b/templates/admin/settings/fields/checkbox-post-types.php
index 76b17c4a63f..0bc1d8c0dde 100644
--- a/templates/admin/settings/fields/checkbox-post-types.php
+++ b/templates/admin/settings/fields/checkbox-post-types.php
@@ -13,7 +13,7 @@
 <fieldset>
 	<?php foreach ( $this->get_supported_post_types() as $post_type ) : ?>
 		<label>
-			<input type="checkbox" value="1" name="<?php echo esc_attr( $this->get_setting_name( $post_type->name ) ); ?>"<?php checked( true, $this->get_settings_value( $post_type->name ) ); ?><?php disabled( true, $this->is_always_on( $post_type->name ) ); ?>> <?php echo esc_html( $post_type->label ); ?>
+			<input type="checkbox" value="1" name="<?php echo esc_attr( $this->get_setting_name( $post_type->name ) ); ?>"<?php checked( true, (bool) $this->get_settings_value( $post_type->name ) ); ?><?php disabled( true, $this->is_always_on( $post_type->name ) ); ?>> <?php echo esc_html( $post_type->label ); ?>
 		</label>
 		<br>
 	<?php endforeach; ?>

From 99e7bcf23d619ba12be8878d3a80e5f824f5847c Mon Sep 17 00:00:00 2001
From: ThierryA <thierry@getbeans.io>
Date: Thu, 23 Nov 2017 12:32:28 +0100
Subject: [PATCH 07/21] Disable post type checkbox setting if AMP post type
 support is set

---
 amp.php                                       |  9 ----
 includes/amp-helper-functions.php             |  7 +++-
 .../class-amp-settings-post-types.php         | 42 +++----------------
 .../settings/fields/checkbox-post-types.php   |  2 +-
 tests/test-class-amp-settings-post-types.php  | 13 ------
 5 files changed, 11 insertions(+), 62 deletions(-)

diff --git a/amp.php b/amp.php
index 5e9d6acd192..56756588371 100644
--- a/amp.php
+++ b/amp.php
@@ -63,15 +63,6 @@ function amp_init() {
 	add_rewrite_endpoint( AMP_QUERY_VAR, EP_PERMALINK );
 	add_post_type_support( 'post', AMP_QUERY_VAR );
 
-	// Listen to post types settings.
-	$post_types_supported = AMP_Settings_Post_Types::get_instance()->get_settings_value();
-
-	foreach ( $post_types_supported as $post_type_name => $enabled ) {
-		if ( true === (bool) $enabled ) {
-			add_post_type_support( $post_type_name, AMP_QUERY_VAR );
-		}
-	}
-
 	add_filter( 'request', 'amp_force_query_var_value' );
 	add_action( 'wp', 'amp_maybe_add_actions' );
 
diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index d9c5d86ea93..62568471a31 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -18,8 +18,11 @@ function amp_get_permalink( $post_id ) {
 }
 
 function post_supports_amp( $post ) {
-	// Because `add_rewrite_endpoint` doesn't let us target specific post_types :(
-	if ( ! post_type_supports( $post->post_type, AMP_QUERY_VAR ) ) {
+	// Listen to post types settings.
+	$is_enabled_via_setting = (bool) AMP_Settings_Post_Types::get_instance()->get_settings_value( $post->post_type );
+
+	// Because `add_rewrite_endpoint` doesn't let us target specific post_types.
+	if ( ! post_type_supports( $post->post_type, AMP_QUERY_VAR ) && true !== $is_enabled_via_setting ) {
 		return false;
 	}
 
diff --git a/includes/settings/class-amp-settings-post-types.php b/includes/settings/class-amp-settings-post-types.php
index 0ce2050c861..b53b6c0727b 100644
--- a/includes/settings/class-amp-settings-post-types.php
+++ b/includes/settings/class-amp-settings-post-types.php
@@ -24,13 +24,6 @@ class AMP_Settings_Post_Types {
 	 */
 	protected $setting = array();
 
-	/**
-	 * List of post types which are always AMPlified.
-	 *
-	 * @var array
-	 */
-	protected $always_on = array( 'post' );
-
 	/**
 	 * Constructor.
 	 */
@@ -73,32 +66,17 @@ public function register_settings() {
 	/**
 	 * Getter for settings value.
 	 *
-	 * The value(s) return are not sanitized.
-	 *
 	 * @param string $post_type The post type name.
-	 * @return bool|array Return true if the post type is always on; the setting value otherwise.
+	 * @return bool Return the setting value.
 	 */
-	public function get_settings_value( $post_type = false ) {
+	public function get_settings_value( $post_type ) {
 		$settings = get_option( AMP_Settings::SETTINGS_KEY, array() );
 
-		if ( false !== $post_type ) {
-			// Always return true if the post type is always on.
-			if ( true === $this->is_always_on( $post_type ) ) {
-				return true;
-			}
-
-			if ( isset( $settings[ $this->setting['id'] ][ $post_type ] ) ) {
-				return $settings[ $this->setting['id'] ][ $post_type ];
-			}
-
-			return false;
+		if ( isset( $settings[ $this->setting['id'] ][ $post_type ] ) ) {
+			return (bool) $settings[ $this->setting['id'] ][ $post_type ];
 		}
 
-		if ( empty( $settings[ $this->setting['id'] ] ) || ! is_array( $settings[ $this->setting['id'] ] ) ) {
-			return array();
-		}
-
-		return $settings[ $this->setting['id'] ];
+		return false;
 	}
 
 	/**
@@ -130,16 +108,6 @@ public function get_setting_name( $post_type ) {
 		return AMP_Settings::SETTINGS_KEY . "[{$id}][{$post_type}]";
 	}
 
-	/**
-	 * Check if a post type is always on.
-	 *
-	 * @param string $post_type The post type name.
-	 * @return bool True if the post type is always on; false otherwise.
-	 */
-	public function is_always_on( $post_type ) {
-		return in_array( $post_type, $this->always_on, true );
-	}
-
 	/**
 	 * Setting renderer.
 	 */
diff --git a/templates/admin/settings/fields/checkbox-post-types.php b/templates/admin/settings/fields/checkbox-post-types.php
index 0bc1d8c0dde..e34166eb0ff 100644
--- a/templates/admin/settings/fields/checkbox-post-types.php
+++ b/templates/admin/settings/fields/checkbox-post-types.php
@@ -13,7 +13,7 @@
 <fieldset>
 	<?php foreach ( $this->get_supported_post_types() as $post_type ) : ?>
 		<label>
-			<input type="checkbox" value="1" name="<?php echo esc_attr( $this->get_setting_name( $post_type->name ) ); ?>"<?php checked( true, (bool) $this->get_settings_value( $post_type->name ) ); ?><?php disabled( true, $this->is_always_on( $post_type->name ) ); ?>> <?php echo esc_html( $post_type->label ); ?>
+			<input type="checkbox" value="1" name="<?php echo esc_attr( $this->get_setting_name( $post_type->name ) ); ?>"<?php checked( true, (bool) $this->get_settings_value( $post_type->name ) || post_type_supports( $post_type->name, AMP_QUERY_VAR ) ); ?><?php disabled( true, post_type_supports( $post_type->name, AMP_QUERY_VAR ) ); ?>> <?php echo esc_html( $post_type->label ); ?>
 		</label>
 		<br>
 	<?php endforeach; ?>
diff --git a/tests/test-class-amp-settings-post-types.php b/tests/test-class-amp-settings-post-types.php
index c4f25b0112e..725c334fdaa 100644
--- a/tests/test-class-amp-settings-post-types.php
+++ b/tests/test-class-amp-settings-post-types.php
@@ -80,8 +80,6 @@ public function test_register_settings() {
 	 * @see AMP_Settings_Post_Types::get_settings_value()
 	 */
 	public function test_get_settings_value() {
-		$this->assertEmpty( $this->instance->get_settings_value() );
-		$this->assertInternalType( 'array', $this->instance->get_settings_value() );
 		$this->assertFalse( $this->instance->get_settings_value( 'foo' ) );
 
 		update_option( AMP_Settings::SETTINGS_KEY, array(
@@ -90,8 +88,6 @@ public function test_get_settings_value() {
 			),
 		) );
 
-		$this->assertContains( 'post', $this->instance->get_settings_value() );
-		$this->assertInternalType( 'array', $this->instance->get_settings_value() );
 		$this->assertTrue( $this->instance->get_settings_value( 'post' ) );
 
 		// Cleanup.
@@ -117,15 +113,6 @@ public function test_get_setting_name() {
 		$this->assertEquals( AMP_Settings::SETTINGS_KEY . '[post_types_support][post]', $this->instance->get_setting_name( 'post' ) );
 	}
 
-	/**
-	 * Test is_always_on.
-	 *
-	 * @see AMP_Settings_Post_Types::is_always_on()
-	 */
-	public function test_is_always_on() {
-		$this->assertTrue( $this->instance->is_always_on( 'post' ) );
-	}
-
 	/**
 	 * Test render_setting.
 	 *

From 68c501708797d8afa6813a2a277e842771ac1e12 Mon Sep 17 00:00:00 2001
From: ThierryA <thierry@getbeans.io>
Date: Fri, 24 Nov 2017 14:44:28 +0100
Subject: [PATCH 08/21] Declare post type support based on the admin setting
 and allow overwrite

---
 amp.php                                       | 17 +++-
 includes/amp-helper-functions.php             |  7 +-
 includes/amp-post-types-support.php           | 35 +++++++
 .../class-amp-settings-post-types.php         | 96 ++++++++++++++++---
 includes/settings/class-amp-settings.php      |  6 ++
 .../settings/fields/checkbox-post-types.php   |  2 +-
 tests/test-amp-post-types-support.php         | 45 +++++++++
 tests/test-class-amp-settings-post-types.php  | 75 ++++++++++++---
 8 files changed, 250 insertions(+), 33 deletions(-)
 create mode 100644 includes/amp-post-types-support.php
 create mode 100644 tests/test-amp-post-types-support.php

diff --git a/amp.php b/amp.php
index 56756588371..0e08b153977 100644
--- a/amp.php
+++ b/amp.php
@@ -17,6 +17,7 @@
 
 require_once AMP__DIR__ . '/back-compat/back-compat.php';
 require_once AMP__DIR__ . '/includes/amp-helper-functions.php';
+require_once AMP__DIR__ . '/includes/amp-post-types-support.php';
 require_once AMP__DIR__ . '/includes/admin/functions.php';
 require_once AMP__DIR__ . '/includes/admin/class-amp-customizer.php';
 require_once AMP__DIR__ . '/includes/settings/class-amp-customizer-settings.php';
@@ -54,14 +55,11 @@ function amp_init() {
 		return;
 	}
 
-	define( 'AMP_QUERY_VAR', apply_filters( 'amp_query_var', 'amp' ) );
-
 	do_action( 'amp_init' );
 
 	load_plugin_textdomain( 'amp', false, plugin_basename( AMP__DIR__ ) . '/languages' );
 
 	add_rewrite_endpoint( AMP_QUERY_VAR, EP_PERMALINK );
-	add_post_type_support( 'post', AMP_QUERY_VAR );
 
 	add_filter( 'request', 'amp_force_query_var_value' );
 	add_action( 'wp', 'amp_maybe_add_actions' );
@@ -74,6 +72,19 @@ function amp_init() {
 	}
 }
 
+/**
+ * Define AMP query var.
+ *
+ * This function must be invoked through the 'after_setup_theme' action to allow
+ * the AMP setting to declare the post types support earlier than plugins/theme.
+ *
+ * @since 0.6
+ */
+function define_query_var() {
+	define( 'AMP_QUERY_VAR', apply_filters( 'amp_query_var', 'amp' ) );
+}
+add_action( 'after_setup_theme', 'define_query_var', 7 );
+
 // Make sure the `amp` query var has an explicit value.
 // Avoids issues when filtering the deprecated `query_string` hook.
 function amp_force_query_var_value( $query_vars ) {
diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index 62568471a31..8ba5cdcac00 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -18,11 +18,8 @@ function amp_get_permalink( $post_id ) {
 }
 
 function post_supports_amp( $post ) {
-	// Listen to post types settings.
-	$is_enabled_via_setting = (bool) AMP_Settings_Post_Types::get_instance()->get_settings_value( $post->post_type );
-
-	// Because `add_rewrite_endpoint` doesn't let us target specific post_types.
-	if ( ! post_type_supports( $post->post_type, AMP_QUERY_VAR ) && true !== $is_enabled_via_setting ) {
+	// Because `add_rewrite_endpoint` doesn't let us target specific post_types :(.
+	if ( ! post_type_supports( $post->post_type, AMP_QUERY_VAR ) ) {
 		return false;
 	}
 
diff --git a/includes/amp-post-types-support.php b/includes/amp-post-types-support.php
new file mode 100644
index 00000000000..3a5a8683d64
--- /dev/null
+++ b/includes/amp-post-types-support.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * AMP Post types support.
+ *
+ * @package AMP
+ * @since 0.6
+ */
+
+/**
+ * Declare core post types support.
+ *
+ * @since 0.6
+ */
+function amp_core_post_types_support() {
+	add_post_type_support( 'post', AMP_QUERY_VAR );
+}
+add_action( 'init', 'amp_core_post_types_support' );
+
+/**
+ * Declare custom post types support.
+ *
+ * This function should only be invoked through the 'after_setup_theme' action to
+ * allow plugins/theme to overwrite the post types support.
+ *
+ * @since 0.6
+ */
+function amp_custom_post_types_support() {
+	// Listen to post types settings.
+	foreach ( AMP_Settings_Post_Types::get_instance()->get_settings() as $post_type => $enabled ) {
+		if ( true === $enabled ) {
+			add_post_type_support( $post_type, AMP_QUERY_VAR );
+		}
+	}
+}
+add_action( 'after_setup_theme', 'amp_custom_post_types_support' );
diff --git a/includes/settings/class-amp-settings-post-types.php b/includes/settings/class-amp-settings-post-types.php
index b53b6c0727b..cf70b2c9d54 100644
--- a/includes/settings/class-amp-settings-post-types.php
+++ b/includes/settings/class-amp-settings-post-types.php
@@ -41,13 +41,18 @@ public function __construct() {
 	public function init() {
 		add_action( 'admin_init', array( $this, 'register_settings' ) );
 		add_action( 'update_option_' . AMP_Settings::SETTINGS_KEY, 'flush_rewrite_rules' );
+		add_action( 'amp_settings_screen', array( $this, 'errors' ) );
 	}
 
 	/**
 	 * Register the current page settings.
 	 */
 	public function register_settings() {
-		register_setting( AMP_Settings::SETTINGS_KEY, AMP_Settings::SETTINGS_KEY );
+		register_setting(
+			AMP_Settings::SETTINGS_KEY,
+			AMP_Settings::SETTINGS_KEY,
+			array( $this, 'validate' )
+		);
 		add_settings_section(
 			$this->section_id,
 			false,
@@ -57,7 +62,7 @@ public function register_settings() {
 		add_settings_field(
 			$this->setting['id'],
 			$this->setting['label'],
-			array( $this, 'render_setting' ),
+			array( $this, 'render' ),
 			AMP_Settings::MENU_SLUG,
 			$this->section_id
 		);
@@ -67,16 +72,24 @@ public function register_settings() {
 	 * Getter for settings value.
 	 *
 	 * @param string $post_type The post type name.
-	 * @return bool Return the setting value.
+	 * @return bool|array Return true if the post type is always on; the setting value otherwise.
 	 */
-	public function get_settings_value( $post_type ) {
-		$settings = get_option( AMP_Settings::SETTINGS_KEY, array() );
+	public function get_settings( $post_type = false ) {
+		$settings = $this->validate( get_option( AMP_Settings::SETTINGS_KEY, array() ) );
+
+		if ( false !== $post_type ) {
+			if ( isset( $settings[ $this->setting['id'] ][ $post_type ] ) ) {
+				return $settings[ $this->setting['id'] ][ $post_type ];
+			}
 
-		if ( isset( $settings[ $this->setting['id'] ][ $post_type ] ) ) {
-			return (bool) $settings[ $this->setting['id'] ][ $post_type ];
+			return false;
 		}
 
-		return false;
+		if ( empty( $settings[ $this->setting['id'] ] ) || ! is_array( $settings[ $this->setting['id'] ] ) ) {
+			return array();
+		}
+
+		return $settings[ $this->setting['id'] ];
 	}
 
 	/**
@@ -102,16 +115,77 @@ public function get_supported_post_types() {
 	 * @param string $post_type The post type name.
 	 * @return object The setting HTML input name attribute.
 	 */
-	public function get_setting_name( $post_type ) {
+	public function get_name_attribute( $post_type ) {
 		$id = $this->setting['id'];
-
 		return AMP_Settings::SETTINGS_KEY . "[{$id}][{$post_type}]";
 	}
 
+	/**
+	 * Check whether the post type should be disabled or not.
+	 *
+	 * Since we can't flag a post type which is not enabled by setting and removed by plugin/theme,
+	 * we can't disable the checkbox but the errors() takes care of this scenario.
+	 *
+	 * @param string $post_type The post type name.
+	 * @return bool True if disabled; false otherwise.
+	 */
+	public function disabled( $post_type ) {
+		$settings = $this->get_settings();
+
+		// Disable if post type support was not added by setting and added by plugin/theme.
+		if ( post_type_supports( $post_type, AMP_QUERY_VAR ) && ! isset( $settings[ $post_type ] ) ) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Handle errors.
+	 */
+	public function errors() {
+		$settings = $this->get_settings();
+
+		foreach ( $settings as $post_type => $value ) {
+			// Throw error if post type support was added by setting and removed by plugin/theme.
+			if ( true === $value && ! post_type_supports( $post_type, AMP_QUERY_VAR ) ) {
+				$post_type_object = get_post_type_object( $post_type );
+
+				add_settings_error(
+					$post_type,
+					$post_type,
+					sprintf(
+						/* Translators: %s: Post type name. */
+						__( '"%s" could not be activated because support was removed by a plugin or theme', 'amp' ),
+						isset( $post_type_object->label ) ? $post_type_object->label : $post_type
+					)
+				);
+			}
+		}
+	}
+
+	/**
+	 * Validate and sanitize the settings.
+	 *
+	 * @param array $settings The post types settings.
+	 * @return array The post types settings.
+	 */
+	public function validate( $settings ) {
+		if ( ! isset( $settings[ $this->setting['id'] ] ) || ! is_array( $settings[ $this->setting['id'] ] ) ) {
+			return array();
+		}
+
+		foreach ( $settings[ $this->setting['id'] ] as $key => $value ) {
+			$settings[ $this->setting['id'] ][ $key ] = (bool) $value;
+		}
+
+		return $settings;
+	}
+
 	/**
 	 * Setting renderer.
 	 */
-	public function render_setting() {
+	public function render() {
 		require_once AMP__DIR__ . '/templates/admin/settings/fields/checkbox-post-types.php';
 	}
 
diff --git a/includes/settings/class-amp-settings.php b/includes/settings/class-amp-settings.php
index 88c7db3eacd..2ee29c78444 100644
--- a/includes/settings/class-amp-settings.php
+++ b/includes/settings/class-amp-settings.php
@@ -63,6 +63,12 @@ public function render_screen() {
 			return;
 		}
 
+		/**
+		 * Fires before the AMP settings screen is rendered.
+		 *
+		 * @since 0.6
+		 */
+		do_action( 'amp_settings_screen' );
 		include_once AMP__DIR__ . '/templates/admin/settings/screen.php';
 	}
 
diff --git a/templates/admin/settings/fields/checkbox-post-types.php b/templates/admin/settings/fields/checkbox-post-types.php
index e34166eb0ff..4321dc80515 100644
--- a/templates/admin/settings/fields/checkbox-post-types.php
+++ b/templates/admin/settings/fields/checkbox-post-types.php
@@ -13,7 +13,7 @@
 <fieldset>
 	<?php foreach ( $this->get_supported_post_types() as $post_type ) : ?>
 		<label>
-			<input type="checkbox" value="1" name="<?php echo esc_attr( $this->get_setting_name( $post_type->name ) ); ?>"<?php checked( true, (bool) $this->get_settings_value( $post_type->name ) || post_type_supports( $post_type->name, AMP_QUERY_VAR ) ); ?><?php disabled( true, post_type_supports( $post_type->name, AMP_QUERY_VAR ) ); ?>> <?php echo esc_html( $post_type->label ); ?>
+			<input type="checkbox" value="1" name="<?php echo esc_attr( $this->get_name_attribute( $post_type->name ) ); ?>"<?php checked( true, post_type_supports( $post_type->name, AMP_QUERY_VAR ) ); ?><?php disabled( true, $this->disabled( $post_type->name ) ); ?>> <?php echo esc_html( $post_type->label ); ?>
 		</label>
 		<br>
 	<?php endforeach; ?>
diff --git a/tests/test-amp-post-types-support.php b/tests/test-amp-post-types-support.php
new file mode 100644
index 00000000000..e23c59be530
--- /dev/null
+++ b/tests/test-amp-post-types-support.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Tests for Post Types Support.
+ *
+ * @package AMP
+ * @since 0.6
+ */
+
+/**
+ * Tests for Post Types Support.
+ */
+class Test_AMP_Post_Types_Support extends WP_UnitTestCase {
+
+	/**
+	 * Test amp_core_post_types_support.
+	 *
+	 * @see amp_core_post_types_support()
+	 */
+	public function test_init() {
+		amp_core_post_types_support();
+		$this->assertTrue( post_type_supports( 'post', AMP_QUERY_VAR ) );
+		remove_post_type_support( 'post', AMP_QUERY_VAR );
+	}
+
+	/**
+	 * Test amp_custom_post_types_support.
+	 *
+	 * @see amp_custom_post_types_support()
+	 */
+	public function test_amp_custom_post_types_support() {
+		update_option( AMP_Settings::SETTINGS_KEY, array(
+			'post_types_support' => array(
+				'foo' => true,
+				'bar' => true,
+			),
+		) );
+		amp_custom_post_types_support();
+		$this->assertTrue( post_type_supports( 'foo', AMP_QUERY_VAR ) );
+		$this->assertTrue( post_type_supports( 'bar', AMP_QUERY_VAR ) );
+		delete_option( AMP_Settings::SETTINGS_KEY );
+		remove_post_type_support( 'foo', AMP_QUERY_VAR );
+		remove_post_type_support( 'bar', AMP_QUERY_VAR );
+	}
+
+}
diff --git a/tests/test-class-amp-settings-post-types.php b/tests/test-class-amp-settings-post-types.php
index 725c334fdaa..f87890cbb6c 100644
--- a/tests/test-class-amp-settings-post-types.php
+++ b/tests/test-class-amp-settings-post-types.php
@@ -75,12 +75,14 @@ public function test_register_settings() {
 	}
 
 	/**
-	 * Test get_settings_value.
+	 * Test get_value.
 	 *
-	 * @see AMP_Settings_Post_Types::get_settings_value()
+	 * @see AMP_Settings_Post_Types::get_settings()
 	 */
-	public function test_get_settings_value() {
-		$this->assertFalse( $this->instance->get_settings_value( 'foo' ) );
+	public function test_get_settings() {
+		$this->assertEmpty( $this->instance->get_settings() );
+		$this->assertInternalType( 'array', $this->instance->get_settings() );
+		$this->assertFalse( $this->instance->get_settings( 'foo' ) );
 
 		update_option( AMP_Settings::SETTINGS_KEY, array(
 			'post_types_support' => array(
@@ -88,7 +90,9 @@ public function test_get_settings_value() {
 			),
 		) );
 
-		$this->assertTrue( $this->instance->get_settings_value( 'post' ) );
+		$this->assertContains( 'post', $this->instance->get_settings() );
+		$this->assertInternalType( 'array', $this->instance->get_settings() );
+		$this->assertTrue( $this->instance->get_settings( 'post' ) );
 
 		// Cleanup.
 		delete_option( AMP_Settings::SETTINGS_KEY );
@@ -105,22 +109,67 @@ public function test_get_supported_post_types() {
 	}
 
 	/**
-	 * Test get_setting_name.
+	 * Test get_name_attribute.
 	 *
-	 * @see AMP_Settings_Post_Types::get_setting_name()
+	 * @see AMP_Settings_Post_Types::get_name_attribute()
 	 */
-	public function test_get_setting_name() {
-		$this->assertEquals( AMP_Settings::SETTINGS_KEY . '[post_types_support][post]', $this->instance->get_setting_name( 'post' ) );
+	public function test_get_name_attribute() {
+		$this->assertEquals( AMP_Settings::SETTINGS_KEY . '[post_types_support][post]', $this->instance->get_name_attribute( 'post' ) );
 	}
 
 	/**
-	 * Test render_setting.
+	 * Test disabled.
 	 *
-	 * @see AMP_Settings_Post_Types::render_setting()
+	 * @see AMP_Settings_Post_Types::disabled()
 	 */
-	public function test_render_setting() {
+	public function test_disabled() {
+		$this->assertFalse( $this->instance->disabled( 'foo' ) );
+		add_post_type_support( 'foo', AMP_QUERY_VAR );
+		$this->assertTrue( $this->instance->disabled( 'foo' ) );
+	}
+
+	/**
+	 * Test errors.
+	 *
+	 * @see AMP_Settings_Post_Types::errors()
+	 */
+	public function test_errors() {
+		update_option( AMP_Settings::SETTINGS_KEY, array(
+			'post_types_support' => array(
+				'foo' => true,
+			),
+		) );
+		remove_post_type_support( 'foo', AMP_QUERY_VAR );
+		$this->instance->errors();
+		$this->assertNotEmpty( get_settings_errors() );
+		delete_option( AMP_Settings::SETTINGS_KEY );
+	}
+
+	/**
+	 * Test validate.
+	 *
+	 * @see AMP_Settings_Post_Types::validate()
+	 */
+	public function test_validate() {
+		$this->assertInternalType( 'array', $this->instance->validate( array() ) );
+		update_option( AMP_Settings::SETTINGS_KEY, array(
+			'post_types_support' => array(
+				'foo' => true,
+			),
+		) );
+		$settings = $this->instance->validate( get_option( AMP_Settings::SETTINGS_KEY ) );
+		$this->assertInternalType( 'bool', $settings['post_types_support']['foo'] );
+		delete_option( AMP_Settings::SETTINGS_KEY );
+	}
+
+	/**
+	 * Test render.
+	 *
+	 * @see AMP_Settings_Post_Types::render()
+	 */
+	public function test_render() {
 		ob_start();
-		$this->instance->render_setting();
+		$this->instance->render();
 		$this->assertContains( '<fieldset>', ob_get_clean() );
 	}
 

From dcadc4faa8f6ab3ba9e621c949299cfee9a8a669 Mon Sep 17 00:00:00 2001
From: ThierryA <thierry@getbeans.io>
Date: Fri, 24 Nov 2017 15:09:37 +0100
Subject: [PATCH 09/21] Added missing since tag + minor code improvement

---
 includes/admin/functions.php                  |  1 +
 .../class-amp-settings-post-types.php         | 19 +++++++++++++++++--
 includes/settings/class-amp-settings.php      | 14 +++++++++++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/includes/admin/functions.php b/includes/admin/functions.php
index 4a2e7fba207..8155b44c865 100644
--- a/includes/admin/functions.php
+++ b/includes/admin/functions.php
@@ -90,6 +90,7 @@ function amp_add_options_menu() {
 	/**
 	 * Filter whether to enable the AMP settings.
 	 *
+	 * @since 0.5
 	 * @param bool $enable Whether to enable the AMP settings. Default true.
 	 */
 	$short_circuit = apply_filters( 'amp_options_menu_is_enabled', true );
diff --git a/includes/settings/class-amp-settings-post-types.php b/includes/settings/class-amp-settings-post-types.php
index cf70b2c9d54..a6ccbbc9f4e 100644
--- a/includes/settings/class-amp-settings-post-types.php
+++ b/includes/settings/class-amp-settings-post-types.php
@@ -3,16 +3,20 @@
  * Post types settings.
  *
  * @package AMP
+ * @since 0.6
  */
 
 /**
  * Settings post types class.
+ *
+ * @since 0.6
  */
 class AMP_Settings_Post_Types {
 
 	/**
 	 * Settings section id.
 	 *
+	 * @since 0.6
 	 * @var string
 	 */
 	protected $section_id = 'post_types';
@@ -20,6 +24,7 @@ class AMP_Settings_Post_Types {
 	/**
 	 * Settings config.
 	 *
+	 * @since 0.6
 	 * @var array
 	 */
 	protected $setting = array();
@@ -71,6 +76,7 @@ public function register_settings() {
 	/**
 	 * Getter for settings value.
 	 *
+	 * @since 0.6
 	 * @param string $post_type The post type name.
 	 * @return bool|array Return true if the post type is always on; the setting value otherwise.
 	 */
@@ -95,6 +101,7 @@ public function get_settings( $post_type = false ) {
 	/**
 	 * Getter for the supported post types.
 	 *
+	 * @since 0.6
 	 * @return object Supported post types list.
 	 */
 	public function get_supported_post_types() {
@@ -106,12 +113,13 @@ public function get_supported_post_types() {
 			'_builtin' => false,
 		), 'objects' );
 
-		return $core + $cpt;
+		return array_merge( $core, $cpt );
 	}
 
 	/**
 	 * Getter for the setting HTML input name attribute.
 	 *
+	 * @since 0.6
 	 * @param string $post_type The post type name.
 	 * @return object The setting HTML input name attribute.
 	 */
@@ -126,6 +134,7 @@ public function get_name_attribute( $post_type ) {
 	 * Since we can't flag a post type which is not enabled by setting and removed by plugin/theme,
 	 * we can't disable the checkbox but the errors() takes care of this scenario.
 	 *
+	 * @since 0.6
 	 * @param string $post_type The post type name.
 	 * @return bool True if disabled; false otherwise.
 	 */
@@ -142,6 +151,8 @@ public function disabled( $post_type ) {
 
 	/**
 	 * Handle errors.
+	 *
+	 * @since 0.6
 	 */
 	public function errors() {
 		$settings = $this->get_settings();
@@ -167,6 +178,7 @@ public function errors() {
 	/**
 	 * Validate and sanitize the settings.
 	 *
+	 * @since 0.6
 	 * @param array $settings The post types settings.
 	 * @return array The post types settings.
 	 */
@@ -184,6 +196,8 @@ public function validate( $settings ) {
 
 	/**
 	 * Setting renderer.
+	 *
+	 * @since 0.6
 	 */
 	public function render() {
 		require_once AMP__DIR__ . '/templates/admin/settings/fields/checkbox-post-types.php';
@@ -192,12 +206,13 @@ public function render() {
 	/**
 	 * Get the instance of AMP_Settings_Post_Types.
 	 *
+	 * @since 0.6
 	 * @return object $instance AMP_Settings_Post_Types instance.
 	 */
 	public static function get_instance() {
 		static $instance;
 
-		if ( ! $instance instanceof AMP_Settings_Post_Types ) {
+		if ( ! ( $instance instanceof AMP_Settings_Post_Types ) ) {
 			$instance = new AMP_Settings_Post_Types();
 		}
 
diff --git a/includes/settings/class-amp-settings.php b/includes/settings/class-amp-settings.php
index 2ee29c78444..ac1a97a009b 100644
--- a/includes/settings/class-amp-settings.php
+++ b/includes/settings/class-amp-settings.php
@@ -3,10 +3,13 @@
  * AMP Settings.
  *
  * @package AMP
+ * @since 0.6
  */
 
 /**
  * Settings class.
+ *
+ * @since 0.6
  */
 class AMP_Settings {
 
@@ -14,6 +17,7 @@ class AMP_Settings {
 	 * Menu slug.
 	 *
 	 * @const string
+	 * @since 0.6
 	 */
 	const MENU_SLUG = 'amp_settings';
 
@@ -21,11 +25,14 @@ class AMP_Settings {
 	 * Settings key.
 	 *
 	 * @const string
+	 * @since 0.6
 	 */
 	const SETTINGS_KEY = 'amp';
 
 	/**
 	 * Initialize.
+	 *
+	 * @since 0.6
 	 */
 	public function init() {
 		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
@@ -33,6 +40,8 @@ public function init() {
 
 	/**
 	 * Add admin menu.
+	 *
+	 * @since 0.6
 	 */
 	public function admin_menu() {
 		add_menu_page(
@@ -56,6 +65,7 @@ public function admin_menu() {
 	/**
 	 * Display Settings.
 	 *
+	 * @since 0.6
 	 * @return void Void on user capabilities check failure.
 	 */
 	public function render_screen() {
@@ -75,6 +85,7 @@ public function render_screen() {
 	/**
 	 * Getter for the AMP svg menu icon.
 	 *
+	 * @since 0.6
 	 * @return object The AMP svg menu icon.
 	 */
 	public function get_svg_icon() {
@@ -84,12 +95,13 @@ public function get_svg_icon() {
 	/**
 	 * Get the instance of AMP_Settings.
 	 *
+	 * @since 0.6
 	 * @return object $instance AMP_Settings instance.
 	 */
 	public static function get_instance() {
 		static $instance;
 
-		if ( ! $instance instanceof AMP_Settings ) {
+		if ( ! ( $instance instanceof AMP_Settings ) ) {
 			$instance = new AMP_Settings();
 		}
 

From cdf905837ccc3cda549b3813b280a429895f2e2b Mon Sep 17 00:00:00 2001
From: ThierryA <thierry@getbeans.io>
Date: Tue, 28 Nov 2017 10:27:52 +0100
Subject: [PATCH 10/21] AMP Settings code improvements

---
 amp.php                                                 | 8 +++++++-
 includes/amp-post-types-support.php                     | 2 +-
 templates/admin/settings/fields/checkbox-post-types.php | 2 +-
 templates/admin/settings/screen.php                     | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/amp.php b/amp.php
index 0e08b153977..ab9c236787f 100644
--- a/amp.php
+++ b/amp.php
@@ -81,9 +81,15 @@ function amp_init() {
  * @since 0.6
  */
 function define_query_var() {
+	/**
+	 * Filter the AMP query variable.
+	 *
+	 * @since 0.3.2
+	 * @param string $query_var The AMP query variable.
+	 */
 	define( 'AMP_QUERY_VAR', apply_filters( 'amp_query_var', 'amp' ) );
 }
-add_action( 'after_setup_theme', 'define_query_var', 7 );
+add_action( 'after_setup_theme', 'define_query_var', 3 );
 
 // Make sure the `amp` query var has an explicit value.
 // Avoids issues when filtering the deprecated `query_string` hook.
diff --git a/includes/amp-post-types-support.php b/includes/amp-post-types-support.php
index 3a5a8683d64..5cf7c522f46 100644
--- a/includes/amp-post-types-support.php
+++ b/includes/amp-post-types-support.php
@@ -32,4 +32,4 @@ function amp_custom_post_types_support() {
 		}
 	}
 }
-add_action( 'after_setup_theme', 'amp_custom_post_types_support' );
+add_action( 'after_setup_theme', 'amp_custom_post_types_support', 5 );
diff --git a/templates/admin/settings/fields/checkbox-post-types.php b/templates/admin/settings/fields/checkbox-post-types.php
index 4321dc80515..a8845bc3123 100644
--- a/templates/admin/settings/fields/checkbox-post-types.php
+++ b/templates/admin/settings/fields/checkbox-post-types.php
@@ -6,7 +6,7 @@
  */
 
 // Check referrer.
-if ( ! $this instanceof AMP_Settings_Post_Types ) {
+if ( ! ( $this instanceof AMP_Settings_Post_Types ) ) {
 	return;
 }
 ?>
diff --git a/templates/admin/settings/screen.php b/templates/admin/settings/screen.php
index 280bd88f8c9..fd1d8248f43 100644
--- a/templates/admin/settings/screen.php
+++ b/templates/admin/settings/screen.php
@@ -6,7 +6,7 @@
  */
 
 // Check referrer.
-if ( ! $this instanceof AMP_Settings ) {
+if ( ! ( $this instanceof AMP_Settings ) ) {
 	return;
 }
 ?>

From f6300624d84d1290215748ae92002c6de9f33725 Mon Sep 17 00:00:00 2001
From: ThierryA <thierry@getbeans.io>
Date: Sun, 3 Dec 2017 15:30:55 -0600
Subject: [PATCH 11/21] Modified AMP admin post type support error handling

---
 .../class-amp-settings-post-types.php         |  57 +-
 readme.md                                     | 851 ++++--------------
 .../settings/fields/checkbox-post-types.php   |   2 +-
 tests/test-class-amp-settings-post-types.php  |  16 +-
 4 files changed, 198 insertions(+), 728 deletions(-)

diff --git a/includes/settings/class-amp-settings-post-types.php b/includes/settings/class-amp-settings-post-types.php
index a6ccbbc9f4e..35469e1b53a 100644
--- a/includes/settings/class-amp-settings-post-types.php
+++ b/includes/settings/class-amp-settings-post-types.php
@@ -129,46 +129,45 @@ public function get_name_attribute( $post_type ) {
 	}
 
 	/**
-	 * Check whether the post type should be disabled or not.
-	 *
-	 * Since we can't flag a post type which is not enabled by setting and removed by plugin/theme,
-	 * we can't disable the checkbox but the errors() takes care of this scenario.
+	 * Handle errors.
 	 *
 	 * @since 0.6
-	 * @param string $post_type The post type name.
-	 * @return bool True if disabled; false otherwise.
 	 */
-	public function disabled( $post_type ) {
-		$settings = $this->get_settings();
+	public function errors() {
+		$on_update = (
+			isset( $_GET['settings-updated'] ) // WPCS: CSRF ok.
+			&&
+			! empty( (bool) wp_unslash( $_GET['settings-updated'] ) ) // WPCS: CSRF ok.
+		);
 
-		// Disable if post type support was not added by setting and added by plugin/theme.
-		if ( post_type_supports( $post_type, AMP_QUERY_VAR ) && ! isset( $settings[ $post_type ] ) ) {
-			return true;
+		// Only apply on update.
+		if ( ! $on_update ) {
+			return;
 		}
 
-		return false;
-	}
+		foreach ( $this->get_supported_post_types() as $post_type ) {
+			if ( ! isset( $post_type->name, $post_type->label ) ) {
+				continue;
+			}
 
-	/**
-	 * Handle errors.
-	 *
-	 * @since 0.6
-	 */
-	public function errors() {
-		$settings = $this->get_settings();
+			$post_type_support = post_type_supports( $post_type->name, AMP_QUERY_VAR );
+			$value             = $this->get_settings( $post_type->name );
 
-		foreach ( $settings as $post_type => $value ) {
-			// Throw error if post type support was added by setting and removed by plugin/theme.
-			if ( true === $value && ! post_type_supports( $post_type, AMP_QUERY_VAR ) ) {
-				$post_type_object = get_post_type_object( $post_type );
+			if ( true === $value && true !== $post_type_support ) {
+				/* Translators: %s: Post type name. */
+				$error = __( '"%s" could not be activated because support is removed by a plugin or theme', 'amp' );
+			} elseif ( empty( $value ) && true === $post_type_support ) {
+				/* Translators: %s: Post type name. */
+				$error = __( '"%s" could not be deactivated because support is added by a plugin or theme', 'amp' );
+			}
 
+			if ( isset( $error ) ) {
 				add_settings_error(
-					$post_type,
-					$post_type,
+					$post_type->name,
+					$post_type->name,
 					sprintf(
-						/* Translators: %s: Post type name. */
-						__( '"%s" could not be activated because support was removed by a plugin or theme', 'amp' ),
-						isset( $post_type_object->label ) ? $post_type_object->label : $post_type
+						$error,
+						$post_type->label
 					)
 				);
 			}
diff --git a/readme.md b/readme.md
index 92608c02aea..4225e1c809a 100644
--- a/readme.md
+++ b/readme.md
@@ -1,698 +1,175 @@
-# AMP for WordPress
+<!-- DO NOT EDIT THIS FILE; it is auto-generated from readme.txt -->
+# AMP
 
-## Overview
+Enable Accelerated Mobile Pages (AMP) on your WordPress site.
 
-This plugin adds support for the [Accelerated Mobile Pages](https://www.ampproject.org) (AMP) Project, which is an open source initiative that aims to provide mobile optimized content that can load instantly everywhere.
+**Contributors:** [batmoo](https://profiles.wordpress.org/batmoo), [joen](https://profiles.wordpress.org/joen), [automattic](https://profiles.wordpress.org/automattic), [potatomaster](https://profiles.wordpress.org/potatomaster), [albertomedina](https://profiles.wordpress.org/albertomedina)  
+**Tags:** [amp](https://wordpress.org/plugins/tags/amp), [mobile](https://wordpress.org/plugins/tags/mobile)  
+**Requires at least:** 4.7  
+**Tested up to:** 4.8  
+**Stable tag:** 0.5.1  
+**License:** [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)  
 
-With the plugin active, all posts on your site will have dynamically generated AMP-compatible versions, accessible by appending `/amp/` to the end your post URLs. For example, if your post URL is `http://example.com/2016/01/01/amp-on/`, you can access the AMP version at `http://example.com/2016/01/01/amp-on/amp/`. If you do not have [pretty permalinks](https://codex.wordpress.org/Using_Permalinks#mod_rewrite:_.22Pretty_Permalinks.22) enabled, you can do the same thing by appending `?amp=1`, i.e. `http://example.com/?p=123&amp=1`
-
-Note #1: that Pages and archives are not currently supported.
-
-Note #2: this plugin only creates AMP content but does not automatically display it to your users when they visit from a mobile device. That is handled by AMP consumers such as Google Search. For more details, see the [AMP Project FAQ](https://www.ampproject.org/docs/support/faqs.html).
-
-## Customization / Templating
-
-The plugin ships with a default template that looks nice and clean and we tried to find a good balance between ease and extensibility when it comes to customization.
-
-You can tweak small pieces of the template or the entire thing depending on your needs.
-
-### AMP Customizer
-
-The plugin ships with its own Customizer that you can use to tweak various parts of the default template like colors.
-
-#### Disabling the AMP Customizer
-
-If you're using a completely custom template, you may want to disable the AMP Customizer:
-
-```
-add_filter( 'amp_customizer_is_enabled', '__return_false' );
-``` 
-
-Note that this needs to be called before the `after_setup_theme` hook to work.
-
-### Where Do I Put My Code?
-
-The code snippets below and any other code-level customizations should happen in one of the following locations.
-
-If you're using an off-the-shelf theme (like from the WordPress.org Theme Directory):
-
-- A [child theme](https://developer.wordpress.org/themes/advanced-topics/child-themes/).
-- A custom plugin that you activate via the Dashboard.
-- A [mu-plugin](https://codex.wordpress.org/Must_Use_Plugins).
-
-If you're using a custom theme:
-
-- `functions.php` (or via a 'require' call to files that load from `functions.php`).
-- Any of the options above.
-
-### Theme Mods
-
-The default template will attempt to draw from various theme mods, such as site icon, if supported by the active theme.
-
-#### Site Icon
-
-If you add a site icon, we will automatically replace the WordPress logo in the template.
-
-If you'd prefer to do it via code:
-
-```php
-add_filter( 'amp_post_template_data', 'xyz_amp_set_site_icon_url' );
-
-function xyz_amp_set_site_icon_url( $data ) {
-	// Ideally a 32x32 image
-	$data[ 'site_icon_url' ] = get_stylesheet_directory_uri() . '/images/amp-site-icon.png';
-	return $data;
-}
-```
-
-#### Logo Only
-
-If you want to hide the site text and just show a logo, use the `amp_post_template_css` action. The following colors the title bar black, hides the site title, and replaces it with a centered logo:
-
-```php
-add_action( 'amp_post_template_css', 'xyz_amp_additional_css_styles' );
-
-function xyz_amp_additional_css_styles( $amp_template ) {
-	// only CSS here please...
-	?>
-	header.amp-wp-header {
-		padding: 12px 0;
-		background: #000;
-	}
-	header.amp-wp-header a {
-		background-image: url( 'https://example.com/path/to/logo.png' );
-		background-repeat: no-repeat;
-		background-size: contain;
-		display: block;
-		height: 28px;
-		width: 94px;
-		margin: 0 auto;
-		text-indent: -9999px;
-	}
-	<?php
-}
-```
-
-Note: you will need to adjust the colors and sizes based on your brand.
-
-### Template Tweaks
-
-You can tweak various parts of the template via code.
-
-#### Featured Image
-
-The default template displays the featured image. If you don't want to display the featured image in your amp page, use the following code:
-
-```php
-add_filter( 'amp_post_template_data', 'xyz_amp_remove_featured_image' );
-
-function xyz_amp_remove_featured_image( $data ) {
-    $data['featured_image'] = false;
-    return $data;
-}
-```
-
-#### Content Width
-
-By default, your theme's `$content_width` value will be used to determine the size of the `amp` content well. You can change this:
-
-```php
-add_filter( 'amp_content_max_width', 'xyz_amp_change_content_width' );
-
-function xyz_amp_change_content_width( $content_max_width ) {
-	return 1200;
-}
-```
-
-#### Template Data
-
-Use the `amp_post_template_data` filter to override default template data. The following changes the placeholder image used for iframes to a file located in the current theme:
-
-```php
-add_filter( 'amp_post_template_data', 'xyz_amp_set_custom_placeholder_image' );
-
-function xyz_set_custom_placeholder_image( $data ) {
-	$data[ 'placeholder_image_url' ] = get_stylesheet_directory_uri() . '/images/amp-iframe-placeholder.png';
-	return $data;
-}
-```
-
-Note: The path must pass the default criteria set out by [`validate_file`](https://developer.wordpress.org/reference/functions/validate_file/) and must be somewhere in a subfolder of `WP_CONTENT_DIR`.
-
-#### Schema.org (JSON) Metadata
-
-The plugin adds some default metadata to enable ["Rich Snippet" support](https://developers.google.com/structured-data/rich-snippets/articles). You can modify this using the `amp_post_template_metadata` filter. The following changes the type annotation to `NewsArticle` (from the default `BlogPosting`) and overrides the default Publisher Logo.
-
-```php
-add_filter( 'amp_post_template_metadata', 'xyz_amp_modify_json_metadata', 10, 2 );
-
-function xyz_amp_modify_json_metadata( $metadata, $post ) {
-	$metadata['@type'] = 'NewsArticle';
-
-	$metadata['publisher']['logo'] = array(
-		'@type' => 'ImageObject',
-		'url' => get_template_directory_uri() . '/images/my-amp-metadata-logo.png',
-		'height' => 60,
-		'width' => 600,
-	);
-
-	return $metadata;
-}
-```
-
-#### Template Meta (Author, Date, etc.)
-
-For the meta section of the template (i.e. author, date, taxonomies, etc.), you can override templates for the existing sections, remove them, add new ones.
+[![Build Status](https://travis-ci.org/Automattic/amp-wp.svg?branch=master)](https://travis-ci.org/Automattic/amp-wp) 
 
-##### Example: Override Author Template from Theme
-
-Create a folder in your theme called `amp` and add a file called `meta-author.php` with the following:
-
-```php
-<li class="xyz-byline">
-	<span>Anonymous</span>
-</li>
-```
-
-Replace the contents, as needed.
-
-##### Example: Override Taxonomy Template via filter
-
-This will load the file `t/meta-custom-tax.php` for the `taxonomy` section:
-
-```php
-add_filter( 'amp_post_template_file', 'xyz_amp_set_custom_tax_meta_template', 10, 3 );
-
-function xyz_amp_set_custom_tax_meta_template( $file, $type, $post ) {
-	if ( 'meta-taxonomy' === $type ) {
-		$file = dirname( __FILE__ ) . '/t/meta-custom-tax.php';
-	}
-	return $file;
-}
-```
-
-In `t/meta-custom-tax.php`, you can add something like the following to replace the default category and tags with your custom `author` taxonomy:
-
-```php
-<li class="xyz-tax-authors">
-	<?php echo get_the_term_list( $this->get( 'post_id' ), 'xyz-author', '', ', ' ); ?>
-</li>
-```
-
-##### Example: Remove Author from `header_meta`
-
-This will completely remove the author section:
-
-```php
-add_filter( 'amp_post_article_header_meta', 'xyz_amp_remove_author_meta' );
-
-function xyz_amp_remove_author_meta( $meta_parts ) {
-	foreach ( array_keys( $meta_parts, 'meta-author', true ) as $key ) {
-		unset( $meta_parts[ $key ] );
-	}
-	return $meta_parts;
-}
-```
-
-##### Example: Add Comment Count to `footer_meta`
-
-This adds a new section to display the comment count:
-
-```php
-add_filter( 'amp_post_article_footer_meta', 'xyz_amp_add_comment_count_meta' );
-
-function xyz_amp_add_comment_count_meta( $meta_parts ) {
-	$meta_parts[] = 'xyz-meta-comment-count';
-	return $meta_parts;
-}
-
-add_filter( 'amp_post_template_file', 'xyz_amp_set_comment_count_meta_path', 10, 3 );
-
-function xyz_amp_set_comment_count_meta_path( $file, $type, $post ) {
-	if ( 'xyz-meta-comment-count' === $type ) {
-		$file = dirname( __FILE__ ) . '/templates/xyz-meta-comment-count.php';
-	}
-	return $file;
-}
-```
-
-Then, in `templates/xyz-meta-comment-count.php`:
-
-```php
-<li>
-	<?php printf( _n( '%d comment', '%d comments', $this->get( 'post' )->comment_count, 'xyz-text-domain' ) ); ?>
-</li>
-```
-
-#### Custom CSS
-
-##### Rule Additions
-
-If you want to append to the existing CSS rules (e.g. styles for a custom embed handler), you can use the `amp_post_template_css` action:
-
-```php
-add_action( 'amp_post_template_css', 'xyz_amp_my_additional_css_styles' );
-
-function xyz_amp_my_additional_css_styles( $amp_template ) {
-	// only CSS here please...
-	?>
-	.amp-wp-byline amp-img {
-		border-radius: 0; /* we don't want round avatars! */
-	}
-	.my-custom-class {
-		color: blue;
-	}
-	<?php
-}
-```
+## Description ##
 
-##### Completely Override CSS
-
-If you'd prefer to use your own styles, you can either:
-
-- Create a folder in your theme called `amp` and add a file called `style.php` with your custom CSS.
-- Specify a custom template using the `amp_post_template_file` filter for `'style' === $type`. See the "Override" examples in the "Meta" section for examples.
-
-Note: the file should only include CSS, not the `<style>` opening and closing tag.
-
-#### Head and Footer
-
-If you want to add stuff to the head or footer of the default AMP template, use the `amp_post_template_head` and `amp_post_template_footer` actions.
-
-```php
-add_action( 'amp_post_template_footer', 'xyz_amp_add_pixel' );
-
-function xyz_amp_add_pixel( $amp_template ) {
-	$post_id = $amp_template->get( 'post_id' );
-	?>
-	<amp-pixel src="https://example.com/hi.gif?x=RANDOM"></amp-pixel>
-	<?php
-}
-```
-
-#### AMP Endpoint
-
-If you don't want to use the default `/amp` endpoint, use the `amp_query_var` filter to change it to anything else.
-
-```php
-add_filter( 'amp_query_var' , 'xyz_amp_change_endpoint' );
-
-function xyz_amp_change_endpoint( $amp_endpoint ) {
-	return 'foo';
-}
-```
-
-### Custom Template
-
-If you want complete control over the look and feel of your AMP content, you can override the default template using the `amp_post_template_file` filter and pass it the path to a custom template:
-
-```php
-add_filter( 'amp_post_template_file', 'xyz_amp_set_custom_template', 10, 3 );
-
-function xyz_amp_set_custom_template( $file, $type, $post ) {
-	if ( 'single' === $type ) {
-		$file = dirname( __FILE__ ) . '/templates/my-amp-template.php';
-	}
-	return $file;
-}
-```
-
-Note: there are some requirements for a custom template:
-
-* You must trigger the `amp_post_template_head` action in the `<head>` section:
-
-```php
-do_action( 'amp_post_template_head', $this );
-```
-
-* You must trigger the `amp_post_template_footer` action right before the `</body>` tag:
-
-```php
-do_action( 'amp_post_template_footer', $this );
-```
-
-* Within your `amp-custom` `style` tags, you must trigger the `amp_post_template_css` action:
-
-```php
-do_action( 'amp_post_template_css', $this );
-```
-
-* You must include [all required mark-up](https://www.ampproject.org/docs/get_started/create/basic_markup.html) that isn't already output via the `amp_post_template_head` action.
-
-## Handling Media
-
-By default, the plugin attempts to gracefully handle the following media elements in your content:
-
-- images (converted from `img` => `amp-img` or `amp-anim`)
-- videos (converted from `video` => `amp-video`; Note: Flash is not supported)
-- audio (converted from `audio` => `amp-audio`)
-- iframes (converted from `iframes` => `amp-iframes`)
-- YouTube, Instagram, Twitter, and Vine oEmbeds and shortcodes (converted from the embed to the matching `amp-` component)
-
-For additional media content such as custom shortcodes, oEmbeds or manually inserted embeds, ads, etc. there are several customization options available and outlined below.
-
-### Do Nothing
-
-If your embeds/media use standard iframes, you can choose to do nothing and let the plugin handle things. They should "just work" in most cases.
-
-### `the_content` filter
-
-All existing hooks on `the_content` will continue to work. This can be a good or bad thing. Good, because existing plugin integrations will continue to work. Bad, because not all added content may make sense in an AMP context.
-
-You can add additional callbacks to `the_content` filter to output additional content as needed. Use the `is_amp_endpoint()` function to check if an AMP version of a post is being viewed. However, we recommend using an Embed Handler instead.
-
-Caveat: with this method, if you add a custom component that requires inclusion of a script, you will need to add that script manually to the template using the `amp_post_template_head` action.
-
-### Update Existing Shortcodes
-
-In your existing shortcode or oEmbed callbacks, you can branch using the `is_amp_endpoint()` and output customized content for AMP content.
-
-The same caveat about scripts for custom AMP components applies.
-
-### Custom Embed Handler
-
-Embed Handlers are helper classes to inject AMP-specific content for your oEmbeds and shortcodes.
-
-Embed Handlers register the embeds they handle using standard WordPress functions such as `add_shortcode`. For working examples, check out the existing implementations for Instagram, Twitter, etc. as guides to build your own.
-
-While the primary purpose of Embed Handlers is for use with embeds, you can use them for adding AMP-specific `the_content` callbacks as well.
-
-#### Step 1: Build the Embed Handler
-
-Your Embed Handler class needs to extend the `AMP_Base_Embed_Handler` class.
-
-Note: make sure to set proper priorities or remove existing callbacks for your regular content.
-
-In `classes/class-amp-related-posts-embed.php`:
-
-```php
-class XYZ_AMP_Related_Posts_Embed extends AMP_Base_Embed_Handler {
-	public function register_embed() {
-		// If we have an existing callback we are overriding, remove it.
-		remove_filter( 'the_content', 'xyz_add_related_posts' );
-
-		// Add our new callback
-		add_filter( 'the_content', array( $this, 'add_related_posts' ) );
-	}
-
-	public function unregister_embed() {
-		// Let's clean up after ourselves, just in case.
-		add_filter( 'the_content', 'xyz_add_related_posts' );
-		remove_filter( 'the_content', array( $this, 'add_related_posts' ) );
-	}
-
-	public function get_scripts() {
-        return array(
-            'amp-mustache' => 'https://cdn.ampproject.org/v0/amp-mustache-0.1.js',
-            'amp-list' => 'https://cdn.ampproject.org/v0/amp-list-0.1.js',
-        );
-	}
-
-	public function add_related_posts( $content ) {
-		// See https://github.com/ampproject/amphtml/blob/master/extensions/amp-list/amp-list.md for details on amp-list
-		$related_posts_list = '
-<amp-list src="https://data.com/articles.json?ref=CANONICAL_URL" width=300 height=200 layout=responsive>
-	<template type="amp-mustache">
-		<div>
-			<amp-img src="{{imageUrl}}" width=50 height=50></amp-img>
-			{{title}}
-		</div>
-	</template>
-	<div overflow role=button aria-label="Show more" class="list-overflow">
-		Show more
-	</div>
-</amp-list>';
-
-		$content .= $related_posts_list;
-
-		return $content;
-	}
-}
-```
-
-#### Step 2: Load the Embed Handler
-
-```php
-add_filter( 'amp_content_embed_handlers', 'xyz_amp_add_related_embed', 10, 2 );
-
-function xyz_amp_add_related_embed( $embed_handler_classes, $post ) {
-	require_once( dirname( __FILE__ ) . '/classes/class-amp-related-posts-embed.php' );
-	$embed_handler_classes[ 'XYZ_AMP_Related_Posts_Embed' ] = array();
-	return $embed_handler_classes;
-}
-```
-
-### Custom Sanitizer
-
-The name "sanitizer" is a bit of a misnomer. These are primarily used internally in the plugin to make your site's content compatible with the amp spec. This involves stripping unsupported tags and attributes and transforming media elements to their matching amp version (e.g. `img` => `amp-img`).
-
-Sanitizers are pretty versatile and, unlike Embed Handlers -- which work with HTML content as a string -- they can be used to manipulate your post's AMP content using [PHP's `DOM` library](http://php.net/manual/en/book.dom.php). We've included an example that shows you how to use a custom sanitizer to inject ads into your content. You can, of course, do many other things such as add related content.
-
-#### Step 1: Build the Sanitizer
-
-Your sanitizer needs to extend the `AMP_Base_Sanitizer`. In `classes/class-ad-inject-sanitizer.php`:
-
-```php
-class XYZ_AMP_Ad_Injection_Sanitizer extends AMP_Base_Sanitizer {
-	public function sanitize() {
-		$body = $this->get_body_node();
-
-		// Build our amp-ad tag
-		$ad_node = AMP_DOM_Utils::create_node( $this->dom, 'amp-ad', array(
-			// Taken from example at https://github.com/ampproject/amphtml/blob/master/builtins/amp-ad.md
-			'width' => 300,
-			'height' => 250,
-			'type' => 'a9',
-			'data-aax_size' => '300x250',
-			'data-aax_pubname' => 'test123',
-			'data-aax_src' => '302',
-		) );
-
-		// Add a placeholder to show while loading
-		$fallback_node = AMP_DOM_Utils::create_node( $this->dom, 'amp-img', array(
-			'placeholder' => '',
-			'layout' => 'fill',
-			'src' => 'https://placehold.it/300X250',
-		) );
-		$ad_node->appendChild( $fallback_node );
-
-		// If we have a lot of paragraphs, insert before the 4th one.
-		// Otherwise, add it to the end.
-		$p_nodes = $body->getElementsByTagName( 'p' );
-		if ( $p_nodes->length > 6 ) {
-			$p_nodes->item( 4 )->parentNode->insertBefore( $ad_node, $p_nodes->item( 4 ));
-		} else {
-			$body->appendChild( $ad_node );
-		}
-	}
-}
-```
-
-#### Step 2: Load the Sanitizer
-
-```php
-add_filter( 'amp_content_sanitizers', 'xyz_amp_add_ad_sanitizer', 10, 2 );
-
-function xyz_amp_add_ad_sanitizer( $sanitizer_classes, $post ) {
-	require_once( dirname( __FILE__ ) . '/classes/class-ad-inject-sanitizer.php' );
-	$sanitizer_classes[ 'XYZ_AMP_Ad_Injection_Sanitizer' ] = array(); // the array can be used to pass args to your sanitizer and accessed within the class via `$this->args`
-	return $sanitizer_classes;
-}
-```
-
-## Extracting Image Dimensions
-
-AMP requires images to have width and height attributes. When these attributes aren't present in an image tag, AMP-WP will
-attempt to determine them for the image.
-
-### Extraction Methods
-
-#### Concurrent Dimension Extraction - PHP 5.3+ and cURL
-If you're using PHP 5.3+ and have the cURL extension installed, AMP-WP will attempt to determine dimensions for all images
-that need them concurrently. Only the minimum number of bytes required to determine the dimensions for a given image type
-are retrieved. Dimensions are then cached via transients for subsequent requests. This is the fastest and therefore recommended method.
-#### Sequential Dimension Extraction - PHP 5.2 or no cURL
-If you're using PHP 5.2 or do not have the cURL extension installed, AMP-WP will attempt to determine image dimensions
-sequentially. Only the minimum number of bytes required to determine the dimensions for a given image type are retrieved,
-but the time it takes to retrieve each image's dimensions sequentially can still add up. Dimensions are then cached via transients for subsequent requests.
-#### Custom Dimension Extraction
-You can implement your own image dimension extraction method by adding a callback to the **amp_extract_image_dimensions_batch** filter.
-
-amp_extract_image_dimensions_batch callback functions take a single argument, *$dimensions* by convention, which is a map/array of image urls to either an array containing the
-dimensions of the image at the url (if another callback for the filter was able to determine them), or false if the dimensions have yet to be determined, e.g.
-
-```php
-array(
-    'http://i0.wp.com/placehold.it/350x150.png' => array(
-        'width' => 350,
-        'height' => 150,
-     ),
-     'http://i0.wp.com/placehold.it/1024x768.png' => false,
-);
-```
-Your custom dimension extraction callback would iterate through the mappings contained in this single argument, determining
-dimensions via your custom method for all image url keys whose values are not arrays of dimensions, e.g.
-```php
-function my_custom_dimension_extraction_callback( $dimensions ) {
-    foreach ( $dimensions as $url => $value ) {
-        // Skip if dimensions have already been determined for this image.
-        if ( is_array( $value ) ) {
-            continue;                
-        }
-        $width = <YOUR CUSTOM CODE TO DETERMINE WIDTH>
-        $height = <YOUR CUSTOM CODE TO DETERMINE HEIGHT>
-        $dimensions[ $url ] = array(
-            'width' => $width,
-            'height' => $height,
-         );
-    }
-
-    return $dimensions;
-```
-Your callback needs to return $dimensions so that the value either cascades to the next callback that was added to the *amp_extract_image_dimensions_batch* filter or is
-returned to the apply_filter() call (if there are no more unprocessed callbacks).
-
-The default callback provided by WP-AMP described above, *extract_by_downloading_images*, will fire unless explicitly removed, so be sure
-to remove it from the callback chain if you don't want it to, e.g.
-
-```php
-	remove_filter( 'amp_extract_image_dimensions_batch', array( 'AMP_Image_Dimension_Extractor', 'extract_by_downloading_images' ), 999, 1 );
-````
-
-**Note that if you previously added a custom dimension extraction callback to the *amp_extract_image_dimensions* filter,
-you need to update it to hook into the *amp_extract_image_dimensions_batch* filter instead and iterate over the key value
-pairs in the single argument as per the example above.**
-
-## Analytics
-
-There are two options you can follow to include analytics tags in your posts.
-
-### Plugin Analytics Options
-
-The plugin defines an analytics option to enable the addition of
-[amp-analytics](https://www.ampproject.org/docs/reference/components/amp-analytics) in your posts. When the plugin is
- active, an AMP top-level menu appears in the Dashboard with one inner sub-menu called 'Analytics':
-
- ![AMP Options Menu](https://github.com/Automattic/amp-wp/blob/amedina/amp-analytics-customizer/readme-assets/amp-options-analytics.png)
-
- Selecting the `Analytics` sub-menu in the AMP options menu takes us to an Analytics Options entry page, where we can
-  define the analytics tags we want to have, by specifying the vendor type (e.g. Parsely), and the associated  JSON 
-  configuration.
-
- ![AMP Options Menu](https://github.com/Automattic/amp-wp/blob/amedina/amp-analytics-customizer/readme-assets/analytics-option-entries.png)
-
-Notice that the goal of this option of the plugin is to provide a simple mechanism to insert analytics tags;
- it provides very simple validation based solely on the validity of the JSON string provided. It is the users 
- responsibility to make sure that the values in the configuration string and the vendor type used are coherent with 
- the analytics requirements of their site . Please review the documentation in the [AMP project ](https://github.com/ampproject/amphtml/blob/master/extensions/amp-analytics/amp-analytics.md) and in [AMPByExample](https://ampbyexample.com/components/amp-analytics/).
- 
- The AMP Analytics options entry form provides a very simple validation feedback mechanism: if the JSON configuration 
- string entered is invalid (i.e. not valid  JSON), an error message (in red) is displayed below the title of the 
- options window and the entry form is reloaded:
-    
-![AMP Options Menu](https://github.com/Automattic/amp-wp/blob/amedina/amp-analytics-customizer/readme-assets/invalid-input.png)
-    
-And, if the configuration provided is actually a valid JSON string, a success message (in green) is displayed at the 
-top of the window below the title, and again the entry form is reloaded. 
-
-![AMP Options Menu](https://github.com/Automattic/amp-wp/blob/amedina/amp-analytics-customizer/readme-assets/options-saved.png)
-
-### Manually
-
-Alaternatively, you can use the `amp_post_template_analytics` filter:
-
-```php
-add_filter( 'amp_post_template_analytics', 'xyz_amp_add_custom_analytics' );
-function xyz_amp_add_custom_analytics( $analytics ) {
-	if ( ! is_array( $analytics ) ) {
-		$analytics = array();
-	}
-
-	// https://developers.google.com/analytics/devguides/collection/amp-analytics/
-	$analytics['xyz-googleanalytics'] = array(
-		'type' => 'googleanalytics',
-		'attributes' => array(
-			// 'data-credentials' => 'include',
-		),
-		'config_data' => array(
-			'vars' => array(
-				'account' => "UA-XXXXX-Y"
-			),
-			'triggers' => array(
-				'trackPageview' => array(
-					'on' => 'visible',
-					'request' => 'pageview',
-				),
-			),
-		),
-	);
-
-	// https://www.parsely.com/docs/integration/tracking/google-amp.html
-	$analytics['xyz-parsely'] = array(
-		'type' => 'parsely',
-		'attributes' => array(),
-		'config_data' => array(
-			'vars' => array(
-				'apikey' => 'YOUR APIKEY GOES HERE',
-			)
-		),
-	);
-
-	return $analytics;
-}
-```
-
-Each analytics entry must include a unique array key and the following attributes:
-
-- `type`: `(string)` one of the [valid vendors](https://github.com/ampproject/amphtml/blob/master/extensions/amp-analytics/amp-analytics.md#analytics-vendors) for amp-analytics.
-- `attributes`: `(array)` any [additional valid  attributes](https://github.com/ampproject/amphtml/blob/master/extensions/amp-analytics/amp-analytics.md#attributes) to add to the `amp-analytics` element.
-- `config_data`: `(array)` the [config data](https://github.com/ampproject/amphtml/blob/master/extensions/amp-analytics/amp-analytics.md#configuration) to include in the `amp-analytics` script tag. This is `json_encode`-d on output.
-
-## Custom Post Type Support
-
-By default, the plugin only creates AMP content for posts. You can add support for other post_types using the post_type parameter used when registering the custom post type (assume our post_type is `xyz-review`):
-
-```php
-add_action( 'amp_init', 'xyz_amp_add_review_cpt' );
-function xyz_amp_add_review_cpt() {
-	add_post_type_support( 'xyz-review', AMP_QUERY_VAR );
-}
-```
-
-You'll need to flush your rewrite rules after this.
-
-If you want a custom template for your post type:
-
-```php
-add_filter( 'amp_post_template_file', 'xyz_amp_set_review_template', 10, 3 );
-
-function xyz_amp_set_review_template( $file, $type, $post ) {
-	if ( 'single' === $type && 'xyz-review' === $post->post_type ) {
-		$file = dirname( __FILE__ ) . '/templates/my-amp-review-template.php';
-	}
-	return $file;
-}
-```
-
-We may provide better ways to handle this in the future.
-
-## Plugin integrations
-
-### Jetpack
-
-Jetpack integration is baked in. More support for things like Related Posts to come.
-
-### Parse.ly
-
-[Parse.ly's WordPress plugin](https://wordpress.org/plugins/wp-parsely/) automatically tracks AMP pages when enabled along with this plugin.
+This plugin adds support for the [Accelerated Mobile Pages](https://www.ampproject.org) (AMP) Project, which is an an open source initiative that aims to provide mobile optimized content that can load instantly everywhere.
 
+With the plugin active, all posts on your site will have dynamically generated AMP-compatible versions, accessible by appending `/amp/` to the end your post URLs. For example, if your post URL is `http://example.com/2016/01/01/amp-on/`, you can access the AMP version at `http://example.com/2016/01/01/amp-on/amp/`. If you do not have [pretty permalinks](https://codex.wordpress.org/Using_Permalinks#mod_rewrite:_.22Pretty_Permalinks.22) enabled, you can do the same thing by appending `?amp=1`, i.e. `http://example.com/?p=123&amp=1`
 
-### Yoast SEO
+Note #1: that Pages and archives are not currently supported. Pages support is being worked on.
 
-If you're using [Yoast SEO](https://wordpress.org/plugins/wordpress-seo/), check out the companion plugin here: https://github.com/Yoast/yoastseo-amp
+Note #2: this plugin only creates AMP content but does not automatically display it to your users when they visit from a mobile device. That is handled by AMP consumers such as Google Search. For more details, see the [AMP Project FAQ](https://www.ampproject.org/docs/support/faqs.html).
 
-## Compatibility Issues
+Follow along with or contribute to the development of this plugin at https://github.com/Automattic/amp-wp
+
+## Installation ##
+
+1. Upload the folder to the `/wp-content/plugins/` directory
+1. Activate the plugin through the 'Plugins' menu in WordPress
+1. You may need to refresh your permalinks by going to `Settings > Permalinks` and tapping the `Save` button.
+
+## Frequently Asked Questions ##
+
+### How do I customize the AMP output for my site? ###
+You can tweak a few things like colors from the AMP Customizer. From the Dashboard, go to `Appearance > AMP`.
+
+For deeper level customizations, please see the readme at https://github.com/Automattic/amp-wp/blob/master/readme.md
+
+### What about ads and shortcodes and such? ###
+Check out https://github.com/Automattic/amp-wp/blob/master/readme.md#handling-media
+
+### What about analytics? ###
+Many plugins are adding AMP support already. If you handling analytics yourself, please see https://github.com/Automattic/amp-wp/blob/master/readme.md#analytics
+
+### Google Webmaster Tools is reporting validation errors for my site. How do I fix them? ###
+The best place to start is to open a new discussion in the [support forum](https://wordpress.org/support/plugin/amp) with details on what the specific validation error is.
+
+### Why aren't Pages supported yet ###
+A wise green Yoda once said, "Patience you must have, my young padawan." We're working on it :)
+
+
+## Changelog ##
+
+### 0.5.1 (2017-08-17) ###
+- Fix: issues with invalid tags not being stripped out (e.g. script tags) (h/t tmmbecker, fahmi182, pppdog, seejacobscott, RavanH, jenniejj, lkraav, simonrperry for the reports).
+- Fix: issues with dimension extraction for protocol-less and relative URLs (h/t ktmn for the report).
+
+### 0.5 (2017-08-04) ###
+- Whitelist Sanitizer: Replace Blacklist Sanitizer with a whitelist-based approach using the AMP spec (props delputnam)
+- Image Dimensions: Replace fastimage with fasterimage for PHP 5.4+. Enables faster downloads and wider support (props gititon)
+- Embed Handlers: Added support for Vimeo, SoundCloud, Pinterest (props amedina) and PlayBuzz (props lysk88)
+- Analytics: UI for easier addition of analytics tags (props amedina)
+- Fix: parse query strings properly (props amyevans)
+- Fix: Old slug redirect for AMP URLs (props rahulsprajapati)
+- Fix: Handle issues with data uri images in CSS (props trepmal)
+- Fix: Add amp-video js for amp-video tags (props ptbello)
+- Fix: Output CSS for feature image (props mjangda)
+- Fix: Fix attribute when adding AMP Mustache lib (props luigitec)
+- Fix: Various documentation updates (props piersb, bhhaskin)
+- Fix: PHP Warnings from `register_customizer_ui` (props jahvi)
+- Fix: Coding Standards (props paulschreiber)
+
+### 0.4.2 (2016-10-13) ###
+- Fix: Prevent validation errors for `html` tag (h/t Maxime2 and everyone else that reported this error)
+- Fix: Handle variable name conflict that was causing content_max_width to be ignored (h/t mimancillas)
+- Fix: Prevent errors when nodes don't have attributes (h/t stephenmax)
+- Fix: Back-compat for 4.5 (add sanitize_hex_color function, h/t xotihcan)
+- Fix: Handle gif featured images (h/t protocolil)
+- Documentation updates (props troyxmccall)
+
+### 0.4.1 (2016-10-10) ###
+- Fix: Don't fire the_content for featured image output
+- Fix: Don't show comment link when disabled and no comments on post (h/t neotrope)
+- Fix: strip `!important` from inline styles (h/t compointdesigner and enriccardonagmailcom)
+
+### 0.4 (2016-10-06) ###
+- New template: spiffy, shiny, and has the fresh theme smell (props allancole and the Automattic Theme Team).
+- *Warning*: The template update has potential breaking changes. Please see https://wordpress.org/support/topic/v0-4-whats-new-and-possible-breaking-changes/
+- AMP Customizer: Pick your colors and make the template your own (props DrewAPicture and 10up)
+- Fix: support for inline styles (props coreymckrill).
+- Fix: no more fatal errors when tags not supported by post type (props david-binda)
+- Fix: no more unnecessary `<br>` tags.
+- Fix: sanitize children of removed nodes (like empty `<a>` tags) (props Maxime2).
+- Fix: no more broken YouTube URLs with multiple ?s.
+- Fix: properly handle tel and sms schemes (h/t soundstrategies).
+- Fix: remove amp endpoint on deactivate.
+- New filter: `amp_pre_get_permalink` if you want a completely custom AMP permalink.
+
+### 0.3.3 (Aug 18, 2016) ###
+- Handle many more validation errors (props bcampeau and alleyinteractive).
+- New filter: `amp_post_template_dir` (props mustafauysal).
+- New template: Nav bar is now it's own template part (props jdevalk).
+- Better ratio for YouTube embeds.
+- Fix: better timezone handling (props rinatkhaziev).
+- Fix: better handling of non-int dimensions (like `100%`).
+- Fix: better handling of empty dimensions.
+- Fix: `autoplay` is a bool-like value.
+- Fix: breakage when using the `query_string` hook (h/t mkuplens).
+- Fix: don't break really large Twitter IDs.
+- Fix: don't break Instagram shortcodes when using URLs with querystrings.
+- Readme improvements (props nickjohnford, sotayamashita)
+
+### 0.3.2 (Mar 4, 2016) ###
+* Jetpack Stats support.
+* Better version of Merriweather and use system fonts for sans-serif (props mattmiklic).
+* Move font to stylesheet so it can be more easily overridden (props mattmiklic).
+* Fix: Template loading issues on Windows. (Thanks to everyone who reported this, especially w33zy for pointing out the `validate_file` issue.)
+* Fix: don't run AMP on post comment feeds (props kraftbj).
+* Fix: un-break pagination when using a static home page with multiple pages.
+* Fix: force amp-iframe to use https to validate correctly (props mister-ben).
+* Fix: validation for `target` and `video`/`audio` attributes.
+* Fix: clipped images in galleries (thanks tobaco).
+
+### 0.3.1 (Feb 24, 2016) ###
+* Allow custom query var (props vaurdan).
+* Fix AMP URLs for non-pretty permalinks (props rakuishi).
+* Fix for password-protected posts.
+* Fix dimension extraction for schema-less or relative image URLs.
+* Better fallback for images with no dimensions.
+* Validation fixes for `a` tags (props kraftbj).
+* Updated AMP boilerplate.
+* Allow `on` tags for elements (props Steven Evatt).
+* Prefixed class names.
+
+### 0.3 (Feb 18, 2016) ###
+* Fetch dimensions for hotlinked images.
+* Add amp-facebook support.
+* Add some new actions and filters (e.g. `amp_init`).
+* Fix validation errors for [gallery] shortcodes.
+* Fix issues with path validation on Windows.
+* Fix issues with really squeezed layout.
+* Breaking change: `style.css` no longer contains the `<style> tag. If you have a custom stylesheet, you need to update it to remove the tag.
+* Breaking change: `single.php` no longer includes the AMP boilerplate styles. They are instead added via the `amp_post_template_head` hook. If you have a custom template, please remove the boilerplate styles.
+
+### 0.2 (Jan 28, 2016) ###
+* Lots and lots and lots of compatibility and validation fixes
+* Lots and lots and lots of improvements for customization
+
+### 0.1 ###
+* Initial version
+
+
+## Upgrade Notice ##
+
+### 0.4 ###
+* Breaking change: The new template has changes to markup, class names, and styles that may not work with existing customizations. If you want to stay on the old template for now, you can use the following code snippet:
+
+```
+if ( function_exists( 'amp_backcompat_use_v03_templates' ) ) {
+    amp_backcompat_use_v03_templates();
+}
+```
+
+For more details, please see https://wordpress.org/support/topic/v0-4-whats-new-and-possible-breaking-changes/
+
+### 0.3.1 ###
+* Breaking change: `AMP_QUERY_VAR` is now defined right before `amp_init`.
+* Breaking change: class names for elements in the default template were prefixed with `amp-wp-`. Any styles targeting these classes should be updated.
+
+### 0.3 ###
+* Breaking change: `style.css` no longer contains the `<style> tag. If you have a custom stylesheet, you need to update it to remove the tag.
+* Breaking change: `single.php` no longer includes the AMP boilerplate styles. They are instead added via the `amp_post_template_head` hook. If you have a custom template, please remove the boilerplate styles.
 
-The following plugins have been known to cause issues with this plugin:
 
-- Cloudflare Rocket Loader (modifies the output of the AMP page, which breaks validation.)
diff --git a/templates/admin/settings/fields/checkbox-post-types.php b/templates/admin/settings/fields/checkbox-post-types.php
index a8845bc3123..e72d62d1496 100644
--- a/templates/admin/settings/fields/checkbox-post-types.php
+++ b/templates/admin/settings/fields/checkbox-post-types.php
@@ -13,7 +13,7 @@
 <fieldset>
 	<?php foreach ( $this->get_supported_post_types() as $post_type ) : ?>
 		<label>
-			<input type="checkbox" value="1" name="<?php echo esc_attr( $this->get_name_attribute( $post_type->name ) ); ?>"<?php checked( true, post_type_supports( $post_type->name, AMP_QUERY_VAR ) ); ?><?php disabled( true, $this->disabled( $post_type->name ) ); ?>> <?php echo esc_html( $post_type->label ); ?>
+			<input type="checkbox" value="1" name="<?php echo esc_attr( $this->get_name_attribute( $post_type->name ) ); ?>"<?php checked( true, post_type_supports( $post_type->name, AMP_QUERY_VAR ) ); ?>> <?php echo esc_html( $post_type->label ); ?>
 		</label>
 		<br>
 	<?php endforeach; ?>
diff --git a/tests/test-class-amp-settings-post-types.php b/tests/test-class-amp-settings-post-types.php
index f87890cbb6c..218d3a407b3 100644
--- a/tests/test-class-amp-settings-post-types.php
+++ b/tests/test-class-amp-settings-post-types.php
@@ -117,32 +117,26 @@ public function test_get_name_attribute() {
 		$this->assertEquals( AMP_Settings::SETTINGS_KEY . '[post_types_support][post]', $this->instance->get_name_attribute( 'post' ) );
 	}
 
-	/**
-	 * Test disabled.
-	 *
-	 * @see AMP_Settings_Post_Types::disabled()
-	 */
-	public function test_disabled() {
-		$this->assertFalse( $this->instance->disabled( 'foo' ) );
-		add_post_type_support( 'foo', AMP_QUERY_VAR );
-		$this->assertTrue( $this->instance->disabled( 'foo' ) );
-	}
-
 	/**
 	 * Test errors.
 	 *
 	 * @see AMP_Settings_Post_Types::errors()
 	 */
 	public function test_errors() {
+		register_post_type( 'foo', array(
+			'public' => true,
+		) );
 		update_option( AMP_Settings::SETTINGS_KEY, array(
 			'post_types_support' => array(
 				'foo' => true,
 			),
 		) );
 		remove_post_type_support( 'foo', AMP_QUERY_VAR );
+		$_GET['settings-updated'] = 'true';
 		$this->instance->errors();
 		$this->assertNotEmpty( get_settings_errors() );
 		delete_option( AMP_Settings::SETTINGS_KEY );
+		unregister_post_type( 'foo' );
 	}
 
 	/**

From fdc26b3e4ec68ed1a2e704a4cf6dece7e2ab3e37 Mon Sep 17 00:00:00 2001
From: ThierryA <thierry@getbeans.io>
Date: Sun, 3 Dec 2017 17:45:15 -0600
Subject: [PATCH 12/21] AMP admin post type support code improvement

---
 includes/settings/class-amp-settings-post-types.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/settings/class-amp-settings-post-types.php b/includes/settings/class-amp-settings-post-types.php
index 35469e1b53a..04b526db6b2 100644
--- a/includes/settings/class-amp-settings-post-types.php
+++ b/includes/settings/class-amp-settings-post-types.php
@@ -137,7 +137,7 @@ public function errors() {
 		$on_update = (
 			isset( $_GET['settings-updated'] ) // WPCS: CSRF ok.
 			&&
-			! empty( (bool) wp_unslash( $_GET['settings-updated'] ) ) // WPCS: CSRF ok.
+			true === (bool) wp_unslash( $_GET['settings-updated'] ) // WPCS: CSRF ok.
 		);
 
 		// Only apply on update.

From 5b0e1cd85c4b71b75009f29f857d4a02b89de549 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Thu, 30 Nov 2017 11:58:45 -0800
Subject: [PATCH 13/21] Correct phpdoc types

---
 includes/settings/class-amp-settings-post-types.php     | 4 ++--
 includes/settings/class-amp-settings.php                | 2 +-
 templates/admin/settings/fields/checkbox-post-types.php | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/includes/settings/class-amp-settings-post-types.php b/includes/settings/class-amp-settings-post-types.php
index 04b526db6b2..2a2f646bc75 100644
--- a/includes/settings/class-amp-settings-post-types.php
+++ b/includes/settings/class-amp-settings-post-types.php
@@ -102,7 +102,7 @@ public function get_settings( $post_type = false ) {
 	 * Getter for the supported post types.
 	 *
 	 * @since 0.6
-	 * @return object Supported post types list.
+	 * @return array Supported post types list.
 	 */
 	public function get_supported_post_types() {
 		$core = get_post_types( array(
@@ -121,7 +121,7 @@ public function get_supported_post_types() {
 	 *
 	 * @since 0.6
 	 * @param string $post_type The post type name.
-	 * @return object The setting HTML input name attribute.
+	 * @return string The setting HTML input name attribute.
 	 */
 	public function get_name_attribute( $post_type ) {
 		$id = $this->setting['id'];
diff --git a/includes/settings/class-amp-settings.php b/includes/settings/class-amp-settings.php
index ac1a97a009b..12f4c4ec28a 100644
--- a/includes/settings/class-amp-settings.php
+++ b/includes/settings/class-amp-settings.php
@@ -86,7 +86,7 @@ public function render_screen() {
 	 * Getter for the AMP svg menu icon.
 	 *
 	 * @since 0.6
-	 * @return object The AMP svg menu icon.
+	 * @return string The AMP svg menu icon.
 	 */
 	public function get_svg_icon() {
 		return 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB3aWR0aD0iNjJweCIgaGVpZ2h0PSI2MnB4IiB2aWV3Qm94PSIwIDAgNjIgNjIiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+QU1QLUJyYW5kLUJsYWNrLUljb248L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iYW1wLWxvZ28taW50ZXJuYWwtc2l0ZSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgICAgICA8ZyBpZD0iQU1QLUJyYW5kLUJsYWNrLUljb24iIGZpbGw9IiMwMDAwMDAiPiAgICAgICAgICAgIDxwYXRoIGQ9Ik00MS42Mjg4NjY3LDI4LjE2MTQzMzMgTDI4LjYyNDM2NjcsNDkuODAzNTY2NyBMMjYuMjY4MzY2Nyw0OS44MDM1NjY3IEwyOC41OTc1LDM1LjcwMTY2NjcgTDIxLjM4MzgsMzUuNzEwOTY2NyBDMjEuMzgzOCwzNS43MTA5NjY3IDIxLjMxNTYsMzUuNzEzMDMzMyAyMS4yODM1NjY3LDM1LjcxMzAzMzMgQzIwLjYzMzYsMzUuNzEzMDMzMyAyMC4xMDc2MzMzLDM1LjE4NzA2NjcgMjAuMTA3NjMzMywzNC41MzcxIEMyMC4xMDc2MzMzLDM0LjI1ODEgMjAuMzY3LDMzLjc4NTg2NjcgMjAuMzY3LDMzLjc4NTg2NjcgTDMzLjMyOTEzMzMsMTIuMTY5NTY2NyBMMzUuNzI0NCwxMi4xNzk5IEwzMy4zMzYzNjY3LDI2LjMwMzUgTDQwLjU4NzI2NjcsMjYuMjk0MiBDNDAuNTg3MjY2NywyNi4yOTQyIDQwLjY2NDc2NjcsMjYuMjkzMTY2NyA0MC43MDE5NjY3LDI2LjI5MzE2NjcgQzQxLjM1MTkzMzMsMjYuMjkzMTY2NyA0MS44Nzc5LDI2LjgxOTEzMzMgNDEuODc3OSwyNy40NjkxIEM0MS44Nzc5LDI3LjczMjYgNDEuNzc0NTY2NywyNy45NjQwNjY3IDQxLjYyNzgzMzMsMjguMTYwNCBMNDEuNjI4ODY2NywyOC4xNjE0MzMzIFogTTMxLDAgQzEzLjg3ODcsMCAwLDEzLjg3OTczMzMgMCwzMSBDMCw0OC4xMjEzIDEzLjg3ODcsNjIgMzEsNjIgQzQ4LjEyMDI2NjcsNjIgNjIsNDguMTIxMyA2MiwzMSBDNjIsMTMuODc5NzMzMyA0OC4xMjAyNjY3LDAgMzEsMCBMMzEsMCBaIiBpZD0iRmlsbC0xIj48L3BhdGg+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=';
diff --git a/templates/admin/settings/fields/checkbox-post-types.php b/templates/admin/settings/fields/checkbox-post-types.php
index e72d62d1496..b425894cccc 100644
--- a/templates/admin/settings/fields/checkbox-post-types.php
+++ b/templates/admin/settings/fields/checkbox-post-types.php
@@ -5,6 +5,12 @@
  * @package AMP
  */
 
+/**
+ * Context.
+ *
+ * @var AMP_Settings_Post_Types $this
+ */
+
 // Check referrer.
 if ( ! ( $this instanceof AMP_Settings_Post_Types ) ) {
 	return;

From 1befc79389a4d97635f2399ab34fda54fcccfe4c Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Mon, 4 Dec 2017 22:26:45 -0800
Subject: [PATCH 14/21] Re-use existing classes; update analytics to use same
 validation method

---
 .dev-lib                                      |   1 +
 amp.php                                       |   7 +-
 includes/admin/functions.php                  |   4 -
 includes/amp-helper-functions.php             |   2 +-
 includes/amp-post-types-support.php           |  35 -
 includes/class-amp-content.php                |   1 +
 includes/class-amp-post-type-support.php      |  59 ++
 .../class-amp-analytics-options-submenu.php   |   5 +-
 includes/options/class-amp-options-menu.php   | 172 +++-
 ...ass-amp-analytics-options-submenu-page.php |  27 +-
 .../views/class-amp-options-manager.php       | 192 +++-
 .../class-amp-settings-post-types.php         | 221 -----
 includes/settings/class-amp-settings.php      | 111 ---
 readme.md                                     | 851 ++++++++++++++----
 .../settings/fields/checkbox-post-types.php   |  27 -
 templates/admin/settings/screen.php           |  23 -
 tests/test-amp-post-types-support.php         |  18 +-
 tests/test-class-amp-settings-post-types.php  |  14 +-
 18 files changed, 1109 insertions(+), 661 deletions(-)
 create mode 100644 .dev-lib
 delete mode 100644 includes/amp-post-types-support.php
 create mode 100644 includes/class-amp-post-type-support.php
 delete mode 100644 includes/settings/class-amp-settings-post-types.php
 delete mode 100644 includes/settings/class-amp-settings.php
 delete mode 100644 templates/admin/settings/fields/checkbox-post-types.php
 delete mode 100644 templates/admin/settings/screen.php

diff --git a/.dev-lib b/.dev-lib
new file mode 100644
index 00000000000..cb76151efe1
--- /dev/null
+++ b/.dev-lib
@@ -0,0 +1 @@
+SYNC_README_MD=0
\ No newline at end of file
diff --git a/amp.php b/amp.php
index ab9c236787f..dba0217ee4d 100644
--- a/amp.php
+++ b/amp.php
@@ -17,13 +17,11 @@
 
 require_once AMP__DIR__ . '/back-compat/back-compat.php';
 require_once AMP__DIR__ . '/includes/amp-helper-functions.php';
-require_once AMP__DIR__ . '/includes/amp-post-types-support.php';
+require_once AMP__DIR__ . '/includes/class-amp-post-type-support.php';
 require_once AMP__DIR__ . '/includes/admin/functions.php';
 require_once AMP__DIR__ . '/includes/admin/class-amp-customizer.php';
 require_once AMP__DIR__ . '/includes/settings/class-amp-customizer-settings.php';
 require_once AMP__DIR__ . '/includes/settings/class-amp-customizer-design-settings.php';
-require_once AMP__DIR__ . '/includes/settings/class-amp-settings.php';
-require_once AMP__DIR__ . '/includes/settings/class-amp-settings-post-types.php';
 require_once AMP__DIR__ . '/includes/actions/class-amp-frontend-actions.php';
 require_once AMP__DIR__ . '/includes/actions/class-amp-paired-post-actions.php';
 
@@ -49,6 +47,8 @@ function amp_deactivate() {
 	flush_rewrite_rules();
 }
 
+AMP_Post_Type_Support::add_hooks();
+
 add_action( 'init', 'amp_init' );
 function amp_init() {
 	if ( false === apply_filters( 'amp_is_enabled', true ) ) {
@@ -56,6 +56,7 @@ function amp_init() {
 	}
 
 	do_action( 'amp_init' );
+	add_action( 'admin_init', 'AMP_Options_Manager::register_settings' );
 
 	load_plugin_textdomain( 'amp', false, plugin_basename( AMP__DIR__ ) . '/languages' );
 
diff --git a/includes/admin/functions.php b/includes/admin/functions.php
index 8155b44c865..791df502d2b 100644
--- a/includes/admin/functions.php
+++ b/includes/admin/functions.php
@@ -99,10 +99,6 @@ function amp_add_options_menu() {
 		return;
 	}
 
-	// Initialize settings.
-	AMP_Settings::get_instance()->init();
-	AMP_Settings_Post_Types::get_instance()->init();
-
 	$amp_options = new AMP_Options_Menu();
 	$amp_options->init();
 }
diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index 8ba5cdcac00..d9c5d86ea93 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -18,7 +18,7 @@ function amp_get_permalink( $post_id ) {
 }
 
 function post_supports_amp( $post ) {
-	// Because `add_rewrite_endpoint` doesn't let us target specific post_types :(.
+	// Because `add_rewrite_endpoint` doesn't let us target specific post_types :(
 	if ( ! post_type_supports( $post->post_type, AMP_QUERY_VAR ) ) {
 		return false;
 	}
diff --git a/includes/amp-post-types-support.php b/includes/amp-post-types-support.php
deleted file mode 100644
index 5cf7c522f46..00000000000
--- a/includes/amp-post-types-support.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * AMP Post types support.
- *
- * @package AMP
- * @since 0.6
- */
-
-/**
- * Declare core post types support.
- *
- * @since 0.6
- */
-function amp_core_post_types_support() {
-	add_post_type_support( 'post', AMP_QUERY_VAR );
-}
-add_action( 'init', 'amp_core_post_types_support' );
-
-/**
- * Declare custom post types support.
- *
- * This function should only be invoked through the 'after_setup_theme' action to
- * allow plugins/theme to overwrite the post types support.
- *
- * @since 0.6
- */
-function amp_custom_post_types_support() {
-	// Listen to post types settings.
-	foreach ( AMP_Settings_Post_Types::get_instance()->get_settings() as $post_type => $enabled ) {
-		if ( true === $enabled ) {
-			add_post_type_support( $post_type, AMP_QUERY_VAR );
-		}
-	}
-}
-add_action( 'after_setup_theme', 'amp_custom_post_types_support', 5 );
diff --git a/includes/class-amp-content.php b/includes/class-amp-content.php
index beb3ea1029a..37ff1db939c 100644
--- a/includes/class-amp-content.php
+++ b/includes/class-amp-content.php
@@ -91,6 +91,7 @@ private function sanitize( $content ) {
 	}
 }
 
+// @todo Split this class out into a separate file.
 class AMP_Content_Sanitizer {
 	public static function sanitize( $content, array $sanitizer_classes, $global_args = array() ) {
 		$scripts = array();
diff --git a/includes/class-amp-post-type-support.php b/includes/class-amp-post-type-support.php
new file mode 100644
index 00000000000..b699683d3d6
--- /dev/null
+++ b/includes/class-amp-post-type-support.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * AMP Post type support.
+ *
+ * @package AMP
+ * @since 0.6
+ */
+
+/**
+ * Class AMP_Post_Type_Support.
+ */
+class AMP_Post_Type_Support {
+
+	/**
+	 * Add hooks.
+	 */
+	public static function add_hooks() {
+		add_action( 'amp_init', array( __CLASS__, 'add_builtin_post_type_support' ) );
+		add_action( 'after_setup_theme', array( __CLASS__, 'add_elected_post_type_support' ), 5 );
+	}
+
+	/**
+	 * Get post types that plugin supports out of the box (which cannot be disabled).
+	 *
+	 * @return array Post types.
+	 */
+	public static function get_builtin_supported_post_types() {
+		return array( 'post' );
+	}
+
+	/**
+	 * Declare core post types support for built-in post types.
+	 *
+	 * @since 0.6
+	 */
+	public static function add_builtin_post_type_support() {
+		foreach ( self::get_builtin_supported_post_types() as $post_type ) {
+			add_post_type_support( $post_type, AMP_QUERY_VAR );
+		}
+	}
+
+	/**
+	 * Declare custom post types support.
+	 *
+	 * This function should only be invoked through the 'after_setup_theme' action to
+	 * allow plugins/theme to overwrite the post types support.
+	 *
+	 * @since 0.6
+	 */
+	public static function add_elected_post_type_support() {
+		$post_types = array_merge(
+			array_keys( array_filter( AMP_Options_Manager::get_option( 'supported_post_types', array() ) ) ),
+			self::get_builtin_supported_post_types()
+		);
+		foreach ( $post_types as $post_type ) {
+			add_post_type_support( $post_type, AMP_QUERY_VAR );
+		}
+	}
+}
diff --git a/includes/options/class-amp-analytics-options-submenu.php b/includes/options/class-amp-analytics-options-submenu.php
index 1e250ffac15..862c173f72a 100644
--- a/includes/options/class-amp-analytics-options-submenu.php
+++ b/includes/options/class-amp-analytics-options-submenu.php
@@ -37,7 +37,10 @@ private function add_submenu() {
 	public function amp_options_styles() {
 		?>
 		<style>
-			.analytics-data-container #delete {
+			.analytics-data-container .button.delete,
+			.analytics-data-container .button.delete:hover,
+			.analytics-data-container .button.delete:active,
+			.analytics-data-container .button.delete:focus {
 				background: red;
 				border-color: red;
 				text-shadow: 0 0 0;
diff --git a/includes/options/class-amp-options-menu.php b/includes/options/class-amp-options-menu.php
index 6acea40d8d6..c040e4189c4 100644
--- a/includes/options/class-amp-options-menu.php
+++ b/includes/options/class-amp-options-menu.php
@@ -14,6 +14,13 @@
  */
 class AMP_Options_Menu {
 
+	/**
+	 * The AMP svg menu icon.
+	 *
+	 * @var string
+	 */
+	const ICON_BASE64_SVG = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB3aWR0aD0iNjJweCIgaGVpZ2h0PSI2MnB4IiB2aWV3Qm94PSIwIDAgNjIgNjIiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+QU1QLUJyYW5kLUJsYWNrLUljb248L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iYW1wLWxvZ28taW50ZXJuYWwtc2l0ZSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgICAgICA8ZyBpZD0iQU1QLUJyYW5kLUJsYWNrLUljb24iIGZpbGw9IiMwMDAwMDAiPiAgICAgICAgICAgIDxwYXRoIGQ9Ik00MS42Mjg4NjY3LDI4LjE2MTQzMzMgTDI4LjYyNDM2NjcsNDkuODAzNTY2NyBMMjYuMjY4MzY2Nyw0OS44MDM1NjY3IEwyOC41OTc1LDM1LjcwMTY2NjcgTDIxLjM4MzgsMzUuNzEwOTY2NyBDMjEuMzgzOCwzNS43MTA5NjY3IDIxLjMxNTYsMzUuNzEzMDMzMyAyMS4yODM1NjY3LDM1LjcxMzAzMzMgQzIwLjYzMzYsMzUuNzEzMDMzMyAyMC4xMDc2MzMzLDM1LjE4NzA2NjcgMjAuMTA3NjMzMywzNC41MzcxIEMyMC4xMDc2MzMzLDM0LjI1ODEgMjAuMzY3LDMzLjc4NTg2NjcgMjAuMzY3LDMzLjc4NTg2NjcgTDMzLjMyOTEzMzMsMTIuMTY5NTY2NyBMMzUuNzI0NCwxMi4xNzk5IEwzMy4zMzYzNjY3LDI2LjMwMzUgTDQwLjU4NzI2NjcsMjYuMjk0MiBDNDAuNTg3MjY2NywyNi4yOTQyIDQwLjY2NDc2NjcsMjYuMjkzMTY2NyA0MC43MDE5NjY3LDI2LjI5MzE2NjcgQzQxLjM1MTkzMzMsMjYuMjkzMTY2NyA0MS44Nzc5LDI2LjgxOTEzMzMgNDEuODc3OSwyNy40NjkxIEM0MS44Nzc5LDI3LjczMjYgNDEuNzc0NTY2NywyNy45NjQwNjY3IDQxLjYyNzgzMzMsMjguMTYwNCBMNDEuNjI4ODY2NywyOC4xNjE0MzMzIFogTTMxLDAgQzEzLjg3ODcsMCAwLDEzLjg3OTczMzMgMCwzMSBDMCw0OC4xMjEzIDEzLjg3ODcsNjIgMzEsNjIgQzQ4LjEyMDI2NjcsNjIgNjIsNDguMTIxMyA2MiwzMSBDNjIsMTMuODc5NzMzMyA0OC4xMjAyNjY3LDAgMzEsMCBMMzEsMCBaIiBpZD0iRmlsbC0xIj48L3BhdGg+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=';
+
 	/**
 	 * Initialize.
 	 */
@@ -26,8 +33,169 @@ public function init() {
 	 * Add menu.
 	 */
 	public function add_menu_items() {
-		$submenu = new AMP_Analytics_Options_Submenu( AMP_Settings::MENU_SLUG );
-		$submenu->init( AMP_Settings::MENU_SLUG );
+
+		add_menu_page(
+			__( 'AMP Options', 'amp' ),
+			__( 'AMP', 'amp' ),
+			'manage_options',
+			AMP_Options_Manager::OPTION_NAME,
+			array( $this, 'render_screen' ),
+			self::ICON_BASE64_SVG
+		);
+
+		add_submenu_page(
+			AMP_Options_Manager::OPTION_NAME,
+			__( 'AMP Settings', 'amp' ),
+			__( 'General', 'amp' ),
+			'manage_options',
+			AMP_Options_Manager::OPTION_NAME
+		);
+
+		add_settings_section(
+			'supported_post_types',
+			false,
+			'__return_false',
+			AMP_Options_Manager::OPTION_NAME
+		);
+		add_settings_field(
+			'supported_post_types',
+			__( 'Post Type Support', 'amp' ),
+			array( $this, 'render_post_types_support' ),
+			AMP_Options_Manager::OPTION_NAME,
+			'supported_post_types'
+		);
+
+		$submenus = array(
+			new AMP_Analytics_Options_Submenu( AMP_Options_Manager::OPTION_NAME ),
+		);
+
+		// Create submenu items and calls on the Submenu Page object to render the actual contents of the page.
+		foreach ( $submenus as $submenu ) {
+			$submenu->init();
+		}
 	}
 
+	/**
+	 * Getter for the supported post types.
+	 *
+	 * @since 0.6
+	 * @return array Supported post types list.
+	 */
+	public function get_supported_post_types() {
+		$core = get_post_types( array(
+			'name' => 'post',
+		), 'objects' );
+		$cpt  = get_post_types( array(
+			'public'   => true,
+			'_builtin' => false,
+		), 'objects' );
+
+		return array_merge( $core, $cpt );
+	}
+
+	/**
+	 * Handle errors.
+	 *
+	 * @since 0.6
+	 */
+	public function errors() {
+		$on_update = (
+			isset( $_GET['settings-updated'] ) // WPCS: CSRF ok.
+			&&
+			true === (bool) wp_unslash( $_GET['settings-updated'] ) // WPCS: CSRF ok.
+		);
+
+		// Only apply on update.
+		if ( ! $on_update ) {
+			return;
+		}
+
+		$builtin_support = AMP_Post_Type_Support::get_builtin_supported_post_types();
+		$settings        = AMP_Options_Manager::get_option( 'supported_post_types', array() );
+		foreach ( $this->get_supported_post_types() as $post_type ) {
+			if ( ! isset( $post_type->name, $post_type->label ) || in_array( $post_type->name, $builtin_support, true ) ) {
+				continue;
+			}
+
+			$post_type_support = post_type_supports( $post_type->name, AMP_QUERY_VAR );
+			$value             = ! empty( $settings[ $post_type->name ] );
+
+			$error = null;
+			if ( true === $value && true !== $post_type_support ) {
+				/* translators: %s: Post type name. */
+				$error = __( '"%s" could not be activated because support is removed by a plugin or theme', 'amp' );
+			} elseif ( empty( $value ) && true === $post_type_support ) {
+				/* translators: %s: Post type name. */
+				$error = __( '"%s" could not be deactivated because support is added by a plugin or theme', 'amp' );
+			}
+
+			if ( isset( $error ) ) {
+				add_settings_error(
+					$post_type->name,
+					$post_type->name,
+					sprintf(
+						$error,
+						$post_type->label
+					)
+				);
+			}
+		}
+	}
+
+	/**
+	 * Post types support section renderer.
+	 *
+	 * @since 0.6
+	 */
+	public function render_post_types_support() {
+		$builtin_support = AMP_Post_Type_Support::get_builtin_supported_post_types();
+		?>
+		<fieldset>
+			<?php foreach ( $this->get_supported_post_types() as $post_type ) : ?>
+				<?php
+				$id         = AMP_Options_Manager::OPTION_NAME . "[supported_post_types][{$post_type->name}][]";
+				$is_builtin = in_array( $post_type->name, $builtin_support, true );
+				?>
+				<?php if ( $is_builtin ) : ?>
+					<input type="hidden" name="<?php echo esc_attr( $id ); ?>" value="1">
+				<?php endif; ?>
+				<input
+					type="checkbox"
+					value="1"
+					id="<?php echo esc_attr( $id ); ?>"
+					name="<?php echo esc_attr( $id ); ?>"
+					<?php checked( true, post_type_supports( $post_type->name, AMP_QUERY_VAR ) ); ?>
+					<?php disabled( $is_builtin ); ?>
+					>
+				<label for="<?php echo esc_attr( $id ); ?>">
+					<?php echo esc_html( $post_type->label ); ?>
+				</label>
+				<br>
+			<?php endforeach; ?>
+			<p class="description"><?php esc_html_e( 'Enable/disable AMP post type(s) support', 'amp' ); ?></p>
+		</fieldset>
+		<?php
+	}
+
+	/**
+	 * Display Settings.
+	 *
+	 * @since 0.6
+	 */
+	public function render_screen() {
+		$this->errors();
+		?>
+		<div class="wrap">
+			<h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
+			<?php settings_errors(); ?>
+			<form action="options.php" method="post">
+				<?php
+				settings_fields( AMP_Options_Manager::OPTION_NAME );
+				do_settings_sections( AMP_Options_Manager::OPTION_NAME );
+				submit_button();
+				?>
+			</form>
+		</div>
+		<?php
+	}
 }
diff --git a/includes/options/views/class-amp-analytics-options-submenu-page.php b/includes/options/views/class-amp-analytics-options-submenu-page.php
index 7068cd2c4e9..e5f0fb8ffc8 100644
--- a/includes/options/views/class-amp-analytics-options-submenu-page.php
+++ b/includes/options/views/class-amp-analytics-options-submenu-page.php
@@ -14,6 +14,12 @@ private function render_entry( $id = '', $type = '', $config = '' ) {
 		} else {
 			$analytics_title = __( 'Add new entry:', 'amp' );
 		}
+
+		if ( ! $is_existing_entry ) {
+			$id = '__new__';
+		}
+
+		$id_base = sprintf( '%s[analytics][%s]', AMP_Options_Manager::OPTION_NAME, $id );
 		?>
 		<div class="analytics-data-container">
 			<form method="post" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
@@ -23,20 +29,20 @@ private function render_entry( $id = '', $type = '', $config = '' ) {
 				<div class="options">
 					<p>
 						<label>
-							<?php echo __( 'Type:', 'amp' ) ?>
-							<input class="option-input" type="text" name=vendor-type value="<?php echo esc_attr( $type ); ?>" />
+							<?php esc_html_e( 'Type:', 'amp' ); ?>
+							<input class="option-input" type="text" name="<?php echo esc_attr( $id_base . '[type]' ); ?>" value="<?php echo esc_attr( $type ); ?>" />
 						</label>
 						<label>
-							<?php echo __( 'ID:', 'amp' ) ?>
-							<input type="text" name=id value="<?php echo esc_attr( $id ); ?>" readonly />
+							<?php esc_html_e( 'ID:', 'amp' ); ?>
+							<input type="text" value="<?php echo esc_attr( $is_existing_entry ? $id : '' ); ?>" readonly />
 						</label>
-						<input type="hidden" name=id-value value="<?php echo esc_attr( $id ); ?>" />
+							<input type="hidden" name="<?php echo esc_attr( $id_base . '[id]' ); ?>" value="<?php echo esc_attr( $id ); ?>" />
 					</p>
 					<p>
 						<label>
-							<?php echo __( 'JSON Configuration:', 'amp' ) ?>
+							<?php esc_html_e( 'JSON Configuration:', 'amp' ); ?>
 							<br />
-							<textarea rows="10" cols="100" name="config"><?php echo esc_textarea( $config ); ?></textarea>
+							<textarea rows="10" cols="100" name="<?php echo esc_attr( $id_base . '[config]' ); ?>"><?php echo esc_textarea( $config ); ?></textarea>
 						</label>
 					</p>
 					<input type="hidden" name="action" value="amp_analytics_options">
@@ -46,7 +52,7 @@ private function render_entry( $id = '', $type = '', $config = '' ) {
 					wp_nonce_field( 'analytics-options', 'analytics-options' );
 					submit_button( __( 'Save', 'amp' ), 'primary', 'save', false );
 					if ( $is_existing_entry ) {
-						submit_button( __( 'Delete', 'amp' ), 'delete button-primary', 'delete', false );
+						submit_button( __( 'Delete', 'amp' ), 'delete button-primary', $id_base . '[delete]', false );
 					}
 					?>
 				</p>
@@ -91,11 +97,12 @@ public function render() {
 
 		$this->render_title();
 
-		// Render entries stored in the DB
+		// Render entries stored in the DB.
 		foreach ( $analytics_entries as $entry_id => $entry ) {
 			$this->render_entry( $entry_id, $entry['type'], $entry['config'] );
 		}
-		// Empty form for adding more entries
+
+		// Empty form for adding more entries.
 		$this->render_entry();
 	}
 }
diff --git a/includes/options/views/class-amp-options-manager.php b/includes/options/views/class-amp-options-manager.php
index 4c312471c9c..27bfc03ed0b 100644
--- a/includes/options/views/class-amp-options-manager.php
+++ b/includes/options/views/class-amp-options-manager.php
@@ -1,14 +1,54 @@
 <?php
+/**
+ * AMP_Options_Manager class.
+ *
+ * @class AMP
+ */
 
-require_once( AMP__DIR__ . '/includes/utils/class-amp-html-utils.php' );
+require_once AMP__DIR__ . '/includes/utils/class-amp-html-utils.php';
 
+/**
+ * Class AMP_Options_Manager
+ */
 class AMP_Options_Manager {
+
+	/**
+	 * Option name.
+	 *
+	 * @var string
+	 */
 	const OPTION_NAME = 'amp-options';
 
+	/**
+	 * Register settings.
+	 */
+	public static function register_settings() {
+		register_setting(
+			self::OPTION_NAME,
+			self::OPTION_NAME,
+			array( __CLASS__, 'validate_options' )
+		);
+
+		add_action( 'update_option_' . self::OPTION_NAME, 'flush_rewrite_rules' );
+	}
+
+	/**
+	 * Get plugin options.
+	 *
+	 * @return array Options.
+	 */
 	public static function get_options() {
 		return get_option( self::OPTION_NAME, array() );
 	}
 
+	/**
+	 * Get plugin option.
+	 *
+	 * @param string $option  Plugin option name.
+	 * @param bool   $default Default value.
+	 *
+	 * @return mixed Option value.
+	 */
 	public static function get_option( $option, $default = false ) {
 		$amp_options = self::get_options();
 
@@ -19,6 +59,88 @@ public static function get_option( $option, $default = false ) {
 		return $amp_options[ $option ];
 	}
 
+	/**
+	 * Validate options.
+	 *
+	 * @param array $new_options Plugin options.
+	 * @return array Options.
+	 */
+	public static function validate_options( $new_options ) {
+
+		$defaults = array(
+			'supported_post_types' => array(),
+			'analytics'            => array(),
+		);
+
+		$options = array_merge(
+			$defaults,
+			self::get_options()
+		);
+
+		// Validate post type support.
+		if ( isset( $new_options['supported_post_types'] ) ) {
+			$options['supported_post_types'] = array();
+			foreach ( $new_options['supported_post_types'] as $post_type => $enabled ) {
+				$options['supported_post_types'][ $post_type ] = (bool) $enabled;
+			}
+		}
+
+		// Validate analytics.
+		if ( isset( $new_options['analytics'] ) ) {
+			foreach ( $new_options['analytics'] as $id => $data ) {
+
+				// Check save/delete pre-conditions and proceed if correct.
+				if ( empty( $data['type'] ) || empty( $data['config'] ) ) {
+					add_settings_error( self::OPTION_NAME, 'missing_analytics_vendor_or_config', __( 'Missing vendor type or config.', 'amp' ) );
+					continue;
+				}
+
+				// Validate JSON configuration.
+				$is_valid_json = AMP_HTML_Utils::is_valid_json( $data['config'] );
+				if ( ! $is_valid_json ) {
+					add_settings_error( self::OPTION_NAME, 'invalid_analytics_config', __( 'Invalid analytics config.', 'amp' ) );
+					continue;
+				}
+
+				$entry_vendor_type = sanitize_key( $data['type'] );
+				$entry_config      = trim( $data['config'] );
+
+				if ( ! empty( $data['id'] ) && '__new__' !== $data['id'] ) {
+					$entry_id = sanitize_key( $data['id'] );
+				} else {
+
+					// Generate a hash string to uniquely identify this entry.
+					$entry_id = substr( md5( $entry_vendor_type . $entry_config ), 0, 12 );
+
+					// Avoid duplicates.
+					if ( isset( $options['analytics'][ $entry_id ] ) ) {
+						add_settings_error( self::OPTION_NAME, 'duplicate_analytics_entry', __( 'Duplicate analytics entry found.', 'amp' ) );
+						continue;
+					}
+				}
+
+				if ( isset( $data['delete'] ) ) {
+					unset( $options['analytics'][ $entry_id ] );
+				} else {
+					$options['analytics'][ $entry_id ] = array(
+						'type'   => $entry_vendor_type,
+						'config' => $entry_config,
+					);
+				}
+			}
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Update plugin option.
+	 *
+	 * @param string $option Plugin option name.
+	 * @param mixed  $value  Plugin option value.
+	 *
+	 * @return bool Whether update succeeded.
+	 */
 	public static function update_option( $option, $value ) {
 		$amp_options = self::get_options();
 
@@ -27,58 +149,42 @@ public static function update_option( $option, $value ) {
 		return update_option( self::OPTION_NAME, $amp_options, false );
 	}
 
+	/**
+	 * Handle analytics submission.
+	 */
 	public static function handle_analytics_submit() {
-		// Request must come from user with right capabilities
+
+		// Request must come from user with right capabilities.
 		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_die( __( 'Sorry, you do not have the necessary permissions to perform this action', 'amp' ) );
+			wp_die( esc_html__( 'Sorry, you do not have the necessary permissions to perform this action', 'amp' ) );
 		}
-		// Ensure request is coming from analytics option form
+
+		// Ensure request is coming from analytics option form.
 		check_admin_referer( 'analytics-options', 'analytics-options' );
 
-		$status = AMP_Options_Manager::update_analytics_options( $_POST );
+		$status = '';
+		if ( isset( $_POST['amp-options']['analytics'] ) ) {
+			self::update_option( 'analytics', wp_unslash( $_POST['amp-options']['analytics'] ) );
+			if ( 0 === count( get_settings_errors( self::OPTION_NAME ) ) ) {
+				$status = '1';
+			}
+		}
 
-		// Redirect to keep the user in the analytics options page
-		// Wrap in is_admin() to enable phpunit tests to exercise this code
+		// Redirect to keep the user in the analytics options page.
+		// Wrap in is_admin() to enable phpunit tests to exercise this code.
 		wp_safe_redirect( admin_url( 'admin.php?page=amp-analytics-options&valid=' . $status ) );
 		exit;
 	}
 
+	/**
+	 * Update analytics options.
+	 *
+	 * @deprecated
+	 * @param array $data Unsanitized unslashed data.
+	 * @return bool Whether options were updated.
+	 */
 	public static function update_analytics_options( $data ) {
-		// Check save/delete pre-conditions and proceed if correct
-		if ( empty( $data['vendor-type'] ) || empty( $data['config'] ) ) {
-			return false;
-		}
-
-		// Validate JSON configuration
-		$is_valid_json = AMP_HTML_Utils::is_valid_json( stripslashes( $data['config'] ) );
-		if ( ! $is_valid_json ) {
-			return false;
-		}
-		$amp_analytics = self::get_option( 'analytics', array() );
-
-		$entry_vendor_type = sanitize_key( $data['vendor-type'] );
-		$entry_config = stripslashes( trim( $data['config'] ) );
-
-		if ( ! empty( $data['id-value'] ) ) {
-			$entry_id = sanitize_key( $data['id-value'] );
-		} else {
-			// Generate a hash string to uniquely identify this entry
-			$entry_id = substr( md5( $entry_vendor_type . $entry_config ), 0, 12 );
-			// Avoid duplicates
-			if ( isset( $amp_analytics[ $entry_id ] ) ) {
-				return false;
-			}
-		}
-
-		if ( isset( $data['delete'] ) ) {
-			unset( $amp_analytics[ $entry_id ] );
-		} else {
-			$amp_analytics[ $entry_id ] = array(
-				'type' => $entry_vendor_type,
-				'config' => $entry_config,
-			);
-		}
-
-		return self::update_option( 'analytics', $amp_analytics );
+		_deprecated_function( __METHOD__, '0.6.0', __CLASS__ . '::update_option' );
+		return self::update_option( 'analytics', wp_unslash( $data ) );
 	}
 }
diff --git a/includes/settings/class-amp-settings-post-types.php b/includes/settings/class-amp-settings-post-types.php
deleted file mode 100644
index 2a2f646bc75..00000000000
--- a/includes/settings/class-amp-settings-post-types.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
- * Post types settings.
- *
- * @package AMP
- * @since 0.6
- */
-
-/**
- * Settings post types class.
- *
- * @since 0.6
- */
-class AMP_Settings_Post_Types {
-
-	/**
-	 * Settings section id.
-	 *
-	 * @since 0.6
-	 * @var string
-	 */
-	protected $section_id = 'post_types';
-
-	/**
-	 * Settings config.
-	 *
-	 * @since 0.6
-	 * @var array
-	 */
-	protected $setting = array();
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() {
-		$this->setting = array(
-			'id'          => 'post_types_support',
-			'label'       => __( 'Post Types Support', 'amp' ),
-			'description' => __( 'Enable/disable AMP post type(s) support', 'amp' ),
-		);
-	}
-
-	/**
-	 * Initialize.
-	 */
-	public function init() {
-		add_action( 'admin_init', array( $this, 'register_settings' ) );
-		add_action( 'update_option_' . AMP_Settings::SETTINGS_KEY, 'flush_rewrite_rules' );
-		add_action( 'amp_settings_screen', array( $this, 'errors' ) );
-	}
-
-	/**
-	 * Register the current page settings.
-	 */
-	public function register_settings() {
-		register_setting(
-			AMP_Settings::SETTINGS_KEY,
-			AMP_Settings::SETTINGS_KEY,
-			array( $this, 'validate' )
-		);
-		add_settings_section(
-			$this->section_id,
-			false,
-			'__return_false',
-			AMP_Settings::MENU_SLUG
-		);
-		add_settings_field(
-			$this->setting['id'],
-			$this->setting['label'],
-			array( $this, 'render' ),
-			AMP_Settings::MENU_SLUG,
-			$this->section_id
-		);
-	}
-
-	/**
-	 * Getter for settings value.
-	 *
-	 * @since 0.6
-	 * @param string $post_type The post type name.
-	 * @return bool|array Return true if the post type is always on; the setting value otherwise.
-	 */
-	public function get_settings( $post_type = false ) {
-		$settings = $this->validate( get_option( AMP_Settings::SETTINGS_KEY, array() ) );
-
-		if ( false !== $post_type ) {
-			if ( isset( $settings[ $this->setting['id'] ][ $post_type ] ) ) {
-				return $settings[ $this->setting['id'] ][ $post_type ];
-			}
-
-			return false;
-		}
-
-		if ( empty( $settings[ $this->setting['id'] ] ) || ! is_array( $settings[ $this->setting['id'] ] ) ) {
-			return array();
-		}
-
-		return $settings[ $this->setting['id'] ];
-	}
-
-	/**
-	 * Getter for the supported post types.
-	 *
-	 * @since 0.6
-	 * @return array Supported post types list.
-	 */
-	public function get_supported_post_types() {
-		$core = get_post_types( array(
-			'name' => 'post',
-		), 'objects' );
-		$cpt  = get_post_types( array(
-			'public'   => true,
-			'_builtin' => false,
-		), 'objects' );
-
-		return array_merge( $core, $cpt );
-	}
-
-	/**
-	 * Getter for the setting HTML input name attribute.
-	 *
-	 * @since 0.6
-	 * @param string $post_type The post type name.
-	 * @return string The setting HTML input name attribute.
-	 */
-	public function get_name_attribute( $post_type ) {
-		$id = $this->setting['id'];
-		return AMP_Settings::SETTINGS_KEY . "[{$id}][{$post_type}]";
-	}
-
-	/**
-	 * Handle errors.
-	 *
-	 * @since 0.6
-	 */
-	public function errors() {
-		$on_update = (
-			isset( $_GET['settings-updated'] ) // WPCS: CSRF ok.
-			&&
-			true === (bool) wp_unslash( $_GET['settings-updated'] ) // WPCS: CSRF ok.
-		);
-
-		// Only apply on update.
-		if ( ! $on_update ) {
-			return;
-		}
-
-		foreach ( $this->get_supported_post_types() as $post_type ) {
-			if ( ! isset( $post_type->name, $post_type->label ) ) {
-				continue;
-			}
-
-			$post_type_support = post_type_supports( $post_type->name, AMP_QUERY_VAR );
-			$value             = $this->get_settings( $post_type->name );
-
-			if ( true === $value && true !== $post_type_support ) {
-				/* Translators: %s: Post type name. */
-				$error = __( '"%s" could not be activated because support is removed by a plugin or theme', 'amp' );
-			} elseif ( empty( $value ) && true === $post_type_support ) {
-				/* Translators: %s: Post type name. */
-				$error = __( '"%s" could not be deactivated because support is added by a plugin or theme', 'amp' );
-			}
-
-			if ( isset( $error ) ) {
-				add_settings_error(
-					$post_type->name,
-					$post_type->name,
-					sprintf(
-						$error,
-						$post_type->label
-					)
-				);
-			}
-		}
-	}
-
-	/**
-	 * Validate and sanitize the settings.
-	 *
-	 * @since 0.6
-	 * @param array $settings The post types settings.
-	 * @return array The post types settings.
-	 */
-	public function validate( $settings ) {
-		if ( ! isset( $settings[ $this->setting['id'] ] ) || ! is_array( $settings[ $this->setting['id'] ] ) ) {
-			return array();
-		}
-
-		foreach ( $settings[ $this->setting['id'] ] as $key => $value ) {
-			$settings[ $this->setting['id'] ][ $key ] = (bool) $value;
-		}
-
-		return $settings;
-	}
-
-	/**
-	 * Setting renderer.
-	 *
-	 * @since 0.6
-	 */
-	public function render() {
-		require_once AMP__DIR__ . '/templates/admin/settings/fields/checkbox-post-types.php';
-	}
-
-	/**
-	 * Get the instance of AMP_Settings_Post_Types.
-	 *
-	 * @since 0.6
-	 * @return object $instance AMP_Settings_Post_Types instance.
-	 */
-	public static function get_instance() {
-		static $instance;
-
-		if ( ! ( $instance instanceof AMP_Settings_Post_Types ) ) {
-			$instance = new AMP_Settings_Post_Types();
-		}
-
-		return $instance;
-	}
-
-}
diff --git a/includes/settings/class-amp-settings.php b/includes/settings/class-amp-settings.php
deleted file mode 100644
index 12f4c4ec28a..00000000000
--- a/includes/settings/class-amp-settings.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * AMP Settings.
- *
- * @package AMP
- * @since 0.6
- */
-
-/**
- * Settings class.
- *
- * @since 0.6
- */
-class AMP_Settings {
-
-	/**
-	 * Menu slug.
-	 *
-	 * @const string
-	 * @since 0.6
-	 */
-	const MENU_SLUG = 'amp_settings';
-
-	/**
-	 * Settings key.
-	 *
-	 * @const string
-	 * @since 0.6
-	 */
-	const SETTINGS_KEY = 'amp';
-
-	/**
-	 * Initialize.
-	 *
-	 * @since 0.6
-	 */
-	public function init() {
-		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-	}
-
-	/**
-	 * Add admin menu.
-	 *
-	 * @since 0.6
-	 */
-	public function admin_menu() {
-		add_menu_page(
-			__( 'AMP', 'amp' ),
-			__( 'AMP', 'amp' ),
-			'manage_options',
-			self::MENU_SLUG,
-			'__return_false',
-			$this->get_svg_icon()
-		);
-		add_submenu_page(
-			self::MENU_SLUG,
-			__( 'AMP Settings', 'amp' ),
-			__( 'Settings', 'amp' ),
-			'manage_options',
-			self::MENU_SLUG,
-			array( $this, 'render_screen' )
-		);
-	}
-
-	/**
-	 * Display Settings.
-	 *
-	 * @since 0.6
-	 * @return void Void on user capabilities check failure.
-	 */
-	public function render_screen() {
-		if ( ! current_user_can( 'manage_options' ) ) {
-			return;
-		}
-
-		/**
-		 * Fires before the AMP settings screen is rendered.
-		 *
-		 * @since 0.6
-		 */
-		do_action( 'amp_settings_screen' );
-		include_once AMP__DIR__ . '/templates/admin/settings/screen.php';
-	}
-
-	/**
-	 * Getter for the AMP svg menu icon.
-	 *
-	 * @since 0.6
-	 * @return string The AMP svg menu icon.
-	 */
-	public function get_svg_icon() {
-		return 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB3aWR0aD0iNjJweCIgaGVpZ2h0PSI2MnB4IiB2aWV3Qm94PSIwIDAgNjIgNjIiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+QU1QLUJyYW5kLUJsYWNrLUljb248L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iYW1wLWxvZ28taW50ZXJuYWwtc2l0ZSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgICAgICA8ZyBpZD0iQU1QLUJyYW5kLUJsYWNrLUljb24iIGZpbGw9IiMwMDAwMDAiPiAgICAgICAgICAgIDxwYXRoIGQ9Ik00MS42Mjg4NjY3LDI4LjE2MTQzMzMgTDI4LjYyNDM2NjcsNDkuODAzNTY2NyBMMjYuMjY4MzY2Nyw0OS44MDM1NjY3IEwyOC41OTc1LDM1LjcwMTY2NjcgTDIxLjM4MzgsMzUuNzEwOTY2NyBDMjEuMzgzOCwzNS43MTA5NjY3IDIxLjMxNTYsMzUuNzEzMDMzMyAyMS4yODM1NjY3LDM1LjcxMzAzMzMgQzIwLjYzMzYsMzUuNzEzMDMzMyAyMC4xMDc2MzMzLDM1LjE4NzA2NjcgMjAuMTA3NjMzMywzNC41MzcxIEMyMC4xMDc2MzMzLDM0LjI1ODEgMjAuMzY3LDMzLjc4NTg2NjcgMjAuMzY3LDMzLjc4NTg2NjcgTDMzLjMyOTEzMzMsMTIuMTY5NTY2NyBMMzUuNzI0NCwxMi4xNzk5IEwzMy4zMzYzNjY3LDI2LjMwMzUgTDQwLjU4NzI2NjcsMjYuMjk0MiBDNDAuNTg3MjY2NywyNi4yOTQyIDQwLjY2NDc2NjcsMjYuMjkzMTY2NyA0MC43MDE5NjY3LDI2LjI5MzE2NjcgQzQxLjM1MTkzMzMsMjYuMjkzMTY2NyA0MS44Nzc5LDI2LjgxOTEzMzMgNDEuODc3OSwyNy40NjkxIEM0MS44Nzc5LDI3LjczMjYgNDEuNzc0NTY2NywyNy45NjQwNjY3IDQxLjYyNzgzMzMsMjguMTYwNCBMNDEuNjI4ODY2NywyOC4xNjE0MzMzIFogTTMxLDAgQzEzLjg3ODcsMCAwLDEzLjg3OTczMzMgMCwzMSBDMCw0OC4xMjEzIDEzLjg3ODcsNjIgMzEsNjIgQzQ4LjEyMDI2NjcsNjIgNjIsNDguMTIxMyA2MiwzMSBDNjIsMTMuODc5NzMzMyA0OC4xMjAyNjY3LDAgMzEsMCBMMzEsMCBaIiBpZD0iRmlsbC0xIj48L3BhdGg+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=';
-	}
-
-	/**
-	 * Get the instance of AMP_Settings.
-	 *
-	 * @since 0.6
-	 * @return object $instance AMP_Settings instance.
-	 */
-	public static function get_instance() {
-		static $instance;
-
-		if ( ! ( $instance instanceof AMP_Settings ) ) {
-			$instance = new AMP_Settings();
-		}
-
-		return $instance;
-	}
-
-}
diff --git a/readme.md b/readme.md
index 4225e1c809a..92608c02aea 100644
--- a/readme.md
+++ b/readme.md
@@ -1,175 +1,698 @@
-<!-- DO NOT EDIT THIS FILE; it is auto-generated from readme.txt -->
-# AMP
+# AMP for WordPress
 
-Enable Accelerated Mobile Pages (AMP) on your WordPress site.
+## Overview
 
-**Contributors:** [batmoo](https://profiles.wordpress.org/batmoo), [joen](https://profiles.wordpress.org/joen), [automattic](https://profiles.wordpress.org/automattic), [potatomaster](https://profiles.wordpress.org/potatomaster), [albertomedina](https://profiles.wordpress.org/albertomedina)  
-**Tags:** [amp](https://wordpress.org/plugins/tags/amp), [mobile](https://wordpress.org/plugins/tags/mobile)  
-**Requires at least:** 4.7  
-**Tested up to:** 4.8  
-**Stable tag:** 0.5.1  
-**License:** [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)  
+This plugin adds support for the [Accelerated Mobile Pages](https://www.ampproject.org) (AMP) Project, which is an open source initiative that aims to provide mobile optimized content that can load instantly everywhere.
 
-[![Build Status](https://travis-ci.org/Automattic/amp-wp.svg?branch=master)](https://travis-ci.org/Automattic/amp-wp) 
+With the plugin active, all posts on your site will have dynamically generated AMP-compatible versions, accessible by appending `/amp/` to the end your post URLs. For example, if your post URL is `http://example.com/2016/01/01/amp-on/`, you can access the AMP version at `http://example.com/2016/01/01/amp-on/amp/`. If you do not have [pretty permalinks](https://codex.wordpress.org/Using_Permalinks#mod_rewrite:_.22Pretty_Permalinks.22) enabled, you can do the same thing by appending `?amp=1`, i.e. `http://example.com/?p=123&amp=1`
 
-## Description ##
+Note #1: that Pages and archives are not currently supported.
 
-This plugin adds support for the [Accelerated Mobile Pages](https://www.ampproject.org) (AMP) Project, which is an an open source initiative that aims to provide mobile optimized content that can load instantly everywhere.
+Note #2: this plugin only creates AMP content but does not automatically display it to your users when they visit from a mobile device. That is handled by AMP consumers such as Google Search. For more details, see the [AMP Project FAQ](https://www.ampproject.org/docs/support/faqs.html).
 
-With the plugin active, all posts on your site will have dynamically generated AMP-compatible versions, accessible by appending `/amp/` to the end your post URLs. For example, if your post URL is `http://example.com/2016/01/01/amp-on/`, you can access the AMP version at `http://example.com/2016/01/01/amp-on/amp/`. If you do not have [pretty permalinks](https://codex.wordpress.org/Using_Permalinks#mod_rewrite:_.22Pretty_Permalinks.22) enabled, you can do the same thing by appending `?amp=1`, i.e. `http://example.com/?p=123&amp=1`
+## Customization / Templating
 
-Note #1: that Pages and archives are not currently supported. Pages support is being worked on.
+The plugin ships with a default template that looks nice and clean and we tried to find a good balance between ease and extensibility when it comes to customization.
 
-Note #2: this plugin only creates AMP content but does not automatically display it to your users when they visit from a mobile device. That is handled by AMP consumers such as Google Search. For more details, see the [AMP Project FAQ](https://www.ampproject.org/docs/support/faqs.html).
+You can tweak small pieces of the template or the entire thing depending on your needs.
+
+### AMP Customizer
+
+The plugin ships with its own Customizer that you can use to tweak various parts of the default template like colors.
+
+#### Disabling the AMP Customizer
+
+If you're using a completely custom template, you may want to disable the AMP Customizer:
+
+```
+add_filter( 'amp_customizer_is_enabled', '__return_false' );
+``` 
+
+Note that this needs to be called before the `after_setup_theme` hook to work.
+
+### Where Do I Put My Code?
+
+The code snippets below and any other code-level customizations should happen in one of the following locations.
+
+If you're using an off-the-shelf theme (like from the WordPress.org Theme Directory):
+
+- A [child theme](https://developer.wordpress.org/themes/advanced-topics/child-themes/).
+- A custom plugin that you activate via the Dashboard.
+- A [mu-plugin](https://codex.wordpress.org/Must_Use_Plugins).
+
+If you're using a custom theme:
+
+- `functions.php` (or via a 'require' call to files that load from `functions.php`).
+- Any of the options above.
+
+### Theme Mods
+
+The default template will attempt to draw from various theme mods, such as site icon, if supported by the active theme.
+
+#### Site Icon
+
+If you add a site icon, we will automatically replace the WordPress logo in the template.
+
+If you'd prefer to do it via code:
+
+```php
+add_filter( 'amp_post_template_data', 'xyz_amp_set_site_icon_url' );
+
+function xyz_amp_set_site_icon_url( $data ) {
+	// Ideally a 32x32 image
+	$data[ 'site_icon_url' ] = get_stylesheet_directory_uri() . '/images/amp-site-icon.png';
+	return $data;
+}
+```
+
+#### Logo Only
+
+If you want to hide the site text and just show a logo, use the `amp_post_template_css` action. The following colors the title bar black, hides the site title, and replaces it with a centered logo:
+
+```php
+add_action( 'amp_post_template_css', 'xyz_amp_additional_css_styles' );
+
+function xyz_amp_additional_css_styles( $amp_template ) {
+	// only CSS here please...
+	?>
+	header.amp-wp-header {
+		padding: 12px 0;
+		background: #000;
+	}
+	header.amp-wp-header a {
+		background-image: url( 'https://example.com/path/to/logo.png' );
+		background-repeat: no-repeat;
+		background-size: contain;
+		display: block;
+		height: 28px;
+		width: 94px;
+		margin: 0 auto;
+		text-indent: -9999px;
+	}
+	<?php
+}
+```
+
+Note: you will need to adjust the colors and sizes based on your brand.
+
+### Template Tweaks
+
+You can tweak various parts of the template via code.
+
+#### Featured Image
+
+The default template displays the featured image. If you don't want to display the featured image in your amp page, use the following code:
+
+```php
+add_filter( 'amp_post_template_data', 'xyz_amp_remove_featured_image' );
+
+function xyz_amp_remove_featured_image( $data ) {
+    $data['featured_image'] = false;
+    return $data;
+}
+```
+
+#### Content Width
+
+By default, your theme's `$content_width` value will be used to determine the size of the `amp` content well. You can change this:
+
+```php
+add_filter( 'amp_content_max_width', 'xyz_amp_change_content_width' );
+
+function xyz_amp_change_content_width( $content_max_width ) {
+	return 1200;
+}
+```
+
+#### Template Data
+
+Use the `amp_post_template_data` filter to override default template data. The following changes the placeholder image used for iframes to a file located in the current theme:
+
+```php
+add_filter( 'amp_post_template_data', 'xyz_amp_set_custom_placeholder_image' );
+
+function xyz_set_custom_placeholder_image( $data ) {
+	$data[ 'placeholder_image_url' ] = get_stylesheet_directory_uri() . '/images/amp-iframe-placeholder.png';
+	return $data;
+}
+```
+
+Note: The path must pass the default criteria set out by [`validate_file`](https://developer.wordpress.org/reference/functions/validate_file/) and must be somewhere in a subfolder of `WP_CONTENT_DIR`.
+
+#### Schema.org (JSON) Metadata
+
+The plugin adds some default metadata to enable ["Rich Snippet" support](https://developers.google.com/structured-data/rich-snippets/articles). You can modify this using the `amp_post_template_metadata` filter. The following changes the type annotation to `NewsArticle` (from the default `BlogPosting`) and overrides the default Publisher Logo.
+
+```php
+add_filter( 'amp_post_template_metadata', 'xyz_amp_modify_json_metadata', 10, 2 );
+
+function xyz_amp_modify_json_metadata( $metadata, $post ) {
+	$metadata['@type'] = 'NewsArticle';
+
+	$metadata['publisher']['logo'] = array(
+		'@type' => 'ImageObject',
+		'url' => get_template_directory_uri() . '/images/my-amp-metadata-logo.png',
+		'height' => 60,
+		'width' => 600,
+	);
+
+	return $metadata;
+}
+```
+
+#### Template Meta (Author, Date, etc.)
+
+For the meta section of the template (i.e. author, date, taxonomies, etc.), you can override templates for the existing sections, remove them, add new ones.
+
+##### Example: Override Author Template from Theme
+
+Create a folder in your theme called `amp` and add a file called `meta-author.php` with the following:
+
+```php
+<li class="xyz-byline">
+	<span>Anonymous</span>
+</li>
+```
+
+Replace the contents, as needed.
+
+##### Example: Override Taxonomy Template via filter
+
+This will load the file `t/meta-custom-tax.php` for the `taxonomy` section:
+
+```php
+add_filter( 'amp_post_template_file', 'xyz_amp_set_custom_tax_meta_template', 10, 3 );
+
+function xyz_amp_set_custom_tax_meta_template( $file, $type, $post ) {
+	if ( 'meta-taxonomy' === $type ) {
+		$file = dirname( __FILE__ ) . '/t/meta-custom-tax.php';
+	}
+	return $file;
+}
+```
+
+In `t/meta-custom-tax.php`, you can add something like the following to replace the default category and tags with your custom `author` taxonomy:
+
+```php
+<li class="xyz-tax-authors">
+	<?php echo get_the_term_list( $this->get( 'post_id' ), 'xyz-author', '', ', ' ); ?>
+</li>
+```
+
+##### Example: Remove Author from `header_meta`
+
+This will completely remove the author section:
+
+```php
+add_filter( 'amp_post_article_header_meta', 'xyz_amp_remove_author_meta' );
+
+function xyz_amp_remove_author_meta( $meta_parts ) {
+	foreach ( array_keys( $meta_parts, 'meta-author', true ) as $key ) {
+		unset( $meta_parts[ $key ] );
+	}
+	return $meta_parts;
+}
+```
+
+##### Example: Add Comment Count to `footer_meta`
+
+This adds a new section to display the comment count:
+
+```php
+add_filter( 'amp_post_article_footer_meta', 'xyz_amp_add_comment_count_meta' );
+
+function xyz_amp_add_comment_count_meta( $meta_parts ) {
+	$meta_parts[] = 'xyz-meta-comment-count';
+	return $meta_parts;
+}
+
+add_filter( 'amp_post_template_file', 'xyz_amp_set_comment_count_meta_path', 10, 3 );
+
+function xyz_amp_set_comment_count_meta_path( $file, $type, $post ) {
+	if ( 'xyz-meta-comment-count' === $type ) {
+		$file = dirname( __FILE__ ) . '/templates/xyz-meta-comment-count.php';
+	}
+	return $file;
+}
+```
+
+Then, in `templates/xyz-meta-comment-count.php`:
+
+```php
+<li>
+	<?php printf( _n( '%d comment', '%d comments', $this->get( 'post' )->comment_count, 'xyz-text-domain' ) ); ?>
+</li>
+```
+
+#### Custom CSS
+
+##### Rule Additions
+
+If you want to append to the existing CSS rules (e.g. styles for a custom embed handler), you can use the `amp_post_template_css` action:
+
+```php
+add_action( 'amp_post_template_css', 'xyz_amp_my_additional_css_styles' );
+
+function xyz_amp_my_additional_css_styles( $amp_template ) {
+	// only CSS here please...
+	?>
+	.amp-wp-byline amp-img {
+		border-radius: 0; /* we don't want round avatars! */
+	}
+	.my-custom-class {
+		color: blue;
+	}
+	<?php
+}
+```
+
+##### Completely Override CSS
+
+If you'd prefer to use your own styles, you can either:
+
+- Create a folder in your theme called `amp` and add a file called `style.php` with your custom CSS.
+- Specify a custom template using the `amp_post_template_file` filter for `'style' === $type`. See the "Override" examples in the "Meta" section for examples.
+
+Note: the file should only include CSS, not the `<style>` opening and closing tag.
+
+#### Head and Footer
+
+If you want to add stuff to the head or footer of the default AMP template, use the `amp_post_template_head` and `amp_post_template_footer` actions.
+
+```php
+add_action( 'amp_post_template_footer', 'xyz_amp_add_pixel' );
+
+function xyz_amp_add_pixel( $amp_template ) {
+	$post_id = $amp_template->get( 'post_id' );
+	?>
+	<amp-pixel src="https://example.com/hi.gif?x=RANDOM"></amp-pixel>
+	<?php
+}
+```
+
+#### AMP Endpoint
+
+If you don't want to use the default `/amp` endpoint, use the `amp_query_var` filter to change it to anything else.
+
+```php
+add_filter( 'amp_query_var' , 'xyz_amp_change_endpoint' );
+
+function xyz_amp_change_endpoint( $amp_endpoint ) {
+	return 'foo';
+}
+```
+
+### Custom Template
+
+If you want complete control over the look and feel of your AMP content, you can override the default template using the `amp_post_template_file` filter and pass it the path to a custom template:
+
+```php
+add_filter( 'amp_post_template_file', 'xyz_amp_set_custom_template', 10, 3 );
+
+function xyz_amp_set_custom_template( $file, $type, $post ) {
+	if ( 'single' === $type ) {
+		$file = dirname( __FILE__ ) . '/templates/my-amp-template.php';
+	}
+	return $file;
+}
+```
+
+Note: there are some requirements for a custom template:
+
+* You must trigger the `amp_post_template_head` action in the `<head>` section:
+
+```php
+do_action( 'amp_post_template_head', $this );
+```
+
+* You must trigger the `amp_post_template_footer` action right before the `</body>` tag:
+
+```php
+do_action( 'amp_post_template_footer', $this );
+```
+
+* Within your `amp-custom` `style` tags, you must trigger the `amp_post_template_css` action:
+
+```php
+do_action( 'amp_post_template_css', $this );
+```
+
+* You must include [all required mark-up](https://www.ampproject.org/docs/get_started/create/basic_markup.html) that isn't already output via the `amp_post_template_head` action.
+
+## Handling Media
+
+By default, the plugin attempts to gracefully handle the following media elements in your content:
+
+- images (converted from `img` => `amp-img` or `amp-anim`)
+- videos (converted from `video` => `amp-video`; Note: Flash is not supported)
+- audio (converted from `audio` => `amp-audio`)
+- iframes (converted from `iframes` => `amp-iframes`)
+- YouTube, Instagram, Twitter, and Vine oEmbeds and shortcodes (converted from the embed to the matching `amp-` component)
+
+For additional media content such as custom shortcodes, oEmbeds or manually inserted embeds, ads, etc. there are several customization options available and outlined below.
+
+### Do Nothing
+
+If your embeds/media use standard iframes, you can choose to do nothing and let the plugin handle things. They should "just work" in most cases.
+
+### `the_content` filter
+
+All existing hooks on `the_content` will continue to work. This can be a good or bad thing. Good, because existing plugin integrations will continue to work. Bad, because not all added content may make sense in an AMP context.
+
+You can add additional callbacks to `the_content` filter to output additional content as needed. Use the `is_amp_endpoint()` function to check if an AMP version of a post is being viewed. However, we recommend using an Embed Handler instead.
+
+Caveat: with this method, if you add a custom component that requires inclusion of a script, you will need to add that script manually to the template using the `amp_post_template_head` action.
+
+### Update Existing Shortcodes
+
+In your existing shortcode or oEmbed callbacks, you can branch using the `is_amp_endpoint()` and output customized content for AMP content.
+
+The same caveat about scripts for custom AMP components applies.
+
+### Custom Embed Handler
+
+Embed Handlers are helper classes to inject AMP-specific content for your oEmbeds and shortcodes.
+
+Embed Handlers register the embeds they handle using standard WordPress functions such as `add_shortcode`. For working examples, check out the existing implementations for Instagram, Twitter, etc. as guides to build your own.
+
+While the primary purpose of Embed Handlers is for use with embeds, you can use them for adding AMP-specific `the_content` callbacks as well.
+
+#### Step 1: Build the Embed Handler
+
+Your Embed Handler class needs to extend the `AMP_Base_Embed_Handler` class.
+
+Note: make sure to set proper priorities or remove existing callbacks for your regular content.
+
+In `classes/class-amp-related-posts-embed.php`:
+
+```php
+class XYZ_AMP_Related_Posts_Embed extends AMP_Base_Embed_Handler {
+	public function register_embed() {
+		// If we have an existing callback we are overriding, remove it.
+		remove_filter( 'the_content', 'xyz_add_related_posts' );
+
+		// Add our new callback
+		add_filter( 'the_content', array( $this, 'add_related_posts' ) );
+	}
+
+	public function unregister_embed() {
+		// Let's clean up after ourselves, just in case.
+		add_filter( 'the_content', 'xyz_add_related_posts' );
+		remove_filter( 'the_content', array( $this, 'add_related_posts' ) );
+	}
+
+	public function get_scripts() {
+        return array(
+            'amp-mustache' => 'https://cdn.ampproject.org/v0/amp-mustache-0.1.js',
+            'amp-list' => 'https://cdn.ampproject.org/v0/amp-list-0.1.js',
+        );
+	}
+
+	public function add_related_posts( $content ) {
+		// See https://github.com/ampproject/amphtml/blob/master/extensions/amp-list/amp-list.md for details on amp-list
+		$related_posts_list = '
+<amp-list src="https://data.com/articles.json?ref=CANONICAL_URL" width=300 height=200 layout=responsive>
+	<template type="amp-mustache">
+		<div>
+			<amp-img src="{{imageUrl}}" width=50 height=50></amp-img>
+			{{title}}
+		</div>
+	</template>
+	<div overflow role=button aria-label="Show more" class="list-overflow">
+		Show more
+	</div>
+</amp-list>';
+
+		$content .= $related_posts_list;
+
+		return $content;
+	}
+}
+```
+
+#### Step 2: Load the Embed Handler
+
+```php
+add_filter( 'amp_content_embed_handlers', 'xyz_amp_add_related_embed', 10, 2 );
+
+function xyz_amp_add_related_embed( $embed_handler_classes, $post ) {
+	require_once( dirname( __FILE__ ) . '/classes/class-amp-related-posts-embed.php' );
+	$embed_handler_classes[ 'XYZ_AMP_Related_Posts_Embed' ] = array();
+	return $embed_handler_classes;
+}
+```
+
+### Custom Sanitizer
+
+The name "sanitizer" is a bit of a misnomer. These are primarily used internally in the plugin to make your site's content compatible with the amp spec. This involves stripping unsupported tags and attributes and transforming media elements to their matching amp version (e.g. `img` => `amp-img`).
+
+Sanitizers are pretty versatile and, unlike Embed Handlers -- which work with HTML content as a string -- they can be used to manipulate your post's AMP content using [PHP's `DOM` library](http://php.net/manual/en/book.dom.php). We've included an example that shows you how to use a custom sanitizer to inject ads into your content. You can, of course, do many other things such as add related content.
+
+#### Step 1: Build the Sanitizer
+
+Your sanitizer needs to extend the `AMP_Base_Sanitizer`. In `classes/class-ad-inject-sanitizer.php`:
+
+```php
+class XYZ_AMP_Ad_Injection_Sanitizer extends AMP_Base_Sanitizer {
+	public function sanitize() {
+		$body = $this->get_body_node();
+
+		// Build our amp-ad tag
+		$ad_node = AMP_DOM_Utils::create_node( $this->dom, 'amp-ad', array(
+			// Taken from example at https://github.com/ampproject/amphtml/blob/master/builtins/amp-ad.md
+			'width' => 300,
+			'height' => 250,
+			'type' => 'a9',
+			'data-aax_size' => '300x250',
+			'data-aax_pubname' => 'test123',
+			'data-aax_src' => '302',
+		) );
+
+		// Add a placeholder to show while loading
+		$fallback_node = AMP_DOM_Utils::create_node( $this->dom, 'amp-img', array(
+			'placeholder' => '',
+			'layout' => 'fill',
+			'src' => 'https://placehold.it/300X250',
+		) );
+		$ad_node->appendChild( $fallback_node );
+
+		// If we have a lot of paragraphs, insert before the 4th one.
+		// Otherwise, add it to the end.
+		$p_nodes = $body->getElementsByTagName( 'p' );
+		if ( $p_nodes->length > 6 ) {
+			$p_nodes->item( 4 )->parentNode->insertBefore( $ad_node, $p_nodes->item( 4 ));
+		} else {
+			$body->appendChild( $ad_node );
+		}
+	}
+}
+```
+
+#### Step 2: Load the Sanitizer
+
+```php
+add_filter( 'amp_content_sanitizers', 'xyz_amp_add_ad_sanitizer', 10, 2 );
+
+function xyz_amp_add_ad_sanitizer( $sanitizer_classes, $post ) {
+	require_once( dirname( __FILE__ ) . '/classes/class-ad-inject-sanitizer.php' );
+	$sanitizer_classes[ 'XYZ_AMP_Ad_Injection_Sanitizer' ] = array(); // the array can be used to pass args to your sanitizer and accessed within the class via `$this->args`
+	return $sanitizer_classes;
+}
+```
+
+## Extracting Image Dimensions
+
+AMP requires images to have width and height attributes. When these attributes aren't present in an image tag, AMP-WP will
+attempt to determine them for the image.
+
+### Extraction Methods
+
+#### Concurrent Dimension Extraction - PHP 5.3+ and cURL
+If you're using PHP 5.3+ and have the cURL extension installed, AMP-WP will attempt to determine dimensions for all images
+that need them concurrently. Only the minimum number of bytes required to determine the dimensions for a given image type
+are retrieved. Dimensions are then cached via transients for subsequent requests. This is the fastest and therefore recommended method.
+#### Sequential Dimension Extraction - PHP 5.2 or no cURL
+If you're using PHP 5.2 or do not have the cURL extension installed, AMP-WP will attempt to determine image dimensions
+sequentially. Only the minimum number of bytes required to determine the dimensions for a given image type are retrieved,
+but the time it takes to retrieve each image's dimensions sequentially can still add up. Dimensions are then cached via transients for subsequent requests.
+#### Custom Dimension Extraction
+You can implement your own image dimension extraction method by adding a callback to the **amp_extract_image_dimensions_batch** filter.
+
+amp_extract_image_dimensions_batch callback functions take a single argument, *$dimensions* by convention, which is a map/array of image urls to either an array containing the
+dimensions of the image at the url (if another callback for the filter was able to determine them), or false if the dimensions have yet to be determined, e.g.
+
+```php
+array(
+    'http://i0.wp.com/placehold.it/350x150.png' => array(
+        'width' => 350,
+        'height' => 150,
+     ),
+     'http://i0.wp.com/placehold.it/1024x768.png' => false,
+);
+```
+Your custom dimension extraction callback would iterate through the mappings contained in this single argument, determining
+dimensions via your custom method for all image url keys whose values are not arrays of dimensions, e.g.
+```php
+function my_custom_dimension_extraction_callback( $dimensions ) {
+    foreach ( $dimensions as $url => $value ) {
+        // Skip if dimensions have already been determined for this image.
+        if ( is_array( $value ) ) {
+            continue;                
+        }
+        $width = <YOUR CUSTOM CODE TO DETERMINE WIDTH>
+        $height = <YOUR CUSTOM CODE TO DETERMINE HEIGHT>
+        $dimensions[ $url ] = array(
+            'width' => $width,
+            'height' => $height,
+         );
+    }
+
+    return $dimensions;
+```
+Your callback needs to return $dimensions so that the value either cascades to the next callback that was added to the *amp_extract_image_dimensions_batch* filter or is
+returned to the apply_filter() call (if there are no more unprocessed callbacks).
+
+The default callback provided by WP-AMP described above, *extract_by_downloading_images*, will fire unless explicitly removed, so be sure
+to remove it from the callback chain if you don't want it to, e.g.
+
+```php
+	remove_filter( 'amp_extract_image_dimensions_batch', array( 'AMP_Image_Dimension_Extractor', 'extract_by_downloading_images' ), 999, 1 );
+````
+
+**Note that if you previously added a custom dimension extraction callback to the *amp_extract_image_dimensions* filter,
+you need to update it to hook into the *amp_extract_image_dimensions_batch* filter instead and iterate over the key value
+pairs in the single argument as per the example above.**
+
+## Analytics
+
+There are two options you can follow to include analytics tags in your posts.
+
+### Plugin Analytics Options
+
+The plugin defines an analytics option to enable the addition of
+[amp-analytics](https://www.ampproject.org/docs/reference/components/amp-analytics) in your posts. When the plugin is
+ active, an AMP top-level menu appears in the Dashboard with one inner sub-menu called 'Analytics':
+
+ ![AMP Options Menu](https://github.com/Automattic/amp-wp/blob/amedina/amp-analytics-customizer/readme-assets/amp-options-analytics.png)
+
+ Selecting the `Analytics` sub-menu in the AMP options menu takes us to an Analytics Options entry page, where we can
+  define the analytics tags we want to have, by specifying the vendor type (e.g. Parsely), and the associated  JSON 
+  configuration.
+
+ ![AMP Options Menu](https://github.com/Automattic/amp-wp/blob/amedina/amp-analytics-customizer/readme-assets/analytics-option-entries.png)
+
+Notice that the goal of this option of the plugin is to provide a simple mechanism to insert analytics tags;
+ it provides very simple validation based solely on the validity of the JSON string provided. It is the users 
+ responsibility to make sure that the values in the configuration string and the vendor type used are coherent with 
+ the analytics requirements of their site . Please review the documentation in the [AMP project ](https://github.com/ampproject/amphtml/blob/master/extensions/amp-analytics/amp-analytics.md) and in [AMPByExample](https://ampbyexample.com/components/amp-analytics/).
+ 
+ The AMP Analytics options entry form provides a very simple validation feedback mechanism: if the JSON configuration 
+ string entered is invalid (i.e. not valid  JSON), an error message (in red) is displayed below the title of the 
+ options window and the entry form is reloaded:
+    
+![AMP Options Menu](https://github.com/Automattic/amp-wp/blob/amedina/amp-analytics-customizer/readme-assets/invalid-input.png)
+    
+And, if the configuration provided is actually a valid JSON string, a success message (in green) is displayed at the 
+top of the window below the title, and again the entry form is reloaded. 
+
+![AMP Options Menu](https://github.com/Automattic/amp-wp/blob/amedina/amp-analytics-customizer/readme-assets/options-saved.png)
+
+### Manually
+
+Alaternatively, you can use the `amp_post_template_analytics` filter:
+
+```php
+add_filter( 'amp_post_template_analytics', 'xyz_amp_add_custom_analytics' );
+function xyz_amp_add_custom_analytics( $analytics ) {
+	if ( ! is_array( $analytics ) ) {
+		$analytics = array();
+	}
+
+	// https://developers.google.com/analytics/devguides/collection/amp-analytics/
+	$analytics['xyz-googleanalytics'] = array(
+		'type' => 'googleanalytics',
+		'attributes' => array(
+			// 'data-credentials' => 'include',
+		),
+		'config_data' => array(
+			'vars' => array(
+				'account' => "UA-XXXXX-Y"
+			),
+			'triggers' => array(
+				'trackPageview' => array(
+					'on' => 'visible',
+					'request' => 'pageview',
+				),
+			),
+		),
+	);
+
+	// https://www.parsely.com/docs/integration/tracking/google-amp.html
+	$analytics['xyz-parsely'] = array(
+		'type' => 'parsely',
+		'attributes' => array(),
+		'config_data' => array(
+			'vars' => array(
+				'apikey' => 'YOUR APIKEY GOES HERE',
+			)
+		),
+	);
+
+	return $analytics;
+}
+```
+
+Each analytics entry must include a unique array key and the following attributes:
+
+- `type`: `(string)` one of the [valid vendors](https://github.com/ampproject/amphtml/blob/master/extensions/amp-analytics/amp-analytics.md#analytics-vendors) for amp-analytics.
+- `attributes`: `(array)` any [additional valid  attributes](https://github.com/ampproject/amphtml/blob/master/extensions/amp-analytics/amp-analytics.md#attributes) to add to the `amp-analytics` element.
+- `config_data`: `(array)` the [config data](https://github.com/ampproject/amphtml/blob/master/extensions/amp-analytics/amp-analytics.md#configuration) to include in the `amp-analytics` script tag. This is `json_encode`-d on output.
+
+## Custom Post Type Support
+
+By default, the plugin only creates AMP content for posts. You can add support for other post_types using the post_type parameter used when registering the custom post type (assume our post_type is `xyz-review`):
+
+```php
+add_action( 'amp_init', 'xyz_amp_add_review_cpt' );
+function xyz_amp_add_review_cpt() {
+	add_post_type_support( 'xyz-review', AMP_QUERY_VAR );
+}
+```
+
+You'll need to flush your rewrite rules after this.
+
+If you want a custom template for your post type:
+
+```php
+add_filter( 'amp_post_template_file', 'xyz_amp_set_review_template', 10, 3 );
+
+function xyz_amp_set_review_template( $file, $type, $post ) {
+	if ( 'single' === $type && 'xyz-review' === $post->post_type ) {
+		$file = dirname( __FILE__ ) . '/templates/my-amp-review-template.php';
+	}
+	return $file;
+}
+```
+
+We may provide better ways to handle this in the future.
+
+## Plugin integrations
+
+### Jetpack
+
+Jetpack integration is baked in. More support for things like Related Posts to come.
+
+### Parse.ly
+
+[Parse.ly's WordPress plugin](https://wordpress.org/plugins/wp-parsely/) automatically tracks AMP pages when enabled along with this plugin.
+
+
+### Yoast SEO
+
+If you're using [Yoast SEO](https://wordpress.org/plugins/wordpress-seo/), check out the companion plugin here: https://github.com/Yoast/yoastseo-amp
 
-Follow along with or contribute to the development of this plugin at https://github.com/Automattic/amp-wp
-
-## Installation ##
-
-1. Upload the folder to the `/wp-content/plugins/` directory
-1. Activate the plugin through the 'Plugins' menu in WordPress
-1. You may need to refresh your permalinks by going to `Settings > Permalinks` and tapping the `Save` button.
-
-## Frequently Asked Questions ##
-
-### How do I customize the AMP output for my site? ###
-You can tweak a few things like colors from the AMP Customizer. From the Dashboard, go to `Appearance > AMP`.
-
-For deeper level customizations, please see the readme at https://github.com/Automattic/amp-wp/blob/master/readme.md
-
-### What about ads and shortcodes and such? ###
-Check out https://github.com/Automattic/amp-wp/blob/master/readme.md#handling-media
-
-### What about analytics? ###
-Many plugins are adding AMP support already. If you handling analytics yourself, please see https://github.com/Automattic/amp-wp/blob/master/readme.md#analytics
-
-### Google Webmaster Tools is reporting validation errors for my site. How do I fix them? ###
-The best place to start is to open a new discussion in the [support forum](https://wordpress.org/support/plugin/amp) with details on what the specific validation error is.
-
-### Why aren't Pages supported yet ###
-A wise green Yoda once said, "Patience you must have, my young padawan." We're working on it :)
-
-
-## Changelog ##
-
-### 0.5.1 (2017-08-17) ###
-- Fix: issues with invalid tags not being stripped out (e.g. script tags) (h/t tmmbecker, fahmi182, pppdog, seejacobscott, RavanH, jenniejj, lkraav, simonrperry for the reports).
-- Fix: issues with dimension extraction for protocol-less and relative URLs (h/t ktmn for the report).
-
-### 0.5 (2017-08-04) ###
-- Whitelist Sanitizer: Replace Blacklist Sanitizer with a whitelist-based approach using the AMP spec (props delputnam)
-- Image Dimensions: Replace fastimage with fasterimage for PHP 5.4+. Enables faster downloads and wider support (props gititon)
-- Embed Handlers: Added support for Vimeo, SoundCloud, Pinterest (props amedina) and PlayBuzz (props lysk88)
-- Analytics: UI for easier addition of analytics tags (props amedina)
-- Fix: parse query strings properly (props amyevans)
-- Fix: Old slug redirect for AMP URLs (props rahulsprajapati)
-- Fix: Handle issues with data uri images in CSS (props trepmal)
-- Fix: Add amp-video js for amp-video tags (props ptbello)
-- Fix: Output CSS for feature image (props mjangda)
-- Fix: Fix attribute when adding AMP Mustache lib (props luigitec)
-- Fix: Various documentation updates (props piersb, bhhaskin)
-- Fix: PHP Warnings from `register_customizer_ui` (props jahvi)
-- Fix: Coding Standards (props paulschreiber)
-
-### 0.4.2 (2016-10-13) ###
-- Fix: Prevent validation errors for `html` tag (h/t Maxime2 and everyone else that reported this error)
-- Fix: Handle variable name conflict that was causing content_max_width to be ignored (h/t mimancillas)
-- Fix: Prevent errors when nodes don't have attributes (h/t stephenmax)
-- Fix: Back-compat for 4.5 (add sanitize_hex_color function, h/t xotihcan)
-- Fix: Handle gif featured images (h/t protocolil)
-- Documentation updates (props troyxmccall)
-
-### 0.4.1 (2016-10-10) ###
-- Fix: Don't fire the_content for featured image output
-- Fix: Don't show comment link when disabled and no comments on post (h/t neotrope)
-- Fix: strip `!important` from inline styles (h/t compointdesigner and enriccardonagmailcom)
-
-### 0.4 (2016-10-06) ###
-- New template: spiffy, shiny, and has the fresh theme smell (props allancole and the Automattic Theme Team).
-- *Warning*: The template update has potential breaking changes. Please see https://wordpress.org/support/topic/v0-4-whats-new-and-possible-breaking-changes/
-- AMP Customizer: Pick your colors and make the template your own (props DrewAPicture and 10up)
-- Fix: support for inline styles (props coreymckrill).
-- Fix: no more fatal errors when tags not supported by post type (props david-binda)
-- Fix: no more unnecessary `<br>` tags.
-- Fix: sanitize children of removed nodes (like empty `<a>` tags) (props Maxime2).
-- Fix: no more broken YouTube URLs with multiple ?s.
-- Fix: properly handle tel and sms schemes (h/t soundstrategies).
-- Fix: remove amp endpoint on deactivate.
-- New filter: `amp_pre_get_permalink` if you want a completely custom AMP permalink.
-
-### 0.3.3 (Aug 18, 2016) ###
-- Handle many more validation errors (props bcampeau and alleyinteractive).
-- New filter: `amp_post_template_dir` (props mustafauysal).
-- New template: Nav bar is now it's own template part (props jdevalk).
-- Better ratio for YouTube embeds.
-- Fix: better timezone handling (props rinatkhaziev).
-- Fix: better handling of non-int dimensions (like `100%`).
-- Fix: better handling of empty dimensions.
-- Fix: `autoplay` is a bool-like value.
-- Fix: breakage when using the `query_string` hook (h/t mkuplens).
-- Fix: don't break really large Twitter IDs.
-- Fix: don't break Instagram shortcodes when using URLs with querystrings.
-- Readme improvements (props nickjohnford, sotayamashita)
-
-### 0.3.2 (Mar 4, 2016) ###
-* Jetpack Stats support.
-* Better version of Merriweather and use system fonts for sans-serif (props mattmiklic).
-* Move font to stylesheet so it can be more easily overridden (props mattmiklic).
-* Fix: Template loading issues on Windows. (Thanks to everyone who reported this, especially w33zy for pointing out the `validate_file` issue.)
-* Fix: don't run AMP on post comment feeds (props kraftbj).
-* Fix: un-break pagination when using a static home page with multiple pages.
-* Fix: force amp-iframe to use https to validate correctly (props mister-ben).
-* Fix: validation for `target` and `video`/`audio` attributes.
-* Fix: clipped images in galleries (thanks tobaco).
-
-### 0.3.1 (Feb 24, 2016) ###
-* Allow custom query var (props vaurdan).
-* Fix AMP URLs for non-pretty permalinks (props rakuishi).
-* Fix for password-protected posts.
-* Fix dimension extraction for schema-less or relative image URLs.
-* Better fallback for images with no dimensions.
-* Validation fixes for `a` tags (props kraftbj).
-* Updated AMP boilerplate.
-* Allow `on` tags for elements (props Steven Evatt).
-* Prefixed class names.
-
-### 0.3 (Feb 18, 2016) ###
-* Fetch dimensions for hotlinked images.
-* Add amp-facebook support.
-* Add some new actions and filters (e.g. `amp_init`).
-* Fix validation errors for [gallery] shortcodes.
-* Fix issues with path validation on Windows.
-* Fix issues with really squeezed layout.
-* Breaking change: `style.css` no longer contains the `<style> tag. If you have a custom stylesheet, you need to update it to remove the tag.
-* Breaking change: `single.php` no longer includes the AMP boilerplate styles. They are instead added via the `amp_post_template_head` hook. If you have a custom template, please remove the boilerplate styles.
-
-### 0.2 (Jan 28, 2016) ###
-* Lots and lots and lots of compatibility and validation fixes
-* Lots and lots and lots of improvements for customization
-
-### 0.1 ###
-* Initial version
-
-
-## Upgrade Notice ##
-
-### 0.4 ###
-* Breaking change: The new template has changes to markup, class names, and styles that may not work with existing customizations. If you want to stay on the old template for now, you can use the following code snippet:
-
-```
-if ( function_exists( 'amp_backcompat_use_v03_templates' ) ) {
-    amp_backcompat_use_v03_templates();
-}
-```
-
-For more details, please see https://wordpress.org/support/topic/v0-4-whats-new-and-possible-breaking-changes/
-
-### 0.3.1 ###
-* Breaking change: `AMP_QUERY_VAR` is now defined right before `amp_init`.
-* Breaking change: class names for elements in the default template were prefixed with `amp-wp-`. Any styles targeting these classes should be updated.
-
-### 0.3 ###
-* Breaking change: `style.css` no longer contains the `<style> tag. If you have a custom stylesheet, you need to update it to remove the tag.
-* Breaking change: `single.php` no longer includes the AMP boilerplate styles. They are instead added via the `amp_post_template_head` hook. If you have a custom template, please remove the boilerplate styles.
+## Compatibility Issues
 
+The following plugins have been known to cause issues with this plugin:
 
+- Cloudflare Rocket Loader (modifies the output of the AMP page, which breaks validation.)
diff --git a/templates/admin/settings/fields/checkbox-post-types.php b/templates/admin/settings/fields/checkbox-post-types.php
deleted file mode 100644
index b425894cccc..00000000000
--- a/templates/admin/settings/fields/checkbox-post-types.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Settings post types checkbox template.
- *
- * @package AMP
- */
-
-/**
- * Context.
- *
- * @var AMP_Settings_Post_Types $this
- */
-
-// Check referrer.
-if ( ! ( $this instanceof AMP_Settings_Post_Types ) ) {
-	return;
-}
-?>
-<fieldset>
-	<?php foreach ( $this->get_supported_post_types() as $post_type ) : ?>
-		<label>
-			<input type="checkbox" value="1" name="<?php echo esc_attr( $this->get_name_attribute( $post_type->name ) ); ?>"<?php checked( true, post_type_supports( $post_type->name, AMP_QUERY_VAR ) ); ?>> <?php echo esc_html( $post_type->label ); ?>
-		</label>
-		<br>
-	<?php endforeach; ?>
-	<p class="description"><?php echo esc_html( $this->setting['description'] ); ?></p>
-</fieldset>
diff --git a/templates/admin/settings/screen.php b/templates/admin/settings/screen.php
deleted file mode 100644
index fd1d8248f43..00000000000
--- a/templates/admin/settings/screen.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Settings template.
- *
- * @package AMP
- */
-
-// Check referrer.
-if ( ! ( $this instanceof AMP_Settings ) ) {
-	return;
-}
-?>
-<div class="wrap">
-	<h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
-	<?php settings_errors(); ?>
-	<form action="options.php" method="post">
-		<?php
-		settings_fields( AMP_Settings::SETTINGS_KEY );
-		do_settings_sections( AMP_Settings::MENU_SLUG );
-		submit_button();
-		?>
-	</form>
-</div>
diff --git a/tests/test-amp-post-types-support.php b/tests/test-amp-post-types-support.php
index e23c59be530..b163784f14a 100644
--- a/tests/test-amp-post-types-support.php
+++ b/tests/test-amp-post-types-support.php
@@ -14,22 +14,26 @@ class Test_AMP_Post_Types_Support extends WP_UnitTestCase {
 	/**
 	 * Test amp_core_post_types_support.
 	 *
-	 * @see amp_core_post_types_support()
+	 * @covers amp_core_post_types_support()
 	 */
 	public function test_init() {
+		remove_post_type_support( 'post', AMP_QUERY_VAR );
 		amp_core_post_types_support();
 		$this->assertTrue( post_type_supports( 'post', AMP_QUERY_VAR ) );
-		remove_post_type_support( 'post', AMP_QUERY_VAR );
 	}
 
 	/**
 	 * Test amp_custom_post_types_support.
 	 *
-	 * @see amp_custom_post_types_support()
+	 * @covers amp_custom_post_types_support()
 	 */
 	public function test_amp_custom_post_types_support() {
-		update_option( AMP_Settings::SETTINGS_KEY, array(
-			'post_types_support' => array(
+		amp_custom_post_types_support();
+		$this->assertFalse( post_type_supports( 'foo', AMP_QUERY_VAR ) );
+		$this->assertFalse( post_type_supports( 'bar', AMP_QUERY_VAR ) );
+
+		update_option( AMP_Options_Manager::OPTION_NAME, array(
+			'supported_post_types' => array(
 				'foo' => true,
 				'bar' => true,
 			),
@@ -37,9 +41,5 @@ public function test_amp_custom_post_types_support() {
 		amp_custom_post_types_support();
 		$this->assertTrue( post_type_supports( 'foo', AMP_QUERY_VAR ) );
 		$this->assertTrue( post_type_supports( 'bar', AMP_QUERY_VAR ) );
-		delete_option( AMP_Settings::SETTINGS_KEY );
-		remove_post_type_support( 'foo', AMP_QUERY_VAR );
-		remove_post_type_support( 'bar', AMP_QUERY_VAR );
 	}
-
 }
diff --git a/tests/test-class-amp-settings-post-types.php b/tests/test-class-amp-settings-post-types.php
index 218d3a407b3..c8dec94efeb 100644
--- a/tests/test-class-amp-settings-post-types.php
+++ b/tests/test-class-amp-settings-post-types.php
@@ -49,7 +49,7 @@ public function test_register_settings() {
 		$menu_slug    = AMP_Settings::MENU_SLUG;
 		$option_group = AMP_Settings::SETTINGS_KEY;
 		$section_id   = 'post_types';
-		$setting_id   = 'post_types_support';
+		$setting_id   = 'supported_post_types';
 
 		$this->instance->register_settings();
 		$this->assertArrayHasKey( $menu_slug, $wp_settings_sections );
@@ -71,7 +71,7 @@ public function test_register_settings() {
 			$this->markTestIncomplete( 'Settings field could not be found.' );
 		}
 
-		$this->assertEquals( 'post_types_support', $wp_settings_fields[ $menu_slug ][ $section_id ][ $setting_id ]['id'] );
+		$this->assertEquals( 'supported_post_types', $wp_settings_fields[ $menu_slug ][ $section_id ][ $setting_id ]['id'] );
 	}
 
 	/**
@@ -85,7 +85,7 @@ public function test_get_settings() {
 		$this->assertFalse( $this->instance->get_settings( 'foo' ) );
 
 		update_option( AMP_Settings::SETTINGS_KEY, array(
-			'post_types_support' => array(
+			'supported_post_types' => array(
 				'post' => true,
 			),
 		) );
@@ -114,7 +114,7 @@ public function test_get_supported_post_types() {
 	 * @see AMP_Settings_Post_Types::get_name_attribute()
 	 */
 	public function test_get_name_attribute() {
-		$this->assertEquals( AMP_Settings::SETTINGS_KEY . '[post_types_support][post]', $this->instance->get_name_attribute( 'post' ) );
+		$this->assertEquals( AMP_Settings::SETTINGS_KEY . '[supported_post_types][post]', $this->instance->get_name_attribute( 'post' ) );
 	}
 
 	/**
@@ -127,7 +127,7 @@ public function test_errors() {
 			'public' => true,
 		) );
 		update_option( AMP_Settings::SETTINGS_KEY, array(
-			'post_types_support' => array(
+			'supported_post_types' => array(
 				'foo' => true,
 			),
 		) );
@@ -147,12 +147,12 @@ public function test_errors() {
 	public function test_validate() {
 		$this->assertInternalType( 'array', $this->instance->validate( array() ) );
 		update_option( AMP_Settings::SETTINGS_KEY, array(
-			'post_types_support' => array(
+			'supported_post_types' => array(
 				'foo' => true,
 			),
 		) );
 		$settings = $this->instance->validate( get_option( AMP_Settings::SETTINGS_KEY ) );
-		$this->assertInternalType( 'bool', $settings['post_types_support']['foo'] );
+		$this->assertInternalType( 'bool', $settings['supported_post_types']['foo'] );
 		delete_option( AMP_Settings::SETTINGS_KEY );
 	}
 

From 5ea54e9282e0c96bf23318aac369635a6573ee6c Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 5 Dec 2017 16:41:31 -0800
Subject: [PATCH 15/21] Add tests for AMP_Options_Menu

---
 includes/class-amp-post-type-support.php      |  25 ++++-
 includes/options/class-amp-options-menu.php   |  33 ++----
 .../views/class-amp-options-manager.php       |   6 +-
 tests/test-class-amp-options-menu.php         |  97 +++++++++++++++++
 tests/test-class-amp-settings.php             | 103 ------------------
 5 files changed, 131 insertions(+), 133 deletions(-)
 create mode 100644 tests/test-class-amp-options-menu.php
 delete mode 100644 tests/test-class-amp-settings.php

diff --git a/includes/class-amp-post-type-support.php b/includes/class-amp-post-type-support.php
index b699683d3d6..8e3a6ec8570 100644
--- a/includes/class-amp-post-type-support.php
+++ b/includes/class-amp-post-type-support.php
@@ -22,10 +22,29 @@ public static function add_hooks() {
 	/**
 	 * Get post types that plugin supports out of the box (which cannot be disabled).
 	 *
-	 * @return array Post types.
+	 * @return string[] Post types.
 	 */
 	public static function get_builtin_supported_post_types() {
-		return array( 'post' );
+		return array_filter( array( 'post' ), 'post_type_exists' );
+	}
+
+	/**
+	 * Get post types that are eligible for AMP support.
+	 *
+	 * @since 0.6
+	 * @return string[] Post types eligible for AMP.
+	 */
+	public static function get_eligible_post_types() {
+		return array_merge(
+			self::get_builtin_supported_post_types(),
+			get_post_types(
+				array(
+					'public'   => true,
+					'_builtin' => false,
+				),
+				'names'
+			)
+		);
 	}
 
 	/**
@@ -50,7 +69,7 @@ public static function add_builtin_post_type_support() {
 	public static function add_elected_post_type_support() {
 		$post_types = array_merge(
 			array_keys( array_filter( AMP_Options_Manager::get_option( 'supported_post_types', array() ) ) ),
-			self::get_builtin_supported_post_types()
+			self::get_builtin_supported_post_types() // Make sure support is still present.
 		);
 		foreach ( $post_types as $post_type ) {
 			add_post_type_support( $post_type, AMP_QUERY_VAR );
diff --git a/includes/options/class-amp-options-menu.php b/includes/options/class-amp-options-menu.php
index c040e4189c4..3e0f7cc7e53 100644
--- a/includes/options/class-amp-options-menu.php
+++ b/includes/options/class-amp-options-menu.php
@@ -52,7 +52,7 @@ public function add_menu_items() {
 		);
 
 		add_settings_section(
-			'supported_post_types',
+			'post_types',
 			false,
 			'__return_false',
 			AMP_Options_Manager::OPTION_NAME
@@ -62,7 +62,7 @@ public function add_menu_items() {
 			__( 'Post Type Support', 'amp' ),
 			array( $this, 'render_post_types_support' ),
 			AMP_Options_Manager::OPTION_NAME,
-			'supported_post_types'
+			'post_types'
 		);
 
 		$submenus = array(
@@ -76,29 +76,11 @@ public function add_menu_items() {
 	}
 
 	/**
-	 * Getter for the supported post types.
-	 *
-	 * @since 0.6
-	 * @return array Supported post types list.
-	 */
-	public function get_supported_post_types() {
-		$core = get_post_types( array(
-			'name' => 'post',
-		), 'objects' );
-		$cpt  = get_post_types( array(
-			'public'   => true,
-			'_builtin' => false,
-		), 'objects' );
-
-		return array_merge( $core, $cpt );
-	}
-
-	/**
-	 * Handle errors.
+	 * Check for errors with updating the supported post types.
 	 *
 	 * @since 0.6
 	 */
-	public function errors() {
+	protected function check_supported_post_type_update_errors() {
 		$on_update = (
 			isset( $_GET['settings-updated'] ) // WPCS: CSRF ok.
 			&&
@@ -112,7 +94,8 @@ public function errors() {
 
 		$builtin_support = AMP_Post_Type_Support::get_builtin_supported_post_types();
 		$settings        = AMP_Options_Manager::get_option( 'supported_post_types', array() );
-		foreach ( $this->get_supported_post_types() as $post_type ) {
+		foreach ( AMP_Post_Type_Support::get_eligible_post_types() as $name ) {
+			$post_type = get_post_type_object( $name );
 			if ( ! isset( $post_type->name, $post_type->label ) || in_array( $post_type->name, $builtin_support, true ) ) {
 				continue;
 			}
@@ -151,7 +134,7 @@ public function render_post_types_support() {
 		$builtin_support = AMP_Post_Type_Support::get_builtin_supported_post_types();
 		?>
 		<fieldset>
-			<?php foreach ( $this->get_supported_post_types() as $post_type ) : ?>
+			<?php foreach ( array_map( 'get_post_type_object', AMP_Post_Type_Support::get_eligible_post_types() ) as $post_type ) : ?>
 				<?php
 				$id         = AMP_Options_Manager::OPTION_NAME . "[supported_post_types][{$post_type->name}][]";
 				$is_builtin = in_array( $post_type->name, $builtin_support, true );
@@ -183,7 +166,7 @@ public function render_post_types_support() {
 	 * @since 0.6
 	 */
 	public function render_screen() {
-		$this->errors();
+		$this->check_supported_post_type_update_errors();
 		?>
 		<div class="wrap">
 			<h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
diff --git a/includes/options/views/class-amp-options-manager.php b/includes/options/views/class-amp-options-manager.php
index 27bfc03ed0b..5bc88ca5d55 100644
--- a/includes/options/views/class-amp-options-manager.php
+++ b/includes/options/views/class-amp-options-manager.php
@@ -26,7 +26,10 @@ public static function register_settings() {
 		register_setting(
 			self::OPTION_NAME,
 			self::OPTION_NAME,
-			array( __CLASS__, 'validate_options' )
+			array(
+				'type'              => 'array',
+				'sanitize_callback' => array( __CLASS__, 'validate_options' ),
+			)
 		);
 
 		add_action( 'update_option_' . self::OPTION_NAME, 'flush_rewrite_rules' );
@@ -66,7 +69,6 @@ public static function get_option( $option, $default = false ) {
 	 * @return array Options.
 	 */
 	public static function validate_options( $new_options ) {
-
 		$defaults = array(
 			'supported_post_types' => array(),
 			'analytics'            => array(),
diff --git a/tests/test-class-amp-options-menu.php b/tests/test-class-amp-options-menu.php
new file mode 100644
index 00000000000..ec5109d2612
--- /dev/null
+++ b/tests/test-class-amp-options-menu.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Tests for AMP_Options_Menu.
+ *
+ * @package AMP
+ */
+
+/**
+ * Tests for AMP_Options_Menu.
+ */
+class Test_AMP_Options_Menu extends WP_UnitTestCase {
+
+	/**
+	 * Instance of AMP_Options_Menu
+	 *
+	 * @var AMP_Options_Menu
+	 */
+	public $instance;
+
+	/**
+	 * Setup.
+	 *
+	 * @inheritdoc
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->instance = new AMP_Options_Menu();
+	}
+
+	/**
+	 * Test constants.
+	 *
+	 * @see AMP_Options_Menu::ICON_BASE64_SVG
+	 */
+	public function test_constants() {
+		$this->assertStringStartsWith( 'data:image/svg+xml;base64,', AMP_Options_Menu::ICON_BASE64_SVG );
+	}
+
+	/**
+	 * Test init.
+	 *
+	 * @see AMP_Options_Menu::init()
+	 */
+	public function test_init() {
+		$this->instance->init();
+		$this->assertEquals( 10, has_action( 'admin_menu', array( $this->instance, 'add_menu_items' ) ) );
+		$this->assertEquals( 10, has_action( 'admin_post_amp_analytics_options', 'AMP_Options_Manager::handle_analytics_submit' ) );
+	}
+
+	/**
+	 * Test admin_menu.
+	 *
+	 * @covers AMP_Options_Menu::add_menu_items()
+	 */
+	public function test_add_menu_items() {
+		global $_parent_pages, $submenu, $wp_settings_sections, $wp_settings_fields;
+
+		wp_set_current_user( $this->factory->user->create( array(
+			'role' => 'administrator',
+		) ) );
+
+		$this->instance->add_menu_items();
+		$this->assertArrayHasKey( 'amp-options', $_parent_pages );
+		$this->assertEquals( 'amp-options', $_parent_pages['amp-options'] );
+		$this->assertArrayHasKey( 'amp-analytics-options', $_parent_pages );
+		$this->assertEquals( 'amp-options', $_parent_pages['amp-analytics-options'] );
+
+		$this->assertArrayHasKey( 'amp-options', $submenu );
+		$this->assertCount( 2, $submenu['amp-options'] );
+		$this->assertEquals( 'amp-options', $submenu['amp-options'][0][2] );
+		$this->assertEquals( 'amp-analytics-options', $submenu['amp-options'][1][2] );
+
+		// Test add_setting_section().
+		$this->assertArrayHasKey( 'amp-options', $wp_settings_sections );
+		$this->assertArrayHasKey( 'post_types', $wp_settings_sections['amp-options'] );
+
+		// Test add_setting_field().
+		$this->assertArrayHasKey( 'amp-options', $wp_settings_fields );
+		$this->assertArrayHasKey( 'post_types', $wp_settings_fields['amp-options'] );
+		$this->assertArrayHasKey( 'supported_post_types', $wp_settings_fields['amp-options']['post_types'] );
+	}
+
+	/**
+	 * Test render_screen for admin users.
+	 *
+	 * @covers AMP_Options_Menu::render_screen()
+	 */
+	public function test_render_screen_for_admin_user() {
+		wp_set_current_user( $this->factory->user->create( array(
+			'role' => 'administrator',
+		) ) );
+
+		ob_start();
+		$this->instance->render_screen();
+		$this->assertContains( '<div class="wrap">', ob_get_clean() );
+	}
+}
diff --git a/tests/test-class-amp-settings.php b/tests/test-class-amp-settings.php
deleted file mode 100644
index 5dc682fa40b..00000000000
--- a/tests/test-class-amp-settings.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Tests for AMP_Settings.
- *
- * @package AMP
- */
-
-/**
- * Tests for AMP_Settings.
- */
-class Test_AMP_Settings extends WP_UnitTestCase {
-
-	/**
-	 * Instance of AMP_Settings
-	 *
-	 * @var AMP_Settings
-	 */
-	public $instance;
-
-	/**
-	 * Setup.
-	 *
-	 * @inheritdoc
-	 */
-	public function setUp() {
-		parent::setUp();
-		$this->instance = AMP_Settings::get_instance();
-	}
-
-	/**
-	 * Test init.
-	 *
-	 * @see AMP_Settings::init()
-	 */
-	public function test_init() {
-		$this->instance->init();
-		$this->assertEquals( 10, has_action( 'admin_menu', array( $this->instance, 'admin_menu' ) ) );
-	}
-
-	/**
-	 * Test admin_menu.
-	 *
-	 * @see AMP_Settings::admin_menu()
-	 */
-	public function test_admin_menu() {
-		global $_parent_pages, $submenu;
-
-		wp_set_current_user( $this->factory->user->create( array(
-			'role' => 'administrator',
-		) ) );
-
-		$this->instance->admin_menu();
-		$this->arrayHasKey( 'amp_settings', $_parent_pages );
-		$this->arrayHasKey( 'amp_settings', $submenu );
-	}
-
-	/**
-	 * Test render_screen for non admin users.
-	 *
-	 * @see AMP_Settings::render_screen()
-	 */
-	public function test_render_screen_for_non_admin_user() {
-		wp_set_current_user( $this->factory->user->create( array(
-			'role' => 'subscriber',
-		) ) );
-
-		$this->assertEmpty( $this->instance->render_screen() );
-	}
-
-	/**
-	 * Test render_screen for admin users.
-	 *
-	 * @see AMP_Settings::render_screen()
-	 */
-	public function test_render_screen_for_admin_user() {
-		wp_set_current_user( $this->factory->user->create( array(
-			'role' => 'administrator',
-		) ) );
-
-		ob_start();
-		$this->instance->render_screen();
-		$this->assertContains( '<div class="wrap">', ob_get_clean() );
-	}
-
-	/**
-	 * Test get_svg_icon.
-	 *
-	 * @see AMP_Settings::get_svg_icon()
-	 */
-	public function test_get_svg_icon() {
-		$this->assertEquals( $this->instance->get_svg_icon(), 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB3aWR0aD0iNjJweCIgaGVpZ2h0PSI2MnB4IiB2aWV3Qm94PSIwIDAgNjIgNjIiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+QU1QLUJyYW5kLUJsYWNrLUljb248L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iYW1wLWxvZ28taW50ZXJuYWwtc2l0ZSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgICAgICA8ZyBpZD0iQU1QLUJyYW5kLUJsYWNrLUljb24iIGZpbGw9IiMwMDAwMDAiPiAgICAgICAgICAgIDxwYXRoIGQ9Ik00MS42Mjg4NjY3LDI4LjE2MTQzMzMgTDI4LjYyNDM2NjcsNDkuODAzNTY2NyBMMjYuMjY4MzY2Nyw0OS44MDM1NjY3IEwyOC41OTc1LDM1LjcwMTY2NjcgTDIxLjM4MzgsMzUuNzEwOTY2NyBDMjEuMzgzOCwzNS43MTA5NjY3IDIxLjMxNTYsMzUuNzEzMDMzMyAyMS4yODM1NjY3LDM1LjcxMzAzMzMgQzIwLjYzMzYsMzUuNzEzMDMzMyAyMC4xMDc2MzMzLDM1LjE4NzA2NjcgMjAuMTA3NjMzMywzNC41MzcxIEMyMC4xMDc2MzMzLDM0LjI1ODEgMjAuMzY3LDMzLjc4NTg2NjcgMjAuMzY3LDMzLjc4NTg2NjcgTDMzLjMyOTEzMzMsMTIuMTY5NTY2NyBMMzUuNzI0NCwxMi4xNzk5IEwzMy4zMzYzNjY3LDI2LjMwMzUgTDQwLjU4NzI2NjcsMjYuMjk0MiBDNDAuNTg3MjY2NywyNi4yOTQyIDQwLjY2NDc2NjcsMjYuMjkzMTY2NyA0MC43MDE5NjY3LDI2LjI5MzE2NjcgQzQxLjM1MTkzMzMsMjYuMjkzMTY2NyA0MS44Nzc5LDI2LjgxOTEzMzMgNDEuODc3OSwyNy40NjkxIEM0MS44Nzc5LDI3LjczMjYgNDEuNzc0NTY2NywyNy45NjQwNjY3IDQxLjYyNzgzMzMsMjguMTYwNCBMNDEuNjI4ODY2NywyOC4xNjE0MzMzIFogTTMxLDAgQzEzLjg3ODcsMCAwLDEzLjg3OTczMzMgMCwzMSBDMCw0OC4xMjEzIDEzLjg3ODcsNjIgMzEsNjIgQzQ4LjEyMDI2NjcsNjIgNjIsNDguMTIxMyA2MiwzMSBDNjIsMTMuODc5NzMzMyA0OC4xMjAyNjY3LDAgMzEsMCBMMzEsMCBaIiBpZD0iRmlsbC0xIj48L3BhdGg+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=' );
-	}
-
-	/**
-	 * Test get_instance.
-	 *
-	 * @see AMP_Settings::get_instance()
-	 */
-	public function test_get_instance() {
-		$this->assertInstanceOf( 'AMP_Settings', AMP_Settings::get_instance() );
-	}
-
-}

From ad7c36b5928d6b1bbfb9e8820c570af3bf036317 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 5 Dec 2017 17:13:22 -0800
Subject: [PATCH 16/21] Add tests for AMP_Post_Type_Support

---
 amp.php                                       |  2 +-
 includes/class-amp-post-type-support.php      | 29 +++----
 .../views/class-amp-options-manager.php       |  3 +-
 tests/test-amp-post-types-support.php         | 45 ----------
 tests/test-class-amp-post-type-support.php    | 82 +++++++++++++++++++
 5 files changed, 95 insertions(+), 66 deletions(-)
 delete mode 100644 tests/test-amp-post-types-support.php
 create mode 100644 tests/test-class-amp-post-type-support.php

diff --git a/amp.php b/amp.php
index dba0217ee4d..ce564337c3b 100644
--- a/amp.php
+++ b/amp.php
@@ -47,7 +47,7 @@ function amp_deactivate() {
 	flush_rewrite_rules();
 }
 
-AMP_Post_Type_Support::add_hooks();
+AMP_Post_Type_Support::init();
 
 add_action( 'init', 'amp_init' );
 function amp_init() {
diff --git a/includes/class-amp-post-type-support.php b/includes/class-amp-post-type-support.php
index 8e3a6ec8570..e3edfbd3a6f 100644
--- a/includes/class-amp-post-type-support.php
+++ b/includes/class-amp-post-type-support.php
@@ -14,9 +14,11 @@ class AMP_Post_Type_Support {
 	/**
 	 * Add hooks.
 	 */
-	public static function add_hooks() {
-		add_action( 'amp_init', array( __CLASS__, 'add_builtin_post_type_support' ) );
-		add_action( 'after_setup_theme', array( __CLASS__, 'add_elected_post_type_support' ), 5 );
+	public static function init() {
+		add_action( 'after_setup_theme', array( __CLASS__, 'add_post_type_support' ), 5 );
+		if ( did_action( 'after_setup_theme' ) ) {
+			self::add_post_type_support();
+		}
 	}
 
 	/**
@@ -37,27 +39,16 @@ public static function get_builtin_supported_post_types() {
 	public static function get_eligible_post_types() {
 		return array_merge(
 			self::get_builtin_supported_post_types(),
-			get_post_types(
+			array_values( get_post_types(
 				array(
 					'public'   => true,
 					'_builtin' => false,
 				),
 				'names'
-			)
+			) )
 		);
 	}
 
-	/**
-	 * Declare core post types support for built-in post types.
-	 *
-	 * @since 0.6
-	 */
-	public static function add_builtin_post_type_support() {
-		foreach ( self::get_builtin_supported_post_types() as $post_type ) {
-			add_post_type_support( $post_type, AMP_QUERY_VAR );
-		}
-	}
-
 	/**
 	 * Declare custom post types support.
 	 *
@@ -66,10 +57,10 @@ public static function add_builtin_post_type_support() {
 	 *
 	 * @since 0.6
 	 */
-	public static function add_elected_post_type_support() {
+	public static function add_post_type_support() {
 		$post_types = array_merge(
-			array_keys( array_filter( AMP_Options_Manager::get_option( 'supported_post_types', array() ) ) ),
-			self::get_builtin_supported_post_types() // Make sure support is still present.
+			self::get_builtin_supported_post_types(),
+			array_keys( array_filter( AMP_Options_Manager::get_option( 'supported_post_types', array() ) ) )
 		);
 		foreach ( $post_types as $post_type ) {
 			add_post_type_support( $post_type, AMP_QUERY_VAR );
diff --git a/includes/options/views/class-amp-options-manager.php b/includes/options/views/class-amp-options-manager.php
index 5bc88ca5d55..027000d0d2d 100644
--- a/includes/options/views/class-amp-options-manager.php
+++ b/includes/options/views/class-amp-options-manager.php
@@ -2,7 +2,8 @@
 /**
  * AMP_Options_Manager class.
  *
- * @class AMP
+ * @todo This file is located in the wrong directory.
+ * @package AMP
  */
 
 require_once AMP__DIR__ . '/includes/utils/class-amp-html-utils.php';
diff --git a/tests/test-amp-post-types-support.php b/tests/test-amp-post-types-support.php
deleted file mode 100644
index b163784f14a..00000000000
--- a/tests/test-amp-post-types-support.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Tests for Post Types Support.
- *
- * @package AMP
- * @since 0.6
- */
-
-/**
- * Tests for Post Types Support.
- */
-class Test_AMP_Post_Types_Support extends WP_UnitTestCase {
-
-	/**
-	 * Test amp_core_post_types_support.
-	 *
-	 * @covers amp_core_post_types_support()
-	 */
-	public function test_init() {
-		remove_post_type_support( 'post', AMP_QUERY_VAR );
-		amp_core_post_types_support();
-		$this->assertTrue( post_type_supports( 'post', AMP_QUERY_VAR ) );
-	}
-
-	/**
-	 * Test amp_custom_post_types_support.
-	 *
-	 * @covers amp_custom_post_types_support()
-	 */
-	public function test_amp_custom_post_types_support() {
-		amp_custom_post_types_support();
-		$this->assertFalse( post_type_supports( 'foo', AMP_QUERY_VAR ) );
-		$this->assertFalse( post_type_supports( 'bar', AMP_QUERY_VAR ) );
-
-		update_option( AMP_Options_Manager::OPTION_NAME, array(
-			'supported_post_types' => array(
-				'foo' => true,
-				'bar' => true,
-			),
-		) );
-		amp_custom_post_types_support();
-		$this->assertTrue( post_type_supports( 'foo', AMP_QUERY_VAR ) );
-		$this->assertTrue( post_type_supports( 'bar', AMP_QUERY_VAR ) );
-	}
-}
diff --git a/tests/test-class-amp-post-type-support.php b/tests/test-class-amp-post-type-support.php
new file mode 100644
index 00000000000..85d47ca559f
--- /dev/null
+++ b/tests/test-class-amp-post-type-support.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Tests for Post Types Support.
+ *
+ * @package AMP
+ * @since 0.6
+ */
+
+/**
+ * Tests for Post Type Support.
+ *
+ * @covers AMP_Post_Type_Support
+ */
+class Test_AMP_Post_Type_Support extends WP_UnitTestCase {
+
+	/**
+	 * Test add_hooks().
+	 *
+	 * @covers AMP_Post_Type_Support::init()
+	 */
+	public function test_init() {
+		AMP_Post_Type_Support::init();
+		$this->assertEquals( 5, has_action( 'after_setup_theme', array( 'AMP_Post_Type_Support', 'add_post_type_support' ) ) );
+	}
+
+	/**
+	 * Test get_builtin_supported_post_types.
+	 *
+	 * @covers AMP_Post_Type_Support::get_builtin_supported_post_types()
+	 */
+	public function test_get_builtin_supported_post_types() {
+		$this->assertEquals( array( 'post' ), AMP_Post_Type_Support::get_builtin_supported_post_types() );
+	}
+
+	/**
+	 * Test get_eligible_post_types.
+	 *
+	 * @covers AMP_Post_Type_Support::get_eligible_post_types()
+	 */
+	public function test_get_eligible_post_types() {
+		register_post_type( 'book', array(
+			'label'  => 'Book',
+			'public' => true,
+		) );
+		register_post_type( 'secret', array(
+			'label'  => 'Secret',
+			'public' => false,
+		) );
+
+		$this->assertEquals(
+			array(
+				'post',
+				'book',
+			),
+			AMP_Post_Type_Support::get_eligible_post_types()
+		);
+	}
+
+	/**
+	 * Test add_post_type_support.
+	 *
+	 * @covers AMP_Post_Type_Support::add_post_type_support()
+	 */
+	public function test_add_post_type_support() {
+		register_post_type( 'book', array(
+			'label'  => 'Book',
+			'public' => true,
+		) );
+		register_post_type( 'poem', array(
+			'label'  => 'Poem',
+			'public' => true,
+		) );
+		AMP_Options_Manager::update_option( 'supported_post_types', array(
+			'poem' => true,
+		) );
+
+		AMP_Post_Type_Support::add_post_type_support();
+		$this->assertTrue( post_type_supports( 'post', AMP_QUERY_VAR ) );
+		$this->assertTrue( post_type_supports( 'poem', AMP_QUERY_VAR ) );
+		$this->assertFalse( post_type_supports( 'book', AMP_QUERY_VAR ) );
+	}
+}

From febd02d6a2a709a54054c041a9039b68c2f6bba8 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 5 Dec 2017 19:29:27 -0800
Subject: [PATCH 17/21] Add tests for AMP_Options_Manager; re-use
 `settings_errors()` for analytics changes

---
 ...ass-amp-analytics-options-submenu-page.php |  27 +--
 .../views/class-amp-options-manager.php       |  14 +-
 tests/test-amp-analytics-options.php          |  24 ++-
 tests/test-class-amp-options-manager.php      | 151 +++++++++++++++
 tests/test-class-amp-settings-post-types.php  | 179 ------------------
 5 files changed, 182 insertions(+), 213 deletions(-)
 create mode 100644 tests/test-class-amp-options-manager.php
 delete mode 100644 tests/test-class-amp-settings-post-types.php

diff --git a/includes/options/views/class-amp-analytics-options-submenu-page.php b/includes/options/views/class-amp-analytics-options-submenu-page.php
index e5f0fb8ffc8..06787f86ac6 100644
--- a/includes/options/views/class-amp-analytics-options-submenu-page.php
+++ b/includes/options/views/class-amp-analytics-options-submenu-page.php
@@ -61,33 +61,14 @@ private function render_entry( $id = '', $type = '', $config = '' ) {
 		<?php
 	}
 
+	/**
+	 * Render title.
+	 */
 	public function render_title() {
-		$admin_notice_text = false;
-		$admin_notice_type = false;
-		if ( isset( $_GET['valid'] ) ) {
-			$is_valid = (bool) $_GET['valid'];
-
-			if ( $is_valid ) {
-				$admin_notice_text = __( 'The analytics entry was successfully saved!', 'amp' );
-				$admin_notice_type = 'success';
-			} else {
-				$admin_notice_text = __( 'Failed to save the analytics entry. Please make sure that the JSON configuration is valid and unique.', 'amp' );
-				$admin_notice_type = 'error';
-			}
-		}
 		?>
 		<div class="wrap">
 			<h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
-			<?php
-			// If redirected from serializer, check if action succeeded
-			if ( $admin_notice_text ) : ?>
-				<div class="amp-analytics-options notice <?php echo esc_attr( 'notice-' . $admin_notice_type ); ?> is-dismissible">
-					<p><?php echo esc_html( $admin_notice_text ); ?></p>
-					<button type="button" class="notice-dismiss">
-						<span class="screen-reader-text"><?php __( 'Dismiss this notice.', 'amp' ) ?></span>
-					</button>
-				</div>
-			<?php endif; ?>
+			<?php settings_errors(); ?>
 		</div><!-- .wrap -->
 		<?php
 	}
diff --git a/includes/options/views/class-amp-options-manager.php b/includes/options/views/class-amp-options-manager.php
index 027000d0d2d..67669d89820 100644
--- a/includes/options/views/class-amp-options-manager.php
+++ b/includes/options/views/class-amp-options-manager.php
@@ -101,7 +101,7 @@ public static function validate_options( $new_options ) {
 				// Validate JSON configuration.
 				$is_valid_json = AMP_HTML_Utils::is_valid_json( $data['config'] );
 				if ( ! $is_valid_json ) {
-					add_settings_error( self::OPTION_NAME, 'invalid_analytics_config', __( 'Invalid analytics config.', 'amp' ) );
+					add_settings_error( self::OPTION_NAME, 'invalid_analytics_config_json', __( 'Invalid analytics config JSON.', 'amp' ) );
 					continue;
 				}
 
@@ -165,23 +165,27 @@ public static function handle_analytics_submit() {
 		// Ensure request is coming from analytics option form.
 		check_admin_referer( 'analytics-options', 'analytics-options' );
 
-		$status = '';
 		if ( isset( $_POST['amp-options']['analytics'] ) ) {
 			self::update_option( 'analytics', wp_unslash( $_POST['amp-options']['analytics'] ) );
-			if ( 0 === count( get_settings_errors( self::OPTION_NAME ) ) ) {
-				$status = '1';
+
+			$errors = get_settings_errors( self::OPTION_NAME );
+			if ( empty( $errors ) ) {
+				add_settings_error( self::OPTION_NAME, 'settings_updated', __( 'The analytics entry was successfully saved!', 'amp' ), 'updated' );
+				$errors = get_settings_errors( self::OPTION_NAME );
 			}
+			set_transient( 'settings_errors', $errors );
 		}
 
 		// Redirect to keep the user in the analytics options page.
 		// Wrap in is_admin() to enable phpunit tests to exercise this code.
-		wp_safe_redirect( admin_url( 'admin.php?page=amp-analytics-options&valid=' . $status ) );
+		wp_safe_redirect( admin_url( 'admin.php?page=amp-analytics-options&settings-updated=1' ) );
 		exit;
 	}
 
 	/**
 	 * Update analytics options.
 	 *
+	 * @codeCoverageIgnore
 	 * @deprecated
 	 * @param array $data Unsanitized unslashed data.
 	 * @return bool Whether options were updated.
diff --git a/tests/test-amp-analytics-options.php b/tests/test-amp-analytics-options.php
index 5c0d173c5d7..38493086b3b 100644
--- a/tests/test-amp-analytics-options.php
+++ b/tests/test-amp-analytics-options.php
@@ -2,6 +2,14 @@
 
 class AMP_Analytics_Options_Test extends WP_UnitTestCase {
 
+	/**
+	 * Set up.
+	 */
+	public function setUp() {
+		parent::setUp();
+		AMP_Options_Manager::register_settings();
+	}
+
 	private $vendor = 'googleanalytics';
 
 	private $config_one = '{
@@ -59,12 +67,16 @@ private function render_post() {
 		return $amp_rendered;
 	}
 
-	private function insert_one_option( $vendor, $config ) {
-		$data = array();
-		$data['id-value'] = '';
-		$data['vendor-type'] = $vendor;
-		$data['config'] = $config;
-		AMP_Options_Manager::update_analytics_options( $data );
+	/**
+	 * Insert one analytics entry.
+	 *
+	 * @param string $type   Entry type (vendor).
+	 * @param string $config Entry config (JSON).
+	 */
+	private function insert_one_option( $type, $config ) {
+		AMP_Options_Manager::update_option( 'analytics', array(
+			'__new__' => compact( 'type', 'config' ),
+		) );
 	}
 
 	/**
diff --git a/tests/test-class-amp-options-manager.php b/tests/test-class-amp-options-manager.php
new file mode 100644
index 00000000000..13ec5f412c4
--- /dev/null
+++ b/tests/test-class-amp-options-manager.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Tests for AMP_Options_Manager.
+ *
+ * @package AMP
+ */
+
+/**
+ * Tests for AMP_Options_Manager.
+ *
+ * @covers AMP_Options_Manager
+ */
+class Test_AMP_Options_Manager extends WP_UnitTestCase {
+
+	/**
+	 * Test constants.
+	 */
+	public function test_constants() {
+		$this->assertEquals( 'amp-options', AMP_Options_Manager::OPTION_NAME );
+	}
+
+	/**
+	 * Test register_settings.
+	 *
+	 * @covers AMP_Options_Manager::register_settings()
+	 */
+	public function test_register_settings() {
+		AMP_Options_Manager::register_settings();
+		$registered_settings = get_registered_settings();
+		$this->assertArrayHasKey( AMP_Options_Manager::OPTION_NAME, $registered_settings );
+		$this->assertEquals( 'array', $registered_settings[ AMP_Options_Manager::OPTION_NAME ]['type'] );
+
+		$this->assertEquals( 10, has_action( 'update_option_' . AMP_Options_Manager::OPTION_NAME, 'flush_rewrite_rules' ) );
+	}
+
+	/**
+	 * Test get_options.
+	 *
+	 * @covers AMP_Options_Manager::get_options()
+	 * @covers AMP_Options_Manager::get_option()
+	 * @covers AMP_Options_Manager::update_option()
+	 * @covers AMP_Options_Manager::validate_options()
+	 */
+	public function test_get_and_set_options() {
+		global $wp_settings_errors;
+
+		AMP_Options_Manager::register_settings(); // Adds validate_options as filter.
+		delete_option( AMP_Options_Manager::OPTION_NAME );
+		$this->assertSame( array(), AMP_Options_Manager::get_options() );
+		$this->assertSame( false, AMP_Options_Manager::get_option( 'foo' ) );
+		$this->assertSame( 'default', AMP_Options_Manager::get_option( 'foo', 'default' ) );
+
+		// Test supported_post_types validation.
+		AMP_Options_Manager::update_option( 'supported_post_types', array(
+			'post'       => true,
+			'page'       => '1',
+			'attachment' => '',
+		) );
+		$this->assertSame(
+			array(
+				'post'       => true,
+				'page'       => true,
+				'attachment' => false,
+			),
+			AMP_Options_Manager::get_option( 'supported_post_types' )
+		);
+
+		// Test analytics validation with missing fields.
+		AMP_Options_Manager::update_option( 'analytics', array(
+			'bad' => array(),
+		) );
+		$errors = get_settings_errors( AMP_Options_Manager::OPTION_NAME );
+		$this->assertEquals( 'missing_analytics_vendor_or_config', $errors[0]['code'] );
+		$wp_settings_errors = array();
+
+		// Test analytics validation with bad JSON.
+		AMP_Options_Manager::update_option( 'analytics', array(
+			'__new__' => array(
+				'type'   => 'foo',
+				'config' => 'BAD',
+			),
+		) );
+		$errors = get_settings_errors( AMP_Options_Manager::OPTION_NAME );
+		$this->assertEquals( 'invalid_analytics_config_json', $errors[0]['code'] );
+		$wp_settings_errors = array();
+
+		// Test analytics validation with good fields.
+		AMP_Options_Manager::update_option( 'analytics', array(
+			'__new__' => array(
+				'type'   => 'foo',
+				'config' => '{"good":true}',
+			),
+		) );
+		$this->assertEmpty( get_settings_errors( AMP_Options_Manager::OPTION_NAME ) );
+
+		// Test analytics validation with duplicate check.
+		AMP_Options_Manager::update_option( 'analytics', array(
+			'__new__' => array(
+				'type'   => 'foo',
+				'config' => '{"good":true}',
+			),
+		) );
+		$errors = get_settings_errors( AMP_Options_Manager::OPTION_NAME );
+		$this->assertEquals( 'duplicate_analytics_entry', $errors[0]['code'] );
+		$wp_settings_errors = array();
+
+		// Confirm format of entry ID.
+		$entries = AMP_Options_Manager::get_option( 'analytics' );
+		$entry   = current( $entries );
+		$id      = substr( md5( $entry['type'] . $entry['config'] ), 0, 12 );
+		$this->assertArrayHasKey( $id, $entries );
+		$this->assertEquals( 'foo', $entries[ $id ]['type'] );
+		$this->assertEquals( '{"good":true}', $entries[ $id ]['config'] );
+
+		// Confirm adding another entry works.
+		AMP_Options_Manager::update_option( 'analytics', array(
+			'__new__' => array(
+				'type'   => 'bar',
+				'config' => '{"good":true}',
+			),
+		) );
+		$entries = AMP_Options_Manager::get_option( 'analytics' );
+		$this->assertCount( 2, AMP_Options_Manager::get_option( 'analytics' ) );
+		$this->assertArrayHasKey( $id, $entries );
+
+		// Confirm updating an entry works.
+		AMP_Options_Manager::update_option( 'analytics', array(
+			$id => array(
+				'id'     => $id,
+				'type'   => 'foo',
+				'config' => '{"very_good":true}',
+			),
+		) );
+		$entries = AMP_Options_Manager::get_option( 'analytics' );
+		$this->assertEquals( 'foo', $entries[ $id ]['type'] );
+		$this->assertEquals( '{"very_good":true}', $entries[ $id ]['config'] );
+
+		// Confirm deleting an entry works.
+		AMP_Options_Manager::update_option( 'analytics', array(
+			$id => array(
+				'id'     => $id,
+				'type'   => 'foo',
+				'config' => '{"very_good":true}',
+				'delete' => true,
+			),
+		) );
+		$entries = AMP_Options_Manager::get_option( 'analytics' );
+		$this->assertCount( 1, $entries );
+		$this->assertArrayNotHasKey( $id, $entries );
+	}
+}
diff --git a/tests/test-class-amp-settings-post-types.php b/tests/test-class-amp-settings-post-types.php
deleted file mode 100644
index c8dec94efeb..00000000000
--- a/tests/test-class-amp-settings-post-types.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/**
- * Tests for AMP_Settings_Post_Types.
- *
- * @package AMP
- */
-
-/**
- * Tests for AMP_Settings_Post_Types.
- */
-class Test_AMP_Settings_Post_Types extends WP_UnitTestCase {
-
-	/**
-	 * Instance of AMP_Settings_Post_Types
-	 *
-	 * @var AMP_Settings_Post_Types
-	 */
-	public $instance;
-
-	/**
-	 * Setup.
-	 *
-	 * @inheritdoc
-	 */
-	public function setUp() {
-		parent::setUp();
-		$this->instance = AMP_Settings_Post_Types::get_instance();
-	}
-
-	/**
-	 * Test init.
-	 *
-	 * @see AMP_Settings_Post_Types::init()
-	 */
-	public function test_init() {
-		$this->instance->init();
-		$this->assertEquals( 10, has_action( 'admin_init', array( $this->instance, 'register_settings' ) ) );
-		$this->assertEquals( 10, has_action( 'update_option_' . AMP_Settings::SETTINGS_KEY, 'flush_rewrite_rules' ) );
-	}
-
-	/**
-	 * Test register_settings.
-	 *
-	 * @see AMP_Settings_Post_Types::register_settings()
-	 */
-	public function test_register_settings() {
-		global $wp_settings_sections, $wp_settings_fields;
-
-		$menu_slug    = AMP_Settings::MENU_SLUG;
-		$option_group = AMP_Settings::SETTINGS_KEY;
-		$section_id   = 'post_types';
-		$setting_id   = 'supported_post_types';
-
-		$this->instance->register_settings();
-		$this->assertArrayHasKey( $menu_slug, $wp_settings_sections );
-
-		if ( ! isset( $wp_settings_sections[ $menu_slug ] ) ) {
-			$this->markTestIncomplete( 'Setting sections page could not be found.' );
-		}
-
-		$sections = $wp_settings_sections[ $menu_slug ];
-		$this->assertArrayHasKey( $section_id, $sections );
-
-		if ( ! isset( $sections[ $section_id ] ) ) {
-			$this->markTestIncomplete( 'Settings section could not be found.' );
-		}
-
-		$this->assertEquals( $section_id, $sections[ $section_id ]['id'] );
-
-		if ( ! isset( $wp_settings_fields[ $menu_slug ][ $section_id ][ $setting_id ] ) ) {
-			$this->markTestIncomplete( 'Settings field could not be found.' );
-		}
-
-		$this->assertEquals( 'supported_post_types', $wp_settings_fields[ $menu_slug ][ $section_id ][ $setting_id ]['id'] );
-	}
-
-	/**
-	 * Test get_value.
-	 *
-	 * @see AMP_Settings_Post_Types::get_settings()
-	 */
-	public function test_get_settings() {
-		$this->assertEmpty( $this->instance->get_settings() );
-		$this->assertInternalType( 'array', $this->instance->get_settings() );
-		$this->assertFalse( $this->instance->get_settings( 'foo' ) );
-
-		update_option( AMP_Settings::SETTINGS_KEY, array(
-			'supported_post_types' => array(
-				'post' => true,
-			),
-		) );
-
-		$this->assertContains( 'post', $this->instance->get_settings() );
-		$this->assertInternalType( 'array', $this->instance->get_settings() );
-		$this->assertTrue( $this->instance->get_settings( 'post' ) );
-
-		// Cleanup.
-		delete_option( AMP_Settings::SETTINGS_KEY );
-	}
-
-	/**
-	 * Test get_supported_post_types.
-	 *
-	 * @see AMP_Settings_Post_Types::get_supported_post_types()
-	 */
-	public function test_get_supported_post_types() {
-		// It would be redundant to add further test already covered in Core.
-		$this->assertInternalType( 'array', $this->instance->get_supported_post_types() );
-	}
-
-	/**
-	 * Test get_name_attribute.
-	 *
-	 * @see AMP_Settings_Post_Types::get_name_attribute()
-	 */
-	public function test_get_name_attribute() {
-		$this->assertEquals( AMP_Settings::SETTINGS_KEY . '[supported_post_types][post]', $this->instance->get_name_attribute( 'post' ) );
-	}
-
-	/**
-	 * Test errors.
-	 *
-	 * @see AMP_Settings_Post_Types::errors()
-	 */
-	public function test_errors() {
-		register_post_type( 'foo', array(
-			'public' => true,
-		) );
-		update_option( AMP_Settings::SETTINGS_KEY, array(
-			'supported_post_types' => array(
-				'foo' => true,
-			),
-		) );
-		remove_post_type_support( 'foo', AMP_QUERY_VAR );
-		$_GET['settings-updated'] = 'true';
-		$this->instance->errors();
-		$this->assertNotEmpty( get_settings_errors() );
-		delete_option( AMP_Settings::SETTINGS_KEY );
-		unregister_post_type( 'foo' );
-	}
-
-	/**
-	 * Test validate.
-	 *
-	 * @see AMP_Settings_Post_Types::validate()
-	 */
-	public function test_validate() {
-		$this->assertInternalType( 'array', $this->instance->validate( array() ) );
-		update_option( AMP_Settings::SETTINGS_KEY, array(
-			'supported_post_types' => array(
-				'foo' => true,
-			),
-		) );
-		$settings = $this->instance->validate( get_option( AMP_Settings::SETTINGS_KEY ) );
-		$this->assertInternalType( 'bool', $settings['supported_post_types']['foo'] );
-		delete_option( AMP_Settings::SETTINGS_KEY );
-	}
-
-	/**
-	 * Test render.
-	 *
-	 * @see AMP_Settings_Post_Types::render()
-	 */
-	public function test_render() {
-		ob_start();
-		$this->instance->render();
-		$this->assertContains( '<fieldset>', ob_get_clean() );
-	}
-
-	/**
-	 * Test get_instance.
-	 *
-	 * @see AMP_Settings_Post_Types::get_instance()
-	 */
-	public function test_get_instance() {
-		$this->assertInstanceOf( 'AMP_Settings_Post_Types', AMP_Settings_Post_Types::get_instance() );
-	}
-
-}

From 63a60bd8869be9b3a5f45775653be780357ba7f0 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 5 Dec 2017 20:07:43 -0800
Subject: [PATCH 18/21] Update readme and add changelog

---
 amp.php    |  6 ++++--
 readme.md  | 10 +++++++---
 readme.txt |  6 ++++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/amp.php b/amp.php
index ce564337c3b..6744b9aefad 100644
--- a/amp.php
+++ b/amp.php
@@ -5,15 +5,17 @@
  * Plugin URI: https://github.com/automattic/amp-wp
  * Author: Automattic
  * Author URI: https://automattic.com
- * Version: 0.5.1
+ * Version: 0.6.0-alpha
  * Text Domain: amp
  * Domain Path: /languages/
  * License: GPLv2 or later
+ *
+ * @package AMP
  */
 
 define( 'AMP__FILE__', __FILE__ );
 define( 'AMP__DIR__', dirname( __FILE__ ) );
-define( 'AMP__VERSION', '0.5.1' );
+define( 'AMP__VERSION', '0.6.0-alpha' );
 
 require_once AMP__DIR__ . '/back-compat/back-compat.php';
 require_once AMP__DIR__ . '/includes/amp-helper-functions.php';
diff --git a/readme.md b/readme.md
index 92608c02aea..f9cbe3df5a2 100644
--- a/readme.md
+++ b/readme.md
@@ -24,7 +24,7 @@ The plugin ships with its own Customizer that you can use to tweak various parts
 
 If you're using a completely custom template, you may want to disable the AMP Customizer:
 
-```
+```php
 add_filter( 'amp_customizer_is_enabled', '__return_false' );
 ``` 
 
@@ -650,7 +650,11 @@ Each analytics entry must include a unique array key and the following attribute
 
 ## Custom Post Type Support
 
-By default, the plugin only creates AMP content for posts. You can add support for other post_types using the post_type parameter used when registering the custom post type (assume our post_type is `xyz-review`):
+By default, the plugin only creates AMP content for posts.
+
+*NEW* You can enable AMP support for other post types via the AMP settings admin screen. Just enable the checkbox with each post type which is able to be served as AMP.
+
+You can also add support for other post types by adding `add_post_type_support()` calls in PHP for the desired post types. For example, assuming our post type is `xyz-review` you can add AMP support by adding the following to a theme or plugin:
 
 ```php
 add_action( 'amp_init', 'xyz_amp_add_review_cpt' );
@@ -659,7 +663,7 @@ function xyz_amp_add_review_cpt() {
 }
 ```
 
-You'll need to flush your rewrite rules after this.
+You'll need to flush your rewrite rules after this. You can do this by accessing the Permalinks admin screen or via running `wp rewrite flush` in WP-CLI.
 
 If you want a custom template for your post type:
 
diff --git a/readme.txt b/readme.txt
index 76db1d2c543..d17a10b24ce 100644
--- a/readme.txt
+++ b/readme.txt
@@ -53,6 +53,12 @@ A wise green Yoda once said, "Patience you must have, my young padawan." We're w
 
 == Changelog ==
 
+= 0.6.0 (unreleased) =
+
+- Add AMP settings admin screen for managing which post types have AMP support, eliminating the requirement to add `add_post_type_support()` calls in theme or plugin. See [#811](https://github.com/Automattic/amp-wp/pull/811). Props ThierryA, westonruter.
+- Add generator meta tag for AMP. See [#810](https://github.com/Automattic/amp-wp/pull/810). Props vaporwavre.
+- Add code quality checking via phpcs, eslint, jscs, and jshint. See [#795](https://github.com/Automattic/amp-wp/pull/795). Props westonruter.
+
 = 0.5.1 (2017-08-17) =
 
 - Fix: issues with invalid tags not being stripped out (e.g. script tags) (h/t tmmbecker, fahmi182, pppdog, seejacobscott, RavanH, jenniejj, lkraav, simonrperry for the reports).

From 832c13b2164997d8b75983684e715017f3a8b6da Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Wed, 6 Dec 2017 07:44:05 -0800
Subject: [PATCH 19/21] Move register_settings call; fix phpdoc and improve
 code style

---
 amp.php                                              | 1 -
 includes/admin/functions.php                         | 6 ++++--
 includes/class-amp-post-type-support.php             | 2 +-
 includes/options/views/class-amp-options-manager.php | 6 ++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/amp.php b/amp.php
index 6744b9aefad..7b080e33d08 100644
--- a/amp.php
+++ b/amp.php
@@ -58,7 +58,6 @@ function amp_init() {
 	}
 
 	do_action( 'amp_init' );
-	add_action( 'admin_init', 'AMP_Options_Manager::register_settings' );
 
 	load_plugin_textdomain( 'amp', false, plugin_basename( AMP__DIR__ ) . '/languages' );
 
diff --git a/includes/admin/functions.php b/includes/admin/functions.php
index 791df502d2b..a6a8e82e8fd 100644
--- a/includes/admin/functions.php
+++ b/includes/admin/functions.php
@@ -1,11 +1,13 @@
 <?php
 // Callbacks for adding AMP-related things to the admin.
 
-require_once( AMP__DIR__ . '/includes/options/class-amp-options-menu.php' );
-require_once( AMP__DIR__ . '/includes/options/views/class-amp-options-manager.php' );
+require_once AMP__DIR__ . '/includes/options/class-amp-options-menu.php';
+require_once AMP__DIR__ . '/includes/options/views/class-amp-options-manager.php';
 
 define( 'AMP_CUSTOMIZER_QUERY_VAR', 'customize_amp' );
 
+add_action( 'admin_init', 'AMP_Options_Manager::register_settings' );
+
 /**
  * Sets up the AMP template editor for the Customizer.
  */
diff --git a/includes/class-amp-post-type-support.php b/includes/class-amp-post-type-support.php
index e3edfbd3a6f..23ca6ed35d9 100644
--- a/includes/class-amp-post-type-support.php
+++ b/includes/class-amp-post-type-support.php
@@ -50,7 +50,7 @@ public static function get_eligible_post_types() {
 	}
 
 	/**
-	 * Declare custom post types support.
+	 * Declare support for post types.
 	 *
 	 * This function should only be invoked through the 'after_setup_theme' action to
 	 * allow plugins/theme to overwrite the post types support.
diff --git a/includes/options/views/class-amp-options-manager.php b/includes/options/views/class-amp-options-manager.php
index 67669d89820..f9c1f7d7d39 100644
--- a/includes/options/views/class-amp-options-manager.php
+++ b/includes/options/views/class-amp-options-manager.php
@@ -176,8 +176,10 @@ public static function handle_analytics_submit() {
 			set_transient( 'settings_errors', $errors );
 		}
 
-		// Redirect to keep the user in the analytics options page.
-		// Wrap in is_admin() to enable phpunit tests to exercise this code.
+		/*
+		 * Redirect to keep the user in the analytics options page.
+		 * Wrap in is_admin() to enable phpunit tests to exercise this code.
+		 */
 		wp_safe_redirect( admin_url( 'admin.php?page=amp-analytics-options&settings-updated=1' ) );
 		exit;
 	}

From 3b922cb427390efcb819b13cc600cb2d495eb4d2 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Wed, 6 Dec 2017 08:29:56 -0800
Subject: [PATCH 20/21] Store supported_post_types as array of post types
 instead of hash mapping to true

---
 includes/class-amp-post-type-support.php      |  2 +-
 includes/options/class-amp-options-menu.php   | 30 ++++++++-----------
 .../views/class-amp-options-manager.php       |  8 +++--
 tests/test-class-amp-options-manager.php      | 12 +++-----
 tests/test-class-amp-post-type-support.php    |  4 +--
 5 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/includes/class-amp-post-type-support.php b/includes/class-amp-post-type-support.php
index 23ca6ed35d9..9a959184657 100644
--- a/includes/class-amp-post-type-support.php
+++ b/includes/class-amp-post-type-support.php
@@ -60,7 +60,7 @@ public static function get_eligible_post_types() {
 	public static function add_post_type_support() {
 		$post_types = array_merge(
 			self::get_builtin_supported_post_types(),
-			array_keys( array_filter( AMP_Options_Manager::get_option( 'supported_post_types', array() ) ) )
+			AMP_Options_Manager::get_option( 'supported_post_types', array() )
 		);
 		foreach ( $post_types as $post_type ) {
 			add_post_type_support( $post_type, AMP_QUERY_VAR );
diff --git a/includes/options/class-amp-options-menu.php b/includes/options/class-amp-options-menu.php
index 3e0f7cc7e53..52c5141da02 100644
--- a/includes/options/class-amp-options-menu.php
+++ b/includes/options/class-amp-options-menu.php
@@ -81,33 +81,28 @@ public function add_menu_items() {
 	 * @since 0.6
 	 */
 	protected function check_supported_post_type_update_errors() {
-		$on_update = (
-			isset( $_GET['settings-updated'] ) // WPCS: CSRF ok.
-			&&
-			true === (bool) wp_unslash( $_GET['settings-updated'] ) // WPCS: CSRF ok.
-		);
 
 		// Only apply on update.
-		if ( ! $on_update ) {
+		if ( empty( $_GET['settings-updated'] ) ) { // WPCS: CSRF ok.
 			return;
 		}
 
 		$builtin_support = AMP_Post_Type_Support::get_builtin_supported_post_types();
-		$settings        = AMP_Options_Manager::get_option( 'supported_post_types', array() );
+		$supported_types = AMP_Options_Manager::get_option( 'supported_post_types', array() );
 		foreach ( AMP_Post_Type_Support::get_eligible_post_types() as $name ) {
 			$post_type = get_post_type_object( $name );
 			if ( ! isset( $post_type->name, $post_type->label ) || in_array( $post_type->name, $builtin_support, true ) ) {
 				continue;
 			}
 
-			$post_type_support = post_type_supports( $post_type->name, AMP_QUERY_VAR );
-			$value             = ! empty( $settings[ $post_type->name ] );
+			$post_type_supported = post_type_supports( $post_type->name, AMP_QUERY_VAR );
+			$is_support_elected  = in_array( $post_type->name, $supported_types, true );
 
 			$error = null;
-			if ( true === $value && true !== $post_type_support ) {
+			if ( $is_support_elected && ! $post_type_supported ) {
 				/* translators: %s: Post type name. */
 				$error = __( '"%s" could not be activated because support is removed by a plugin or theme', 'amp' );
-			} elseif ( empty( $value ) && true === $post_type_support ) {
+			} elseif ( ! $is_support_elected && $post_type_supported ) {
 				/* translators: %s: Post type name. */
 				$error = __( '"%s" could not be deactivated because support is added by a plugin or theme', 'amp' );
 			}
@@ -132,25 +127,26 @@ protected function check_supported_post_type_update_errors() {
 	 */
 	public function render_post_types_support() {
 		$builtin_support = AMP_Post_Type_Support::get_builtin_supported_post_types();
+		$element_name    = AMP_Options_Manager::OPTION_NAME . '[supported_post_types][]';
 		?>
 		<fieldset>
 			<?php foreach ( array_map( 'get_post_type_object', AMP_Post_Type_Support::get_eligible_post_types() ) as $post_type ) : ?>
 				<?php
-				$id         = AMP_Options_Manager::OPTION_NAME . "[supported_post_types][{$post_type->name}][]";
+				$element_id = AMP_Options_Manager::OPTION_NAME . "-supported_post_types-{$post_type->name}";
 				$is_builtin = in_array( $post_type->name, $builtin_support, true );
 				?>
 				<?php if ( $is_builtin ) : ?>
-					<input type="hidden" name="<?php echo esc_attr( $id ); ?>" value="1">
+					<input type="hidden" name="<?php echo esc_attr( $element_name ); ?>" value="<?php echo esc_attr( $post_type->name ); ?>">
 				<?php endif; ?>
 				<input
 					type="checkbox"
-					value="1"
-					id="<?php echo esc_attr( $id ); ?>"
-					name="<?php echo esc_attr( $id ); ?>"
+					id="<?php echo esc_attr( $element_id ); ?>"
+					name="<?php echo esc_attr( $element_name ); ?>"
+					value="<?php echo esc_attr( $post_type->name ); ?>"
 					<?php checked( true, post_type_supports( $post_type->name, AMP_QUERY_VAR ) ); ?>
 					<?php disabled( $is_builtin ); ?>
 					>
-				<label for="<?php echo esc_attr( $id ); ?>">
+				<label for="<?php echo esc_attr( $element_id ); ?>">
 					<?php echo esc_html( $post_type->label ); ?>
 				</label>
 				<br>
diff --git a/includes/options/views/class-amp-options-manager.php b/includes/options/views/class-amp-options-manager.php
index f9c1f7d7d39..7ece0a09a1c 100644
--- a/includes/options/views/class-amp-options-manager.php
+++ b/includes/options/views/class-amp-options-manager.php
@@ -83,8 +83,12 @@ public static function validate_options( $new_options ) {
 		// Validate post type support.
 		if ( isset( $new_options['supported_post_types'] ) ) {
 			$options['supported_post_types'] = array();
-			foreach ( $new_options['supported_post_types'] as $post_type => $enabled ) {
-				$options['supported_post_types'][ $post_type ] = (bool) $enabled;
+			foreach ( $new_options['supported_post_types'] as $post_type ) {
+				if ( ! post_type_exists( $post_type ) ) {
+					add_settings_error( self::OPTION_NAME, 'unknown_post_type', __( 'Unrecognized post type.', 'amp' ) );
+				} else {
+					$options['supported_post_types'][] = $post_type;
+				}
 			}
 		}
 
diff --git a/tests/test-class-amp-options-manager.php b/tests/test-class-amp-options-manager.php
index 13ec5f412c4..cbd2bcbdb59 100644
--- a/tests/test-class-amp-options-manager.php
+++ b/tests/test-class-amp-options-manager.php
@@ -51,16 +51,12 @@ public function test_get_and_set_options() {
 		$this->assertSame( 'default', AMP_Options_Manager::get_option( 'foo', 'default' ) );
 
 		// Test supported_post_types validation.
-		AMP_Options_Manager::update_option( 'supported_post_types', array(
-			'post'       => true,
-			'page'       => '1',
-			'attachment' => '',
-		) );
+		AMP_Options_Manager::update_option( 'supported_post_types', array( 'post', 'page', 'attachment' ) );
 		$this->assertSame(
 			array(
-				'post'       => true,
-				'page'       => true,
-				'attachment' => false,
+				'post',
+				'page',
+				'attachment',
 			),
 			AMP_Options_Manager::get_option( 'supported_post_types' )
 		);
diff --git a/tests/test-class-amp-post-type-support.php b/tests/test-class-amp-post-type-support.php
index 85d47ca559f..28f7521cb2a 100644
--- a/tests/test-class-amp-post-type-support.php
+++ b/tests/test-class-amp-post-type-support.php
@@ -70,9 +70,7 @@ public function test_add_post_type_support() {
 			'label'  => 'Poem',
 			'public' => true,
 		) );
-		AMP_Options_Manager::update_option( 'supported_post_types', array(
-			'poem' => true,
-		) );
+		AMP_Options_Manager::update_option( 'supported_post_types', array( 'poem' ) );
 
 		AMP_Post_Type_Support::add_post_type_support();
 		$this->assertTrue( post_type_supports( 'post', AMP_QUERY_VAR ) );

From 8c140631320654af9d2ba2316731feb61c69374d Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Wed, 6 Dec 2017 09:16:46 -0800
Subject: [PATCH 21/21] Move check_supported_post_type_update_errors to
 AMP_Options_Manager

---
 includes/class-amp-post-type-support.php      |  3 --
 includes/options/class-amp-options-menu.php   | 49 ++-----------------
 .../views/class-amp-options-manager.php       | 44 +++++++++++++++++
 tests/test-class-amp-options-manager.php      | 45 +++++++++++++++++
 tests/test-class-amp-post-type-support.php    |  9 ++++
 5 files changed, 101 insertions(+), 49 deletions(-)

diff --git a/includes/class-amp-post-type-support.php b/includes/class-amp-post-type-support.php
index 9a959184657..df0be538543 100644
--- a/includes/class-amp-post-type-support.php
+++ b/includes/class-amp-post-type-support.php
@@ -16,9 +16,6 @@ class AMP_Post_Type_Support {
 	 */
 	public static function init() {
 		add_action( 'after_setup_theme', array( __CLASS__, 'add_post_type_support' ), 5 );
-		if ( did_action( 'after_setup_theme' ) ) {
-			self::add_post_type_support();
-		}
 	}
 
 	/**
diff --git a/includes/options/class-amp-options-menu.php b/includes/options/class-amp-options-menu.php
index 52c5141da02..88d299f3947 100644
--- a/includes/options/class-amp-options-menu.php
+++ b/includes/options/class-amp-options-menu.php
@@ -75,51 +75,6 @@ public function add_menu_items() {
 		}
 	}
 
-	/**
-	 * Check for errors with updating the supported post types.
-	 *
-	 * @since 0.6
-	 */
-	protected function check_supported_post_type_update_errors() {
-
-		// Only apply on update.
-		if ( empty( $_GET['settings-updated'] ) ) { // WPCS: CSRF ok.
-			return;
-		}
-
-		$builtin_support = AMP_Post_Type_Support::get_builtin_supported_post_types();
-		$supported_types = AMP_Options_Manager::get_option( 'supported_post_types', array() );
-		foreach ( AMP_Post_Type_Support::get_eligible_post_types() as $name ) {
-			$post_type = get_post_type_object( $name );
-			if ( ! isset( $post_type->name, $post_type->label ) || in_array( $post_type->name, $builtin_support, true ) ) {
-				continue;
-			}
-
-			$post_type_supported = post_type_supports( $post_type->name, AMP_QUERY_VAR );
-			$is_support_elected  = in_array( $post_type->name, $supported_types, true );
-
-			$error = null;
-			if ( $is_support_elected && ! $post_type_supported ) {
-				/* translators: %s: Post type name. */
-				$error = __( '"%s" could not be activated because support is removed by a plugin or theme', 'amp' );
-			} elseif ( ! $is_support_elected && $post_type_supported ) {
-				/* translators: %s: Post type name. */
-				$error = __( '"%s" could not be deactivated because support is added by a plugin or theme', 'amp' );
-			}
-
-			if ( isset( $error ) ) {
-				add_settings_error(
-					$post_type->name,
-					$post_type->name,
-					sprintf(
-						$error,
-						$post_type->label
-					)
-				);
-			}
-		}
-	}
-
 	/**
 	 * Post types support section renderer.
 	 *
@@ -162,7 +117,9 @@ public function render_post_types_support() {
 	 * @since 0.6
 	 */
 	public function render_screen() {
-		$this->check_supported_post_type_update_errors();
+		if ( ! empty( $_GET['settings-updated'] ) ) { // WPCS: CSRF ok.
+			AMP_Options_Manager::check_supported_post_type_update_errors();
+		}
 		?>
 		<div class="wrap">
 			<h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
diff --git a/includes/options/views/class-amp-options-manager.php b/includes/options/views/class-amp-options-manager.php
index 7ece0a09a1c..0a2c8594844 100644
--- a/includes/options/views/class-amp-options-manager.php
+++ b/includes/options/views/class-amp-options-manager.php
@@ -140,6 +140,50 @@ public static function validate_options( $new_options ) {
 		return $options;
 	}
 
+
+	/**
+	 * Check for errors with updating the supported post types.
+	 *
+	 * @since 0.6
+	 * @see add_settings_error()
+	 */
+	public static function check_supported_post_type_update_errors() {
+		$builtin_support = AMP_Post_Type_Support::get_builtin_supported_post_types();
+		$supported_types = self::get_option( 'supported_post_types', array() );
+		foreach ( AMP_Post_Type_Support::get_eligible_post_types() as $name ) {
+			$post_type = get_post_type_object( $name );
+			if ( empty( $post_type ) || in_array( $post_type->name, $builtin_support, true ) ) {
+				continue;
+			}
+
+			$post_type_supported = post_type_supports( $post_type->name, AMP_QUERY_VAR );
+			$is_support_elected  = in_array( $post_type->name, $supported_types, true );
+
+			$error = null;
+			$code  = null;
+			if ( $is_support_elected && ! $post_type_supported ) {
+				/* translators: %s: Post type name. */
+				$error = __( '"%s" could not be activated because support is removed by a plugin or theme', 'amp' );
+				$code  = sprintf( '%s_activation_error', $post_type->name );
+			} elseif ( ! $is_support_elected && $post_type_supported ) {
+				/* translators: %s: Post type name. */
+				$error = __( '"%s" could not be deactivated because support is added by a plugin or theme', 'amp' );
+				$code  = sprintf( '%s_deactivation_error', $post_type->name );
+			}
+
+			if ( isset( $error, $code ) ) {
+				add_settings_error(
+					self::OPTION_NAME,
+					$code,
+					sprintf(
+						$error,
+						isset( $post_type->label ) ? $post_type->label : $post_type->name
+					)
+				);
+			}
+		}
+	}
+
 	/**
 	 * Update plugin option.
 	 *
diff --git a/tests/test-class-amp-options-manager.php b/tests/test-class-amp-options-manager.php
index cbd2bcbdb59..afe0ffc0863 100644
--- a/tests/test-class-amp-options-manager.php
+++ b/tests/test-class-amp-options-manager.php
@@ -12,6 +12,14 @@
  */
 class Test_AMP_Options_Manager extends WP_UnitTestCase {
 
+	/**
+	 * After a test method runs, reset any state in WordPress the test method might have changed.
+	 */
+	public function tearDown() {
+		parent::tearDown();
+		unregister_post_type( 'foo' );
+	}
+
 	/**
 	 * Test constants.
 	 */
@@ -144,4 +152,41 @@ public function test_get_and_set_options() {
 		$this->assertCount( 1, $entries );
 		$this->assertArrayNotHasKey( $id, $entries );
 	}
+
+	/**
+	 * Test check_supported_post_type_update_errors.
+	 *
+	 * @covers AMP_Options_Manager::check_supported_post_type_update_errors()
+	 */
+	public function test_check_supported_post_type_update_errors() {
+		global $wp_settings_errors;
+
+		register_post_type( 'foo', array(
+			'public' => true,
+			'label'  => 'Foo',
+		) );
+		AMP_Options_Manager::update_option( 'supported_post_types', array( 'foo' ) );
+		AMP_Post_Type_Support::add_post_type_support();
+		AMP_Options_Manager::check_supported_post_type_update_errors();
+		$this->assertEmpty( get_settings_errors() );
+
+		// Activation error.
+		remove_post_type_support( 'foo', AMP_QUERY_VAR );
+		AMP_Options_Manager::check_supported_post_type_update_errors();
+		$errors = get_settings_errors();
+		$this->assertCount( 1, $errors );
+		$error = current( $errors );
+		$this->assertEquals( 'foo_activation_error', $error['code'] );
+		$wp_settings_errors = array();
+
+		// Deactivation error.
+		AMP_Options_Manager::update_option( 'supported_post_types', array() );
+		add_post_type_support( 'foo', AMP_QUERY_VAR );
+		AMP_Options_Manager::check_supported_post_type_update_errors();
+		$errors = get_settings_errors();
+		$this->assertCount( 1, $errors );
+		$error = current( $errors );
+		$this->assertEquals( 'foo_deactivation_error', $error['code'] );
+		$wp_settings_errors = array();
+	}
 }
diff --git a/tests/test-class-amp-post-type-support.php b/tests/test-class-amp-post-type-support.php
index 28f7521cb2a..70295e71fb1 100644
--- a/tests/test-class-amp-post-type-support.php
+++ b/tests/test-class-amp-post-type-support.php
@@ -13,6 +13,15 @@
  */
 class Test_AMP_Post_Type_Support extends WP_UnitTestCase {
 
+	/**
+	 * After a test method runs, reset any state in WordPress the test method might have changed.
+	 */
+	public function tearDown() {
+		parent::tearDown();
+		unregister_post_type( 'book' );
+		unregister_post_type( 'secret' );
+	}
+
 	/**
 	 * Test add_hooks().
 	 *