From 5f1d549d4bc4e6e0a4aa4561315d6f76a874f7d4 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <ryan.kienstra@xwp.co>
Date: Tue, 3 Apr 2018 14:31:30 -0500
Subject: [PATCH 1/2] Run bash script to update generated sanitizer file.

Update to spec revision 595.
Adds 'amp-date-picker' and 'amp-consent,'
And updates a few other specs.
---
 .../class-amp-allowed-tags-generated.php      | 349 +++++++++++++++++-
 1 file changed, 347 insertions(+), 2 deletions(-)

diff --git a/includes/sanitizers/class-amp-allowed-tags-generated.php b/includes/sanitizers/class-amp-allowed-tags-generated.php
index 0c5cc33e67a..d7e28aecf92 100644
--- a/includes/sanitizers/class-amp-allowed-tags-generated.php
+++ b/includes/sanitizers/class-amp-allowed-tags-generated.php
@@ -13,8 +13,8 @@
  */
 class AMP_Allowed_Tags_Generated {
 
-	private static $spec_file_revision = 586;
-	private static $minimum_validator_revision_required = 319;
+	private static $spec_file_revision = 595;
+	private static $minimum_validator_revision_required = 322;
 
 	private static $allowed_tags = array(
 		'a' => array(
@@ -528,6 +528,9 @@ class AMP_Allowed_Tags_Generated {
 					'loop' => array(
 						'value_regex_casei' => '(false|number|true)',
 					),
+					'noautoplay' => array(
+						'value' => '',
+					),
 					'src' => array(
 						'mandatory' => true,
 						'value_url' => array(
@@ -695,6 +698,22 @@ class AMP_Allowed_Tags_Generated {
 				),
 			),
 		),
+		'amp-consent' => array(
+			array(
+				'attr_spec_list' => array(
+					'media' => array(),
+					'noloading' => array(
+						'value' => '',
+					),
+				),
+				'tag_spec' => array(
+					'requires_extension' => array(
+						'amp-consent',
+					),
+					'unique' => true,
+				),
+			),
+		),
 		'amp-dailymotion' => array(
 			array(
 				'attr_spec_list' => array(
@@ -737,6 +756,244 @@ class AMP_Allowed_Tags_Generated {
 				),
 			),
 		),
+		'amp-date-picker' => array(
+			array(
+				'attr_spec_list' => array(
+					'allow-blocked-ranges' => array(
+						'value' => '',
+					),
+					'blocked' => array(),
+					'day-size' => array(
+						'value_regex' => '[0-9]+',
+					),
+					'first-day-of-week' => array(
+						'value_regex' => '[0-6]',
+					),
+					'format' => array(),
+					'fullscreen' => array(
+						'value' => '',
+					),
+					'highlighted' => array(),
+					'input-selector' => array(),
+					'locale' => array(),
+					'max' => array(),
+					'media' => array(),
+					'min' => array(),
+					'mode' => array(
+						'value_casei' => 'static',
+					),
+					'month-format' => array(),
+					'noloading' => array(
+						'value' => '',
+					),
+					'number-of-months' => array(
+						'value_regex' => '[0-9]+',
+					),
+					'open-after-clear' => array(
+						'value' => '',
+					),
+					'open-after-select' => array(
+						'value' => '',
+					),
+					'src' => array(
+						'blacklisted_value_regex' => '__amp_source_origin',
+						'value_url' => array(
+							'allow_relative' => true,
+							'allowed_protocol' => array(
+								'https',
+							),
+						),
+					),
+					'type' => array(
+						'value_casei' => 'single',
+					),
+					'week-day-format' => array(),
+				),
+				'tag_spec' => array(
+					'requires_extension' => array(
+						'amp-date-picker',
+					),
+					'spec_name' => 'amp-date-picker[type=single][mode=static]',
+				),
+			),
+			array(
+				'attr_spec_list' => array(
+					'allow-blocked-ranges' => array(
+						'value' => '',
+					),
+					'blocked' => array(),
+					'day-size' => array(
+						'value_regex' => '[0-9]+',
+					),
+					'first-day-of-week' => array(
+						'value_regex' => '[0-6]',
+					),
+					'format' => array(),
+					'highlighted' => array(),
+					'input-selector' => array(),
+					'locale' => array(),
+					'max' => array(),
+					'media' => array(),
+					'min' => array(),
+					'mode' => array(
+						'mandatory' => true,
+						'value_casei' => 'overlay',
+					),
+					'month-format' => array(),
+					'noloading' => array(
+						'value' => '',
+					),
+					'number-of-months' => array(
+						'value_regex' => '[0-9]+',
+					),
+					'open-after-clear' => array(
+						'value' => '',
+					),
+					'open-after-select' => array(
+						'value' => '',
+					),
+					'src' => array(
+						'blacklisted_value_regex' => '__amp_source_origin',
+						'value_url' => array(
+							'allow_relative' => true,
+							'allowed_protocol' => array(
+								'https',
+							),
+						),
+					),
+					'type' => array(
+						'value_casei' => 'single',
+					),
+					'week-day-format' => array(),
+				),
+				'tag_spec' => array(
+					'requires_extension' => array(
+						'amp-date-picker',
+					),
+					'spec_name' => 'amp-date-picker[type=single][mode=overlay]',
+				),
+			),
+			array(
+				'attr_spec_list' => array(
+					'allow-blocked-ranges' => array(
+						'value' => '',
+					),
+					'blocked' => array(),
+					'day-size' => array(
+						'value_regex' => '[0-9]+',
+					),
+					'end-input-selector' => array(),
+					'first-day-of-week' => array(
+						'value_regex' => '[0-6]',
+					),
+					'format' => array(),
+					'fullscreen' => array(
+						'value' => '',
+					),
+					'highlighted' => array(),
+					'locale' => array(),
+					'max' => array(),
+					'media' => array(),
+					'min' => array(),
+					'mode' => array(
+						'value_casei' => 'static',
+					),
+					'month-format' => array(),
+					'noloading' => array(
+						'value' => '',
+					),
+					'number-of-months' => array(
+						'value_regex' => '[0-9]+',
+					),
+					'open-after-clear' => array(
+						'value' => '',
+					),
+					'open-after-select' => array(
+						'value' => '',
+					),
+					'src' => array(
+						'blacklisted_value_regex' => '__amp_source_origin',
+						'value_url' => array(
+							'allow_relative' => true,
+							'allowed_protocol' => array(
+								'https',
+							),
+						),
+					),
+					'start-input-selector' => array(),
+					'type' => array(
+						'mandatory' => true,
+						'value_casei' => 'range',
+					),
+					'week-day-format' => array(),
+				),
+				'tag_spec' => array(
+					'requires_extension' => array(
+						'amp-date-picker',
+					),
+					'spec_name' => 'amp-date-picker[type=range][mode=static]',
+				),
+			),
+			array(
+				'attr_spec_list' => array(
+					'allow-blocked-ranges' => array(
+						'value' => '',
+					),
+					'blocked' => array(),
+					'day-size' => array(
+						'value_regex' => '[0-9]+',
+					),
+					'end-input-selector' => array(),
+					'first-day-of-week' => array(
+						'value_regex' => '[0-6]',
+					),
+					'format' => array(),
+					'highlighted' => array(),
+					'locale' => array(),
+					'max' => array(),
+					'media' => array(),
+					'min' => array(),
+					'mode' => array(
+						'mandatory' => true,
+						'value_casei' => 'overlay',
+					),
+					'month-format' => array(),
+					'noloading' => array(
+						'value' => '',
+					),
+					'number-of-months' => array(
+						'value_regex' => '[0-9]+',
+					),
+					'open-after-clear' => array(
+						'value' => '',
+					),
+					'open-after-select' => array(
+						'value' => '',
+					),
+					'src' => array(
+						'blacklisted_value_regex' => '__amp_source_origin',
+						'value_url' => array(
+							'allow_relative' => true,
+							'allowed_protocol' => array(
+								'https',
+							),
+						),
+					),
+					'start-input-selector' => array(),
+					'type' => array(
+						'mandatory' => true,
+						'value_casei' => 'range',
+					),
+					'week-day-format' => array(),
+				),
+				'tag_spec' => array(
+					'requires_extension' => array(
+						'amp-date-picker',
+					),
+					'spec_name' => 'amp-date-picker[type=range][mode=overlay]',
+				),
+			),
+		),
 		'amp-document-recommendations' => array(
 			array(
 				'attr_spec_list' => array(),
@@ -1364,6 +1621,9 @@ class AMP_Allowed_Tags_Generated {
 					'noloading' => array(
 						'value' => '',
 					),
+					'reset-on-refresh' => array(
+						'value' => '',
+					),
 					'single-item' => array(),
 					'src' => array(
 						'blacklisted_value_regex' => '__amp_source_origin',
@@ -5447,6 +5707,7 @@ class AMP_Allowed_Tags_Generated {
 						'blacklisted_value_regex' => '(^|\\s)(amp-.*|amp4ads-.*|apple-itunes-app|content-disposition|revisit-after|viewport)(\\s|$)',
 					),
 					'property' => array(),
+					'scheme' => array(),
 				),
 				'tag_spec' => array(
 					'spec_name' => 'meta name= and content=',
@@ -5591,6 +5852,24 @@ class AMP_Allowed_Tags_Generated {
 					'spec_url' => 'https://www.ampproject.org/docs/reference/spec#html-tags',
 				),
 			),
+			array(
+				'attr_spec_list' => array(
+					'content' => array(
+						'mandatory' => true,
+						'value_regex_casei' => '(off|on)',
+					),
+					'http-equiv' => array(
+						'dispatch_key' => 2,
+						'mandatory' => true,
+						'value_casei' => 'x-dns-prefetch-control',
+					),
+				),
+				'tag_spec' => array(
+					'mandatory_ancestor' => 'head',
+					'spec_name' => 'meta http-equiv=x-dns-prefetch-control',
+					'spec_url' => 'https://www.ampproject.org/docs/reference/spec#html-tags',
+				),
+			),
 			array(
 				'attr_spec_list' => array(
 					'content' => array(
@@ -7087,6 +7366,51 @@ class AMP_Allowed_Tags_Generated {
 					),
 				),
 			),
+			array(
+				'attr_spec_list' => array(
+					'async' => array(
+						'mandatory' => true,
+						'value' => '',
+					),
+					'nonce' => array(),
+					'type' => array(
+						'value_casei' => 'text/javascript',
+					),
+				),
+				'tag_spec' => array(
+					'extension_spec' => array(
+						'allowed_versions' => array(
+							'0.1',
+							'latest',
+						),
+						'name' => 'amp-consent',
+					),
+				),
+			),
+			array(
+				'attr_spec_list' => array(
+					'nonce' => array(),
+					'type' => array(
+						'dispatch_key' => 3,
+						'mandatory' => true,
+						'value_casei' => 'application/json',
+					),
+				),
+				'cdata' => array(
+					'blacklisted_cdata_regex' => array(
+						'error_message' => 'html comments',
+						'regex' => '<!--',
+					),
+				),
+				'tag_spec' => array(
+					'mandatory_parent' => 'amp-consent',
+					'requires_extension' => array(
+						'amp-consent',
+					),
+					'spec_name' => 'amp-consent extension .json script',
+					'unique' => true,
+				),
+			),
 			array(
 				'attr_spec_list' => array(
 					'async' => array(
@@ -7110,6 +7434,27 @@ class AMP_Allowed_Tags_Generated {
 					),
 				),
 			),
+			array(
+				'attr_spec_list' => array(
+					'async' => array(
+						'mandatory' => true,
+						'value' => '',
+					),
+					'nonce' => array(),
+					'type' => array(
+						'value_casei' => 'text/javascript',
+					),
+				),
+				'tag_spec' => array(
+					'extension_spec' => array(
+						'allowed_versions' => array(
+							'0.1',
+							'latest',
+						),
+						'name' => 'amp-date-picker',
+					),
+				),
+			),
 			array(
 				'attr_spec_list' => array(),
 				'tag_spec' => array(

From 75743c31191a9e75631eb019150b3e23d66861d0 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <ryan.kienstra@xwp.co>
Date: Tue, 3 Apr 2018 14:54:13 -0500
Subject: [PATCH 2/2] Test new components <amp-date-picker> and <amp-consent>.

The previous commit updated the spec,
and these are the new components that it added.
The <amp-date-picker> markup is mainly copied
from the documentation.
@see https://www.ampproject.org/docs/reference/components/amp-date-picker
---
 tests/test-tag-and-attribute-sanitizer.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/test-tag-and-attribute-sanitizer.php b/tests/test-tag-and-attribute-sanitizer.php
index 62caaa6e7a6..5d30dca97f4 100644
--- a/tests/test-tag-and-attribute-sanitizer.php
+++ b/tests/test-tag-and-attribute-sanitizer.php
@@ -727,6 +727,18 @@ public function get_body_data() {
 				null, // No change.
 				array( 'amp-live-list' ),
 			),
+
+			'amp_consent'                                               => array(
+				'<amp-consent media="all" noloading></amp-consent>',
+				null, // No change.
+				array( 'amp-consent' ),
+			),
+
+			'amp_date_picker'                                           => array(
+				'<amp-date-picker id="simple-date-picker" type="single" mode="overlay" layout="container" on="select:AMP.setState({date1: event.date, dateType1: event.id})" format="Y-MM-DD" open-after-select input-selector="[name=date1]" class="mr1 ml1 flex picker"><div class="ampstart-input inline-block mt1"><input class="border-none p0" name="date1" placeholder="Pick a date"></div><button class="ampstart-btn m1 caps" on="tap: simple-date-picker.clear">Clear</button></amp-date-picker>',
+				null, // No change.
+				array( 'amp-date-picker' ),
+			),
 		);
 	}