From 305c28baa5fa486773df7aac7b42754aaba83aa3 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 29 May 2018 22:50:35 -0500
Subject: [PATCH 01/85] Begin testing of site urls, starting with helper
 method.

Define get_post_permalinks().
This gets permalinks for public posts,
other than attachments.
Another helper function can call
AMP_Validation_Manager::validate_url()
for each of these permalinks.
---
 includes/class-amp-autoloader.php             |  1 +
 .../validation/class-amp-site-validation.php  | 42 ++++++++++
 tests/test-class-amp-site-validation.php      | 79 +++++++++++++++++++
 3 files changed, 122 insertions(+)
 create mode 100644 includes/validation/class-amp-site-validation.php
 create mode 100644 tests/test-class-amp-site-validation.php

diff --git a/includes/class-amp-autoloader.php b/includes/class-amp-autoloader.php
index 1a11d9ba1d0..02dbe12eb8e 100644
--- a/includes/class-amp-autoloader.php
+++ b/includes/class-amp-autoloader.php
@@ -92,6 +92,7 @@ class AMP_Autoloader {
 		'AMP_Validation_Manager'                      => 'includes/validation/class-amp-validation-manager',
 		'AMP_Invalid_URL_Post_Type'                   => 'includes/validation/class-amp-invalid-url-post-type',
 		'AMP_Validation_Error_Taxonomy'               => 'includes/validation/class-amp-validation-error-taxonomy',
+		'AMP_Site_Validation'                         => 'includes/validation/class-amp-site-validation',
 		'AMP_String_Utils'                            => 'includes/utils/class-amp-string-utils',
 		'AMP_WP_Utils'                                => 'includes/utils/class-amp-wp-utils',
 		'AMP_Widget_Archives'                         => 'includes/widgets/class-amp-widget-archives',
diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
new file mode 100644
index 00000000000..594b94bc2f2
--- /dev/null
+++ b/includes/validation/class-amp-site-validation.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Class AMP_Site_Validation
+ *
+ * @package AMP
+ */
+
+/**
+ * Class AMP_Site_Validation
+ *
+ * @since 1.0
+ */
+class AMP_Site_Validation {
+
+	/**
+	 * Get the post permalinks to check for AMP validity.
+	 *
+	 * This excludes 'attachment' post types, as it only searches for posts with the status 'publish.'
+	 * Attachments have a default status of 'inherit,' so they can depend on the status of their parent like a post.
+	 *
+	 * @todo: consider whether this should also return 'attachment' permalinks.
+	 * @param int|null $number_posts The maximum amount of posts to get the permalinks for.
+	 * @return string[] $permalinks The permalinks, as an array of strings.
+	 */
+	public static function get_post_permalinks( $number_posts ) {
+		$post_types = get_post_types( array( 'public' => true ), 'names' );
+		$query      = new WP_Query( array(
+			'posts_per_page' => $number_posts,
+			'post_type'      => array_values( $post_types ),
+			'orderby'        => 'ID',
+			'order'          => 'ASC',
+			'post_status'    => array( 'publish' ),
+		) );
+
+		$permalinks = array();
+		foreach ( $query->posts as $post ) {
+			$permalinks[] = amp_get_permalink( $post->ID );
+		}
+
+		return $permalinks;
+	}
+}
diff --git a/tests/test-class-amp-site-validation.php b/tests/test-class-amp-site-validation.php
new file mode 100644
index 00000000000..a9d12b157f6
--- /dev/null
+++ b/tests/test-class-amp-site-validation.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Tests for AMP_Site_Validation class.
+ *
+ * @package AMP
+ */
+
+/**
+ * Tests for AMP_Site_Validation class.
+ *
+ * @since 1.0
+ */
+class Test_AMP_Site_Validation extends \WP_UnitTestCase {
+
+	/**
+	 * The name of the tested class.
+	 *
+	 * @var string
+	 */
+	const TESTED_CLASS = 'AMP_Site_Validation';
+
+	/**
+	 * The name of the tag to test.
+	 *
+	 * @var string
+	 */
+	const TAG_NAME = 'img';
+
+	/**
+	 * An instance of DOMElement to test.
+	 *
+	 * @var DOMElement
+	 */
+	public $node;
+
+	/**
+	 * Setup.
+	 *
+	 * @inheritdoc
+	 * @global $wp_registered_widgets
+	 */
+	public function setUp() {
+		parent::setUp();
+		$dom_document = new DOMDocument( '1.0', 'utf-8' );
+		$this->node   = $dom_document->createElement( self::TAG_NAME );
+		AMP_Validation_Manager::reset_validation_results();
+	}
+
+	/**
+	 * Test get_post_permalinks.
+	 *
+	 * @covers AMP_Site_Validation::get_post_permalinks()
+	 */
+	public function test_get_post_permalinks() {
+		$posts                       = array();
+		$permalinks                  = array();
+		$number_posts_each_post_type = 20;
+		$post_types                  = get_post_types( array( 'public' => true ), 'names' );
+
+		/**
+		 * The tested method does not get attachment permalinks.
+		 * It only searches for posts with the status 'publish.'
+		 * Attachments have a default status of 'inherit,' to depend on the status of their parent post.
+		 */
+		unset( $post_types['attachment'] );
+		foreach ( $post_types as $post_type ) {
+			for ( $i = 0; $i < $number_posts_each_post_type; $i++ ) {
+				$post         = $this->factory()->post->create_and_get( array(
+					'post_type'   => $post_type,
+					'post_status' => 'publish',
+				) );
+				$posts[]      = $post;
+				$permalinks[] = amp_get_permalink( $post->ID );
+			}
+		}
+		$number_of_posts = count( $post_types ) * $number_posts_each_post_type;
+		$this->assertEquals( $permalinks, AMP_Site_Validation::get_post_permalinks( $number_of_posts ) );
+	}
+}

From 9e9df92533bd75b7ce01d581954aa3770b56ad70 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 29 May 2018 23:49:24 -0500
Subject: [PATCH 02/85] Change helper method to output IDs, for use with
 existing method.

validate_queued_posts_on_frontend() uses IDs,
which are stored in
$posts_pending_frontend_validation.
So simply return IDs from the helper function.
---
 .../validation/class-amp-site-validation.php  | 30 ++++++++++++-------
 tests/test-class-amp-site-validation.php      | 21 +++++++------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 594b94bc2f2..676d4d10b55 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -13,16 +13,16 @@
 class AMP_Site_Validation {
 
 	/**
-	 * Get the post permalinks to check for AMP validity.
+	 * Gets the post IDs of all public post types with the status 'publish,' to check for AMP validity.
 	 *
 	 * This excludes 'attachment' post types, as it only searches for posts with the status 'publish.'
 	 * Attachments have a default status of 'inherit,' so they can depend on the status of their parent like a post.
 	 *
-	 * @todo: consider whether this should also return 'attachment' permalinks.
-	 * @param int|null $number_posts The maximum amount of posts to get the permalinks for.
-	 * @return string[] $permalinks The permalinks, as an array of strings.
+	 * @todo: consider whether this should also return 'attachment' IDs.
+	 * @param int $number_posts The maximum amount of posts to get the IDs for (optional).
+	 * @return int[] $post_ids The post IDs in an array.
 	 */
-	public static function get_post_permalinks( $number_posts ) {
+	public static function get_post_ids( $number_posts = 200 ) {
 		$post_types = get_post_types( array( 'public' => true ), 'names' );
 		$query      = new WP_Query( array(
 			'posts_per_page' => $number_posts,
@@ -32,11 +32,21 @@ public static function get_post_permalinks( $number_posts ) {
 			'post_status'    => array( 'publish' ),
 		) );
 
-		$permalinks = array();
-		foreach ( $query->posts as $post ) {
-			$permalinks[] = amp_get_permalink( $post->ID );
-		}
+		return wp_list_pluck( $query->posts, 'ID' );
+	}
 
-		return $permalinks;
+	/**
+	 * Validates the URLs on the site.
+	 *
+	 * @todo: Consider wrapping this function with another, as different use cases will probably require a different return value or display.
+	 * For example, the <button> in /wp-admin that makes an AJAX request for this will need a different response than a WP-CLI command.
+	 * @return array $validation_result The post ID as the index, and the result of validation as the value.
+	 */
+	public static function validate_site_urls() {
+		$site_post_ids = self::get_post_ids();
+		foreach ( $site_post_ids as $id ) {
+			AMP_Validation_Manager::$posts_pending_frontend_validation[ $id ] = true;
+		}
+		return AMP_Validation_Manager::validate_queued_posts_on_frontend();
 	}
 }
diff --git a/tests/test-class-amp-site-validation.php b/tests/test-class-amp-site-validation.php
index a9d12b157f6..fe2fe17802b 100644
--- a/tests/test-class-amp-site-validation.php
+++ b/tests/test-class-amp-site-validation.php
@@ -26,6 +26,13 @@ class Test_AMP_Site_Validation extends \WP_UnitTestCase {
 	 */
 	const TAG_NAME = 'img';
 
+	/**
+	 * A disallowed element, which should cause a validation error.
+	 *
+	 * @var string
+	 */
+	const DISALLOWED_TAG = '<script>doThis();</script>';
+
 	/**
 	 * An instance of DOMElement to test.
 	 *
@@ -47,13 +54,11 @@ public function setUp() {
 	}
 
 	/**
-	 * Test get_post_permalinks.
+	 * Test get_post_ids.
 	 *
-	 * @covers AMP_Site_Validation::get_post_permalinks()
+	 * @covers AMP_Site_Validation::get_post_ids()
 	 */
-	public function test_get_post_permalinks() {
-		$posts                       = array();
-		$permalinks                  = array();
+	public function test_get_post_ids() {
 		$number_posts_each_post_type = 20;
 		$post_types                  = get_post_types( array( 'public' => true ), 'names' );
 
@@ -65,15 +70,13 @@ public function test_get_post_permalinks() {
 		unset( $post_types['attachment'] );
 		foreach ( $post_types as $post_type ) {
 			for ( $i = 0; $i < $number_posts_each_post_type; $i++ ) {
-				$post         = $this->factory()->post->create_and_get( array(
+				$post_ids[] = $this->factory()->post->create( array(
 					'post_type'   => $post_type,
 					'post_status' => 'publish',
 				) );
-				$posts[]      = $post;
-				$permalinks[] = amp_get_permalink( $post->ID );
 			}
 		}
 		$number_of_posts = count( $post_types ) * $number_posts_each_post_type;
-		$this->assertEquals( $permalinks, AMP_Site_Validation::get_post_permalinks( $number_of_posts ) );
+		$this->assertEquals( $post_ids, AMP_Site_Validation::get_post_permalinks( $number_of_posts ) );
 	}
 }

From fd509932d88d475965e5f31489b4cda01a045594 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 29 May 2018 23:59:36 -0500
Subject: [PATCH 03/85] Change method name in test, assign $post_ids.

Before, $post_ids wasn't assigned as an array().
This addresses a failed Travis build.
---
 tests/test-class-amp-site-validation.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test-class-amp-site-validation.php b/tests/test-class-amp-site-validation.php
index fe2fe17802b..d4163cacfa6 100644
--- a/tests/test-class-amp-site-validation.php
+++ b/tests/test-class-amp-site-validation.php
@@ -61,6 +61,7 @@ public function setUp() {
 	public function test_get_post_ids() {
 		$number_posts_each_post_type = 20;
 		$post_types                  = get_post_types( array( 'public' => true ), 'names' );
+		$post_ids                    = array();
 
 		/**
 		 * The tested method does not get attachment permalinks.
@@ -77,6 +78,6 @@ public function test_get_post_ids() {
 			}
 		}
 		$number_of_posts = count( $post_types ) * $number_posts_each_post_type;
-		$this->assertEquals( $post_ids, AMP_Site_Validation::get_post_permalinks( $number_of_posts ) );
+		$this->assertEquals( $post_ids, AMP_Site_Validation::get_post_ids( $number_of_posts ) );
 	}
 }

From 13240448aa7fb1b3f4ead65cf06f20ed3793e8c5 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 30 May 2018 00:17:09 -0500
Subject: [PATCH 04/85] Query for the latest posts, instead of by ID.

Querying for ID was simply to make testing easier.
So remove that, and fall back to the default
'orderby' => 'date'.
---
 includes/validation/class-amp-site-validation.php | 4 +---
 tests/test-class-amp-site-validation.php          | 8 +++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 676d4d10b55..a6b6f74917b 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -27,9 +27,7 @@ public static function get_post_ids( $number_posts = 200 ) {
 		$query      = new WP_Query( array(
 			'posts_per_page' => $number_posts,
 			'post_type'      => array_values( $post_types ),
-			'orderby'        => 'ID',
-			'order'          => 'ASC',
-			'post_status'    => array( 'publish' ),
+			'post_status'    => 'publish',
 		) );
 
 		return wp_list_pluck( $query->posts, 'ID' );
diff --git a/tests/test-class-amp-site-validation.php b/tests/test-class-amp-site-validation.php
index d4163cacfa6..0771b3e81ba 100644
--- a/tests/test-class-amp-site-validation.php
+++ b/tests/test-class-amp-site-validation.php
@@ -78,6 +78,12 @@ public function test_get_post_ids() {
 			}
 		}
 		$number_of_posts = count( $post_types ) * $number_posts_each_post_type;
-		$this->assertEquals( $post_ids, AMP_Site_Validation::get_post_ids( $number_of_posts ) );
+
+		/*
+		 * The factory() method above creates posts so quickly that the WP_Query() argument of 'orderby' => 'date'
+		 * doesn't return them in the exact order they were created.
+		 * So this simply ensures all of the created $post_ids are present in the return value of the tested method.
+		 */
+		$this->assertEquals( 0, count( array_diff( $post_ids, AMP_Site_Validation::get_post_ids( $number_of_posts ) ) ) );
 	}
 }

From 3c4db61c671006d390d75b18523a0e5c67112538 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 30 May 2018 13:23:01 -0500
Subject: [PATCH 05/85] Change helper method to get post permalinks.

This class is not going to use this method anymore:
validate_queued_posts_on_frontend().
So this will need the permalinks, not IDs.
---
 .../validation/class-amp-site-validation.php  |  9 ++++----
 tests/test-class-amp-site-validation.php      | 21 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index a6b6f74917b..5025d9ef143 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -13,16 +13,16 @@
 class AMP_Site_Validation {
 
 	/**
-	 * Gets the post IDs of all public post types with the status 'publish,' to check for AMP validity.
+	 * Gets the permalinks of all public post types with the status 'publish,' to check for AMP validity.
 	 *
 	 * This excludes 'attachment' post types, as it only searches for posts with the status 'publish.'
 	 * Attachments have a default status of 'inherit,' so they can depend on the status of their parent like a post.
 	 *
 	 * @todo: consider whether this should also return 'attachment' IDs.
 	 * @param int $number_posts The maximum amount of posts to get the IDs for (optional).
-	 * @return int[] $post_ids The post IDs in an array.
+	 * @return int[] $post_ids The post permalinks in an array.
 	 */
-	public static function get_post_ids( $number_posts = 200 ) {
+	public static function get_post_permalinks( $number_posts = 200 ) {
 		$post_types = get_post_types( array( 'public' => true ), 'names' );
 		$query      = new WP_Query( array(
 			'posts_per_page' => $number_posts,
@@ -30,7 +30,8 @@ public static function get_post_ids( $number_posts = 200 ) {
 			'post_status'    => 'publish',
 		) );
 
-		return wp_list_pluck( $query->posts, 'ID' );
+		$post_ids = wp_list_pluck( $query->posts, 'ID' );
+		return array_map( 'get_permalink', $post_ids );
 	}
 
 	/**
diff --git a/tests/test-class-amp-site-validation.php b/tests/test-class-amp-site-validation.php
index 0771b3e81ba..1f0b83737b9 100644
--- a/tests/test-class-amp-site-validation.php
+++ b/tests/test-class-amp-site-validation.php
@@ -54,14 +54,14 @@ public function setUp() {
 	}
 
 	/**
-	 * Test get_post_ids.
+	 * Test get_post_permalinks.
 	 *
-	 * @covers AMP_Site_Validation::get_post_ids()
+	 * @covers AMP_Site_Validation::get_post_permalinks()
 	 */
-	public function test_get_post_ids() {
+	public function test_get_post_permalinks() {
 		$number_posts_each_post_type = 20;
 		$post_types                  = get_post_types( array( 'public' => true ), 'names' );
-		$post_ids                    = array();
+		$expected_post_permalinks    = array();
 
 		/**
 		 * The tested method does not get attachment permalinks.
@@ -71,19 +71,20 @@ public function test_get_post_ids() {
 		unset( $post_types['attachment'] );
 		foreach ( $post_types as $post_type ) {
 			for ( $i = 0; $i < $number_posts_each_post_type; $i++ ) {
-				$post_ids[] = $this->factory()->post->create( array(
+				$expected_post_permalinks[] = get_permalink( $this->factory()->post->create( array(
 					'post_type'   => $post_type,
-					'post_status' => 'publish',
-				) );
+				) ) );
 			}
 		}
-		$number_of_posts = count( $post_types ) * $number_posts_each_post_type;
+		$number_of_posts        = count( $post_types ) * $number_posts_each_post_type;
+		$actual_post_permalinks = AMP_Site_Validation::get_post_permalinks( $number_of_posts );
 
 		/*
-		 * The factory() method above creates posts so quickly that the WP_Query() argument of 'orderby' => 'date'
+		 * The factory() method above creates posts so quickly that the WP_Query() default argument of 'orderby' => 'date'
 		 * doesn't return them in the exact order they were created.
 		 * So this simply ensures all of the created $post_ids are present in the return value of the tested method.
 		 */
-		$this->assertEquals( 0, count( array_diff( $post_ids, AMP_Site_Validation::get_post_ids( $number_of_posts ) ) ) );
+		$this->assertEquals( 0, count( array_diff( $expected_post_permalinks, $actual_post_permalinks ) ) );
+		$this->assertEquals( count( $expected_post_permalinks ), count( $actual_post_permalinks ) );
 	}
 }

From bbfafa431d6be329edd60570746af85132796cda Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 30 May 2018 14:57:21 -0500
Subject: [PATCH 06/85] Add a method to get links for public terms.

For example, http://example.org/?cat=2
This includes categories and tags,
and any more that are registered.
But it excludes post_format links.
---
 .../validation/class-amp-site-validation.php  | 29 +++++++++++-
 tests/test-class-amp-site-validation.php      | 46 ++++++++++++++++++-
 2 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 5025d9ef143..c8e5a1c68f0 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -19,8 +19,8 @@ class AMP_Site_Validation {
 	 * Attachments have a default status of 'inherit,' so they can depend on the status of their parent like a post.
 	 *
 	 * @todo: consider whether this should also return 'attachment' IDs.
-	 * @param int $number_posts The maximum amount of posts to get the IDs for (optional).
-	 * @return int[] $post_ids The post permalinks in an array.
+	 * @param int $number_posts The maximum amount of posts to get the permalinks for (optional).
+	 * @return string[] $permalinks The post permalinks in an array.
 	 */
 	public static function get_post_permalinks( $number_posts = 200 ) {
 		$post_types = get_post_types( array( 'public' => true ), 'names' );
@@ -34,6 +34,31 @@ public static function get_post_permalinks( $number_posts = 200 ) {
 		return array_map( 'get_permalink', $post_ids );
 	}
 
+	/**
+	 * Gets the front-end links for public taxonomy terms, like categories and tags.
+	 *
+	 * For example, https://example.org/?cat=2
+	 * This includes categories and tags, and any more that are registered.
+	 * But it excludes post_format terms.
+	 *
+	 * @param int $number_links The maximum amount of links to get (optional).
+	 * @return string[] $links The term links in an array.
+	 */
+	public static function get_taxonomy_links( $number_links = 200 ) {
+		$public_taxonomies = get_taxonomies( array(
+			'public' => true,
+		) );
+
+		// It doesn't seem necessary to get links for post format terms, like asides, galleries, or quotes.
+		unset( $public_taxonomies['post_format'] );
+		$terms = get_terms( array(
+			'taxonomy' => $public_taxonomies,
+			'count'    => $number_links,
+		) );
+
+		return array_map( 'get_term_link', $terms );
+	}
+
 	/**
 	 * Validates the URLs on the site.
 	 *
diff --git a/tests/test-class-amp-site-validation.php b/tests/test-class-amp-site-validation.php
index 1f0b83737b9..27c2c9f8235 100644
--- a/tests/test-class-amp-site-validation.php
+++ b/tests/test-class-amp-site-validation.php
@@ -72,7 +72,7 @@ public function test_get_post_permalinks() {
 		foreach ( $post_types as $post_type ) {
 			for ( $i = 0; $i < $number_posts_each_post_type; $i++ ) {
 				$expected_post_permalinks[] = get_permalink( $this->factory()->post->create( array(
-					'post_type'   => $post_type,
+					'post_type' => $post_type,
 				) ) );
 			}
 		}
@@ -87,4 +87,48 @@ public function test_get_post_permalinks() {
 		$this->assertEquals( 0, count( array_diff( $expected_post_permalinks, $actual_post_permalinks ) ) );
 		$this->assertEquals( count( $expected_post_permalinks ), count( $actual_post_permalinks ) );
 	}
+
+	/**
+	 * Test get_taxonomy_links.
+	 *
+	 * @covers AMP_Site_Validation::get_taxonomy_links()
+	 */
+	public function test_get_taxonomy_links() {
+		$number_links_each_taxonomy = 20;
+		$taxonomies                 = get_taxonomies( array(
+			'public' => true,
+		) );
+
+		unset( $taxonomies['post_format'] );
+		$all_terms = array();
+
+		foreach ( $taxonomies as $taxonomy ) {
+			$terms_for_current_taxonomy = array();
+			for ( $i = 0; $i < $number_links_each_taxonomy; $i++ ) {
+				$terms_for_current_taxonomy[] = $this->factory()->term->create( array(
+					'taxonomy' => $taxonomy,
+				) );
+			}
+
+			// Terms need to be associated with a post in order to be returned in get_terms().
+			wp_set_post_terms(
+				$this->factory()->post->create(),
+				$terms_for_current_taxonomy,
+				$taxonomy
+			);
+			$all_terms = array_merge( $all_terms, $terms_for_current_taxonomy );
+		}
+
+		$expected_links  = array_map( 'get_term_link', $all_terms );
+		$number_of_links = 100;
+		$actual_links    = AMP_Site_Validation::get_taxonomy_links( $number_of_links );
+
+		/*
+		 * Test that all of the $expected_links are present.
+		 * There is already one term present before this test method adds any,
+		 * so that can also appear in the returned $actual_links.
+		 */
+		$this->assertEquals( 0, count( array_diff( $expected_links, $actual_links ) ) );
+		$this->assertLessThan( $number_of_links, count( $actual_links ) );
+	}
 }

From db54a537a5267eb49c6a80cbbdaeb1b3475ab091 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 30 May 2018 17:25:53 -0500
Subject: [PATCH 07/85] Also get links for post_format terms.

Before, I had unset() these from the array.
But as Weston pointed out,
post_format terms can have archive links.
---
 includes/validation/class-amp-site-validation.php | 2 --
 tests/test-class-amp-site-validation.php          | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index c8e5a1c68f0..d9d78f15e20 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -49,8 +49,6 @@ public static function get_taxonomy_links( $number_links = 200 ) {
 			'public' => true,
 		) );
 
-		// It doesn't seem necessary to get links for post format terms, like asides, galleries, or quotes.
-		unset( $public_taxonomies['post_format'] );
 		$terms = get_terms( array(
 			'taxonomy' => $public_taxonomies,
 			'count'    => $number_links,
diff --git a/tests/test-class-amp-site-validation.php b/tests/test-class-amp-site-validation.php
index 27c2c9f8235..7878b7384b9 100644
--- a/tests/test-class-amp-site-validation.php
+++ b/tests/test-class-amp-site-validation.php
@@ -98,9 +98,7 @@ public function test_get_taxonomy_links() {
 		$taxonomies                 = get_taxonomies( array(
 			'public' => true,
 		) );
-
-		unset( $taxonomies['post_format'] );
-		$all_terms = array();
+		$all_terms                  = array();
 
 		foreach ( $taxonomies as $taxonomy ) {
 			$terms_for_current_taxonomy = array();

From 6713ff3aac0f51a3942ffa61a9e142e241e3ec97 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 30 May 2018 17:40:58 -0500
Subject: [PATCH 08/85] Begin to apply review suggestion for
 get_taxonomy_links().

Add a $taxonomy parameter,
to only get the terms for a given taxonomy.
---
 .../validation/class-amp-site-validation.php  | 11 ++++-----
 tests/test-class-amp-site-validation.php      | 24 +++++++++----------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index d9d78f15e20..26b0a73b5b0 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -41,16 +41,13 @@ public static function get_post_permalinks( $number_posts = 200 ) {
 	 * This includes categories and tags, and any more that are registered.
 	 * But it excludes post_format terms.
 	 *
-	 * @param int $number_links The maximum amount of links to get (optional).
+	 * @param string $taxonomy The name of the taxonomy.
+	 * @param int    $number_links The maximum amount of links to get (optional).
 	 * @return string[] $links The term links in an array.
 	 */
-	public static function get_taxonomy_links( $number_links = 200 ) {
-		$public_taxonomies = get_taxonomies( array(
-			'public' => true,
-		) );
-
+	public static function get_taxonomy_links( $taxonomy, $number_links = 200 ) {
 		$terms = get_terms( array(
-			'taxonomy' => $public_taxonomies,
+			'taxonomy' => $taxonomy,
 			'count'    => $number_links,
 		) );
 
diff --git a/tests/test-class-amp-site-validation.php b/tests/test-class-amp-site-validation.php
index 7878b7384b9..6d091ab424c 100644
--- a/tests/test-class-amp-site-validation.php
+++ b/tests/test-class-amp-site-validation.php
@@ -98,7 +98,6 @@ public function test_get_taxonomy_links() {
 		$taxonomies                 = get_taxonomies( array(
 			'public' => true,
 		) );
-		$all_terms                  = array();
 
 		foreach ( $taxonomies as $taxonomy ) {
 			$terms_for_current_taxonomy = array();
@@ -114,19 +113,18 @@ public function test_get_taxonomy_links() {
 				$terms_for_current_taxonomy,
 				$taxonomy
 			);
-			$all_terms = array_merge( $all_terms, $terms_for_current_taxonomy );
-		}
 
-		$expected_links  = array_map( 'get_term_link', $all_terms );
-		$number_of_links = 100;
-		$actual_links    = AMP_Site_Validation::get_taxonomy_links( $number_of_links );
+			$expected_links  = array_map( 'get_term_link', $terms_for_current_taxonomy );
+			$number_of_links = 100;
+			$actual_links    = AMP_Site_Validation::get_taxonomy_links( $taxonomy, $number_of_links );
 
-		/*
-		 * Test that all of the $expected_links are present.
-		 * There is already one term present before this test method adds any,
-		 * so that can also appear in the returned $actual_links.
-		 */
-		$this->assertEquals( 0, count( array_diff( $expected_links, $actual_links ) ) );
-		$this->assertLessThan( $number_of_links, count( $actual_links ) );
+			/*
+			 * Test that all of the $expected_links are present.
+			 * There is already one term present before this test method adds any,
+			 * so that can also appear in the returned $actual_links.
+			 */
+			$this->assertEquals( 0, count( array_diff( $expected_links, $actual_links ) ) );
+			$this->assertLessThan( $number_of_links, count( $actual_links ) );
+		}
 	}
 }

From 26553102bc9a2f02e58b80bb9ce54159b67e6ae6 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 30 May 2018 18:40:09 -0500
Subject: [PATCH 09/85] Add an $offset parameter to get_taxonomy_links().

As Weston mentioned,
this helps to get the links in batches.
Also, simplify the test.
---
 .../validation/class-amp-site-validation.php    | 17 +++++++++++------
 tests/test-class-amp-site-validation.php        | 14 ++++++++------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 26b0a73b5b0..e0813939e4c 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -41,17 +41,22 @@ public static function get_post_permalinks( $number_posts = 200 ) {
 	 * This includes categories and tags, and any more that are registered.
 	 * But it excludes post_format terms.
 	 *
-	 * @param string $taxonomy The name of the taxonomy.
+	 * @param string $taxonomy     The name of the taxonomy.
 	 * @param int    $number_links The maximum amount of links to get (optional).
+	 * @param int    $offset       The number at which to offset the query.
 	 * @return string[] $links The term links in an array.
 	 */
-	public static function get_taxonomy_links( $taxonomy, $number_links = 200 ) {
-		$terms = get_terms( array(
+	public static function get_taxonomy_links( $taxonomy, $number_links = 200, $offset = null ) {
+		$args = array(
 			'taxonomy' => $taxonomy,
-			'count'    => $number_links,
-		) );
+			'orderby'  => 'id',
+			'number'   => $number_links,
+		);
+		if ( is_int( $offset ) ) {
+			$args = array_merge( $args, compact( 'offset' ) );
+		}
 
-		return array_map( 'get_term_link', $terms );
+		return array_map( 'get_term_link', get_terms( $args ) );
 	}
 
 	/**
diff --git a/tests/test-class-amp-site-validation.php b/tests/test-class-amp-site-validation.php
index 6d091ab424c..b967d207aed 100644
--- a/tests/test-class-amp-site-validation.php
+++ b/tests/test-class-amp-site-validation.php
@@ -118,13 +118,15 @@ public function test_get_taxonomy_links() {
 			$number_of_links = 100;
 			$actual_links    = AMP_Site_Validation::get_taxonomy_links( $taxonomy, $number_of_links );
 
-			/*
-			 * Test that all of the $expected_links are present.
-			 * There is already one term present before this test method adds any,
-			 * so that can also appear in the returned $actual_links.
-			 */
-			$this->assertEquals( 0, count( array_diff( $expected_links, $actual_links ) ) );
+			// The get_terms() call in get_taxonomy_links() returns an array with a first index of 1, so correct for that with array_values().
+			$this->assertEquals( $expected_links, array_values( $actual_links ) );
 			$this->assertLessThan( $number_of_links, count( $actual_links ) );
+
+			$number_of_links           = 5;
+			$offset                    = 10;
+			$actual_links_using_offset = AMP_Site_Validation::get_taxonomy_links( $taxonomy, $number_of_links, $offset );
+			$this->assertEquals( array_slice( $expected_links, $offset, $number_of_links ), array_values( $actual_links_using_offset ) );
+			$this->assertEquals( $number_of_links, count( $actual_links_using_offset ) );
 		}
 	}
 }

From 32ab6356d12bae3df4efca2df578f39f2128da97 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 30 May 2018 18:55:03 -0500
Subject: [PATCH 10/85] Add (optional) to the @param tag for $offset.

---
 includes/validation/class-amp-site-validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index e0813939e4c..53754029b3a 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -43,7 +43,7 @@ public static function get_post_permalinks( $number_posts = 200 ) {
 	 *
 	 * @param string $taxonomy     The name of the taxonomy.
 	 * @param int    $number_links The maximum amount of links to get (optional).
-	 * @param int    $offset       The number at which to offset the query.
+	 * @param int    $offset       The number at which to offset the query (optional).
 	 * @return string[] $links The term links in an array.
 	 */
 	public static function get_taxonomy_links( $taxonomy, $number_links = 200, $offset = null ) {

From 1a862c772cb3471a17bb92705754c9548b3ed23d Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 30 May 2018 19:07:06 -0500
Subject: [PATCH 11/85] Pass 'fields' => 'ids' to WP_Query().

Props 10up Engineering Best Practices.
The prevents the need to use
wp_list_pluck() to get the ids.
---
 includes/validation/class-amp-site-validation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 53754029b3a..d23b8e5c7d8 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -28,10 +28,10 @@ public static function get_post_permalinks( $number_posts = 200 ) {
 			'posts_per_page' => $number_posts,
 			'post_type'      => array_values( $post_types ),
 			'post_status'    => 'publish',
+			'fields'         => 'ids',
 		) );
 
-		$post_ids = wp_list_pluck( $query->posts, 'ID' );
-		return array_map( 'get_permalink', $post_ids );
+		return array_map( 'get_permalink', $query->posts );
 	}
 
 	/**

From c250bd5657342c062a6a2507cb21b1e067091e69 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 30 May 2018 23:25:14 -0500
Subject: [PATCH 12/85] Allow paging through posts in get_post_permalinks().

A similar change to the one Weston proposed
for get_taxonomy_links().
Get permalinks by post types,
and allow paging through them.
This will allow iteration, in a way similar to
that in get_taxonomy_links().
---
 .../validation/class-amp-site-validation.php  | 25 +++++++++--------
 tests/test-class-amp-site-validation.php      | 27 +++++++++----------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index d23b8e5c7d8..05e50efed2e 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -13,23 +13,26 @@
 class AMP_Site_Validation {
 
 	/**
-	 * Gets the permalinks of all public post types with the status 'publish,' to check for AMP validity.
+	 * Gets the permalinks of public, published posts.
 	 *
-	 * This excludes 'attachment' post types, as it only searches for posts with the status 'publish.'
-	 * Attachments have a default status of 'inherit,' so they can depend on the status of their parent like a post.
-	 *
-	 * @todo: consider whether this should also return 'attachment' IDs.
-	 * @param int $number_posts The maximum amount of posts to get the permalinks for (optional).
+	 * @param string $post_type The post type.
+	 * @param int    $number_posts The maximum amount of posts to get the permalinks for (optional).
+	 * @param int    $offset The offset of the query (optional).
 	 * @return string[] $permalinks The post permalinks in an array.
 	 */
-	public static function get_post_permalinks( $number_posts = 200 ) {
-		$post_types = get_post_types( array( 'public' => true ), 'names' );
-		$query      = new WP_Query( array(
+	public static function get_post_permalinks( $post_type, $number_posts = 200, $offset = null ) {
+		$args = array(
+			'post_type'      => $post_type,
 			'posts_per_page' => $number_posts,
-			'post_type'      => array_values( $post_types ),
 			'post_status'    => 'publish',
+			'orderby'        => 'ID',
+			'order'          => 'ASC',
 			'fields'         => 'ids',
-		) );
+		);
+		if ( is_int( $offset ) ) {
+			$args = array_merge( $args, compact( 'offset' ) );
+		}
+		$query = new WP_Query( $args );
 
 		return array_map( 'get_permalink', $query->posts );
 	}
diff --git a/tests/test-class-amp-site-validation.php b/tests/test-class-amp-site-validation.php
index b967d207aed..7f0b040dd15 100644
--- a/tests/test-class-amp-site-validation.php
+++ b/tests/test-class-amp-site-validation.php
@@ -61,31 +61,30 @@ public function setUp() {
 	public function test_get_post_permalinks() {
 		$number_posts_each_post_type = 20;
 		$post_types                  = get_post_types( array( 'public' => true ), 'names' );
-		$expected_post_permalinks    = array();
 
 		/**
-		 * The tested method does not get attachment permalinks.
-		 * It only searches for posts with the status 'publish.'
-		 * Attachments have a default status of 'inherit,' to depend on the status of their parent post.
+		 * Exclude attachment permalinks from the test.
+		 * They have a default status of 'inherit,' to depend on the status of their parent post.
 		 */
 		unset( $post_types['attachment'] );
 		foreach ( $post_types as $post_type ) {
+			$expected_post_permalinks = array();
 			for ( $i = 0; $i < $number_posts_each_post_type; $i++ ) {
 				$expected_post_permalinks[] = get_permalink( $this->factory()->post->create( array(
 					'post_type' => $post_type,
 				) ) );
 			}
-		}
-		$number_of_posts        = count( $post_types ) * $number_posts_each_post_type;
-		$actual_post_permalinks = AMP_Site_Validation::get_post_permalinks( $number_of_posts );
 
-		/*
-		 * The factory() method above creates posts so quickly that the WP_Query() default argument of 'orderby' => 'date'
-		 * doesn't return them in the exact order they were created.
-		 * So this simply ensures all of the created $post_ids are present in the return value of the tested method.
-		 */
-		$this->assertEquals( 0, count( array_diff( $expected_post_permalinks, $actual_post_permalinks ) ) );
-		$this->assertEquals( count( $expected_post_permalinks ), count( $actual_post_permalinks ) );
+			$actual_post_permalinks = AMP_Site_Validation::get_post_permalinks( $post_type );
+			$this->assertEquals( $expected_post_permalinks, array_values( $actual_post_permalinks ) );
+
+			// Test with the 2 optional arguments for AMP_Site_Validation::get_post_permalinks().
+			$number_of_posts        = $number_posts_each_post_type / 2;
+			$offset                 = $number_of_posts;
+			$actual_post_permalinks = AMP_Site_Validation::get_post_permalinks( $post_type, $number_of_posts, $offset );
+			$this->assertEquals( array_slice( $expected_post_permalinks, $offset, $number_of_posts ), array_values( $actual_post_permalinks ) );
+			$this->assertCount( $number_of_posts, $actual_post_permalinks );
+		}
 	}
 
 	/**

From 71f7543629225de27dce3c5190effe5339648b42 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 31 May 2018 01:48:20 -0500
Subject: [PATCH 13/85] Add a method to crawl the entire site.

Iterate over all of the terms and posts
from the existing helper methods.
@todo: consider self::BATCH_SIZE,
and whether the validation requests
should be throttled,
or somehow prevented from timing out WP.
---
 .../validation/class-amp-site-validation.php  | 74 +++++++++++++++--
 tests/test-class-amp-site-validation.php      | 83 +++++++++++++------
 2 files changed, 123 insertions(+), 34 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 05e50efed2e..7ac042e0037 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -12,6 +12,20 @@
  */
 class AMP_Site_Validation {
 
+	/**
+	 * The size of the batch of URLs to validate.
+	 *
+	 * @var int
+	 */
+	const BATCH_SIZE = 100;
+
+	/**
+	 * All of the site validation results.
+	 *
+	 * @var array
+	 */
+	public static $site_validation_urls = array();
+
 	/**
 	 * Gets the permalinks of public, published posts.
 	 *
@@ -44,7 +58,7 @@ public static function get_post_permalinks( $post_type, $number_posts = 200, $of
 	 * This includes categories and tags, and any more that are registered.
 	 * But it excludes post_format terms.
 	 *
-	 * @param string $taxonomy     The name of the taxonomy.
+	 * @param string $taxonomy     The name of the taxonomy, like 'category' or 'post_tag'.
 	 * @param int    $number_links The maximum amount of links to get (optional).
 	 * @param int    $offset       The number at which to offset the query (optional).
 	 * @return string[] $links The term links in an array.
@@ -63,17 +77,63 @@ public static function get_taxonomy_links( $taxonomy, $number_links = 200, $offs
 	}
 
 	/**
-	 * Validates the URLs on the site.
+	 * Validates the URLs of the entire site.
 	 *
 	 * @todo: Consider wrapping this function with another, as different use cases will probably require a different return value or display.
 	 * For example, the <button> in /wp-admin that makes an AJAX request for this will need a different response than a WP-CLI command.
 	 * @return array $validation_result The post ID as the index, and the result of validation as the value.
 	 */
-	public static function validate_site_urls() {
-		$site_post_ids = self::get_post_ids();
-		foreach ( $site_post_ids as $id ) {
-			AMP_Validation_Manager::$posts_pending_frontend_validation[ $id ] = true;
+	public static function validate_entire_site_urls() {
+		// Validate the homepage.
+		self::validate_urls( home_url( '/' ) );
+
+		// Validate all public, published posts.
+		$public_post_types = get_post_types( array( 'public' => true ), 'names' );
+		foreach ( $public_post_types as $post_type ) {
+			$permalinks = self::get_post_permalinks( $post_type, self::BATCH_SIZE );
+			$offset     = 0;
+
+			while ( ! empty( $permalinks ) ) {
+				self::validate_urls( $permalinks );
+				$offset    += self::BATCH_SIZE;
+				$permalinks = self::get_post_permalinks( $post_type, self::BATCH_SIZE, $offset );
+			}
+		}
+
+		// Validate all public taxonomies.
+		$public_taxonomies = get_taxonomies( array( 'public' => true ) );
+		foreach ( $public_taxonomies as $taxonomy ) {
+			$taxonomy_links = self::get_taxonomy_links( $taxonomy, self::BATCH_SIZE );
+			$offset         = 0;
+
+			while ( ! empty( $taxonomy_links ) ) {
+				self::validate_urls( $taxonomy_links );
+				$offset        += self::BATCH_SIZE;
+				$taxonomy_links = self::get_taxonomy_links( $taxonomy, self::BATCH_SIZE, $offset );
+			}
+		}
+
+		return self::$site_validation_urls;
+	}
+
+	/**
+	 * Validates a single URL, and stores the URL in a property.
+	 *
+	 * @todo: Maybe storing the URLS in the property isn't needed, as AMP_Validation_Manager stores the actual errors.
+	 * This could be an extremely large array.
+	 * For now, this is helpful in unit testing.
+	 * @param array|string $urls An array of URLs to validate, or a single string of a URL.
+	 * @return void
+	 */
+	public static function validate_urls( $urls ) {
+		if ( is_string( $urls ) ) {
+			$urls = array( $urls );
+		}
+
+		foreach ( $urls as $url ) {
+			$validation = AMP_Validation_Manager::validate_url( $url );
+			AMP_Invalid_URL_Post_Type::store_validation_errors( $validation, $url );
+			self::$site_validation_urls[] = $url;
 		}
-		return AMP_Validation_Manager::validate_queued_posts_on_frontend();
 	}
 }
diff --git a/tests/test-class-amp-site-validation.php b/tests/test-class-amp-site-validation.php
index 7f0b040dd15..e7ee58f7406 100644
--- a/tests/test-class-amp-site-validation.php
+++ b/tests/test-class-amp-site-validation.php
@@ -20,37 +20,14 @@ class Test_AMP_Site_Validation extends \WP_UnitTestCase {
 	const TESTED_CLASS = 'AMP_Site_Validation';
 
 	/**
-	 * The name of the tag to test.
-	 *
-	 * @var string
-	 */
-	const TAG_NAME = 'img';
-
-	/**
-	 * A disallowed element, which should cause a validation error.
-	 *
-	 * @var string
-	 */
-	const DISALLOWED_TAG = '<script>doThis();</script>';
-
-	/**
-	 * An instance of DOMElement to test.
-	 *
-	 * @var DOMElement
-	 */
-	public $node;
-
-	/**
-	 * Setup.
+	 * Reset the state after a test method is called.
 	 *
 	 * @inheritdoc
 	 * @global $wp_registered_widgets
 	 */
-	public function setUp() {
-		parent::setUp();
-		$dom_document = new DOMDocument( '1.0', 'utf-8' );
-		$this->node   = $dom_document->createElement( self::TAG_NAME );
-		AMP_Validation_Manager::reset_validation_results();
+	public function tearDown() {
+		AMP_Site_Validation::$site_validation_urls = array();
+		parent::tearDown();
 	}
 
 	/**
@@ -128,4 +105,56 @@ public function test_get_taxonomy_links() {
 			$this->assertEquals( $number_of_links, count( $actual_links_using_offset ) );
 		}
 	}
+
+	/**
+	 * Test validate_entire_site_urls.
+	 *
+	 * @covers AMP_Site_Validation::validate_entire_site_urls()
+	 */
+	public function test_validate_entire_site_urls() {
+		$number_of_posts = 20;
+		$number_of_terms = 30;
+		$posts           = array();
+		$terms           = array();
+
+		for ( $i = 0; $i < $number_of_posts; $i++ ) {
+			$posts[] = $this->factory()->post->create();
+		}
+		$validated_urls = AMP_Site_Validation::validate_entire_site_urls();
+
+		// All of the posts created above should be present in $validated_urls.
+		$this->assertEmpty( array_diff( array_map( 'get_permalink', $posts ), $validated_urls ) );
+
+		for ( $i = 0; $i < $number_of_terms; $i++ ) {
+			$terms[] = $this->factory()->category->create();
+		}
+		// Terms need to be associated with a post in order to be returned in get_terms().
+		wp_set_post_terms( $posts[0], $terms, 'category' );
+		$validated_urls = AMP_Site_Validation::validate_entire_site_urls();
+
+		// All of the terms created above should be present in $validated_urls.
+		$this->assertEmpty( array_diff( array_map( 'get_term_link', $terms ), $validated_urls ) );
+		$this->assertTrue( in_array( home_url( '/' ), $validated_urls, true ) );
+	}
+
+	/**
+	 * Test validate_urls.
+	 *
+	 * @covers AMP_Site_Validation::validate_urls()
+	 */
+	public function test_validate_urls() {
+		$single_post_permalink = get_permalink( $this->factory()->post->create() );
+		AMP_Site_Validation::validate_urls( $single_post_permalink );
+		$this->assertEquals( array( $single_post_permalink ), AMP_Site_Validation::$site_validation_urls );
+
+		AMP_Site_Validation::$site_validation_urls = array();
+		$number_of_posts                           = 30;
+		$post_permalinks                           = array();
+
+		for ( $i = 0; $i < $number_of_posts; $i++ ) {
+			$post_permalinks[] = get_permalink( $this->factory()->post->create() );
+		}
+		AMP_Site_Validation::validate_urls( $post_permalinks );
+		$this->assertEquals( $post_permalinks, AMP_Site_Validation::$site_validation_urls );
+	}
 }

From 4aade515d2837740fde13f91aaf4799b63086910 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 31 May 2018 02:17:05 -0500
Subject: [PATCH 14/85] Address Travis error by using full class name, not
 self::

In PHP 5.3, there was:
Fatal error: Cannot access self:: when no class scope is active.
https://travis-ci.org/Automattic/amp-wp/jobs/386045157.

This looks to be because self isn't
available inside the function in 5.3.
Another option might be to add $self to use().
But this seems simpler, if it works.
---
 includes/validation/class-amp-invalid-url-post-type.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/validation/class-amp-invalid-url-post-type.php b/includes/validation/class-amp-invalid-url-post-type.php
index 665068fffc9..1b0001ffe3b 100644
--- a/includes/validation/class-amp-invalid-url-post-type.php
+++ b/includes/validation/class-amp-invalid-url-post-type.php
@@ -365,7 +365,7 @@ public static function store_validation_errors( $validation_errors, $url ) {
 				&&
 				$placeholder === $post_data['post_content']
 				&&
-				self::POST_TYPE_SLUG === $post_data['post_type']
+				AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG === $post_data['post_type']
 			);
 			if ( $should_supply_post_content ) {
 				$post_data['post_content'] = wp_slash( $post_content );

From 584ffea2c4865bb07ffb7d99b34409bd60defea8 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 31 May 2018 03:08:26 -0500
Subject: [PATCH 15/85] Force theme support of 'amp' on validation requests.

This will enable crawling the site in Native AMP.
This seems simpler than registering Paired Mode
support, and adding template_dir.
But it's still an open discussion as to
whether it should only be Native AMP.
If this already finds theme support,
it doesn't change it.
---
 .../validation/class-amp-validation-manager.php  | 14 ++++++++++++++
 tests/test-class-amp-site-validation.php         |  7 -------
 tests/test-class-amp-validation-utils.php        | 16 ++++++++++++++++
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php
index 20a3aa4a8d5..ecbc293fcbb 100644
--- a/includes/validation/class-amp-validation-manager.php
+++ b/includes/validation/class-amp-validation-manager.php
@@ -152,6 +152,9 @@ public static function init( $args = array() ) {
 
 		add_action( 'rest_api_init', array( __CLASS__, 'add_rest_api_fields' ) );
 
+		// Run after other hooks, as this doesn't change the arguments for 'amp' theme support if it already exists.
+		add_action( 'after_setup_theme', array( __CLASS__, 'conditionally_force_theme_support' ), PHP_INT_MAX );
+
 		// Actions and filters involved in validation.
 		add_action( 'activate_plugin', function() {
 			if ( ! has_action( 'shutdown', array( __CLASS__, 'validate_after_plugin_activation' ) ) ) {
@@ -1415,4 +1418,15 @@ public static function enqueue_block_validation() {
 		) );
 		wp_add_inline_script( $slug, sprintf( 'ampBlockValidation.boot( %s );', $data ) );
 	}
+
+	/**
+	 * Forces Native AMP if the validation query var is present and the theme does not support 'amp.'
+	 *
+	 * @return void
+	 */
+	public static function conditionally_force_theme_support() {
+		if ( ! current_theme_supports( 'amp' ) && self::should_validate_response() ) {
+			add_theme_support( 'amp' );
+		}
+	}
 }
diff --git a/tests/test-class-amp-site-validation.php b/tests/test-class-amp-site-validation.php
index e7ee58f7406..f54e960eae0 100644
--- a/tests/test-class-amp-site-validation.php
+++ b/tests/test-class-amp-site-validation.php
@@ -12,13 +12,6 @@
  */
 class Test_AMP_Site_Validation extends \WP_UnitTestCase {
 
-	/**
-	 * The name of the tested class.
-	 *
-	 * @var string
-	 */
-	const TESTED_CLASS = 'AMP_Site_Validation';
-
 	/**
 	 * Reset the state after a test method is called.
 	 *
diff --git a/tests/test-class-amp-validation-utils.php b/tests/test-class-amp-validation-utils.php
index 9b3241e57cb..40b03c80988 100644
--- a/tests/test-class-amp-validation-utils.php
+++ b/tests/test-class-amp-validation-utils.php
@@ -123,6 +123,7 @@ public function test_init() {
 		$this->assertEquals( 10, has_action( 'admin_menu', self::TESTED_CLASS . '::remove_publish_meta_box' ) );
 		$this->assertEquals( 10, has_action( 'add_meta_boxes', self::TESTED_CLASS . '::add_meta_boxes' ) );
 		$this->assertEquals( 10, has_action( 'rest_api_init', self::TESTED_CLASS . '::add_rest_api_fields' ) );
+		$this->assertEquals( PHP_INT_MAX, has_action( 'after_setup_theme', self::TESTED_CLASS . '::conditionally_force_theme_support' ) );
 	}
 
 	/**
@@ -1605,6 +1606,21 @@ public function test_rest_field_amp_validation() {
 		$this->assertEquals( $field['errors'], $this->get_mock_errors() );
 	}
 
+	/**
+	 * Test conditionally_force_theme_support.
+	 *
+	 * @covers AMP_Validation_Manager::conditionally_force_theme_support()
+	 */
+	public function test_conditionally_force_theme_support() {
+		$_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ] = 1;
+		AMP_Validation_Manager::conditionally_force_theme_support();
+		$this->assertFalse( current_theme_supports( 'amp' ) );
+
+		$_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ] = AMP_Validation_Manager::get_amp_validate_nonce();
+		AMP_Validation_Manager::conditionally_force_theme_support();
+		$this->assertTrue( current_theme_supports( 'amp' ) );
+	}
+
 	/**
 	 * Creates and inserts a custom post.
 	 *

From ae4371cf504bc21d58b0fcaea7982c19dcb1d3bf Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 31 May 2018 03:21:12 -0500
Subject: [PATCH 16/85] Add an 'amp' query arg if it's in Paired Mode.

In the validate_url() helper function,
find if it's in Paired Mode.
If so, set the $url to the amp endpoint.
---
 includes/validation/class-amp-site-validation.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 7ac042e0037..74a535d15a5 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -131,6 +131,9 @@ public static function validate_urls( $urls ) {
 		}
 
 		foreach ( $urls as $url ) {
+			if ( AMP_Theme_Support::is_paired_available() ) {
+				$url = add_query_arg( 'amp', 1, $url );
+			}
 			$validation = AMP_Validation_Manager::validate_url( $url );
 			AMP_Invalid_URL_Post_Type::store_validation_errors( $validation, $url );
 			self::$site_validation_urls[] = $url;

From 7b67efe8554961484789bee9f597c312eed1e9dd Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 31 May 2018 23:50:41 -0500
Subject: [PATCH 17/85] Begin WP-CLI script to crawl the site.

This mainly calls the existing helper function.
But it also passes it $wp_cli_progress.
This advances the progress bar,
after each post type or taxonomy validation completes.
---
 bin/validate-site.php                         | 25 +++++++++++++++++++
 .../validation/class-amp-site-validation.php  | 14 ++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 bin/validate-site.php

diff --git a/bin/validate-site.php b/bin/validate-site.php
new file mode 100644
index 00000000000..810a090a6a5
--- /dev/null
+++ b/bin/validate-site.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Crawls the entire site and validates it for AMP compatibility.
+ *
+ * @codeCoverageIgnore
+ * @package AMP
+ */
+
+namespace AMP;
+
+// Bootstrap.
+if ( defined( 'WP_CLI' ) ) {
+	try {
+		$count_post_types_and_taxonomies = count( get_post_types( array( 'public' => true ), 'names' ) ) + count( get_taxonomies( array( 'public' => true ) ) );
+		$wp_cli_progress                 = \WP_CLI\Utils\make_progress_bar( 'Validating the URLs of the entire site', $count_post_types_and_taxonomies );
+		$validation_result               = \AMP_Site_Validation::validate_entire_site_urls( $wp_cli_progress );
+		$wp_cli_progress->finish();
+		\WP_CLI::success( sprintf( '%d URLs were validated for AMP compatibility.', count( $validation_result ) ) );
+	} catch ( \Exception $e ) {
+		\WP_CLI::error( $e->getMessage() );
+	}
+} else {
+	echo "This script should be run with WP-CLI via: wp eval-file bin/validate-site.php\n";
+	exit( 1 );
+}
diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 74a535d15a5..538448faa62 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -79,11 +79,15 @@ public static function get_taxonomy_links( $taxonomy, $number_links = 200, $offs
 	/**
 	 * Validates the URLs of the entire site.
 	 *
+	 * Accepts an optional parameter of a WP-CLI progress bar object.
+	 * Calling its tick() method updates the display in WP-CLI to show the percentage of the site crawl that's complete.
+	 *
 	 * @todo: Consider wrapping this function with another, as different use cases will probably require a different return value or display.
 	 * For example, the <button> in /wp-admin that makes an AJAX request for this will need a different response than a WP-CLI command.
+	 * @param object $wp_cli_progress The object that shows progress in the WP-CLI script to validate the site.
 	 * @return array $validation_result The post ID as the index, and the result of validation as the value.
 	 */
-	public static function validate_entire_site_urls() {
+	public static function validate_entire_site_urls( $wp_cli_progress = null ) {
 		// Validate the homepage.
 		self::validate_urls( home_url( '/' ) );
 
@@ -98,6 +102,10 @@ public static function validate_entire_site_urls() {
 				$offset    += self::BATCH_SIZE;
 				$permalinks = self::get_post_permalinks( $post_type, self::BATCH_SIZE, $offset );
 			}
+
+			if ( $wp_cli_progress ) {
+				$wp_cli_progress->tick();
+			}
 		}
 
 		// Validate all public taxonomies.
@@ -111,6 +119,10 @@ public static function validate_entire_site_urls() {
 				$offset        += self::BATCH_SIZE;
 				$taxonomy_links = self::get_taxonomy_links( $taxonomy, self::BATCH_SIZE, $offset );
 			}
+
+			if ( $wp_cli_progress ) {
+				$wp_cli_progress->tick();
+			}
 		}
 
 		return self::$site_validation_urls;

From 15ec0ed35c3121a3a9e5cbfd93473525aae0c50b Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Fri, 1 Jun 2018 00:25:39 -0500
Subject: [PATCH 18/85] Display the number of validation issues in the sucess
 message:

Success: 196 URLs were crawled, and 196 have AMP validation issue(s).
Query for the validation error posts.
And output the number found.
---
 bin/validate-site.php                         | 33 +++++++++++++++----
 .../validation/class-amp-site-validation.php  |  2 +-
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/bin/validate-site.php b/bin/validate-site.php
index 810a090a6a5..8ad32950052 100644
--- a/bin/validate-site.php
+++ b/bin/validate-site.php
@@ -8,18 +8,39 @@
 
 namespace AMP;
 
+/**
+ * Crawl the entire site to validate it, and get the results.
+ *
+ * @return array[] {
+ *     @type int  $number_crawled The number of URLs visited, regardless of the validation results.
+ *     @type int  $number_invalid The number of URLs that have AMP validation error(s).
+ * }
+ */
+function crawl_site() {
+	$count_post_types_and_taxonomies = count( get_post_types( array( 'public' => true ), 'names' ) ) + count( get_taxonomies( array( 'public' => true ) ) );
+	$wp_cli_progress                 = \WP_CLI\Utils\make_progress_bar( 'Validating the URLs of the entire site', $count_post_types_and_taxonomies );
+	$number_crawled                  = count( \AMP_Site_Validation::validate_entire_site_urls( $wp_cli_progress ) );
+	$wp_cli_progress->finish();
+
+	$query_invalid_urls = new \WP_Query( array(
+		'post_type'      => \AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+		'posts_per_page' => $number_crawled,
+		'fields'         => 'ids',
+	) );
+	$number_invalid     = count( $query_invalid_urls->posts );
+
+	return compact( 'number_crawled', 'number_invalid' );
+}
+
 // Bootstrap.
 if ( defined( 'WP_CLI' ) ) {
 	try {
-		$count_post_types_and_taxonomies = count( get_post_types( array( 'public' => true ), 'names' ) ) + count( get_taxonomies( array( 'public' => true ) ) );
-		$wp_cli_progress                 = \WP_CLI\Utils\make_progress_bar( 'Validating the URLs of the entire site', $count_post_types_and_taxonomies );
-		$validation_result               = \AMP_Site_Validation::validate_entire_site_urls( $wp_cli_progress );
-		$wp_cli_progress->finish();
-		\WP_CLI::success( sprintf( '%d URLs were validated for AMP compatibility.', count( $validation_result ) ) );
+		$validation_counts = crawl_site();
+		\WP_CLI::success( sprintf( '%d URLs were crawled, and %d have AMP validation issue(s).', $validation_counts['number_crawled'], $validation_counts['number_invalid'] ) );
 	} catch ( \Exception $e ) {
 		\WP_CLI::error( $e->getMessage() );
 	}
 } else {
-	echo "This script should be run with WP-CLI via: wp eval-file bin/validate-site.php\n";
+	echo "Please run this script with WP-CLI via: wp eval-file bin/validate-site.php\n";
 	exit( 1 );
 }
diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 538448faa62..1b55b33600d 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -85,7 +85,7 @@ public static function get_taxonomy_links( $taxonomy, $number_links = 200, $offs
 	 * @todo: Consider wrapping this function with another, as different use cases will probably require a different return value or display.
 	 * For example, the <button> in /wp-admin that makes an AJAX request for this will need a different response than a WP-CLI command.
 	 * @param object $wp_cli_progress The object that shows progress in the WP-CLI script to validate the site.
-	 * @return array $validation_result The post ID as the index, and the result of validation as the value.
+	 * @return array $urls_validated The URLs that were visited, regardless of what the validation result was.
 	 */
 	public static function validate_entire_site_urls( $wp_cli_progress = null ) {
 		// Validate the homepage.

From 1ef10a73dcebc3f629d32652c2df39a96a4f5994 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Fri, 1 Jun 2018 18:16:32 -0500
Subject: [PATCH 19/85] Site crawling script: output 'more detail' link.

This drives to the page:
Invalid AMP Pages (URLs)

Also, output a message at the beginning:
Crawling the entire site to test for AMP validity.
This might take a while...
---
 bin/validate-site.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/bin/validate-site.php b/bin/validate-site.php
index 8ad32950052..e855d8b76ea 100644
--- a/bin/validate-site.php
+++ b/bin/validate-site.php
@@ -17,8 +17,9 @@
  * }
  */
 function crawl_site() {
+	\WP_CLI::log( 'Crawling the entire site to test for AMP validity. This might take a while...' );
 	$count_post_types_and_taxonomies = count( get_post_types( array( 'public' => true ), 'names' ) ) + count( get_taxonomies( array( 'public' => true ) ) );
-	$wp_cli_progress                 = \WP_CLI\Utils\make_progress_bar( 'Validating the URLs of the entire site', $count_post_types_and_taxonomies );
+	$wp_cli_progress                 = \WP_CLI\Utils\make_progress_bar( 'Validating URLs...', $count_post_types_and_taxonomies );
 	$number_crawled                  = count( \AMP_Site_Validation::validate_entire_site_urls( $wp_cli_progress ) );
 	$wp_cli_progress->finish();
 
@@ -36,7 +37,20 @@ function crawl_site() {
 if ( defined( 'WP_CLI' ) ) {
 	try {
 		$validation_counts = crawl_site();
-		\WP_CLI::success( sprintf( '%d URLs were crawled, and %d have AMP validation issue(s).', $validation_counts['number_crawled'], $validation_counts['number_invalid'] ) );
+		$url_more_details  = add_query_arg(
+			'post_type',
+			\AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			admin_url( 'edit.php' )
+		);
+
+		\WP_CLI::success(
+			sprintf(
+				"%d URLs were crawled, and %d have AMP validation issue(s).\nFor more details, please see: \n%s",
+				$validation_counts['number_crawled'],
+				$validation_counts['number_invalid'],
+				$url_more_details
+			)
+		);
 	} catch ( \Exception $e ) {
 		\WP_CLI::error( $e->getMessage() );
 	}

From bfe37a8b6aef515962530cffa27557ce9760a607 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 00:31:50 -0500
Subject: [PATCH 20/85] Register a WP-CLI command: wp amp validate-site

On Weston's suggestion.
Before, running the validation required:
wp eval-file bin/validate-site.php.
---
 bin/create-gutenberg-test-post.php            |  2 +-
 bin/validate-site.php                         | 60 -------------------
 .../validation/class-amp-site-validation.php  | 58 ++++++++++++++++++
 .../class-amp-validation-manager.php          |  1 +
 .../test-class-amp-site-validation.php        |  2 +-
 5 files changed, 61 insertions(+), 62 deletions(-)
 delete mode 100644 bin/validate-site.php

diff --git a/bin/create-gutenberg-test-post.php b/bin/create-gutenberg-test-post.php
index 75211d31c69..21e2204b32e 100644
--- a/bin/create-gutenberg-test-post.php
+++ b/bin/create-gutenberg-test-post.php
@@ -167,7 +167,7 @@ function create_gutenberg_test_post( $content ) {
 		$post_id = create_gutenberg_test_post( get_test_block_fixtures() );
 		\WP_CLI::success( sprintf( 'The test page is at: %s', \amp_get_permalink( $post_id ) . '#development=1' ) );
 	} catch ( \Exception $e ) {
-		\WP_CLI::error( $e->getMessage() );
+		wP_CLI::error( $e->getMessage() );
 	}
 } else {
 	echo "This script should be run WP-CLI via: wp eval-file bin/create-gutenberg-test-post.php\n";
diff --git a/bin/validate-site.php b/bin/validate-site.php
deleted file mode 100644
index e855d8b76ea..00000000000
--- a/bin/validate-site.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Crawls the entire site and validates it for AMP compatibility.
- *
- * @codeCoverageIgnore
- * @package AMP
- */
-
-namespace AMP;
-
-/**
- * Crawl the entire site to validate it, and get the results.
- *
- * @return array[] {
- *     @type int  $number_crawled The number of URLs visited, regardless of the validation results.
- *     @type int  $number_invalid The number of URLs that have AMP validation error(s).
- * }
- */
-function crawl_site() {
-	\WP_CLI::log( 'Crawling the entire site to test for AMP validity. This might take a while...' );
-	$count_post_types_and_taxonomies = count( get_post_types( array( 'public' => true ), 'names' ) ) + count( get_taxonomies( array( 'public' => true ) ) );
-	$wp_cli_progress                 = \WP_CLI\Utils\make_progress_bar( 'Validating URLs...', $count_post_types_and_taxonomies );
-	$number_crawled                  = count( \AMP_Site_Validation::validate_entire_site_urls( $wp_cli_progress ) );
-	$wp_cli_progress->finish();
-
-	$query_invalid_urls = new \WP_Query( array(
-		'post_type'      => \AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
-		'posts_per_page' => $number_crawled,
-		'fields'         => 'ids',
-	) );
-	$number_invalid     = count( $query_invalid_urls->posts );
-
-	return compact( 'number_crawled', 'number_invalid' );
-}
-
-// Bootstrap.
-if ( defined( 'WP_CLI' ) ) {
-	try {
-		$validation_counts = crawl_site();
-		$url_more_details  = add_query_arg(
-			'post_type',
-			\AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
-			admin_url( 'edit.php' )
-		);
-
-		\WP_CLI::success(
-			sprintf(
-				"%d URLs were crawled, and %d have AMP validation issue(s).\nFor more details, please see: \n%s",
-				$validation_counts['number_crawled'],
-				$validation_counts['number_invalid'],
-				$url_more_details
-			)
-		);
-	} catch ( \Exception $e ) {
-		\WP_CLI::error( $e->getMessage() );
-	}
-} else {
-	echo "Please run this script with WP-CLI via: wp eval-file bin/validate-site.php\n";
-	exit( 1 );
-}
diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 5ee83575cf8..bf80059b32a 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -19,6 +19,13 @@ class AMP_Site_Validation {
 	 */
 	const BATCH_SIZE = 100;
 
+	/**
+	 * The argument to validate the site.
+	 *
+	 * @var int
+	 */
+	const WP_CLI_ARGUMENT = 'validate-site';
+
 	/**
 	 * All of the site validation results.
 	 *
@@ -26,6 +33,57 @@ class AMP_Site_Validation {
 	 */
 	public static $site_validation_urls = array();
 
+	/**
+	 * Inits the class.
+	 */
+	public static function init() {
+		if ( ! defined( 'WP_CLI' ) || ! WP_CLI ) {
+			return;
+		}
+		WP_CLI::add_command( 'amp', array( __CLASS__, 'crawl_site' ) );
+	}
+
+	/**
+	 * Crawls the entire site to validate it, and gets the results.
+	 *
+	 * @param array $args The arguments for the command.
+	 */
+	public function crawl_site( $args ) {
+		if ( ! defined( 'WP_CLI' ) || ! WP_CLI || ! isset( $args[0] ) && self::WP_CLI_ARGUMENT !== $args[0] ) {
+			return;
+		}
+
+		WP_CLI::log( __( 'Crawling the entire site to test for AMP validity. This might take a while...', 'amp' ) );
+		$count_post_types_and_taxonomies = count( get_post_types( array( 'public' => true ), 'names' ) ) + count( get_taxonomies( array( 'public' => true ) ) );
+		$wp_cli_progress                 = WP_CLI\Utils\make_progress_bar( 'Validating URLs...', $count_post_types_and_taxonomies );
+		$number_crawled                  = count( self::validate_entire_site_urls( $wp_cli_progress ) );
+		$wp_cli_progress->finish();
+
+		$query_invalid_urls = new \WP_Query( array(
+			'post_type'      => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			'posts_per_page' => $number_crawled,
+			'fields'         => 'ids',
+		) );
+		$number_invalid     = count( $query_invalid_urls->posts );
+
+		$validation_counts = compact( 'number_crawled', 'number_invalid' );
+		$url_more_details  = add_query_arg(
+			'post_type',
+			\AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			admin_url( 'edit.php' )
+		);
+
+		WP_CLI::success(
+			sprintf(
+				/* Translators: $1%d: the number of URls crawled, $2%d: the number of validation issues, $3%s: link for more details */
+				__( "%1\$d URLs were crawled, and %2\$d have AMP validation issue(s).\nFor more details, please see: \n%3\$s", 'amp' ),
+				$validation_counts['number_crawled'],
+				$validation_counts['number_invalid'],
+				$url_more_details
+			)
+		);
+	}
+
 	/**
 	 * Gets the permalinks of public, published posts.
 	 *
diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php
index 74ec05d7dcf..70de44d61a2 100644
--- a/includes/validation/class-amp-validation-manager.php
+++ b/includes/validation/class-amp-validation-manager.php
@@ -157,6 +157,7 @@ public static function init( $args = array() ) {
 
 		AMP_Invalid_URL_Post_Type::register();
 		AMP_Validation_Error_Taxonomy::register();
+		AMP_Site_Validation::init();
 
 		add_action( 'save_post', array( __CLASS__, 'handle_save_post_prompting_validation' ) );
 		add_action( 'enqueue_block_editor_assets', array( __CLASS__, 'enqueue_block_validation' ) );
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 890893feea6..8935127ab14 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -184,7 +184,7 @@ public function add_comment() {
 		);
 
 		return array(
-			'body' => sprintf(
+			'body'     => sprintf(
 				'<html amp><head></head><body></body><!--%s--></html>',
 				'AMP_VALIDATION_RESULTS:' . wp_json_encode( $mock_validation_results )
 			),

From 3d9a01c163988208ca5c497c5ac3a83e2398299b Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 01:14:57 -0500
Subject: [PATCH 21/85] Call the WP-CLI tick() method for every URL validated.

This has a much better display of the activity.
On Weston's suggestion.
Create a new method to count all of the URLs
to be validated.
This should only be used for WP-CLI,
as it uses 'posts_per_page' => -1
---
 .../validation/class-amp-site-validation.php  | 51 ++++++++++++++-----
 .../test-class-amp-site-validation.php        | 39 ++++++++++++++
 2 files changed, 78 insertions(+), 12 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index bf80059b32a..4fe4b0c913c 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -33,6 +33,13 @@ class AMP_Site_Validation {
 	 */
 	public static $site_validation_urls = array();
 
+	/**
+	 * The WP CLI progress bar.
+	 *
+	 * @var cli\progress\Bar|WP_CLI\NoOp
+	 */
+	public static $wp_cli_progress;
+
 	/**
 	 * Inits the class.
 	 */
@@ -54,10 +61,9 @@ public function crawl_site( $args ) {
 		}
 
 		WP_CLI::log( __( 'Crawling the entire site to test for AMP validity. This might take a while...', 'amp' ) );
-		$count_post_types_and_taxonomies = count( get_post_types( array( 'public' => true ), 'names' ) ) + count( get_taxonomies( array( 'public' => true ) ) );
-		$wp_cli_progress                 = WP_CLI\Utils\make_progress_bar( 'Validating URLs...', $count_post_types_and_taxonomies );
-		$number_crawled                  = count( self::validate_entire_site_urls( $wp_cli_progress ) );
-		$wp_cli_progress->finish();
+		self::$wp_cli_progress = WP_CLI\Utils\make_progress_bar( 'Validating URLs...', self::count_posts_and_terms() );
+		$number_crawled        = count( self::validate_entire_site_urls() );
+		self::$wp_cli_progress->finish();
 
 		$query_invalid_urls = new \WP_Query( array(
 			'post_type'      => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
@@ -84,6 +90,32 @@ public function crawl_site( $args ) {
 		);
 	}
 
+	/**
+	 * Finds the total number of posts and terms on the site.
+	 *
+	 * @return int The number of posts and terms.
+	 */
+	public static function count_posts_and_terms() {
+
+		/**
+		 * Because of the posts_per_page => -1 value, this is only suited for use in WP-CLI.
+		 * This is necessary to pass as an argument to WP_CLI\Utils\make_progress_bar(),
+		 * in order to show the progress of every post.
+		 */
+		$post_query = new WP_Query( array(
+			'post_types'     => get_post_types( array( 'public' => true ), 'names' ),
+			'fields'         => 'ids',
+			'posts_per_page' => -1,
+		) );
+
+		$term_query = new WP_Term_Query( array(
+			'taxonomy' => get_taxonomies( array( 'public' => true ) ),
+			'fields'   => 'ids',
+		) );
+
+		return $post_query->found_posts + count( $term_query->terms );
+	}
+
 	/**
 	 * Gets the permalinks of public, published posts.
 	 *
@@ -160,10 +192,6 @@ public static function validate_entire_site_urls( $wp_cli_progress = null ) {
 				$offset    += self::BATCH_SIZE;
 				$permalinks = self::get_post_permalinks( $post_type, self::BATCH_SIZE, $offset );
 			}
-
-			if ( $wp_cli_progress ) {
-				$wp_cli_progress->tick();
-			}
 		}
 
 		// Validate all public taxonomies.
@@ -177,10 +205,6 @@ public static function validate_entire_site_urls( $wp_cli_progress = null ) {
 				$offset        += self::BATCH_SIZE;
 				$taxonomy_links = self::get_taxonomy_links( $taxonomy, self::BATCH_SIZE, $offset );
 			}
-
-			if ( $wp_cli_progress ) {
-				$wp_cli_progress->tick();
-			}
 		}
 
 		return self::$site_validation_urls;
@@ -209,6 +233,9 @@ public static function validate_urls( $urls ) {
 			if ( ! is_wp_error( $validity ) ) {
 				AMP_Invalid_URL_Post_Type::store_validation_errors( $validity['validation_errors'], $validity['url'] );
 				self::$site_validation_urls[] = $url;
+				if ( self::$wp_cli_progress ) {
+					self::$wp_cli_progress->tick();
+				}
 			}
 		}
 	}
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 8935127ab14..42fd6b7430a 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -32,6 +32,45 @@ public function tearDown() {
 		parent::tearDown();
 	}
 
+	/**
+	 * Test count_posts_and_terms.
+	 *
+	 * @covers AMP_Site_Validation::count_posts_and_terms()
+	 */
+	public function test_count_posts_and_terms() {
+		$this->assertEquals( 0, AMP_Site_Validation::count_posts_and_terms() );
+
+		$number_of_posts = 20;
+		$post_ids        = array();
+		for ( $i = 0; $i < $number_of_posts; $i++ ) {
+			$post_ids[] = $this->factory()->post->create();
+		}
+
+		/**
+		 * The term (category) of 'Uncategorized' should be present, as there are posts now.
+		 * So account for it with +1.
+		 */
+		$this->assertEquals( $number_of_posts + 1, AMP_Site_Validation::count_posts_and_terms() );
+
+		$number_of_new_terms        = 20;
+		$taxonomy                   = 'category';
+		$terms_for_current_taxonomy = array();
+		for ( $i = 0; $i < $number_of_new_terms; $i++ ) {
+			$terms_for_current_taxonomy[] = $this->factory()->term->create( array(
+				'taxonomy' => $taxonomy,
+			) );
+		}
+
+		// Terms need to be associated with a post in order to be returned in get_terms().
+		wp_set_post_terms(
+			$post_ids[0],
+			$terms_for_current_taxonomy,
+			$taxonomy
+		);
+
+		$this->assertEquals( $number_of_posts + $number_of_new_terms + 1, AMP_Site_Validation::count_posts_and_terms() );
+	}
+
 	/**
 	 * Test get_post_permalinks.
 	 *

From c586c24e9689b55efe7c059905df1ee884180d6f Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 01:19:18 -0500
Subject: [PATCH 22/85] Remove 'This might take a while...'

There's now more accurate feedback
in the progress bar,
and it'll be clear that this will
probably take more than a minute.
---
 includes/validation/class-amp-site-validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 4fe4b0c913c..cf09662dc28 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -60,7 +60,7 @@ public function crawl_site( $args ) {
 			return;
 		}
 
-		WP_CLI::log( __( 'Crawling the entire site to test for AMP validity. This might take a while...', 'amp' ) );
+		WP_CLI::log( __( 'Crawling the entire site to test for AMP validity.', 'amp' ) );
 		self::$wp_cli_progress = WP_CLI\Utils\make_progress_bar( 'Validating URLs...', self::count_posts_and_terms() );
 		$number_crawled        = count( self::validate_entire_site_urls() );
 		self::$wp_cli_progress->finish();

From 128ca9cf93ec8e31dc5e6b69d8cc451453a6bb0f Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 01:34:15 -0500
Subject: [PATCH 23/85] Only report unaccepted validation errors.

If a script is enqueued on all pages,
and the user has accepted that error,
there's probably no need to report all of the
URLs that have that issue.
---
 includes/validation/class-amp-site-validation.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index cf09662dc28..cfbe8ea3df2 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -232,7 +232,17 @@ public static function validate_urls( $urls ) {
 			$validity = AMP_Validation_Manager::validate_url( $url );
 			if ( ! is_wp_error( $validity ) ) {
 				AMP_Invalid_URL_Post_Type::store_validation_errors( $validity['validation_errors'], $validity['url'] );
-				self::$site_validation_urls[] = $url;
+				$unaccepted_error_count = count( array_filter(
+					$validity['validation_errors'],
+					function( $error ) {
+						return ! AMP_Validation_Error_Taxonomy::is_validation_error_sanitized( $error );
+					}
+				) );
+
+				if ( $unaccepted_error_count > 0 ) {
+					self::$site_validation_urls[] = $url;
+				}
+
 				if ( self::$wp_cli_progress ) {
 					self::$wp_cli_progress->tick();
 				}

From 441044f5cf70f4b8d54553605fd8e530fe0af1a1 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 01:50:15 -0500
Subject: [PATCH 24/85] Remove the return value of validate_entire_site_urls().

This stores the URLs in a property,
so there's no need to also return that property.
---
 .../validation/class-amp-site-validation.php  | 35 +++++++++----------
 .../test-class-amp-site-validation.php        | 15 ++++----
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index cfbe8ea3df2..c1394f2c2bb 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -31,7 +31,7 @@ class AMP_Site_Validation {
 	 *
 	 * @var array
 	 */
-	public static $site_validation_urls = array();
+	public static $site_invalid_urls = array();
 
 	/**
 	 * The WP CLI progress bar.
@@ -40,6 +40,13 @@ class AMP_Site_Validation {
 	 */
 	public static $wp_cli_progress;
 
+	/**
+	 * The number of URLs crawled.
+	 *
+	 * @var int
+	 */
+	public static $number_crawled = 0;
+
 	/**
 	 * Inits the class.
 	 */
@@ -62,18 +69,10 @@ public function crawl_site( $args ) {
 
 		WP_CLI::log( __( 'Crawling the entire site to test for AMP validity.', 'amp' ) );
 		self::$wp_cli_progress = WP_CLI\Utils\make_progress_bar( 'Validating URLs...', self::count_posts_and_terms() );
-		$number_crawled        = count( self::validate_entire_site_urls() );
+		self::validate_entire_site_urls();
 		self::$wp_cli_progress->finish();
 
-		$query_invalid_urls = new \WP_Query( array(
-			'post_type'      => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
-			'posts_per_page' => $number_crawled,
-			'fields'         => 'ids',
-		) );
-		$number_invalid     = count( $query_invalid_urls->posts );
-
-		$validation_counts = compact( 'number_crawled', 'number_invalid' );
-		$url_more_details  = add_query_arg(
+		$url_more_details = add_query_arg(
 			'post_type',
 			\AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
 			admin_url( 'edit.php' )
@@ -83,8 +82,8 @@ public function crawl_site( $args ) {
 			sprintf(
 				/* Translators: $1%d: the number of URls crawled, $2%d: the number of validation issues, $3%s: link for more details */
 				__( "%1\$d URLs were crawled, and %2\$d have AMP validation issue(s).\nFor more details, please see: \n%3\$s", 'amp' ),
-				$validation_counts['number_crawled'],
-				$validation_counts['number_invalid'],
+				self::$number_crawled,
+				count( self::$site_invalid_urls ),
 				$url_more_details
 			)
 		);
@@ -174,10 +173,8 @@ public static function get_taxonomy_links( $taxonomy, $number_links = 200, $offs
 	 *
 	 * @todo: Consider wrapping this function with another, as different use cases will probably require a different return value or display.
 	 * For example, the <button> in /wp-admin that makes an AJAX request for this will need a different response than a WP-CLI command.
-	 * @param object $wp_cli_progress The object that shows progress in the WP-CLI script to validate the site.
-	 * @return array $urls_validated The URLs that were visited, regardless of what the validation result was.
 	 */
-	public static function validate_entire_site_urls( $wp_cli_progress = null ) {
+	public static function validate_entire_site_urls() {
 		// Validate the homepage.
 		self::validate_urls( home_url( '/' ) );
 
@@ -206,8 +203,6 @@ public static function validate_entire_site_urls( $wp_cli_progress = null ) {
 				$taxonomy_links = self::get_taxonomy_links( $taxonomy, self::BATCH_SIZE, $offset );
 			}
 		}
-
-		return self::$site_validation_urls;
 	}
 
 	/**
@@ -240,13 +235,15 @@ function( $error ) {
 				) );
 
 				if ( $unaccepted_error_count > 0 ) {
-					self::$site_validation_urls[] = $url;
+					self::$site_invalid_urls[] = $url;
 				}
 
 				if ( self::$wp_cli_progress ) {
 					self::$wp_cli_progress->tick();
 				}
 			}
+
+			self::$number_crawled++;
 		}
 	}
 }
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 42fd6b7430a..f4c6765f83c 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -28,7 +28,7 @@ public function setUp() {
 	 * @inheritdoc
 	 */
 	public function tearDown() {
-		AMP_Site_Validation::$site_validation_urls = array();
+		AMP_Site_Validation::$site_invalid_urls = array();
 		parent::tearDown();
 	}
 
@@ -164,7 +164,8 @@ public function test_validate_entire_site_urls() {
 			$posts[]           = $post_id;
 			$post_permalinks[] = add_query_arg( 'amp', '1', get_permalink( $post_id ) );
 		}
-		$validated_urls = AMP_Site_Validation::validate_entire_site_urls();
+		AMP_Site_Validation::validate_entire_site_urls();
+		$validated_urls = AMP_Site_Validation::$site_invalid_urls;
 
 		// All of the posts created above should be present in $validated_urls.
 		$this->assertEmpty( array_diff( $post_permalinks, $validated_urls ) );
@@ -174,8 +175,8 @@ public function test_validate_entire_site_urls() {
 		}
 		// Terms need to be associated with a post in order to be returned in get_terms().
 		wp_set_post_terms( $posts[0], $terms, 'category' );
-
-		$actual_validated_urls   = AMP_Site_Validation::validate_entire_site_urls();
+		AMP_Site_Validation::validate_entire_site_urls();
+		$actual_validated_urls   = AMP_Site_Validation::$site_invalid_urls;
 		$expected_validated_urls = array_map(
 			function( $term ) {
 				return add_query_arg( 'amp', '1', get_term_link( $term ) );
@@ -196,9 +197,9 @@ function( $term ) {
 	public function test_validate_urls() {
 		$single_post_permalink = get_permalink( $this->factory()->post->create() );
 		AMP_Site_Validation::validate_urls( $single_post_permalink );
-		$this->assertEquals( array( add_query_arg( 'amp', 1, $single_post_permalink ) ), AMP_Site_Validation::$site_validation_urls );
+		$this->assertEquals( array( add_query_arg( 'amp', 1, $single_post_permalink ) ), AMP_Site_Validation::$site_invalid_urls );
 
-		AMP_Site_Validation::$site_validation_urls = array();
+		AMP_Site_Validation::$site_invalid_urls = array();
 		$number_of_posts                           = 30;
 		$post_permalinks                           = array();
 
@@ -206,7 +207,7 @@ public function test_validate_urls() {
 			$post_permalinks[] = add_query_arg( 'amp', 1, get_permalink( $this->factory()->post->create() ) );
 		}
 		AMP_Site_Validation::validate_urls( $post_permalinks );
-		$this->assertEquals( $post_permalinks, AMP_Site_Validation::$site_validation_urls );
+		$this->assertEquals( $post_permalinks, AMP_Site_Validation::$site_invalid_urls );
 	}
 
 	/**

From 875d4eeaca95b4a6b678012fbc089fbe554e8c41 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 02:09:30 -0500
Subject: [PATCH 25/85] Address PHPCS error by aligning =

---
 tests/validation/test-class-amp-site-validation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index f4c6765f83c..40bbe13ad3d 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -200,8 +200,8 @@ public function test_validate_urls() {
 		$this->assertEquals( array( add_query_arg( 'amp', 1, $single_post_permalink ) ), AMP_Site_Validation::$site_invalid_urls );
 
 		AMP_Site_Validation::$site_invalid_urls = array();
-		$number_of_posts                           = 30;
-		$post_permalinks                           = array();
+		$number_of_posts                        = 30;
+		$post_permalinks                        = array();
 
 		for ( $i = 0; $i < $number_of_posts; $i++ ) {
 			$post_permalinks[] = add_query_arg( 'amp', 1, get_permalink( $this->factory()->post->create() ) );

From 4e8c00c8ef2aeebe104a39b811e629abace8c713 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 02:15:51 -0500
Subject: [PATCH 26/85] Remove function that forced AMP theme support.

This isn't needed, as validate_url()
can add the AMP query arg if needed.
---
 .../validation/class-amp-validation-manager.php  | 13 -------------
 .../test-class-amp-validation-manager.php        | 16 ----------------
 2 files changed, 29 deletions(-)

diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php
index 70de44d61a2..9206cee8fea 100644
--- a/includes/validation/class-amp-validation-manager.php
+++ b/includes/validation/class-amp-validation-manager.php
@@ -167,9 +167,6 @@ public static function init( $args = array() ) {
 
 		add_action( 'rest_api_init', array( __CLASS__, 'add_rest_api_fields' ) );
 
-		// Run after other hooks, as this doesn't change the arguments for 'amp' theme support if it already exists.
-		add_action( 'after_setup_theme', array( __CLASS__, 'conditionally_force_theme_support' ), PHP_INT_MAX );
-
 		// Actions and filters involved in validation.
 		add_action( 'activate_plugin', function() {
 			if ( ! has_action( 'shutdown', array( __CLASS__, 'validate_after_plugin_activation' ) ) ) {
@@ -1737,14 +1734,4 @@ public static function enqueue_block_validation() {
 		wp_add_inline_script( $slug, sprintf( 'ampBlockValidation.boot( %s );', $data ) );
 	}
 
-	/**
-	 * Forces Native AMP if the validation query var is present and the theme does not support 'amp.'
-	 *
-	 * @return void
-	 */
-	public static function conditionally_force_theme_support() {
-		if ( ! current_theme_supports( 'amp' ) && self::should_validate_response() ) {
-			add_theme_support( 'amp' );
-		}
-	}
 }
diff --git a/tests/validation/test-class-amp-validation-manager.php b/tests/validation/test-class-amp-validation-manager.php
index b1b8221066c..1272c336223 100644
--- a/tests/validation/test-class-amp-validation-manager.php
+++ b/tests/validation/test-class-amp-validation-manager.php
@@ -126,7 +126,6 @@ public function test_init() {
 		$this->assertEquals( 10, has_action( 'all_admin_notices', self::TESTED_CLASS . '::print_plugin_notice' ) );
 
 		$this->assertEquals( 10, has_action( 'rest_api_init', self::TESTED_CLASS . '::add_rest_api_fields' ) );
-		$this->assertEquals( PHP_INT_MAX, has_action( 'after_setup_theme', self::TESTED_CLASS . '::conditionally_force_theme_support' ) );
 		$this->assertContains( AMP_Validation_Manager::VALIDATION_ERRORS_QUERY_VAR, wp_removable_query_args() );
 		$this->assertEquals( 100, has_action( 'admin_bar_menu', array( self::TESTED_CLASS, 'add_admin_bar_menu_items' ) ) );
 
@@ -1374,21 +1373,6 @@ public function get_string() {
 		return 'Example string';
 	}
 
-	/**
-	 * Test conditionally_force_theme_support.
-	 *
-	 * @covers AMP_Validation_Manager::conditionally_force_theme_support()
-	 */
-	public function test_conditionally_force_theme_support() {
-		$_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ] = 1;
-		AMP_Validation_Manager::conditionally_force_theme_support();
-		$this->assertFalse( current_theme_supports( 'amp' ) );
-
-		$_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ] = AMP_Validation_Manager::get_amp_validate_nonce();
-		AMP_Validation_Manager::conditionally_force_theme_support();
-		$this->assertTrue( current_theme_supports( 'amp' ) );
-	}
-
 	/**
 	 * Creates and inserts a custom post.
 	 *

From c4b8f5f8f5b72892b18103a04d4a5f96f6b4a369 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 02:40:14 -0500
Subject: [PATCH 27/85] Go back to displaying total errors,

regardless of whether they were accepted.
This is just to be able to demo this work.
It probably still makes more sense to only
show errors that weren't accepted.
---
 .../validation/class-amp-site-validation.php  | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index c1394f2c2bb..d0959c073d0 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -27,18 +27,25 @@ class AMP_Site_Validation {
 	const WP_CLI_ARGUMENT = 'validate-site';
 
 	/**
-	 * All of the site validation results.
+	 * The WP CLI progress bar.
+	 *
+	 * @var cli\progress\Bar|WP_CLI\NoOp
+	 */
+	public static $wp_cli_progress;
+
+	/**
+	 * All of the site validation URLs that have at least one unaccepted error.
 	 *
 	 * @var array
 	 */
 	public static $site_invalid_urls = array();
 
 	/**
-	 * The WP CLI progress bar.
+	 * All of the site validation errors.
 	 *
-	 * @var cli\progress\Bar|WP_CLI\NoOp
+	 * @var array
 	 */
-	public static $wp_cli_progress;
+	public static $total_errors = 0;
 
 	/**
 	 * The number of URLs crawled.
@@ -83,7 +90,7 @@ public function crawl_site( $args ) {
 				/* Translators: $1%d: the number of URls crawled, $2%d: the number of validation issues, $3%s: link for more details */
 				__( "%1\$d URLs were crawled, and %2\$d have AMP validation issue(s).\nFor more details, please see: \n%3\$s", 'amp' ),
 				self::$number_crawled,
-				count( self::$site_invalid_urls ),
+				self::$total_errors,
 				$url_more_details
 			)
 		);
@@ -227,6 +234,7 @@ public static function validate_urls( $urls ) {
 			$validity = AMP_Validation_Manager::validate_url( $url );
 			if ( ! is_wp_error( $validity ) ) {
 				AMP_Invalid_URL_Post_Type::store_validation_errors( $validity['validation_errors'], $validity['url'] );
+				$error_count            = count( $validity['validation_errors'] );
 				$unaccepted_error_count = count( array_filter(
 					$validity['validation_errors'],
 					function( $error ) {
@@ -234,6 +242,9 @@ function( $error ) {
 					}
 				) );
 
+				if ( $error_count > 0 ) {
+					self::$total_errors++;
+				}
 				if ( $unaccepted_error_count > 0 ) {
 					self::$site_invalid_urls[] = $url;
 				}

From c28e5ee32a8a1efe86d48c52b73677fc9efdecc6 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 15:03:28 -0500
Subject: [PATCH 28/85] Remove wrapping in add_query_arg()

validate_url() can already simulate theme support.
So there's no need to do this before.
---
 includes/validation/class-amp-site-validation.php   | 10 ++++------
 tests/validation/test-class-amp-site-validation.php | 13 ++++---------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index d0959c073d0..e20485163c1 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -73,9 +73,11 @@ public function crawl_site( $args ) {
 		if ( ! defined( 'WP_CLI' ) || ! WP_CLI || ! isset( $args[0] ) && self::WP_CLI_ARGUMENT !== $args[0] ) {
 			return;
 		}
+		$count_urls_to_crawl = self::count_posts_and_terms();
 
-		WP_CLI::log( __( 'Crawling the entire site to test for AMP validity.', 'amp' ) );
-		self::$wp_cli_progress = WP_CLI\Utils\make_progress_bar( 'Validating URLs...', self::count_posts_and_terms() );
+		/* Translators: %d: The number of URLs. */
+		WP_CLI::log( sprintf( __( 'Crawling %d URLs to test for AMP validity.', 'amp' ), $count_urls_to_crawl ) );
+		self::$wp_cli_progress = WP_CLI\Utils\make_progress_bar( 'Validating URLs...', $count_urls_to_crawl );
 		self::validate_entire_site_urls();
 		self::$wp_cli_progress->finish();
 
@@ -227,10 +229,6 @@ public static function validate_urls( $urls ) {
 		}
 
 		foreach ( $urls as $url ) {
-			if ( AMP_Theme_Support::is_paired_available() ) {
-				$url = add_query_arg( 'amp', 1, $url );
-			}
-
 			$validity = AMP_Validation_Manager::validate_url( $url );
 			if ( ! is_wp_error( $validity ) ) {
 				AMP_Invalid_URL_Post_Type::store_validation_errors( $validity['validation_errors'], $validity['url'] );
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 40bbe13ad3d..705920c17be 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -162,7 +162,7 @@ public function test_validate_entire_site_urls() {
 		for ( $i = 0; $i < $number_of_posts; $i++ ) {
 			$post_id           = $this->factory()->post->create();
 			$posts[]           = $post_id;
-			$post_permalinks[] = add_query_arg( 'amp', '1', get_permalink( $post_id ) );
+			$post_permalinks[] = get_permalink( $post_id );
 		}
 		AMP_Site_Validation::validate_entire_site_urls();
 		$validated_urls = AMP_Site_Validation::$site_invalid_urls;
@@ -177,16 +177,11 @@ public function test_validate_entire_site_urls() {
 		wp_set_post_terms( $posts[0], $terms, 'category' );
 		AMP_Site_Validation::validate_entire_site_urls();
 		$actual_validated_urls   = AMP_Site_Validation::$site_invalid_urls;
-		$expected_validated_urls = array_map(
-			function( $term ) {
-				return add_query_arg( 'amp', '1', get_term_link( $term ) );
-			},
-			$terms
-		);
+		$expected_validated_urls = array_map( 'get_term_link', $terms );
 
 		// All of the terms created above should be present in $validated_urls.
 		$this->assertEmpty( array_diff( $expected_validated_urls, $actual_validated_urls ) );
-		$this->assertTrue( in_array( add_query_arg( 'amp', '1', home_url( '/' ) ), $actual_validated_urls, true ) );
+		$this->assertTrue( in_array( home_url( '/' ), $actual_validated_urls, true ) );
 	}
 
 	/**
@@ -197,7 +192,7 @@ function( $term ) {
 	public function test_validate_urls() {
 		$single_post_permalink = get_permalink( $this->factory()->post->create() );
 		AMP_Site_Validation::validate_urls( $single_post_permalink );
-		$this->assertEquals( array( add_query_arg( 'amp', 1, $single_post_permalink ) ), AMP_Site_Validation::$site_invalid_urls );
+		$this->assertEquals( array( $single_post_permalink ), AMP_Site_Validation::$site_invalid_urls );
 
 		AMP_Site_Validation::$site_invalid_urls = array();
 		$number_of_posts                        = 30;

From b6393cc2b71666a41abb39bf1c7e30e84f76f132 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 16:09:49 -0500
Subject: [PATCH 29/85] Fix the progress bar, by making counts more accurate.

Before, this didn't account for 'attachment' posts.
It needs a special WP_Query, as
their post_status is usually inherit.
---
 .../validation/class-amp-site-validation.php  | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index e20485163c1..53a6ea4006f 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -14,6 +14,7 @@ class AMP_Site_Validation {
 
 	/**
 	 * The size of the batch of URLs to validate.
+	 * To avoid making loopback requests for all of a site's posts at the same time.
 	 *
 	 * @var int
 	 */
@@ -76,7 +77,7 @@ public function crawl_site( $args ) {
 		$count_urls_to_crawl = self::count_posts_and_terms();
 
 		/* Translators: %d: The number of URLs. */
-		WP_CLI::log( sprintf( __( 'Crawling %d URLs to test for AMP validity.', 'amp' ), $count_urls_to_crawl ) );
+		WP_CLI::log( sprintf( __( 'Crawling %d URLs to test the entire site for AMP validity.', 'amp' ), $count_urls_to_crawl ) );
 		self::$wp_cli_progress = WP_CLI\Utils\make_progress_bar( 'Validating URLs...', $count_urls_to_crawl );
 		self::validate_entire_site_urls();
 		self::$wp_cli_progress->finish();
@@ -104,6 +105,13 @@ public function crawl_site( $args ) {
 	 * @return int The number of posts and terms.
 	 */
 	public static function count_posts_and_terms() {
+		$total_count       = 0;
+		$public_post_types = get_post_types( array( 'public' => true ), 'names' );
+		$term_query        = new WP_Term_Query( array(
+			'taxonomy' => get_taxonomies( array( 'public' => true ) ),
+			'fields'   => 'ids',
+		) );
+		$total_count      += count( $term_query->terms );
 
 		/**
 		 * Because of the posts_per_page => -1 value, this is only suited for use in WP-CLI.
@@ -111,17 +119,24 @@ public static function count_posts_and_terms() {
 		 * in order to show the progress of every post.
 		 */
 		$post_query = new WP_Query( array(
-			'post_types'     => get_post_types( array( 'public' => true ), 'names' ),
+			'post_type'      => $public_post_types,
 			'fields'         => 'ids',
 			'posts_per_page' => -1,
 		) );
+		$total_count += $post_query->found_posts;
 
-		$term_query = new WP_Term_Query( array(
-			'taxonomy' => get_taxonomies( array( 'public' => true ) ),
-			'fields'   => 'ids',
-		) );
+		// Attachment posts usually have the post_status of 'inherit,' so they can use the status of the post they're attached to.
+		if ( in_array( 'attachment', $public_post_types, true ) ) {
+			$attachment_query = new WP_Query( array(
+				'post_type'      => 'attachment',
+				'post_status'    => 'inherit',
+				'fields'         => 'ids',
+				'posts_per_page' => -1,
+			) );
+			$total_count     += $attachment_query->found_posts;
+		}
 
-		return $post_query->found_posts + count( $term_query->terms );
+		return $total_count;
 	}
 
 	/**
@@ -144,6 +159,11 @@ public static function get_post_permalinks( $post_type, $number_posts = 200, $of
 		if ( is_int( $offset ) ) {
 			$args = array_merge( $args, compact( 'offset' ) );
 		}
+
+		// Attachment posts usually have the post_status of 'inherit,' so they can use the status of the post they're attached to.
+		if ( 'attachment' === $post_type ) {
+			$args['post_status'] = 'inherit';
+		}
 		$query = new WP_Query( $args );
 
 		return array_map( 'get_permalink', $query->posts );
@@ -250,9 +270,11 @@ function( $error ) {
 				if ( self::$wp_cli_progress ) {
 					self::$wp_cli_progress->tick();
 				}
+
+				self::$number_crawled++;
 			}
 
-			self::$number_crawled++;
+
 		}
 	}
 }

From c638e7ec8f11893195f70a6f8a0c8dd93a2f62b8 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 17:34:14 -0500
Subject: [PATCH 30/85] Align = to address failed Travis build.

---
 includes/validation/class-amp-site-validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 53a6ea4006f..992db7a8422 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -118,7 +118,7 @@ public static function count_posts_and_terms() {
 		 * This is necessary to pass as an argument to WP_CLI\Utils\make_progress_bar(),
 		 * in order to show the progress of every post.
 		 */
-		$post_query = new WP_Query( array(
+		$post_query   = new WP_Query( array(
 			'post_type'      => $public_post_types,
 			'fields'         => 'ids',
 			'posts_per_page' => -1,

From ad43100ecc0228e723594d389954adee5173397f Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 17:37:29 -0500
Subject: [PATCH 31/85] Remove empty lines to address Travis issue.

---
 includes/validation/class-amp-site-validation.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 992db7a8422..6264451e420 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -273,8 +273,6 @@ function( $error ) {
 
 				self::$number_crawled++;
 			}
-
-
 		}
 	}
 }

From 5af8dc98a034111035b87e030a591c520256cf1c Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 18:40:12 -0500
Subject: [PATCH 32/85] Output a count of unaccepted errors.

Before, this simply counted all of the errors.
But there could be an accepted script removal,
and this could result in errors being
reported for the entire site.
So also output the number of unaccepted errors.
---
 .../validation/class-amp-site-validation.php  | 30 ++++++++++++-------
 .../test-class-amp-site-validation.php        |  1 +
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 6264451e420..5d136b3724b 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -35,9 +35,9 @@ class AMP_Site_Validation {
 	public static $wp_cli_progress;
 
 	/**
-	 * All of the site validation URLs that have at least one unaccepted error.
+	 * All of the invalid URLs.
 	 *
-	 * @var array
+	 * @var string[]
 	 */
 	public static $site_invalid_urls = array();
 
@@ -48,6 +48,13 @@ class AMP_Site_Validation {
 	 */
 	public static $total_errors = 0;
 
+	/**
+	 * All of the unaccepted site validation errors.
+	 *
+	 * @var array
+	 */
+	public static $unaccepted_errors = 0;
+
 	/**
 	 * The number of URLs crawled.
 	 *
@@ -76,9 +83,12 @@ public function crawl_site( $args ) {
 		}
 		$count_urls_to_crawl = self::count_posts_and_terms();
 
-		/* Translators: %d: The number of URLs. */
-		WP_CLI::log( sprintf( __( 'Crawling %d URLs to test the entire site for AMP validity.', 'amp' ), $count_urls_to_crawl ) );
-		self::$wp_cli_progress = WP_CLI\Utils\make_progress_bar( 'Validating URLs...', $count_urls_to_crawl );
+		WP_CLI::log( sprintf( __( 'Crawling the entire site for AMP validity.', 'amp' ) ) );
+		self::$wp_cli_progress = WP_CLI\Utils\make_progress_bar(
+			/* Translators: %d: The number of URLs. */
+			sprintf( __( 'Validating %d URLs...', 'amp' ), $count_urls_to_crawl ),
+			$count_urls_to_crawl
+		);
 		self::validate_entire_site_urls();
 		self::$wp_cli_progress->finish();
 
@@ -90,10 +100,11 @@ public function crawl_site( $args ) {
 
 		WP_CLI::success(
 			sprintf(
-				/* Translators: $1%d: the number of URls crawled, $2%d: the number of validation issues, $3%s: link for more details */
-				__( "%1\$d URLs were crawled, and %2\$d have AMP validation issue(s).\nFor more details, please see: \n%3\$s", 'amp' ),
+				/* Translators: $1%d: the number of URls crawled, $2%d: the number of validation issues, $3%d: The number of unaccepted issues, $4%s: link for more details */
+				__( "Of the %1\$d URLs crawled, %2\$d have AMP validation issue(s), and %3\$d have unaccepted issue(s).\nFor more details, please see: \n%4\$s", 'amp' ),
 				self::$number_crawled,
 				self::$total_errors,
+				self::$unaccepted_errors,
 				$url_more_details
 			)
 		);
@@ -200,7 +211,6 @@ public static function get_taxonomy_links( $taxonomy, $number_links = 200, $offs
 	 * Accepts an optional parameter of a WP-CLI progress bar object.
 	 * Calling its tick() method updates the display in WP-CLI to show the percentage of the site crawl that's complete.
 	 *
-	 * @todo: Consider wrapping this function with another, as different use cases will probably require a different return value or display.
 	 * For example, the <button> in /wp-admin that makes an AJAX request for this will need a different response than a WP-CLI command.
 	 */
 	public static function validate_entire_site_urls() {
@@ -262,11 +272,11 @@ function( $error ) {
 
 				if ( $error_count > 0 ) {
 					self::$total_errors++;
+					self::$site_invalid_urls[] = $url;
 				}
 				if ( $unaccepted_error_count > 0 ) {
-					self::$site_invalid_urls[] = $url;
+					self::$unaccepted_errors++;
 				}
-
 				if ( self::$wp_cli_progress ) {
 					self::$wp_cli_progress->tick();
 				}
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 705920c17be..a3d57957093 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -28,6 +28,7 @@ public function setUp() {
 	 * @inheritdoc
 	 */
 	public function tearDown() {
+		AMP_Site_Validation::$total_errors      = 0;
 		AMP_Site_Validation::$site_invalid_urls = array();
 		parent::tearDown();
 	}

From adcb9015b9d1a62968f72dcd62ef8d2fc9f90682 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 20:52:06 -0500
Subject: [PATCH 33/85] Stop storing the validated URLs in a property.

AMP_Site_Validation::$site_invalid_urls stored these.
But this doesn't seem to be needed.
A WP_Query() could later find any invalid URLs.
---
 .../validation/class-amp-site-validation.php  |  8 ----
 .../test-class-amp-site-validation.php        | 43 +++++++++++++------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 5d136b3724b..6bb89c6ca8d 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -34,13 +34,6 @@ class AMP_Site_Validation {
 	 */
 	public static $wp_cli_progress;
 
-	/**
-	 * All of the invalid URLs.
-	 *
-	 * @var string[]
-	 */
-	public static $site_invalid_urls = array();
-
 	/**
 	 * All of the site validation errors.
 	 *
@@ -272,7 +265,6 @@ function( $error ) {
 
 				if ( $error_count > 0 ) {
 					self::$total_errors++;
-					self::$site_invalid_urls[] = $url;
 				}
 				if ( $unaccepted_error_count > 0 ) {
 					self::$unaccepted_errors++;
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index a3d57957093..5d6af25342d 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -28,8 +28,7 @@ public function setUp() {
 	 * @inheritdoc
 	 */
 	public function tearDown() {
-		AMP_Site_Validation::$total_errors      = 0;
-		AMP_Site_Validation::$site_invalid_urls = array();
+		AMP_Site_Validation::$total_errors = 0;
 		parent::tearDown();
 	}
 
@@ -166,10 +165,9 @@ public function test_validate_entire_site_urls() {
 			$post_permalinks[] = get_permalink( $post_id );
 		}
 		AMP_Site_Validation::validate_entire_site_urls();
-		$validated_urls = AMP_Site_Validation::$site_invalid_urls;
 
 		// All of the posts created above should be present in $validated_urls.
-		$this->assertEmpty( array_diff( $post_permalinks, $validated_urls ) );
+		$this->assertEmpty( array_diff( $post_permalinks, self::get_validated_urls() ) );
 
 		for ( $i = 0; $i < $number_of_terms; $i++ ) {
 			$terms[] = $this->factory()->category->create();
@@ -177,12 +175,12 @@ public function test_validate_entire_site_urls() {
 		// Terms need to be associated with a post in order to be returned in get_terms().
 		wp_set_post_terms( $posts[0], $terms, 'category' );
 		AMP_Site_Validation::validate_entire_site_urls();
-		$actual_validated_urls   = AMP_Site_Validation::$site_invalid_urls;
 		$expected_validated_urls = array_map( 'get_term_link', $terms );
+		$actual_validated_urls   = self::get_validated_urls();
 
 		// All of the terms created above should be present in $validated_urls.
 		$this->assertEmpty( array_diff( $expected_validated_urls, $actual_validated_urls ) );
-		$this->assertTrue( in_array( home_url( '/' ), $actual_validated_urls, true ) );
+		$this->assertTrue( in_array( home_url( '/' ), self::get_validated_urls(), true ) );
 	}
 
 	/**
@@ -193,17 +191,38 @@ public function test_validate_entire_site_urls() {
 	public function test_validate_urls() {
 		$single_post_permalink = get_permalink( $this->factory()->post->create() );
 		AMP_Site_Validation::validate_urls( $single_post_permalink );
-		$this->assertEquals( array( $single_post_permalink ), AMP_Site_Validation::$site_invalid_urls );
+		$this->assertTrue( in_array( $single_post_permalink, self::get_validated_urls(), true ) );
 
-		AMP_Site_Validation::$site_invalid_urls = array();
-		$number_of_posts                        = 30;
-		$post_permalinks                        = array();
+		$number_of_posts = 30;
+		$post_permalinks = array();
 
 		for ( $i = 0; $i < $number_of_posts; $i++ ) {
-			$post_permalinks[] = add_query_arg( 'amp', 1, get_permalink( $this->factory()->post->create() ) );
+			$post_permalinks[] = get_permalink( $this->factory()->post->create() );
 		}
 		AMP_Site_Validation::validate_urls( $post_permalinks );
-		$this->assertEquals( $post_permalinks, AMP_Site_Validation::$site_invalid_urls );
+
+		// All of the posts created should be present in the validated URLs.
+		$this->assertEmpty( array_diff( $post_permalinks, self::get_validated_urls() ) );
+	}
+
+	/**
+	 * Gets all of the validated URLs.
+	 *
+	 * @return string[] $urls The validated URLs.
+	 */
+	public function get_validated_urls() {
+		$query = new WP_Query( array(
+			'post_type'      => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			'posts_per_page' => 100,
+			'fields'         => 'ids',
+		) );
+
+		return array_map(
+			function( $post ) {
+				return remove_query_arg( 'amp', AMP_Invalid_URL_Post_Type::get_url_from_post( $post ) );
+			},
+			$query->posts
+		);
 	}
 
 	/**

From 9d114394d5bc55be6f778abb515efdfaf9733c54 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 12 Jul 2018 21:09:59 -0500
Subject: [PATCH 34/85] Make count_posts_and_terms() private.

This passes 'posts_per_page' => -1 to WP_Query.
It's a performance risk,
and is only intended for use in the WP-CLI command.
---
 includes/validation/class-amp-site-validation.php   | 7 ++++++-
 tests/validation/test-class-amp-site-validation.php | 8 +++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 6bb89c6ca8d..4d443b56920 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -106,9 +106,14 @@ public function crawl_site( $args ) {
 	/**
 	 * Finds the total number of posts and terms on the site.
 	 *
+	 * The access level is private,
+	 * as this passes 'posts_per_page' => -1 to WP_Query().
+	 * This is only intended for use with WP-CLI,
+	 * and it's a performance risk otherwise.
+	 *
 	 * @return int The number of posts and terms.
 	 */
-	public static function count_posts_and_terms() {
+	private static function count_posts_and_terms() {
 		$total_count       = 0;
 		$public_post_types = get_post_types( array( 'public' => true ), 'names' );
 		$term_query        = new WP_Term_Query( array(
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 5d6af25342d..bf9f78283b2 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -38,7 +38,9 @@ public function tearDown() {
 	 * @covers AMP_Site_Validation::count_posts_and_terms()
 	 */
 	public function test_count_posts_and_terms() {
-		$this->assertEquals( 0, AMP_Site_Validation::count_posts_and_terms() );
+		$method = new ReflectionMethod( 'AMP_Site_Validation::count_posts_and_terms' );
+		$method->setAccessible( true );
+		$this->assertEquals( 0, $method->invoke( null ) );
 
 		$number_of_posts = 20;
 		$post_ids        = array();
@@ -50,7 +52,7 @@ public function test_count_posts_and_terms() {
 		 * The term (category) of 'Uncategorized' should be present, as there are posts now.
 		 * So account for it with +1.
 		 */
-		$this->assertEquals( $number_of_posts + 1, AMP_Site_Validation::count_posts_and_terms() );
+		$this->assertEquals( $number_of_posts + 1, $method->invoke( null ) );
 
 		$number_of_new_terms        = 20;
 		$taxonomy                   = 'category';
@@ -68,7 +70,7 @@ public function test_count_posts_and_terms() {
 			$taxonomy
 		);
 
-		$this->assertEquals( $number_of_posts + $number_of_new_terms + 1, AMP_Site_Validation::count_posts_and_terms() );
+		$this->assertEquals( $number_of_posts + $number_of_new_terms + 1, $method->invoke( null ) );
 	}
 
 	/**

From 5e19020b74f267e539f8decd85bcf263d0f61a43 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 2 Aug 2018 17:03:41 -0500
Subject: [PATCH 35/85] Improve PHP DocBlocks.

Add more DocBlock descriptions,
and update descriptions.
---
 bin/create-gutenberg-test-post.php            |  2 +-
 .../validation/class-amp-site-validation.php  | 54 +++++++++----------
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/bin/create-gutenberg-test-post.php b/bin/create-gutenberg-test-post.php
index 21e2204b32e..b57dd81d1ad 100644
--- a/bin/create-gutenberg-test-post.php
+++ b/bin/create-gutenberg-test-post.php
@@ -167,7 +167,7 @@ function create_gutenberg_test_post( $content ) {
 		$post_id = create_gutenberg_test_post( get_test_block_fixtures() );
 		\WP_CLI::success( sprintf( 'The test page is at: %s', \amp_get_permalink( $post_id ) . '#development=1' ) );
 	} catch ( \Exception $e ) {
-		wP_CLI::error( $e->getMessage() );
+		\wP_CLI::error( $e->getMessage() );
 	}
 } else {
 	echo "This script should be run WP-CLI via: wp eval-file bin/create-gutenberg-test-post.php\n";
diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 4d443b56920..2f6ab207f85 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -14,14 +14,15 @@ class AMP_Site_Validation {
 
 	/**
 	 * The size of the batch of URLs to validate.
-	 * To avoid making loopback requests for all of a site's posts at the same time.
+	 * Grouped in a batch to avoid making loopback requests for all of a site's URLs at the same time.
 	 *
 	 * @var int
 	 */
 	const BATCH_SIZE = 100;
 
 	/**
-	 * The argument to validate the site.
+	 * The WP-CLI argument to validate the site.
+	 * The full command is: wp amp validate-site.
 	 *
 	 * @var int
 	 */
@@ -30,26 +31,30 @@ class AMP_Site_Validation {
 	/**
 	 * The WP CLI progress bar.
 	 *
+	 * @see https://make.wordpress.org/cli/handbook/internal-api/wp-cli-utils-make-progress-bar/
 	 * @var cli\progress\Bar|WP_CLI\NoOp
 	 */
 	public static $wp_cli_progress;
 
 	/**
-	 * All of the site validation errors.
+	 * All of the site validation errors, regardless of whether they were accepted.
 	 *
-	 * @var array
+	 * @var int
 	 */
 	public static $total_errors = 0;
 
 	/**
 	 * All of the unaccepted site validation errors.
 	 *
-	 * @var array
+	 * If an error has been accepted in the /wp-admin validation UI,
+	 * it won't count toward this.
+	 *
+	 * @var int
 	 */
 	public static $unaccepted_errors = 0;
 
 	/**
-	 * The number of URLs crawled.
+	 * The number of URLs crawled, regardless of whether they have validation errors.
 	 *
 	 * @var int
 	 */
@@ -59,10 +64,9 @@ class AMP_Site_Validation {
 	 * Inits the class.
 	 */
 	public static function init() {
-		if ( ! defined( 'WP_CLI' ) || ! WP_CLI ) {
-			return;
+		if ( defined( 'WP_CLI' ) && WP_CLI ) {
+			WP_CLI::add_command( 'amp', array( __CLASS__, 'crawl_site' ) );
 		}
-		WP_CLI::add_command( 'amp', array( __CLASS__, 'crawl_site' ) );
 	}
 
 	/**
@@ -71,16 +75,17 @@ public static function init() {
 	 * @param array $args The arguments for the command.
 	 */
 	public function crawl_site( $args ) {
-		if ( ! defined( 'WP_CLI' ) || ! WP_CLI || ! isset( $args[0] ) && self::WP_CLI_ARGUMENT !== $args[0] ) {
+		if ( ! isset( $args[0] ) || ! self::WP_CLI_ARGUMENT === $args[0] ) {
 			return;
 		}
-		$count_urls_to_crawl = self::count_posts_and_terms();
 
+		$number_urls_to_crawl = self::count_posts_and_terms();
 		WP_CLI::log( sprintf( __( 'Crawling the entire site for AMP validity.', 'amp' ) ) );
+
 		self::$wp_cli_progress = WP_CLI\Utils\make_progress_bar(
-			/* Translators: %d: The number of URLs. */
-			sprintf( __( 'Validating %d URLs...', 'amp' ), $count_urls_to_crawl ),
-			$count_urls_to_crawl
+			/* translators: %d is the number of URLs. */
+			sprintf( __( 'Validating %d URLs...', 'amp' ), $number_urls_to_crawl ),
+			$number_urls_to_crawl
 		);
 		self::validate_entire_site_urls();
 		self::$wp_cli_progress->finish();
@@ -93,7 +98,7 @@ public function crawl_site( $args ) {
 
 		WP_CLI::success(
 			sprintf(
-				/* Translators: $1%d: the number of URls crawled, $2%d: the number of validation issues, $3%d: The number of unaccepted issues, $4%s: link for more details */
+				/* translators: $1%d is the number of URls crawled, $2%d is the number of validation issues, $3%d is the number of unaccepted issues, $4%s is the link for more details */
 				__( "Of the %1\$d URLs crawled, %2\$d have AMP validation issue(s), and %3\$d have unaccepted issue(s).\nFor more details, please see: \n%4\$s", 'amp' ),
 				self::$number_crawled,
 				self::$total_errors,
@@ -205,15 +210,11 @@ public static function get_taxonomy_links( $taxonomy, $number_links = 200, $offs
 
 	/**
 	 * Validates the URLs of the entire site.
-	 *
-	 * Accepts an optional parameter of a WP-CLI progress bar object.
-	 * Calling its tick() method updates the display in WP-CLI to show the percentage of the site crawl that's complete.
-	 *
-	 * For example, the <button> in /wp-admin that makes an AJAX request for this will need a different response than a WP-CLI command.
+	 * Includes the URLs of public, published posts, and public taxonomies.
 	 */
 	public static function validate_entire_site_urls() {
 		// Validate the homepage.
-		self::validate_urls( home_url( '/' ) );
+		self::validate_urls( array( home_url( '/' ) ) );
 
 		// Validate all public, published posts.
 		$public_post_types = get_post_types( array( 'public' => true ), 'names' );
@@ -243,19 +244,12 @@ public static function validate_entire_site_urls() {
 	}
 
 	/**
-	 * Validates a single URL, and stores the URL in a property.
+	 * Validates a single URL, and increments the counts as needed.
 	 *
-	 * @todo: Maybe storing the URLS in the property isn't needed, as AMP_Validation_Manager stores the actual errors.
-	 * This could be an extremely large array.
-	 * For now, this is helpful in unit testing.
-	 * @param array|string $urls An array of URLs to validate, or a single string of a URL.
+	 * @param array $urls The URLs to validate.
 	 * @return void
 	 */
 	public static function validate_urls( $urls ) {
-		if ( is_string( $urls ) ) {
-			$urls = array( $urls );
-		}
-
 		foreach ( $urls as $url ) {
 			$validity = AMP_Validation_Manager::validate_url( $url );
 			if ( ! is_wp_error( $validity ) ) {

From f4e6bfd6490e477bfd7e75ddab2560110cb2305a Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 2 Aug 2018 17:23:36 -0500
Subject: [PATCH 36/85] Address failed unit test.

This should have an argument of an array,
not a string.
---
 tests/validation/test-class-amp-site-validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index bf9f78283b2..fdb46d5566b 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -192,7 +192,7 @@ public function test_validate_entire_site_urls() {
 	 */
 	public function test_validate_urls() {
 		$single_post_permalink = get_permalink( $this->factory()->post->create() );
-		AMP_Site_Validation::validate_urls( $single_post_permalink );
+		AMP_Site_Validation::validate_urls( array( $single_post_permalink ) );
 		$this->assertTrue( in_array( $single_post_permalink, self::get_validated_urls(), true ) );
 
 		$number_of_posts = 30;

From 8e1b031d6a4260a40d6d4c2a9dbc06c2b7403b88 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 2 Aug 2018 20:32:37 -0500
Subject: [PATCH 37/85] Make function static, and other documentation changes

crawl_site() needs to be static,
as it's called statically,
and there isn't yet a meants of bootstrapping.
---
 bin/create-gutenberg-test-post.php                     | 2 +-
 includes/validation/class-amp-site-validation.php      | 8 ++++----
 tests/validation/test-class-amp-validation-manager.php | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/create-gutenberg-test-post.php b/bin/create-gutenberg-test-post.php
index b57dd81d1ad..75211d31c69 100644
--- a/bin/create-gutenberg-test-post.php
+++ b/bin/create-gutenberg-test-post.php
@@ -167,7 +167,7 @@ function create_gutenberg_test_post( $content ) {
 		$post_id = create_gutenberg_test_post( get_test_block_fixtures() );
 		\WP_CLI::success( sprintf( 'The test page is at: %s', \amp_get_permalink( $post_id ) . '#development=1' ) );
 	} catch ( \Exception $e ) {
-		\wP_CLI::error( $e->getMessage() );
+		\WP_CLI::error( $e->getMessage() );
 	}
 } else {
 	echo "This script should be run WP-CLI via: wp eval-file bin/create-gutenberg-test-post.php\n";
diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 2f6ab207f85..b0c64b173f6 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -37,14 +37,14 @@ class AMP_Site_Validation {
 	public static $wp_cli_progress;
 
 	/**
-	 * All of the site validation errors, regardless of whether they were accepted.
+	 * The total number of validation errors, regardless of whether they were accepted.
 	 *
 	 * @var int
 	 */
 	public static $total_errors = 0;
 
 	/**
-	 * All of the unaccepted site validation errors.
+	 * The total number of unaccepted validation errors.
 	 *
 	 * If an error has been accepted in the /wp-admin validation UI,
 	 * it won't count toward this.
@@ -74,7 +74,7 @@ public static function init() {
 	 *
 	 * @param array $args The arguments for the command.
 	 */
-	public function crawl_site( $args ) {
+	public static function crawl_site( $args ) {
 		if ( ! isset( $args[0] ) || ! self::WP_CLI_ARGUMENT === $args[0] ) {
 			return;
 		}
@@ -83,7 +83,7 @@ public function crawl_site( $args ) {
 		WP_CLI::log( sprintf( __( 'Crawling the entire site for AMP validity.', 'amp' ) ) );
 
 		self::$wp_cli_progress = WP_CLI\Utils\make_progress_bar(
-			/* translators: %d is the number of URLs. */
+			/* translators: %d is the number of URLs */
 			sprintf( __( 'Validating %d URLs...', 'amp' ), $number_urls_to_crawl ),
 			$number_urls_to_crawl
 		);
diff --git a/tests/validation/test-class-amp-validation-manager.php b/tests/validation/test-class-amp-validation-manager.php
index 1272c336223..2877efc5f26 100644
--- a/tests/validation/test-class-amp-validation-manager.php
+++ b/tests/validation/test-class-amp-validation-manager.php
@@ -126,6 +126,7 @@ public function test_init() {
 		$this->assertEquals( 10, has_action( 'all_admin_notices', self::TESTED_CLASS . '::print_plugin_notice' ) );
 
 		$this->assertEquals( 10, has_action( 'rest_api_init', self::TESTED_CLASS . '::add_rest_api_fields' ) );
+
 		$this->assertContains( AMP_Validation_Manager::VALIDATION_ERRORS_QUERY_VAR, wp_removable_query_args() );
 		$this->assertEquals( 100, has_action( 'admin_bar_menu', array( self::TESTED_CLASS, 'add_admin_bar_menu_items' ) ) );
 

From ce2b04403535891fe099e48508b4283af21f9204 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 2 Aug 2018 20:51:36 -0500
Subject: [PATCH 38/85] Add to DocBlock, remove needless empty line.

Add a description about how to run the command.
And remove an extra empty line.
---
 includes/validation/class-amp-site-validation.php    | 3 +++
 includes/validation/class-amp-validation-manager.php | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index b0c64b173f6..4710ee3615f 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -8,6 +8,9 @@
 /**
  * Class AMP_Site_Validation
  *
+ * Registers a WP-CLI command to crawl the entire site to check for AMP validity.
+ * To use this, run: wp amp validate-site.
+ *
  * @since 1.0
  */
 class AMP_Site_Validation {
diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php
index 4c1cd76510c..37e949b1027 100644
--- a/includes/validation/class-amp-validation-manager.php
+++ b/includes/validation/class-amp-validation-manager.php
@@ -1735,5 +1735,4 @@ public static function enqueue_block_validation() {
 		) );
 		wp_add_inline_script( $slug, sprintf( 'ampBlockValidation.boot( %s );', $data ) );
 	}
-
 }

From cd1d09e2adb89f08a13a28ff5ac70b6b0e0c1b8b Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Sat, 11 Aug 2018 11:50:29 -0500
Subject: [PATCH 39/85] Remove 'posts_per_page' => -1 from WP_Query arguments

    As Weston suggested,
    this passes 'orderby' => 'ID' to WP_Query(),
    so it's alright if another post is added during the query.
    Also, this increments the offset each query.
---
 .../validation/class-amp-site-validation.php  | 124 ++++++++++--------
 .../test-class-amp-site-validation.php        |  79 +++++++----
 2 files changed, 124 insertions(+), 79 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 4710ee3615f..8fae638f0fa 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -16,8 +16,8 @@
 class AMP_Site_Validation {
 
 	/**
-	 * The size of the batch of URLs to validate.
-	 * Grouped in a batch to avoid making loopback requests for all of a site's URLs at the same time.
+	 * The size of the batch of URLs to query and validate.
+	 * Grouped in a batch to avoid passing 'posts_per_page' => -1 to WP_Query.
 	 *
 	 * @var int
 	 */
@@ -27,7 +27,7 @@ class AMP_Site_Validation {
 	 * The WP-CLI argument to validate the site.
 	 * The full command is: wp amp validate-site.
 	 *
-	 * @var int
+	 * @var string
 	 */
 	const WP_CLI_ARGUMENT = 'validate-site';
 
@@ -83,7 +83,7 @@ public static function crawl_site( $args ) {
 		}
 
 		$number_urls_to_crawl = self::count_posts_and_terms();
-		WP_CLI::log( sprintf( __( 'Crawling the entire site for AMP validity.', 'amp' ) ) );
+		WP_CLI::log( __( 'Crawling the entire site for AMP validity.', 'amp' ) );
 
 		self::$wp_cli_progress = WP_CLI\Utils\make_progress_bar(
 			/* translators: %d is the number of URLs */
@@ -95,7 +95,7 @@ public static function crawl_site( $args ) {
 
 		$url_more_details = add_query_arg(
 			'post_type',
-			\AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
 			admin_url( 'edit.php' )
 		);
 
@@ -112,45 +112,52 @@ public static function crawl_site( $args ) {
 	}
 
 	/**
-	 * Finds the total number of posts and terms on the site.
-	 *
-	 * The access level is private,
-	 * as this passes 'posts_per_page' => -1 to WP_Query().
-	 * This is only intended for use with WP-CLI,
-	 * and it's a performance risk otherwise.
+	 * Gets the total number of posts and terms on the site.
 	 *
 	 * @return int The number of posts and terms.
 	 */
-	private static function count_posts_and_terms() {
-		$total_count       = 0;
+	public static function count_posts_and_terms() {
+		/*
+		 * If the homepage is set to 'Your latest posts,' start the $total_count at 1.
+		 * Otherwise, the homepage wouldn't be counted here, even though validate_entire_site_urls() visits it.
+		 * If it's not set to that, it will probably be counted in the query for pages.
+		 */
+		$total_count       = 'posts' === get_option( 'show_on_front' ) ? 1 : 0;
 		$public_post_types = get_post_types( array( 'public' => true ), 'names' );
-		$term_query        = new WP_Term_Query( array(
+
+		// Count all public taxonomy terms.
+		$term_query   = new WP_Term_Query( array(
 			'taxonomy' => get_taxonomies( array( 'public' => true ) ),
 			'fields'   => 'ids',
 		) );
-		$total_count      += count( $term_query->terms );
+		$total_count += count( $term_query->terms );
 
 		/**
-		 * Because of the posts_per_page => -1 value, this is only suited for use in WP-CLI.
-		 * This is necessary to pass as an argument to WP_CLI\Utils\make_progress_bar(),
-		 * in order to show the progress of every post.
+		 * Count all public posts.
+		 * This batches the queries, to avoid passing posts_per_page => -1 to WP_Query.
+		 * After the first iteration, it passes an 'offset' value to WP_Query.
+		 * And by passing 'orderby' => 'ID' to WP_Query, it ensures there isn't an issue if a post is added while counting them.
 		 */
-		$post_query   = new WP_Query( array(
-			'post_type'      => $public_post_types,
-			'fields'         => 'ids',
-			'posts_per_page' => -1,
-		) );
-		$total_count += $post_query->found_posts;
+		$offset = 0;
+		$posts  = self::get_posts_by_type( $public_post_types );
+		while ( ! empty( $posts ) ) {
+			$offset      += self::BATCH_SIZE;
+			$total_count += count( $posts );
+			$posts        = self::get_posts_by_type( $public_post_types, $offset );
+		}
 
-		// Attachment posts usually have the post_status of 'inherit,' so they can use the status of the post they're attached to.
+		/**
+		 * Count all attachments.
+		 * Attachment posts usually have the post_status of 'inherit,' so they can use the status of the post they're attached to.
+		 */
 		if ( in_array( 'attachment', $public_post_types, true ) ) {
-			$attachment_query = new WP_Query( array(
-				'post_type'      => 'attachment',
-				'post_status'    => 'inherit',
-				'fields'         => 'ids',
-				'posts_per_page' => -1,
-			) );
-			$total_count     += $attachment_query->found_posts;
+			$offset      = 0;
+			$attachments = self::get_posts_by_type( 'attachment' );
+			while ( ! empty( $attachments ) ) {
+				$offset      += self::BATCH_SIZE;
+				$total_count += count( $attachments );
+				$attachments  = self::get_posts_by_type( 'attachment', $offset );
+			}
 		}
 
 		return $total_count;
@@ -160,21 +167,20 @@ private static function count_posts_and_terms() {
 	 * Gets the permalinks of public, published posts.
 	 *
 	 * @param string $post_type The post type.
-	 * @param int    $number_posts The maximum amount of posts to get the permalinks for (optional).
 	 * @param int    $offset The offset of the query (optional).
 	 * @return string[] $permalinks The post permalinks in an array.
 	 */
-	public static function get_post_permalinks( $post_type, $number_posts = 200, $offset = null ) {
+	public static function get_posts_by_type( $post_type, $offset = null ) {
 		$args = array(
 			'post_type'      => $post_type,
-			'posts_per_page' => $number_posts,
+			'posts_per_page' => self::BATCH_SIZE,
 			'post_status'    => 'publish',
 			'orderby'        => 'ID',
 			'order'          => 'ASC',
 			'fields'         => 'ids',
 		);
 		if ( is_int( $offset ) ) {
-			$args = array_merge( $args, compact( 'offset' ) );
+			$args['offset'] = $offset;
 		}
 
 		// Attachment posts usually have the post_status of 'inherit,' so they can use the status of the post they're attached to.
@@ -183,7 +189,7 @@ public static function get_post_permalinks( $post_type, $number_posts = 200, $of
 		}
 		$query = new WP_Query( $args );
 
-		return array_map( 'get_permalink', $query->posts );
+		return $query->posts;
 	}
 
 	/**
@@ -222,13 +228,13 @@ public static function validate_entire_site_urls() {
 		// Validate all public, published posts.
 		$public_post_types = get_post_types( array( 'public' => true ), 'names' );
 		foreach ( $public_post_types as $post_type ) {
-			$permalinks = self::get_post_permalinks( $post_type, self::BATCH_SIZE );
+			$permalinks = array_map( 'get_permalink', self::get_posts_by_type( $post_type ) );
 			$offset     = 0;
 
 			while ( ! empty( $permalinks ) ) {
 				self::validate_urls( $permalinks );
 				$offset    += self::BATCH_SIZE;
-				$permalinks = self::get_post_permalinks( $post_type, self::BATCH_SIZE, $offset );
+				$permalinks = array_map( 'get_permalink', self::get_posts_by_type( $post_type, $offset ) );
 			}
 		}
 
@@ -255,28 +261,34 @@ public static function validate_entire_site_urls() {
 	public static function validate_urls( $urls ) {
 		foreach ( $urls as $url ) {
 			$validity = AMP_Validation_Manager::validate_url( $url );
-			if ( ! is_wp_error( $validity ) ) {
-				AMP_Invalid_URL_Post_Type::store_validation_errors( $validity['validation_errors'], $validity['url'] );
-				$error_count            = count( $validity['validation_errors'] );
-				$unaccepted_error_count = count( array_filter(
-					$validity['validation_errors'],
-					function( $error ) {
-						return ! AMP_Validation_Error_Taxonomy::is_validation_error_sanitized( $error );
-					}
-				) );
-
-				if ( $error_count > 0 ) {
-					self::$total_errors++;
-				}
-				if ( $unaccepted_error_count > 0 ) {
-					self::$unaccepted_errors++;
-				}
+
+			if ( is_wp_error( $validity ) ) {
 				if ( self::$wp_cli_progress ) {
 					self::$wp_cli_progress->tick();
 				}
+				continue;
+			}
 
-				self::$number_crawled++;
+			AMP_Invalid_URL_Post_Type::store_validation_errors( $validity['validation_errors'], $validity['url'] );
+			$error_count            = count( $validity['validation_errors'] );
+			$unaccepted_error_count = count( array_filter(
+				$validity['validation_errors'],
+				function( $error ) {
+					return ! AMP_Validation_Error_Taxonomy::is_validation_error_sanitized( $error );
+				}
+			) );
+
+			if ( $error_count > 0 ) {
+				self::$total_errors++;
+			}
+			if ( $unaccepted_error_count > 0 ) {
+				self::$unaccepted_errors++;
 			}
+			if ( self::$wp_cli_progress ) {
+				self::$wp_cli_progress->tick();
+			}
+
+			self::$number_crawled++;
 		}
 	}
 }
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index fdb46d5566b..24d910d82f8 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -38,13 +38,16 @@ public function tearDown() {
 	 * @covers AMP_Site_Validation::count_posts_and_terms()
 	 */
 	public function test_count_posts_and_terms() {
-		$method = new ReflectionMethod( 'AMP_Site_Validation::count_posts_and_terms' );
-		$method->setAccessible( true );
-		$this->assertEquals( 0, $method->invoke( null ) );
+		/**
+		 * The number of original URLs present before adding these test URLs.
+		 * These include a post, a term, and the home URL.
+		 */
+		$number_original_urls = $this->get_inital_url_count();
+		$this->assertEquals( $number_original_urls, AMP_Site_Validation::count_posts_and_terms() );
 
-		$number_of_posts = 20;
-		$post_ids        = array();
-		for ( $i = 0; $i < $number_of_posts; $i++ ) {
+		$number_new_posts = AMP_Site_Validation::BATCH_SIZE * 3;
+		$post_ids         = array();
+		for ( $i = 0; $i < $number_new_posts; $i++ ) {
 			$post_ids[] = $this->factory()->post->create();
 		}
 
@@ -52,7 +55,7 @@ public function test_count_posts_and_terms() {
 		 * The term (category) of 'Uncategorized' should be present, as there are posts now.
 		 * So account for it with +1.
 		 */
-		$this->assertEquals( $number_of_posts + 1, $method->invoke( null ) );
+		$this->assertEquals( $number_new_posts + $number_original_urls, AMP_Site_Validation::count_posts_and_terms() );
 
 		$number_of_new_terms        = 20;
 		$taxonomy                   = 'category';
@@ -70,15 +73,15 @@ public function test_count_posts_and_terms() {
 			$taxonomy
 		);
 
-		$this->assertEquals( $number_of_posts + $number_of_new_terms + 1, $method->invoke( null ) );
+		$this->assertEquals( $number_new_posts + $number_of_new_terms + $number_original_urls, AMP_Site_Validation::count_posts_and_terms() );
 	}
 
 	/**
-	 * Test get_post_permalinks.
+	 * Test get_posts_by_type.
 	 *
-	 * @covers AMP_Site_Validation::get_post_permalinks()
+	 * @covers AMP_Site_Validation::get_posts_by_type()
 	 */
-	public function test_get_post_permalinks() {
+	public function test_get_posts_by_type() {
 		$number_posts_each_post_type = 20;
 		$post_types                  = get_post_types( array( 'public' => true ), 'names' );
 
@@ -87,23 +90,31 @@ public function test_get_post_permalinks() {
 		 * They have a default status of 'inherit,' to depend on the status of their parent post.
 		 */
 		unset( $post_types['attachment'] );
+
 		foreach ( $post_types as $post_type ) {
-			$expected_post_permalinks = array();
+			// Start the expected posts with the existing post.
+			$query          = new WP_Query( array(
+				'fields'    => 'ids',
+				'post_type' => $post_type,
+			) );
+			$expected_posts = $query->posts;
+
+			// Store the initial count of posts to test that the newly-created posts are found.
+			$initial_post_count = count( $expected_posts );
+
 			for ( $i = 0; $i < $number_posts_each_post_type; $i++ ) {
-				$expected_post_permalinks[] = get_permalink( $this->factory()->post->create( array(
+				$expected_posts[] = $this->factory()->post->create( array(
 					'post_type' => $post_type,
-				) ) );
+				) );
 			}
 
-			$actual_post_permalinks = AMP_Site_Validation::get_post_permalinks( $post_type );
-			$this->assertEquals( $expected_post_permalinks, array_values( $actual_post_permalinks ) );
+			$actual_posts = AMP_Site_Validation::get_posts_by_type( $post_type );
+			$this->assertEquals( $expected_posts, array_values( $actual_posts ) );
 
-			// Test with the 2 optional arguments for AMP_Site_Validation::get_post_permalinks().
-			$number_of_posts        = $number_posts_each_post_type / 2;
-			$offset                 = $number_of_posts;
-			$actual_post_permalinks = AMP_Site_Validation::get_post_permalinks( $post_type, $number_of_posts, $offset );
-			$this->assertEquals( array_slice( $expected_post_permalinks, $offset, $number_of_posts ), array_values( $actual_post_permalinks ) );
-			$this->assertCount( $number_of_posts, $actual_post_permalinks );
+			// Test with the 2 optional arguments for AMP_Site_Validation::get_posts_by_type().
+			$number_of_posts = $number_posts_each_post_type / 2;
+			$actual_posts    = AMP_Site_Validation::get_posts_by_type( $post_type, $number_of_posts );
+			$this->assertEquals( array_slice( $expected_posts, $number_of_posts ), $actual_posts );
 		}
 	}
 
@@ -119,6 +130,8 @@ public function test_get_taxonomy_links() {
 		) );
 
 		foreach ( $taxonomies as $taxonomy ) {
+			// Begin the expected links with the term links that already exist.
+			$expected_links             = array_map( 'get_term_link', get_terms( array( 'taxonomy' => $taxonomy ) ) );
 			$terms_for_current_taxonomy = array();
 			for ( $i = 0; $i < $number_links_each_taxonomy; $i++ ) {
 				$terms_for_current_taxonomy[] = $this->factory()->term->create( array(
@@ -133,7 +146,10 @@ public function test_get_taxonomy_links() {
 				$taxonomy
 			);
 
-			$expected_links  = array_map( 'get_term_link', $terms_for_current_taxonomy );
+			$expected_links  = array_merge(
+				$expected_links,
+				array_map( 'get_term_link', $terms_for_current_taxonomy )
+			);
 			$number_of_links = 100;
 			$actual_links    = AMP_Site_Validation::get_taxonomy_links( $taxonomy, $number_of_links );
 
@@ -207,6 +223,23 @@ public function test_validate_urls() {
 		$this->assertEmpty( array_diff( $post_permalinks, self::get_validated_urls() ) );
 	}
 
+	/**
+	 * Gets the initial count of URLs on the site.
+	 *
+	 * @return int The initial count of URLs.
+	 */
+	public function get_inital_url_count() {
+		$total_count  = 'posts' === get_option( 'show_on_front' ) ? 1 : 0;
+		$post_query   = new WP_Query( array( 'post_type' => 'post' ) );
+		$total_count += $post_query->found_posts;
+
+		$term_query   = new WP_Term_Query( array(
+			'taxonomy' => get_taxonomies( array( 'public' => true ) ),
+		) );
+		$total_count += count( $term_query->terms );
+		return $total_count;
+	}
+
 	/**
 	 * Gets all of the validated URLs.
 	 *

From edfdd6524c3f6cd28c996bedc2cc65cae869ccb6 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Sun, 12 Aug 2018 14:47:36 -0500
Subject: [PATCH 40/85] Address failed unit test

All of the created posts had a term of 'Uncategorizes' added.
Before, 'Uncategorized' wasn't countent in the term query,
because there were no posts.
So create a new term to add to all of the posts,
and count it.
So 'Uncategorized' won't be part of the term query,
as it has no posts associated with it.
---
 .../test-class-amp-site-validation.php        | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 24d910d82f8..34f58feb3a9 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -38,26 +38,28 @@ public function tearDown() {
 	 * @covers AMP_Site_Validation::count_posts_and_terms()
 	 */
 	public function test_count_posts_and_terms() {
-		/**
-		 * The number of original URLs present before adding these test URLs.
-		 * These include a post, a term, and the home URL.
-		 */
+		// The number of original URLs present before adding these test URLs.
 		$number_original_urls = $this->get_inital_url_count();
 		$this->assertEquals( $number_original_urls, AMP_Site_Validation::count_posts_and_terms() );
 
+		$category         = $this->factory()->term->create( array( 'taxonomy' => 'category' ) );
 		$number_new_posts = AMP_Site_Validation::BATCH_SIZE * 3;
 		$post_ids         = array();
 		for ( $i = 0; $i < $number_new_posts; $i++ ) {
-			$post_ids[] = $this->factory()->post->create();
+			$post_ids[] = $this->factory()->post->create( array(
+				'tax_input' => array( 'category' => $category ),
+			) );
 		}
 
 		/**
-		 * The term (category) of 'Uncategorized' should be present, as there are posts now.
-		 * So account for it with +1.
+		 * Add the number of new posts, original URLs, and 1 for the $category that all of them have.
+		 * And ensure that the tested method finds a URL for all of them.
 		 */
-		$this->assertEquals( $number_new_posts + $number_original_urls, AMP_Site_Validation::count_posts_and_terms() );
+		$expected_url_count = $number_new_posts + $number_original_urls + 1;
+		$this->assertEquals( $expected_url_count, AMP_Site_Validation::count_posts_and_terms() );
 
 		$number_of_new_terms        = 20;
+		$expected_url_count        += $number_of_new_terms;
 		$taxonomy                   = 'category';
 		$terms_for_current_taxonomy = array();
 		for ( $i = 0; $i < $number_of_new_terms; $i++ ) {
@@ -73,7 +75,7 @@ public function test_count_posts_and_terms() {
 			$taxonomy
 		);
 
-		$this->assertEquals( $number_new_posts + $number_of_new_terms + $number_original_urls, AMP_Site_Validation::count_posts_and_terms() );
+		$this->assertEquals( $expected_url_count, AMP_Site_Validation::count_posts_and_terms() );
 	}
 
 	/**
@@ -230,12 +232,15 @@ public function test_validate_urls() {
 	 */
 	public function get_inital_url_count() {
 		$total_count  = 'posts' === get_option( 'show_on_front' ) ? 1 : 0;
-		$post_query   = new WP_Query( array( 'post_type' => 'post' ) );
+		$post_query   = new WP_Query( array( 'post_type' => get_post_types( array( 'public' => true ), 'names' ) ) );
 		$total_count += $post_query->found_posts;
 
 		$term_query   = new WP_Term_Query( array(
 			'taxonomy' => get_taxonomies( array( 'public' => true ) ),
+			'fields'   => 'ids',
 		) );
+
+		$total_count += count( $term_query->terms );
 		$total_count += count( $term_query->terms );
 		return $total_count;
 	}

From 19f4febf06b686e83400200baa2be4f42a2ab6ff Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Sun, 12 Aug 2018 14:52:01 -0500
Subject: [PATCH 41/85] Address Travis error by aligning =.

---
 tests/validation/test-class-amp-site-validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 34f58feb3a9..81d1721486b 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -235,7 +235,7 @@ public function get_inital_url_count() {
 		$post_query   = new WP_Query( array( 'post_type' => get_post_types( array( 'public' => true ), 'names' ) ) );
 		$total_count += $post_query->found_posts;
 
-		$term_query   = new WP_Term_Query( array(
+		$term_query = new WP_Term_Query( array(
 			'taxonomy' => get_taxonomies( array( 'public' => true ) ),
 			'fields'   => 'ids',
 		) );

From 57411c67fa5a3106e5d45faedcc53f2a6dd71102 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Mon, 13 Aug 2018 22:00:26 -0500
Subject: [PATCH 42/85] Remove extra conditional block to call tick()

Instead of having this conditional block in 2 places,
simply place it at the top.
It was going to run either way, and this is simpler.
---
 includes/validation/class-amp-site-validation.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 8fae638f0fa..39c6ef63e4e 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -262,10 +262,10 @@ public static function validate_urls( $urls ) {
 		foreach ( $urls as $url ) {
 			$validity = AMP_Validation_Manager::validate_url( $url );
 
+			if ( self::$wp_cli_progress ) {
+				self::$wp_cli_progress->tick();
+			}
 			if ( is_wp_error( $validity ) ) {
-				if ( self::$wp_cli_progress ) {
-					self::$wp_cli_progress->tick();
-				}
 				continue;
 			}
 
@@ -284,9 +284,6 @@ function( $error ) {
 			if ( $unaccepted_error_count > 0 ) {
 				self::$unaccepted_errors++;
 			}
-			if ( self::$wp_cli_progress ) {
-				self::$wp_cli_progress->tick();
-			}
 
 			self::$number_crawled++;
 		}

From 680217555319a73eca822455bd60d3cd129d4004 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Mon, 13 Aug 2018 23:38:29 -0500
Subject: [PATCH 43/85] Improve documentation, remove duplicated code.

Improve the DocBlocks and inline documentation.
Also, remove a duplicated line.
---
 includes/validation/class-amp-site-validation.php   | 3 +--
 tests/validation/test-class-amp-site-validation.php | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 39c6ef63e4e..45fd1f76750 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -253,10 +253,9 @@ public static function validate_entire_site_urls() {
 	}
 
 	/**
-	 * Validates a single URL, and increments the counts as needed.
+	 * Validates the URLs, and increments the counts.
 	 *
 	 * @param array $urls The URLs to validate.
-	 * @return void
 	 */
 	public static function validate_urls( $urls ) {
 		foreach ( $urls as $url ) {
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 81d1721486b..073589b2d33 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -101,9 +101,6 @@ public function test_get_posts_by_type() {
 			) );
 			$expected_posts = $query->posts;
 
-			// Store the initial count of posts to test that the newly-created posts are found.
-			$initial_post_count = count( $expected_posts );
-
 			for ( $i = 0; $i < $number_posts_each_post_type; $i++ ) {
 				$expected_posts[] = $this->factory()->post->create( array(
 					'post_type' => $post_type,
@@ -192,6 +189,7 @@ public function test_validate_entire_site_urls() {
 		for ( $i = 0; $i < $number_of_terms; $i++ ) {
 			$terms[] = $this->factory()->category->create();
 		}
+
 		// Terms need to be associated with a post in order to be returned in get_terms().
 		wp_set_post_terms( $posts[0], $terms, 'category' );
 		AMP_Site_Validation::validate_entire_site_urls();
@@ -240,7 +238,6 @@ public function get_inital_url_count() {
 			'fields'   => 'ids',
 		) );
 
-		$total_count += count( $term_query->terms );
 		$total_count += count( $term_query->terms );
 		return $total_count;
 	}
@@ -267,6 +264,8 @@ function( $post ) {
 
 	/**
 	 * Adds the AMP_VALIDATION_RESULTS: comment to the <html> body.
+	 *
+	 * @return array The response, with a comment in the body.
 	 */
 	public function add_comment() {
 		$mock_validation_results = array(

From a53bb459c4844728e168718f15d58431c3bcf55d Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 14 Aug 2018 21:28:45 -0500
Subject: [PATCH 44/85] Add a way to force crawling non-AMP-enabled URLs

If the property is true,
force counting and crawling non-AMP-enabled URLs.
The default behavior is to skip any URLs
that are explicitly opted-out of AMP.
Like if you uncheck 'Enable AMP' in the post editor.
---
 .../validation/class-amp-site-validation.php  | 71 ++++++++++++++-----
 .../test-class-amp-site-validation.php        | 49 +++++++++++++
 2 files changed, 104 insertions(+), 16 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 45fd1f76750..585bc38bf94 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -63,6 +63,18 @@ class AMP_Site_Validation {
 	 */
 	public static $number_crawled = 0;
 
+	/**
+	 * Whether to force crawling of all URLs.
+	 *
+	 * By default, this script only crawls URLs that support AMP,
+	 * where the user hasn't opted-out of AMP for the URL.
+	 * For example, by unchecking 'Posts' in 'AMP Settings' > 'Supported Templates'.
+	 * Or unchecking 'Enable AMP' in the post's editor.
+	 *
+	 * @var int
+	 */
+	public static $force_crawl_all_urls = false;
+
 	/**
 	 * Inits the class.
 	 */
@@ -114,6 +126,9 @@ public static function crawl_site( $args ) {
 	/**
 	 * Gets the total number of posts and terms on the site.
 	 *
+	 * By default, this only counts AMP-enabled posts and terms.
+	 * But if $force_crawl_all_urls is true, it counts all of them, regardless of their AMP status.
+	 *
 	 * @return int The number of posts and terms.
 	 */
 	public static function count_posts_and_terms() {
@@ -138,12 +153,12 @@ public static function count_posts_and_terms() {
 		 * After the first iteration, it passes an 'offset' value to WP_Query.
 		 * And by passing 'orderby' => 'ID' to WP_Query, it ensures there isn't an issue if a post is added while counting them.
 		 */
-		$offset = 0;
-		$posts  = self::get_posts_by_type( $public_post_types );
-		while ( ! empty( $posts ) ) {
+		$offset   = 0;
+		$post_ids = self::get_posts_by_type( $public_post_types );
+		while ( ! empty( $post_ids ) ) {
 			$offset      += self::BATCH_SIZE;
-			$total_count += count( $posts );
-			$posts        = self::get_posts_by_type( $public_post_types, $offset );
+			$total_count += count( self::get_posts_that_support_amp( $post_ids ) );
+			$post_ids     = self::get_posts_by_type( $public_post_types, $offset );
 		}
 
 		/**
@@ -151,24 +166,47 @@ public static function count_posts_and_terms() {
 		 * Attachment posts usually have the post_status of 'inherit,' so they can use the status of the post they're attached to.
 		 */
 		if ( in_array( 'attachment', $public_post_types, true ) ) {
-			$offset      = 0;
-			$attachments = self::get_posts_by_type( 'attachment' );
-			while ( ! empty( $attachments ) ) {
-				$offset      += self::BATCH_SIZE;
-				$total_count += count( $attachments );
-				$attachments  = self::get_posts_by_type( 'attachment', $offset );
+			$offset         = 0;
+			$attachment_ids = self::get_posts_by_type( 'attachment' );
+			while ( ! empty( $attachment_ids ) ) {
+				$offset        += self::BATCH_SIZE;
+				$total_count   += count( self::get_posts_that_support_amp( $attachment_ids ) );
+				$attachment_ids = self::get_posts_by_type( 'attachment', $offset );
 			}
 		}
 
 		return $total_count;
 	}
 
+	/**
+	 * Gets the posts IDs that support AMP.
+	 *
+	 * Only get the post IDs if they support AMP.
+	 * This means that 'Posts' isn't deselected in 'AMP Settings' > 'Supported Templates'.
+	 * And 'Enable AMP' isn't unchecked in the post's editor.
+	 *
+	 * @param array $ids The post or term IDs.
+	 * @return array The post IDs that support AMP.
+	 */
+	public static function get_posts_that_support_amp( $ids ) {
+		if ( self::$force_crawl_all_urls ) {
+			return $ids;
+		} else {
+			return array_filter(
+				$ids,
+				function( $id ) {
+					return post_supports_amp( $id );
+				}
+			);
+		}
+	}
+
 	/**
 	 * Gets the permalinks of public, published posts.
 	 *
 	 * @param string $post_type The post type.
 	 * @param int    $offset The offset of the query (optional).
-	 * @return string[] $permalinks The post permalinks in an array.
+	 * @return int[] $post_ids The post IDs in an array.
 	 */
 	public static function get_posts_by_type( $post_type, $offset = null ) {
 		$args = array(
@@ -228,7 +266,8 @@ public static function validate_entire_site_urls() {
 		// Validate all public, published posts.
 		$public_post_types = get_post_types( array( 'public' => true ), 'names' );
 		foreach ( $public_post_types as $post_type ) {
-			$permalinks = array_map( 'get_permalink', self::get_posts_by_type( $post_type ) );
+			$post_ids   = self::get_posts_that_support_amp( self::get_posts_by_type( $post_type ) );
+			$permalinks = array_map( 'get_permalink', $post_ids );
 			$offset     = 0;
 
 			while ( ! empty( $permalinks ) ) {
@@ -261,12 +300,12 @@ public static function validate_urls( $urls ) {
 		foreach ( $urls as $url ) {
 			$validity = AMP_Validation_Manager::validate_url( $url );
 
-			if ( self::$wp_cli_progress ) {
-				self::$wp_cli_progress->tick();
-			}
 			if ( is_wp_error( $validity ) ) {
 				continue;
 			}
+			if ( self::$wp_cli_progress ) {
+				self::$wp_cli_progress->tick();
+			}
 
 			AMP_Invalid_URL_Post_Type::store_validation_errors( $validity['validation_errors'], $validity['url'] );
 			$error_count            = count( $validity['validation_errors'] );
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 073589b2d33..1e8a3199a5e 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -78,6 +78,55 @@ public function test_count_posts_and_terms() {
 		$this->assertEquals( $expected_url_count, AMP_Site_Validation::count_posts_and_terms() );
 	}
 
+	/**
+	 * Test get_posts_that_support_amp.
+	 *
+	 * @covers AMP_Site_Validation::get_posts_that_support_amp()
+	 */
+	public function test_get_posts_that_support_amp() {
+		$number_of_posts = 20;
+		$ids             = array();
+		for ( $i = 0; $i < $number_of_posts; $i++ ) {
+			$ids[] = $this->factory()->post->create();
+		}
+
+		// This should count all of the newly-created posts as supporting AMP (when you add the query ary).
+		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
+
+		// Simulate 'Enable AMP' being unchecked in the post editor, in which case get_url_count() should not count it.
+		$first_id = $ids[0];
+		update_post_meta(
+			$first_id,
+			AMP_Post_Meta_Box::STATUS_POST_META_KEY,
+			AMP_Post_Meta_Box::DISABLED_STATUS
+		);
+		$this->assertEquals( array(), AMP_Site_Validation::get_posts_that_support_amp( array( $first_id ) ) );
+
+		update_post_meta(
+			$first_id,
+			AMP_Post_Meta_Box::STATUS_POST_META_KEY,
+			AMP_Post_Meta_Box::ENABLED_STATUS
+		);
+
+		/**
+		 * When the second $force_count_all_urls argument is true, all of the newly-created posts should be part of the URL count,
+		 * even though they're not AMP endpoints.
+		 */
+		AMP_Site_Validation::$force_crawl_all_urls = true;
+		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids, true ) );
+		AMP_Site_Validation::$force_crawl_all_urls = false;
+
+		// In Native AMP, the URL count should include all of the newly-created posts.
+		add_theme_support( 'amp' );
+		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
+
+		// In Paired Mode, the URL count should also include all of the newly-created posts.
+		add_theme_support( 'amp', array(
+			'paired' => true,
+		) );
+		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
+	}
+
 	/**
 	 * Test get_posts_by_type.
 	 *

From d44cde9b3d0a3c4fc3172ee57cb8891be5918969 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 14 Aug 2018 23:54:04 -0500
Subject: [PATCH 45/85] Exclude taxonomy templates if the user has unchecked
 them

Like the previous commit a53bb45,
but for taxonomies.
This applies to default taxonomies
and custom taxonomies.
---
 .../validation/class-amp-site-validation.php  | 54 +++++++++++++++++--
 .../test-class-amp-site-validation.php        | 36 +++++++++++++
 2 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 585bc38bf94..ecfdea39c19 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -140,9 +140,14 @@ public static function count_posts_and_terms() {
 		$total_count       = 'posts' === get_option( 'show_on_front' ) ? 1 : 0;
 		$public_post_types = get_post_types( array( 'public' => true ), 'names' );
 
+		$amp_enabled_taxonomies = array_filter(
+			get_taxonomies( array( 'public' => true ) ),
+			array( 'AMP_Site_Validation', 'does_taxonomy_support_amp' )
+		);
+
 		// Count all public taxonomy terms.
 		$term_query   = new WP_Term_Query( array(
-			'taxonomy' => get_taxonomies( array( 'public' => true ) ),
+			'taxonomy' => $amp_enabled_taxonomies,
 			'fields'   => 'ids',
 		) );
 		$total_count += count( $term_query->terms );
@@ -181,9 +186,10 @@ public static function count_posts_and_terms() {
 	/**
 	 * Gets the posts IDs that support AMP.
 	 *
-	 * Only get the post IDs if they support AMP.
+	 * By default, only get the post IDs if they support AMP.
 	 * This means that 'Posts' isn't deselected in 'AMP Settings' > 'Supported Templates'.
 	 * And 'Enable AMP' isn't unchecked in the post's editor.
+	 * But if $force_crawl_all_urls is true, this simply returns all of the IDs.
 	 *
 	 * @param array $ids The post or term IDs.
 	 * @return array The post IDs that support AMP.
@@ -201,6 +207,40 @@ function( $id ) {
 		}
 	}
 
+	/**
+	 * Gets whether the taxonomy supports AMP.
+	 *
+	 * Only get the term IDs if they support AMP.
+	 * If their taxonomy is unchecked in 'AMP Settings' > 'Supported Templates,' don't return them.
+	 * For example, if 'Categories' is unchecked there, don't return any category IDs.
+	 *
+	 * @param string $taxonomy The taxonomy.
+	 * @return boolean Wether the taxonomy supports AMP.
+	 */
+	public static function does_taxonomy_support_amp( $taxonomy ) {
+		if ( self::$force_crawl_all_urls ) {
+			return true;
+		}
+
+		if ( 'post_tag' === $taxonomy ) {
+			$taxonomy = 'tag';
+		}
+
+		/**
+		 * Check whether this taxonomy's template is supported, including in the 'AMP Settings' > 'Supported Templates' UI.
+		 * This first conditional is for default taxonomies like categories.
+		 */
+		$templates    = AMP_Theme_Support::get_supportable_templates();
+		$taxonomy_key = 'is_' . $taxonomy;
+		if ( isset( $templates[ $taxonomy_key ]['supported'] ) && $templates[ $taxonomy_key ]['supported'] ) {
+			return true;
+		}
+
+		// If this is a custom taxonomy, find if it supports AMP.
+		$custom_taxonomy_key = sprintf( 'is_tax[%s]', $taxonomy );
+		return isset( $templates[ $custom_taxonomy_key ]['supported'] ) && $templates[ $custom_taxonomy_key ]['supported'];
+	}
+
 	/**
 	 * Gets the permalinks of public, published posts.
 	 *
@@ -277,9 +317,13 @@ public static function validate_entire_site_urls() {
 			}
 		}
 
-		// Validate all public taxonomies.
-		$public_taxonomies = get_taxonomies( array( 'public' => true ) );
-		foreach ( $public_taxonomies as $taxonomy ) {
+		// Validate all public taxonomies that don't have AMP disabled.
+		$amp_enabled_taxonomies = array_filter(
+			get_taxonomies( array( 'public' => true ) ),
+			array( 'AMP_Site_Validation', 'does_taxonomy_support_amp' )
+		);
+
+		foreach ( $amp_enabled_taxonomies as $taxonomy ) {
 			$taxonomy_links = self::get_taxonomy_links( $taxonomy, self::BATCH_SIZE );
 			$offset         = 0;
 
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 1e8a3199a5e..24740e0cbea 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -127,6 +127,42 @@ public function test_get_posts_that_support_amp() {
 		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
 	}
 
+	/**
+	 * Test does_taxonomy_support_amp.
+	 *
+	 * @covers AMP_Site_Validation::does_taxonomy_support_amp()
+	 */
+	public function test_does_taxonomy_support_amp() {
+		$custom_taxonomy = 'foo_custom_taxonomy';
+		register_taxonomy( $custom_taxonomy, 'post' );
+		$taxonomies_to_test = array( $custom_taxonomy, 'category', 'post_tag' );
+
+		// When no template is unchecked in the 'AMP Settings' UI, these should be supported.
+		foreach ( $taxonomies_to_test as $taxonomy ) {
+			$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
+		}
+
+		// When the user has not checked the boxes for 'Categories' and 'Tags,' this should be false.
+		AMP_Options_Manager::update_option( 'all_templates_supported', false );
+		AMP_Options_Manager::update_option( 'supported_templates', array( 'is_author' ) );
+		foreach ( $taxonomies_to_test as $taxonomy ) {
+			$this->assertFalse( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
+		}
+
+		// When $force_crawl_all_urls is true, all taxonomies should be supported.
+		AMP_Site_Validation::$force_crawl_all_urls = true;
+		foreach ( $taxonomies_to_test as $taxonomy ) {
+			$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
+		}
+		AMP_Site_Validation::$force_crawl_all_urls = false;
+
+		// When the user has the 'all_templates_supported' box, this should always be true.
+		AMP_Options_Manager::update_option( 'all_templates_supported', true );
+		foreach ( $taxonomies_to_test as $taxonomy ) {
+			$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
+		}
+	}
+
 	/**
 	 * Test get_posts_by_type.
 	 *

From 71f4fcb83f89068868829b30c479e0fac632c20a Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 15 Aug 2018 12:59:15 -0500
Subject: [PATCH 46/85] Add a flag to force validation of the entire site (but
 not yet implemented)

Add a flag --force-validate-all
If it's added to the command wp amp validate-site,
This will validate all URLs,
regardless of whether a user has opted-out of the template,
like by unchecking 'Categories' in
'AMP Settings' > 'Supported Templates'.
---
 .../validation/class-amp-site-validation.php  | 40 ++++++++++++++++---
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index ecfdea39c19..69fe91d6d49 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -29,7 +29,18 @@ class AMP_Site_Validation {
 	 *
 	 * @var string
 	 */
-	const WP_CLI_ARGUMENT = 'validate-site';
+	const WP_CLI_COMMAND = 'amp validate-site';
+
+	/**
+	 * The WP-CLI flag to force validation of all URLs.
+	 *
+	 * By default, this does not validate templates that the user has opted-out of.
+	 * For example, by unchecking 'Categories' in 'AMP Settings' > 'Supported Templates'.
+	 * But with this command flag, this will validate all URLs.
+	 *
+	 * @var string
+	 */
+	const FLAG_NAME_FORCE_VALIDATE_ALL = 'force-validate-all';
 
 	/**
 	 * The WP CLI progress bar.
@@ -76,11 +87,26 @@ class AMP_Site_Validation {
 	public static $force_crawl_all_urls = false;
 
 	/**
-	 * Inits the class.
+	 * Adds the WP-CLI command to validate the site.
 	 */
 	public static function init() {
 		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			WP_CLI::add_command( 'amp', array( __CLASS__, 'crawl_site' ) );
+			WP_CLI::add_command(
+				self::WP_CLI_COMMAND,
+				array( __CLASS__, 'crawl_site' ),
+				array(
+					'shortdesc' => __( 'Crawl the entire site to get AMP validation results', 'amp' ),
+					'synopsis'  => array(
+						array(
+							'type'     => 'flag',
+							'name'     => self::FLAG_NAME_FORCE_VALIDATE_ALL,
+							'optional' => true,
+						),
+					),
+					'when'      => 'after_wp_load',
+					'longdesc'  => '## EXAMPLES' . "\n\n" . 'wp ' . self::WP_CLI_COMMAND,
+				)
+			);
 		}
 	}
 
@@ -88,10 +114,12 @@ public static function init() {
 	 * Crawls the entire site to validate it, and gets the results.
 	 *
 	 * @param array $args The arguments for the command.
+	 * @param array $assoc_args The associative arguments, which can also include command flags like --force-validate-all.
 	 */
-	public static function crawl_site( $args ) {
-		if ( ! isset( $args[0] ) || ! self::WP_CLI_ARGUMENT === $args[0] ) {
-			return;
+	public static function crawl_site( $args, $assoc_args ) {
+		unset( $args );
+		if ( isset( $assoc_args[ self::FLAG_NAME_FORCE_VALIDATE_ALL ] ) ) {
+			self::$force_crawl_all_urls = true;
 		}
 
 		$number_urls_to_crawl = self::count_posts_and_terms();

From ff3a5c003e5bd74e437b5ffa7fe914a339f98b0c Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 15 Aug 2018 15:53:09 -0500
Subject: [PATCH 47/85] Allow crawling templates the user has unchecked in
 'Supported Templates'

In 'AMP Settings,' users can uncheck certain templates.
And this had blocked validation of them,
as is_amp_endpoint() returned false and they were redirected.
So if the user passes the flag to the WP-CLI command,
add a query var.
This forces all endpoints to be AMP endpoints, to allow validation.
Still, is_amp_endpoint might not be the right
place to make this change.
---
 includes/amp-helper-functions.php             | 10 +++++++++
 .../validation/class-amp-site-validation.php  | 17 ++++++++++++++-
 tests/test-amp-helper-functions.php           | 21 +++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index 1b8a2050d61..6b6eaccdf00 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -287,6 +287,16 @@ function is_amp_endpoint() {
 		return false;
 	}
 
+	/**
+	 * If this is a URL for validation, and validation is forced for all URLs, return true.
+	 * Normally, this would be false if the user has deselected a template,
+	 * like by unchecking 'Categories' in 'AMP Settings' > 'Supported Templates'.
+	 * But there's a flag for the WP-CLI command that sets this query var to validate all URLs.
+	 */
+	if ( isset( $_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ], $_GET[ AMP_Site_Validation::FORCE_VALIDATION_QUERY_VAR ] ) ) { // WPCS: CSRF OK.
+		return true;
+	}
+
 	$availability = AMP_Theme_Support::get_template_availability();
 	return amp_is_canonical() ? $availability['supported'] : ( $has_amp_query_var && $availability['supported'] );
 }
diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 69fe91d6d49..f917cc062aa 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -42,6 +42,18 @@ class AMP_Site_Validation {
 	 */
 	const FLAG_NAME_FORCE_VALIDATE_ALL = 'force-validate-all';
 
+	/**
+	 * The query var key to force AMP validation, regardless or whether the user has deselected support for a URL.
+	 *
+	 * If the WP-CLI flag above is present in the command,
+	 * this query var is added to the URL.
+	 * Then, this forces validation, no matter whether the user has deselected a certain template.
+	 * Like by unchecking 'Categories' in 'AMP Settings' > 'Supported Templates'.
+	 *
+	 * @var string
+	 */
+	const FORCE_VALIDATION_QUERY_VAR = 'amp_force_validation';
+
 	/**
 	 * The WP CLI progress bar.
 	 *
@@ -90,7 +102,7 @@ class AMP_Site_Validation {
 	 * Adds the WP-CLI command to validate the site.
 	 */
 	public static function init() {
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
+		if ( class_exists( 'WP_CLI' ) ) {
 			WP_CLI::add_command(
 				self::WP_CLI_COMMAND,
 				array( __CLASS__, 'crawl_site' ),
@@ -370,6 +382,9 @@ public static function validate_entire_site_urls() {
 	 */
 	public static function validate_urls( $urls ) {
 		foreach ( $urls as $url ) {
+			if ( self::$force_crawl_all_urls ) {
+				$url = add_query_arg( self::FORCE_VALIDATION_QUERY_VAR, '', $url );
+			}
 			$validity = AMP_Validation_Manager::validate_url( $url );
 
 			if ( is_wp_error( $validity ) ) {
diff --git a/tests/test-amp-helper-functions.php b/tests/test-amp-helper-functions.php
index 16894c7aa4e..6c92036017d 100644
--- a/tests/test-amp-helper-functions.php
+++ b/tests/test-amp-helper-functions.php
@@ -344,6 +344,27 @@ public function test_is_amp_endpoint() {
 			$GLOBALS['pagenow'] = $page;
 			$this->assertFalse( is_amp_endpoint() );
 		}
+		unset( $GLOBALS['pagenow'] );
+
+		/**
+		 * Simulate a user unchecking almost all of the boxes in 'AMP Settings' > 'Supported Templates'.
+		 * The user has chosen not to show them as AMP, so most URLs should not be AMP endpoints.
+		 */
+		AMP_Options_Manager::update_option( 'all_templates_supported', false );
+		AMP_Options_Manager::update_option( 'supported_templates', array( 'is_author' ) );
+
+		// A post shouldn't be an AMP endpoint, as it was unchecked in the UI via the options above.
+		$this->go_to( $this->factory()->post->create() );
+		$this->assertFalse( is_amp_endpoint() );
+
+		// The homepage shouldn't be an AMP endpoint, as it was also unchecked in the UI.
+		$this->go_to( home_url( '/' ) );
+		$this->assertFalse( is_amp_endpoint() );
+
+		// When the user passes a flag to the WP-CLI command, it forces AMP validation no matter whether the user disabled AMP on any template.
+		$_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ]      = 1;
+		$_GET[ AMP_Site_Validation::FORCE_VALIDATION_QUERY_VAR ] = 1;
+		$this->assertTrue( is_amp_endpoint() );
 	}
 
 	/**

From d378a37a4ca09cef39cf2dcbebccdddefcf18e69 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 15 Aug 2018 16:16:48 -0500
Subject: [PATCH 48/85] If there are no AMP-enabled taxonomies, don't count
 them.

Before, there was an issue when
$amp_enabled_taxonomies was an empty array().
Then, the WP_Term_Query() returned terms
from all taxonomies.
So simply don't run the query if there
are no AMP-enabled taxonomies.
---
 includes/validation/class-amp-site-validation.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index f917cc062aa..7a054b15130 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -185,12 +185,14 @@ public static function count_posts_and_terms() {
 			array( 'AMP_Site_Validation', 'does_taxonomy_support_amp' )
 		);
 
-		// Count all public taxonomy terms.
-		$term_query   = new WP_Term_Query( array(
-			'taxonomy' => $amp_enabled_taxonomies,
-			'fields'   => 'ids',
-		) );
-		$total_count += count( $term_query->terms );
+		if ( ! empty( $amp_enabled_taxonomies ) ) {
+			// Count all public taxonomy terms.
+			$term_query   = new WP_Term_Query( array(
+				'taxonomy' => $amp_enabled_taxonomies,
+				'fields'   => 'ids',
+			) );
+			$total_count += count( $term_query->terms );
+		}
 
 		/**
 		 * Count all public posts.

From 4f8b3e981bbc5daa024c35d6159cca486ab6c054 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 15 Aug 2018 18:48:55 -0500
Subject: [PATCH 49/85] Add an argument --include to the WP-CLI command.

On Weston's suggestion,
this can have whitelisted conditionals.
For example, --include=is_tag,is_author.
---
 .../validation/class-amp-site-validation.php  | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 7a054b15130..2ed15cbd353 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -54,6 +54,17 @@ class AMP_Site_Validation {
 	 */
 	const FORCE_VALIDATION_QUERY_VAR = 'amp_force_validation';
 
+	/**
+	 * The WP-CLI argument to validate based on certain conditionals
+	 *
+	 * For example, --include=is_tag,is_author
+	 * Normally, this script will validate all of the templates that don't have AMP disabled.
+	 * But this allows validating only specific templates.
+	 *
+	 * @var string
+	 */
+	const INCLUDE_ARGUMENT = 'include';
+
 	/**
 	 * The WP CLI progress bar.
 	 *
@@ -98,6 +109,16 @@ class AMP_Site_Validation {
 	 */
 	public static $force_crawl_all_urls = false;
 
+	/**
+	 * A whitelist of conditionals to use for validation.
+	 *
+	 * Usually, this script will validate all of the templates that don't have AMP disabled.
+	 * But this allows validating based on only these conditionals.
+	 *
+	 * @var array
+	 */
+	public static $include_conditionals;
+
 	/**
 	 * Adds the WP-CLI command to validate the site.
 	 */
@@ -114,9 +135,16 @@ public static function init() {
 							'name'     => self::FLAG_NAME_FORCE_VALIDATE_ALL,
 							'optional' => true,
 						),
+						array(
+							'type'        => 'assoc',
+							'name'        => self::INCLUDE_ARGUMENT,
+							'description' => __( 'Only validate if one of the conditionals is true', 'amp' ),
+							'optional'    => true,
+							'options'     => array( 'is_singular', 'is_home', 'is_author', 'is_date', 'is_category', 'is_tag', 'is_search', 'is_404' ),
+						),
 					),
 					'when'      => 'after_wp_load',
-					'longdesc'  => '## EXAMPLES' . "\n\n" . 'wp ' . self::WP_CLI_COMMAND,
+					'longdesc'  => '## EXAMPLES' . "\n\n" . 'wp ' . self::WP_CLI_COMMAND . ' --include=is_author,is_tag',
 				)
 			);
 		}
@@ -133,6 +161,9 @@ public static function crawl_site( $args, $assoc_args ) {
 		if ( isset( $assoc_args[ self::FLAG_NAME_FORCE_VALIDATE_ALL ] ) ) {
 			self::$force_crawl_all_urls = true;
 		}
+		if ( isset( $assoc_args[ self::INCLUDE_ARGUMENT ] ) ) {
+			self::$include_conditionals = explode( ',', $assoc_args[ self::INCLUDE_ARGUMENT ], ',' );
+		}
 
 		$number_urls_to_crawl = self::count_posts_and_terms();
 		WP_CLI::log( __( 'Crawling the entire site for AMP validity.', 'amp' ) );

From 4ea25bf07b6537152db55109c872331a0d22d189 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 15 Aug 2018 19:34:51 -0500
Subject: [PATCH 50/85] Implement the --include argument for taxonomies and
 posts

If the --include argument doesn't include the
taxonomy conditional, like is_category,
don't validate it.
For posts, if there's an include argument that
does no include is_singular,
don't allow any posts.
---
 .../validation/class-amp-site-validation.php  | 49 ++++++++++++++-----
 .../test-class-amp-site-validation.php        | 23 +++++++++
 2 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 2ed15cbd353..935016ad59c 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -140,7 +140,6 @@ public static function init() {
 							'name'        => self::INCLUDE_ARGUMENT,
 							'description' => __( 'Only validate if one of the conditionals is true', 'amp' ),
 							'optional'    => true,
-							'options'     => array( 'is_singular', 'is_home', 'is_author', 'is_date', 'is_category', 'is_tag', 'is_search', 'is_404' ),
 						),
 					),
 					'when'      => 'after_wp_load',
@@ -162,7 +161,7 @@ public static function crawl_site( $args, $assoc_args ) {
 			self::$force_crawl_all_urls = true;
 		}
 		if ( isset( $assoc_args[ self::INCLUDE_ARGUMENT ] ) ) {
-			self::$include_conditionals = explode( ',', $assoc_args[ self::INCLUDE_ARGUMENT ], ',' );
+			self::$include_conditionals = explode( ',', $assoc_args[ self::INCLUDE_ARGUMENT ] );
 		}
 
 		$number_urls_to_crawl = self::count_posts_and_terms();
@@ -270,14 +269,25 @@ public static function count_posts_and_terms() {
 	public static function get_posts_that_support_amp( $ids ) {
 		if ( self::$force_crawl_all_urls ) {
 			return $ids;
-		} else {
-			return array_filter(
-				$ids,
-				function( $id ) {
-					return post_supports_amp( $id );
-				}
-			);
 		}
+
+		/**
+		 * If the user has passed an include argument to the WP-CLI command,
+		 * is_singular must be present in that argument.
+		 * For example, wp amp validate-site --include=is_singular,is_tag,is_category
+		 * That argument is a whitelist of conditionals, one of which must be true to validate a URL.
+		 * And is_singular must be true to access posts.
+		 */
+		if ( isset( self::$include_conditionals ) && ! in_array( 'is_singular', self::$include_conditionals, true ) ) {
+			return array();
+		}
+
+		return array_filter(
+			$ids,
+			function( $id ) {
+				return post_supports_amp( $id );
+			}
+		);
 	}
 
 	/**
@@ -299,18 +309,33 @@ public static function does_taxonomy_support_amp( $taxonomy ) {
 			$taxonomy = 'tag';
 		}
 
+		$taxonomy_key        = 'is_' . $taxonomy;
+		$custom_taxonomy_key = sprintf( 'is_tax[%s]', $taxonomy );
+
+		/**
+		 * If the user has passed an include argument to the WP-CLI command, use that to find if this taxonomy supports AMP.
+		 * For example, wp amp validate-site --include=is_tag,is_category
+		 * This would return true only if is_tag() or is_category().
+		 */
+		if ( isset( self::$include_conditionals ) ) {
+			return (
+				in_array( $taxonomy_key, self::$include_conditionals, true )
+				||
+				in_array( $custom_taxonomy_key, self::$include_conditionals, true )
+			);
+		}
+
 		/**
 		 * Check whether this taxonomy's template is supported, including in the 'AMP Settings' > 'Supported Templates' UI.
 		 * This first conditional is for default taxonomies like categories.
 		 */
-		$templates    = AMP_Theme_Support::get_supportable_templates();
-		$taxonomy_key = 'is_' . $taxonomy;
+		$templates = AMP_Theme_Support::get_supportable_templates();
+
 		if ( isset( $templates[ $taxonomy_key ]['supported'] ) && $templates[ $taxonomy_key ]['supported'] ) {
 			return true;
 		}
 
 		// If this is a custom taxonomy, find if it supports AMP.
-		$custom_taxonomy_key = sprintf( 'is_tax[%s]', $taxonomy );
 		return isset( $templates[ $custom_taxonomy_key ]['supported'] ) && $templates[ $custom_taxonomy_key ]['supported'];
 	}
 
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 24740e0cbea..070d6c4ecd2 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -125,6 +125,20 @@ public function test_get_posts_that_support_amp() {
 			'paired' => true,
 		) );
 		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
+
+		/**
+		 * If the WP-CLI command has an include argument, and is_singular isn't in it, no posts will have AMP enabled.
+		 * For example, wp amp validate-site include=is_tag,is_category
+		 */
+		AMP_Site_Validation::$include_conditionals = array( 'is_tag', 'is_category' );
+		$this->assertEquals( array(), AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
+
+		/*
+		 * If is_singular is in the WP-CLI argument, it should allow return these posts as being AMP-enabled.
+		 * For example, wp amp validate-site include=is_singular,is_category
+		 */
+		AMP_Site_Validation::$include_conditionals = array( 'is_singular', 'is_category' );
+		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
 	}
 
 	/**
@@ -161,6 +175,15 @@ public function test_does_taxonomy_support_amp() {
 		foreach ( $taxonomies_to_test as $taxonomy ) {
 			$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
 		}
+		AMP_Options_Manager::update_option( 'all_templates_supported', false );
+
+		/**
+		 * If the user passed allowed conditionals to the WP-CLI command like wp amp validate-site --include=is_category,is_tag
+		 * these should be supported taxonomies.
+		 */
+		AMP_Site_Validation::$include_conditionals = array( 'is_category', 'is_tag' );
+		$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( 'category' ) );
+		$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( 'tag' ) );
 	}
 
 	/**

From dadab103b20a9eeb11b092c895349db847b267ce Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 15 Aug 2018 21:50:33 -0500
Subject: [PATCH 51/85] Validate author pages, including with include=is_author

Also, set $force_crawl_urls if there's an include argument.
You could pass a conditional to include that
has AMP disabled now.
Like if you use the command:
wp amp validate-site include=is_author
But 'Author' could be unchecked in
'AMP Settings' > 'Supported Templates'
In that case, this would need to force
validation of that URL,
as the URL would otherwise redirect to the non-AMP URL.
---
 .../validation/class-amp-site-validation.php  | 61 ++++++++++++++-----
 .../class-amp-validation-manager.php          |  2 +-
 .../test-class-amp-site-validation.php        | 40 +++++++++---
 3 files changed, 78 insertions(+), 25 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 935016ad59c..4731367a008 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -98,7 +98,7 @@ class AMP_Site_Validation {
 	public static $number_crawled = 0;
 
 	/**
-	 * Whether to force crawling of all URLs.
+	 * Whether to force crawling of URLs.
 	 *
 	 * By default, this script only crawls URLs that support AMP,
 	 * where the user hasn't opted-out of AMP for the URL.
@@ -107,7 +107,7 @@ class AMP_Site_Validation {
 	 *
 	 * @var int
 	 */
-	public static $force_crawl_all_urls = false;
+	public static $force_crawl_urls = false;
 
 	/**
 	 * A whitelist of conditionals to use for validation.
@@ -157,11 +157,11 @@ public static function init() {
 	 */
 	public static function crawl_site( $args, $assoc_args ) {
 		unset( $args );
-		if ( isset( $assoc_args[ self::FLAG_NAME_FORCE_VALIDATE_ALL ] ) ) {
-			self::$force_crawl_all_urls = true;
-		}
 		if ( isset( $assoc_args[ self::INCLUDE_ARGUMENT ] ) ) {
 			self::$include_conditionals = explode( ',', $assoc_args[ self::INCLUDE_ARGUMENT ] );
+			self::$force_crawl_urls     = true;
+		} elseif ( isset( $assoc_args[ self::FLAG_NAME_FORCE_VALIDATE_ALL ] ) ) {
+			self::$force_crawl_urls = true;
 		}
 
 		$number_urls_to_crawl = self::count_posts_and_terms();
@@ -197,7 +197,7 @@ public static function crawl_site( $args, $assoc_args ) {
 	 * Gets the total number of posts and terms on the site.
 	 *
 	 * By default, this only counts AMP-enabled posts and terms.
-	 * But if $force_crawl_all_urls is true, it counts all of them, regardless of their AMP status.
+	 * But if $force_crawl_urls is true, it counts all of them, regardless of their AMP status.
 	 *
 	 * @return int The number of posts and terms.
 	 */
@@ -252,6 +252,9 @@ public static function count_posts_and_terms() {
 			}
 		}
 
+		// Count author pages, like https://example.com/author/admin/.
+		$total_count += count( self::get_author_page_urls() );
+
 		return $total_count;
 	}
 
@@ -261,16 +264,12 @@ public static function count_posts_and_terms() {
 	 * By default, only get the post IDs if they support AMP.
 	 * This means that 'Posts' isn't deselected in 'AMP Settings' > 'Supported Templates'.
 	 * And 'Enable AMP' isn't unchecked in the post's editor.
-	 * But if $force_crawl_all_urls is true, this simply returns all of the IDs.
+	 * But if $force_crawl_urls is true, this simply returns all of the IDs.
 	 *
 	 * @param array $ids The post or term IDs.
 	 * @return array The post IDs that support AMP.
 	 */
 	public static function get_posts_that_support_amp( $ids ) {
-		if ( self::$force_crawl_all_urls ) {
-			return $ids;
-		}
-
 		/**
 		 * If the user has passed an include argument to the WP-CLI command,
 		 * is_singular must be present in that argument.
@@ -282,6 +281,10 @@ public static function get_posts_that_support_amp( $ids ) {
 			return array();
 		}
 
+		if ( self::$force_crawl_urls ) {
+			return $ids;
+		}
+
 		return array_filter(
 			$ids,
 			function( $id ) {
@@ -301,10 +304,6 @@ function( $id ) {
 	 * @return boolean Wether the taxonomy supports AMP.
 	 */
 	public static function does_taxonomy_support_amp( $taxonomy ) {
-		if ( self::$force_crawl_all_urls ) {
-			return true;
-		}
-
 		if ( 'post_tag' === $taxonomy ) {
 			$taxonomy = 'tag';
 		}
@@ -325,6 +324,10 @@ public static function does_taxonomy_support_amp( $taxonomy ) {
 			);
 		}
 
+		if ( self::$force_crawl_urls ) {
+			return true;
+		}
+
 		/**
 		 * Check whether this taxonomy's template is supported, including in the 'AMP Settings' > 'Supported Templates' UI.
 		 * This first conditional is for default taxonomies like categories.
@@ -393,6 +396,29 @@ public static function get_taxonomy_links( $taxonomy, $number_links = 200, $offs
 		return array_map( 'get_term_link', get_terms( $args ) );
 	}
 
+	/**
+	 * Gets the author page URLs, like https://example.com/author/admin/.
+	 *
+	 * @return array The author page URLs, or
+	 */
+	public static function get_author_page_urls() {
+		/**
+		 * If the user has passed an include argument to the WP-CLI command,
+		 * is_author must be present in that argument.
+		 * For example, wp amp validate-site --include=is_author,is_tag,is_category
+		 */
+		if ( ! isset( self::$force_crawl_urls ) && isset( self::$include_conditionals ) && ! in_array( 'is_author', self::$include_conditionals, true ) ) {
+			return array();
+		}
+
+		$urls = array();
+		foreach ( get_users() as $author ) {
+			$urls[] = get_author_posts_url( $author->ID, $author->user_nicename );
+		}
+
+		return $urls;
+	}
+
 	/**
 	 * Validates the URLs of the entire site.
 	 * Includes the URLs of public, published posts, and public taxonomies.
@@ -431,6 +457,9 @@ public static function validate_entire_site_urls() {
 				$taxonomy_links = self::get_taxonomy_links( $taxonomy, self::BATCH_SIZE, $offset );
 			}
 		}
+
+		// Validate author pages.
+		self::validate_urls( self::get_author_page_urls() );
 	}
 
 	/**
@@ -440,7 +469,7 @@ public static function validate_entire_site_urls() {
 	 */
 	public static function validate_urls( $urls ) {
 		foreach ( $urls as $url ) {
-			if ( self::$force_crawl_all_urls ) {
+			if ( self::$force_crawl_urls ) {
 				$url = add_query_arg( self::FORCE_VALIDATION_QUERY_VAR, '', $url );
 			}
 			$validity = AMP_Validation_Manager::validate_url( $url );
diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php
index 37e949b1027..5105649dfd8 100644
--- a/includes/validation/class-amp-validation-manager.php
+++ b/includes/validation/class-amp-validation-manager.php
@@ -1655,7 +1655,7 @@ public static function validate_url( $url ) {
 		}
 
 		$url = remove_query_arg(
-			array_keys( $added_query_vars ),
+			array_merge( array_keys( $added_query_vars ), array( AMP_Site_Validation::FORCE_VALIDATION_QUERY_VAR ) ),
 			$validation_url
 		);
 
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 070d6c4ecd2..b96eeec322b 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -40,7 +40,8 @@ public function tearDown() {
 	public function test_count_posts_and_terms() {
 		// The number of original URLs present before adding these test URLs.
 		$number_original_urls = $this->get_inital_url_count();
-		$this->assertEquals( $number_original_urls, AMP_Site_Validation::count_posts_and_terms() );
+		$number_author_pages  = count( AMP_Site_Validation::get_author_page_urls() );
+		$this->assertEquals( $number_original_urls + $number_author_pages, AMP_Site_Validation::count_posts_and_terms() );
 
 		$category         = $this->factory()->term->create( array( 'taxonomy' => 'category' ) );
 		$number_new_posts = AMP_Site_Validation::BATCH_SIZE * 3;
@@ -55,7 +56,7 @@ public function test_count_posts_and_terms() {
 		 * Add the number of new posts, original URLs, and 1 for the $category that all of them have.
 		 * And ensure that the tested method finds a URL for all of them.
 		 */
-		$expected_url_count = $number_new_posts + $number_original_urls + 1;
+		$expected_url_count = $number_new_posts + $number_original_urls + $number_author_pages + 1;
 		$this->assertEquals( $expected_url_count, AMP_Site_Validation::count_posts_and_terms() );
 
 		$number_of_new_terms        = 20;
@@ -112,9 +113,9 @@ public function test_get_posts_that_support_amp() {
 		 * When the second $force_count_all_urls argument is true, all of the newly-created posts should be part of the URL count,
 		 * even though they're not AMP endpoints.
 		 */
-		AMP_Site_Validation::$force_crawl_all_urls = true;
+		AMP_Site_Validation::$force_crawl_urls = true;
 		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids, true ) );
-		AMP_Site_Validation::$force_crawl_all_urls = false;
+		AMP_Site_Validation::$force_crawl_urls = false;
 
 		// In Native AMP, the URL count should include all of the newly-created posts.
 		add_theme_support( 'amp' );
@@ -139,6 +140,7 @@ public function test_get_posts_that_support_amp() {
 		 */
 		AMP_Site_Validation::$include_conditionals = array( 'is_singular', 'is_category' );
 		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
+		AMP_Site_Validation::$include_conditionals = null;
 	}
 
 	/**
@@ -163,12 +165,12 @@ public function test_does_taxonomy_support_amp() {
 			$this->assertFalse( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
 		}
 
-		// When $force_crawl_all_urls is true, all taxonomies should be supported.
-		AMP_Site_Validation::$force_crawl_all_urls = true;
+		// When $force_crawl_urls is true, all taxonomies should be supported.
+		AMP_Site_Validation::$force_crawl_urls = true;
 		foreach ( $taxonomies_to_test as $taxonomy ) {
 			$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
 		}
-		AMP_Site_Validation::$force_crawl_all_urls = false;
+		AMP_Site_Validation::$force_crawl_urls = false;
 
 		// When the user has the 'all_templates_supported' box, this should always be true.
 		AMP_Options_Manager::update_option( 'all_templates_supported', true );
@@ -272,6 +274,28 @@ public function test_get_taxonomy_links() {
 		}
 	}
 
+	/**
+	 * Test get_author_page_urls.
+	 *
+	 * @covers AMP_Site_Validation::get_author_page_urls()
+	 */
+	public function test_get_author_page_urls() {
+		$this->factory()->user->create();
+		$users = get_users();
+
+		$this->assertEquals( count( $users ), count( AMP_Site_Validation::get_author_page_urls() ) );
+
+		// If $include_conditionals is set and does not have is_author, this should not return any URL.
+		AMP_Site_Validation::$include_conditionals = array( 'is_category' );
+		AMP_Site_Validation::$force_crawl_urls     = null;
+		$this->assertEquals( array(), AMP_Site_Validation::get_author_page_urls() );
+
+		// If $include_conditionals is set and has is_author, this should not return any URL.
+		AMP_Site_Validation::$include_conditionals = array( 'is_author' );
+		$this->assertEquals( count( $users ), count( AMP_Site_Validation::get_author_page_urls() ) );
+		AMP_Site_Validation::$include_conditionals = null;
+	}
+
 	/**
 	 * Test validate_entire_site_urls.
 	 *
@@ -358,7 +382,7 @@ public function get_inital_url_count() {
 	public function get_validated_urls() {
 		$query = new WP_Query( array(
 			'post_type'      => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
-			'posts_per_page' => 100,
+			'posts_per_page' => 150,
 			'fields'         => 'ids',
 		) );
 

From c687ea002f33e1e375105a8ccb36cebd9ac0de28 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 16 Aug 2018 01:29:54 -0500
Subject: [PATCH 52/85] Validate the search template

Also, decompose duplicated logic into
is_template_supported().
---
 .../validation/class-amp-site-validation.php  | 85 ++++++++++++-------
 .../test-class-amp-site-validation.php        | 55 ++++++++++--
 2 files changed, 102 insertions(+), 38 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 4731367a008..eeb1fa9a408 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -40,7 +40,7 @@ class AMP_Site_Validation {
 	 *
 	 * @var string
 	 */
-	const FLAG_NAME_FORCE_VALIDATE_ALL = 'force-validate-all';
+	const FLAG_NAME_FORCE_VALIDATE_ALL = 'force-validation';
 
 	/**
 	 * The query var key to force AMP validation, regardless or whether the user has deselected support for a URL.
@@ -65,6 +65,13 @@ class AMP_Site_Validation {
 	 */
 	const INCLUDE_ARGUMENT = 'include';
 
+	/**
+	 * The supportable templates, mainly based on a user's selection in 'AMP Settings' > 'Supported Templates'.
+	 *
+	 * @var array
+	 */
+	public static $supportable_templates;
+
 	/**
 	 * The WP CLI progress bar.
 	 *
@@ -124,6 +131,8 @@ class AMP_Site_Validation {
 	 */
 	public static function init() {
 		if ( class_exists( 'WP_CLI' ) ) {
+			self::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
+
 			WP_CLI::add_command(
 				self::WP_CLI_COMMAND,
 				array( __CLASS__, 'crawl_site' ),
@@ -255,6 +264,11 @@ public static function count_posts_and_terms() {
 		// Count author pages, like https://example.com/author/admin/.
 		$total_count += count( self::get_author_page_urls() );
 
+		// Count a single example search page, like https://example.com/?s=example.
+		if ( self::get_search_page() ) {
+			$total_count++;
+		}
+
 		return $total_count;
 	}
 
@@ -277,7 +291,7 @@ public static function get_posts_that_support_amp( $ids ) {
 		 * That argument is a whitelist of conditionals, one of which must be true to validate a URL.
 		 * And is_singular must be true to access posts.
 		 */
-		if ( isset( self::$include_conditionals ) && ! in_array( 'is_singular', self::$include_conditionals, true ) ) {
+		if ( ! self::is_template_supported( 'is_singular' ) ) {
 			return array();
 		}
 
@@ -307,23 +321,27 @@ public static function does_taxonomy_support_amp( $taxonomy ) {
 		if ( 'post_tag' === $taxonomy ) {
 			$taxonomy = 'tag';
 		}
-
 		$taxonomy_key        = 'is_' . $taxonomy;
 		$custom_taxonomy_key = sprintf( 'is_tax[%s]', $taxonomy );
+		return self::is_template_supported( $taxonomy_key ) || self::is_template_supported( $custom_taxonomy_key );
+	}
 
-		/**
-		 * If the user has passed an include argument to the WP-CLI command, use that to find if this taxonomy supports AMP.
-		 * For example, wp amp validate-site --include=is_tag,is_category
-		 * This would return true only if is_tag() or is_category().
-		 */
-		if ( isset( self::$include_conditionals ) ) {
-			return (
-				in_array( $taxonomy_key, self::$include_conditionals, true )
-				||
-				in_array( $custom_taxonomy_key, self::$include_conditionals, true )
-			);
+	/**
+	 * Gets whether the template is supported.
+	 *
+	 * If the user has passed an include argument to the WP-CLI command, use that to find if this template supports AMP.
+	 * For example, wp amp validate-site --include=is_tag,is_category
+	 * would return true only if is_tag() or is_category().
+	 * Then, if the user has not unchecked the template in 'AMP Settings' > 'Supported Templates', return false.
+	 *
+	 * @param string $template The template to check.
+	 * @return bool Whether the template is supported.
+	 */
+	public static function is_template_supported( $template ) {
+		// If the include argument is present in the WP-CLI command, this template conditional must be present in it.
+		if ( isset( self::$include_conditionals ) && ! in_array( $template, self::$include_conditionals, true ) ) {
+			return false;
 		}
-
 		if ( self::$force_crawl_urls ) {
 			return true;
 		}
@@ -332,14 +350,7 @@ public static function does_taxonomy_support_amp( $taxonomy ) {
 		 * Check whether this taxonomy's template is supported, including in the 'AMP Settings' > 'Supported Templates' UI.
 		 * This first conditional is for default taxonomies like categories.
 		 */
-		$templates = AMP_Theme_Support::get_supportable_templates();
-
-		if ( isset( $templates[ $taxonomy_key ]['supported'] ) && $templates[ $taxonomy_key ]['supported'] ) {
-			return true;
-		}
-
-		// If this is a custom taxonomy, find if it supports AMP.
-		return isset( $templates[ $custom_taxonomy_key ]['supported'] ) && $templates[ $custom_taxonomy_key ]['supported'];
+		return isset( self::$supportable_templates[ $template ]['supported'] ) && self::$supportable_templates[ $template ]['supported'];
 	}
 
 	/**
@@ -399,19 +410,14 @@ public static function get_taxonomy_links( $taxonomy, $number_links = 200, $offs
 	/**
 	 * Gets the author page URLs, like https://example.com/author/admin/.
 	 *
-	 * @return array The author page URLs, or
+	 * @return array The author page URLs, or an empty array.
 	 */
 	public static function get_author_page_urls() {
-		/**
-		 * If the user has passed an include argument to the WP-CLI command,
-		 * is_author must be present in that argument.
-		 * For example, wp amp validate-site --include=is_author,is_tag,is_category
-		 */
-		if ( ! isset( self::$force_crawl_urls ) && isset( self::$include_conditionals ) && ! in_array( 'is_author', self::$include_conditionals, true ) ) {
-			return array();
+		$urls = array();
+		if ( ! self::is_template_supported( 'is_author' ) ) {
+			return $urls;
 		}
 
-		$urls = array();
 		foreach ( get_users() as $author ) {
 			$urls[] = get_author_posts_url( $author->ID, $author->user_nicename );
 		}
@@ -419,6 +425,19 @@ public static function get_author_page_urls() {
 		return $urls;
 	}
 
+	/**
+	 * Gets a search page URLs, like https://example.com/?s=example.
+	 *
+	 * @return string|null An example search page, or null.
+	 */
+	public static function get_search_page() {
+		if ( ! self::is_template_supported( 'is_search' ) ) {
+			return null;
+		}
+
+		return add_query_arg( 's', 'example', home_url( '/' ) );
+	}
+
 	/**
 	 * Validates the URLs of the entire site.
 	 * Includes the URLs of public, published posts, and public taxonomies.
@@ -458,8 +477,8 @@ public static function validate_entire_site_urls() {
 			}
 		}
 
-		// Validate author pages.
 		self::validate_urls( self::get_author_page_urls() );
+		self::validate_urls( array( self::get_search_page() ) );
 	}
 
 	/**
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index b96eeec322b..cf21beb0bf7 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -20,6 +20,7 @@ class Test_AMP_Site_Validation extends \WP_UnitTestCase {
 	public function setUp() {
 		parent::setUp();
 		add_filter( 'pre_http_request', array( $this, 'add_comment' ) );
+		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 	}
 
 	/**
@@ -41,7 +42,8 @@ public function test_count_posts_and_terms() {
 		// The number of original URLs present before adding these test URLs.
 		$number_original_urls = $this->get_inital_url_count();
 		$number_author_pages  = count( AMP_Site_Validation::get_author_page_urls() );
-		$this->assertEquals( $number_original_urls + $number_author_pages, AMP_Site_Validation::count_posts_and_terms() );
+		$number_search_pages  = is_string( AMP_Site_Validation::get_search_page() ) ? 1 : 0;
+		$this->assertEquals( $number_original_urls + $number_author_pages + $number_search_pages, AMP_Site_Validation::count_posts_and_terms() );
 
 		$category         = $this->factory()->term->create( array( 'taxonomy' => 'category' ) );
 		$number_new_posts = AMP_Site_Validation::BATCH_SIZE * 3;
@@ -56,7 +58,7 @@ public function test_count_posts_and_terms() {
 		 * Add the number of new posts, original URLs, and 1 for the $category that all of them have.
 		 * And ensure that the tested method finds a URL for all of them.
 		 */
-		$expected_url_count = $number_new_posts + $number_original_urls + $number_author_pages + 1;
+		$expected_url_count = $number_new_posts + $number_original_urls + $number_author_pages + $number_search_pages + 1;
 		$this->assertEquals( $expected_url_count, AMP_Site_Validation::count_posts_and_terms() );
 
 		$number_of_new_terms        = 20;
@@ -139,7 +141,7 @@ public function test_get_posts_that_support_amp() {
 		 * For example, wp amp validate-site include=is_singular,is_category
 		 */
 		AMP_Site_Validation::$include_conditionals = array( 'is_singular', 'is_category' );
-		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
+		$this->assertEmpty( array_diff( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) ) );
 		AMP_Site_Validation::$include_conditionals = null;
 	}
 
@@ -152,8 +154,10 @@ public function test_does_taxonomy_support_amp() {
 		$custom_taxonomy = 'foo_custom_taxonomy';
 		register_taxonomy( $custom_taxonomy, 'post' );
 		$taxonomies_to_test = array( $custom_taxonomy, 'category', 'post_tag' );
+		AMP_Options_Manager::update_option( 'supported_templates', array( 'is_category', 'is_tag', sprintf( 'is_tax[%s]', $custom_taxonomy ) ) );
+		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 
-		// When no template is unchecked in the 'AMP Settings' UI, these should be supported.
+		// When these templates are not unchecked in the 'AMP Settings' UI, these should be supported.
 		foreach ( $taxonomies_to_test as $taxonomy ) {
 			$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
 		}
@@ -161,6 +165,7 @@ public function test_does_taxonomy_support_amp() {
 		// When the user has not checked the boxes for 'Categories' and 'Tags,' this should be false.
 		AMP_Options_Manager::update_option( 'all_templates_supported', false );
 		AMP_Options_Manager::update_option( 'supported_templates', array( 'is_author' ) );
+		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 		foreach ( $taxonomies_to_test as $taxonomy ) {
 			$this->assertFalse( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
 		}
@@ -174,10 +179,11 @@ public function test_does_taxonomy_support_amp() {
 
 		// When the user has the 'all_templates_supported' box, this should always be true.
 		AMP_Options_Manager::update_option( 'all_templates_supported', true );
+		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 		foreach ( $taxonomies_to_test as $taxonomy ) {
 			$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
 		}
-		AMP_Options_Manager::update_option( 'all_templates_supported', false );
+		AMP_Options_Manager::update_option( 'all_templates_supported', null );
 
 		/**
 		 * If the user passed allowed conditionals to the WP-CLI command like wp amp validate-site --include=is_category,is_tag
@@ -186,6 +192,26 @@ public function test_does_taxonomy_support_amp() {
 		AMP_Site_Validation::$include_conditionals = array( 'is_category', 'is_tag' );
 		$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( 'category' ) );
 		$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( 'tag' ) );
+		AMP_Site_Validation::$include_conditionals = null;
+	}
+
+	/**
+	 * Test is_template_supported.
+	 *
+	 * @covers AMP_Site_Validation::is_template_supported()
+	 */
+	public function test_is_template_supported() {
+		$author_conditional = 'is_author';
+		$search_conditional = 'is_search';
+		AMP_Options_Manager::update_option( 'supported_templates', array( $author_conditional ) );
+		AMP_Options_Manager::update_option( 'all_templates_supported', false );
+		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
+		$this->assertTrue( AMP_Site_Validation::is_template_supported( $author_conditional ) );
+
+		AMP_Options_Manager::update_option( 'supported_templates', array( $search_conditional ) );
+		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
+		$this->assertTrue( AMP_Site_Validation::is_template_supported( $search_conditional ) );
+		$this->assertFalse( AMP_Site_Validation::is_template_supported( $author_conditional ) );
 	}
 
 	/**
@@ -296,6 +322,25 @@ public function test_get_author_page_urls() {
 		AMP_Site_Validation::$include_conditionals = null;
 	}
 
+	/**
+	 * Test get_search_page.
+	 *
+	 * @covers AMP_Site_Validation::get_search_page()
+	 */
+	public function test_get_search_page() {
+		// Normally, this should return a string, unless the user has opted out of the search template.
+		$this->assertTrue( is_string( AMP_Site_Validation::get_search_page() ) );
+
+		// If $include_conditionals is set and does not have is_search, this should not return a URL.
+		AMP_Site_Validation::$include_conditionals = array( 'is_author' );
+		$this->assertEquals( null, AMP_Site_Validation::get_search_page() );
+
+		// If $include_conditionals has is_search, this should return a URL.
+		AMP_Site_Validation::$include_conditionals = array( 'is_search' );
+		$this->assertTrue( is_string( AMP_Site_Validation::get_search_page() ) );
+		AMP_Site_Validation::$include_conditionals = null;
+	}
+
 	/**
 	 * Test validate_entire_site_urls.
 	 *

From 09fa08366ee8bb2765a6c1af03a2b93a1555f621 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 16 Aug 2018 01:57:30 -0500
Subject: [PATCH 53/85] If there are no URLs to crawl, call WP_CLI:error()

This is most likely if all of the templates in
Supported Templates are unchecked.
Add a message that passing --force-validation
to the command could help.
---
 includes/validation/class-amp-site-validation.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index eeb1fa9a408..771b22d0a5a 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -174,7 +174,17 @@ public static function crawl_site( $args, $assoc_args ) {
 		}
 
 		$number_urls_to_crawl = self::count_posts_and_terms();
-		WP_CLI::log( __( 'Crawling the entire site for AMP validity.', 'amp' ) );
+		if ( ! $number_urls_to_crawl ) {
+			WP_CLI::error(
+				sprintf(
+					/* translators: %s is the command line argument to force validation */
+					__( 'All of your template might be unchecked in AMP Settings > Supported Templates. You might pass --%s to this command.', 'amp' ),
+					self::FLAG_NAME_FORCE_VALIDATE_ALL
+				)
+			);
+		}
+
+		WP_CLI::log( __( 'Crawling the site for AMP validity.', 'amp' ) );
 
 		self::$wp_cli_progress = WP_CLI\Utils\make_progress_bar(
 			/* translators: %d is the number of URLs */

From e8717fd8c32333f98f904598d6e54b03ea060c52 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Thu, 16 Aug 2018 07:39:28 -0700
Subject: [PATCH 54/85] Update dev-lib: Install WP-CLI after installing
 WordPress on Travis CI

---
 dev-lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lib b/dev-lib
index 0d455597093..213ab6905ac 160000
--- a/dev-lib
+++ b/dev-lib
@@ -1 +1 @@
-Subproject commit 0d4555970933fcb32ad75c5435fb1849e1def670
+Subproject commit 213ab6905acef0d7655390f1487315c184f130af

From 13a0cc72fb6d21458633768723c2bc10d5a9491a Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Thu, 16 Aug 2018 07:59:23 -0700
Subject: [PATCH 55/85] Ensure WP-CLI is available for deploy script

---
 .travis.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a1e20b2e7db..89dd2e2f970 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,6 +57,13 @@ jobs:
       env: WP_VERSION=latest DEV_LIB_ONLY=composer,grunt
       script:
         - |
+          if ! command -v wp >/dev/null 2>&1; then
+            mkdir -p /tmp/wp-cli
+            wget -O /tmp/wp-cli/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
+            chmod +x /tmp/wp-cli/wp
+            export PATH="/tmp/wp-cli:$PATH"
+            wp cli update --yes --nightly # Temporary until WP-CLI 2.1 or 2.0.1
+          fi
           eval "$(ssh-agent -s)"
           pantheon_branch=$( echo $TRAVIS_BRANCH | sed 's/^\([0-9]\)/v\1/' | sed 's/[^a-z0-9-]/-/' )
           echo "Initializing deployment to Pantheon branch: $pantheon_branch"

From f054f13e5194f7bcbb796e787c0ec4a9a92779d4 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Thu, 16 Aug 2018 10:38:59 -0700
Subject: [PATCH 56/85] Update Node so that Object.values is available

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 89dd2e2f970..834542eb5bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ cache:
 
 install:
   - if [[ $DEV_LIB_SKIP =~ composer ]]; then composer install --no-dev; fi
-  - nvm install 6 && nvm use 6
+  - nvm install 8.11.4 && nvm use 8.11.4
   - export DEV_LIB_PATH=dev-lib
   - source $DEV_LIB_PATH/travis.install.sh
 

From be32dcf988ae73d4604620178c1ce4b14790ae9b Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 16 Aug 2018 17:19:57 -0500
Subject: [PATCH 57/85] Refactor get_author_page_urls() to use round-robin
 validation

As Alberto and Weston suggested,
the site crawling could validate one URL
of each template at a time.
This prevents validating possibly thousands of
posts or pages before getting to other URLs.
So this accepts an $offset argument.
0 gets the first user, and 1 the second...
The optional second parameter sets a number to return.
So in the round-robin validation,
this could be 1.
---
 .../validation/class-amp-site-validation.php  | 25 +++++++++++++------
 .../test-class-amp-site-validation.php        | 22 +++++++++++-----
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 771b22d0a5a..368a1960f88 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -420,19 +420,30 @@ public static function get_taxonomy_links( $taxonomy, $number_links = 200, $offs
 	/**
 	 * Gets the author page URLs, like https://example.com/author/admin/.
 	 *
+	 * Accepts an $offset parameter, for the query of authors.
+	 * 0 is the first author in the query, and 1 is the second.
+	 *
+	 * @param int $offset The offset for the URL to query for.
+	 * @param int $number The total number to query for.
 	 * @return array The author page URLs, or an empty array.
 	 */
-	public static function get_author_page_urls() {
-		$urls = array();
+	public static function get_author_page_urls( $offset = 0, $number = null ) {
+		$author_page_urls = array();
 		if ( ! self::is_template_supported( 'is_author' ) ) {
-			return $urls;
+			return $author_page_urls;
+		}
+
+		$get_users_args = compact( 'offset' );
+		if ( isset( $number ) ) {
+			$get_users_args['number'] = $number;
 		}
+		$users = get_users( $get_users_args );
 
-		foreach ( get_users() as $author ) {
-			$urls[] = get_author_posts_url( $author->ID, $author->user_nicename );
+		foreach ( $users as $author ) {
+			$author_page_urls[] = get_author_posts_url( $author->ID, $author->user_nicename );
 		}
 
-		return $urls;
+		return $author_page_urls;
 	}
 
 	/**
@@ -487,7 +498,7 @@ public static function validate_entire_site_urls() {
 			}
 		}
 
-		self::validate_urls( self::get_author_page_urls() );
+		self::validate_urls( self::get_author_page_urls( 0, 1 ) );
 		self::validate_urls( array( self::get_search_page() ) );
 	}
 
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index cf21beb0bf7..32e7f9e84db 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -307,18 +307,28 @@ public function test_get_taxonomy_links() {
 	 */
 	public function test_get_author_page_urls() {
 		$this->factory()->user->create();
-		$users = get_users();
+		$users             = get_users();
+		$first_author      = $users[0];
+		$first_author_url  = get_author_posts_url( $first_author->ID, $first_author->user_nicename );
+		$second_author     = $users[1];
+		$second_author_url = get_author_posts_url( $second_author->ID, $second_author->user_nicename );
 
-		$this->assertEquals( count( $users ), count( AMP_Site_Validation::get_author_page_urls() ) );
+		// Passing 0 as the offset argument should get the first author.
+		$this->assertEquals( array( $first_author_url ), $actual_urls = AMP_Site_Validation::get_author_page_urls( 0, 1 ) );
 
-		// If $include_conditionals is set and does not have is_author, this should not return any URL.
+		// Passing 1 as the offset argument should get the second author.
+		$this->assertEquals( array( $second_author_url ), $actual_urls = AMP_Site_Validation::get_author_page_urls( 1, 1 ) );
+
+		// If $include_conditionals is set and does not have is_author, this should not return a URL.
 		AMP_Site_Validation::$include_conditionals = array( 'is_category' );
-		AMP_Site_Validation::$force_crawl_urls     = null;
 		$this->assertEquals( array(), AMP_Site_Validation::get_author_page_urls() );
 
-		// If $include_conditionals is set and has is_author, this should not return any URL.
+		// If $include_conditionals is set and has is_author, this should return URLs.
 		AMP_Site_Validation::$include_conditionals = array( 'is_author' );
-		$this->assertEquals( count( $users ), count( AMP_Site_Validation::get_author_page_urls() ) );
+		$this->assertEquals(
+			array( $first_author_url, $second_author_url ),
+			AMP_Site_Validation::get_author_page_urls()
+		);
 		AMP_Site_Validation::$include_conditionals = null;
 	}
 

From ff8d365eb0feb62715db362df0075cebd6c1df6e Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 16 Aug 2018 17:50:31 -0500
Subject: [PATCH 58/85] Refactor validate_entire_site_url() to use round-robin
 validation

As Alberto and Weston suggested,
this validates one URL of each type at a time,
up to a limit of maximum URLs to validate.
---
 .../validation/class-amp-site-validation.php  | 71 ++++++++++---------
 .../test-class-amp-site-validation.php        |  4 +-
 2 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 368a1960f88..c6337abc830 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -126,6 +126,17 @@ class AMP_Site_Validation {
 	 */
 	public static $include_conditionals;
 
+	/**
+	 * The maximum number of URLs to validate for each type.
+	 *
+	 * Templates are each a separate type, like those for is_category() and is_tag().
+	 * Also, post types are a separate type.
+	 * So by default, this validates 100 posts of each post type.
+	 *
+	 * @var int
+	 */
+	public static $maximum_urls_to_validate_for_each_type = 100;
+
 	/**
 	 * Adds the WP-CLI command to validate the site.
 	 */
@@ -368,12 +379,13 @@ public static function is_template_supported( $template ) {
 	 *
 	 * @param string $post_type The post type.
 	 * @param int    $offset The offset of the query (optional).
+	 * @param int    $number The number of posts to query for (optional).
 	 * @return int[] $post_ids The post IDs in an array.
 	 */
-	public static function get_posts_by_type( $post_type, $offset = null ) {
+	public static function get_posts_by_type( $post_type, $offset = null, $number = null ) {
 		$args = array(
 			'post_type'      => $post_type,
-			'posts_per_page' => self::BATCH_SIZE,
+			'posts_per_page' => isset( $number ) ? $number : self::BATCH_SIZE,
 			'post_status'    => 'publish',
 			'orderby'        => 'ID',
 			'order'          => 'ASC',
@@ -400,11 +412,11 @@ public static function get_posts_by_type( $post_type, $offset = null ) {
 	 * But it excludes post_format terms.
 	 *
 	 * @param string $taxonomy     The name of the taxonomy, like 'category' or 'post_tag'.
-	 * @param int    $number_links The maximum amount of links to get (optional).
 	 * @param int    $offset       The number at which to offset the query (optional).
+	 * @param int    $number_links The maximum amount of links to get (optional).
 	 * @return string[] $links The term links in an array.
 	 */
-	public static function get_taxonomy_links( $taxonomy, $number_links = 200, $offset = null ) {
+	public static function get_taxonomy_links( $taxonomy, $offset = null, $number_links = 200 ) {
 		$args = array(
 			'taxonomy' => $taxonomy,
 			'orderby'  => 'id',
@@ -461,44 +473,39 @@ public static function get_search_page() {
 
 	/**
 	 * Validates the URLs of the entire site.
-	 * Includes the URLs of public, published posts, and public taxonomies.
+	 *
+	 * Includes the URLs of public, published posts, public taxonomies, and other templates.
+	 * This validates one of each type at a time.
+	 * And continues this until it reaches the maximum number of URLs for each type.
 	 */
 	public static function validate_entire_site_urls() {
-		// Validate the homepage.
-		self::validate_urls( array( home_url( '/' ) ) );
-
-		// Validate all public, published posts.
-		$public_post_types = get_post_types( array( 'public' => true ), 'names' );
-		foreach ( $public_post_types as $post_type ) {
-			$post_ids   = self::get_posts_that_support_amp( self::get_posts_by_type( $post_type ) );
-			$permalinks = array_map( 'get_permalink', $post_ids );
-			$offset     = 0;
-
-			while ( ! empty( $permalinks ) ) {
-				self::validate_urls( $permalinks );
-				$offset    += self::BATCH_SIZE;
-				$permalinks = array_map( 'get_permalink', self::get_posts_by_type( $post_type, $offset ) );
-			}
-		}
-
-		// Validate all public taxonomies that don't have AMP disabled.
 		$amp_enabled_taxonomies = array_filter(
 			get_taxonomies( array( 'public' => true ) ),
 			array( 'AMP_Site_Validation', 'does_taxonomy_support_amp' )
 		);
+		$public_post_types      = get_post_types( array( 'public' => true ), 'names' );
+		$offset                 = 0;
+
+		while ( $offset < self::$maximum_urls_to_validate_for_each_type ) {
+			// Validate all public, published posts.
+			foreach ( $public_post_types as $post_type ) {
+				$post_ids = self::get_posts_that_support_amp( self::get_posts_by_type( $post_type, $offset, 1 ) );
+				if ( ! empty( $post_ids ) ) {
+					self::validate_urls( array_map( 'get_permalink', $post_ids ) );
+				}
+			}
 
-		foreach ( $amp_enabled_taxonomies as $taxonomy ) {
-			$taxonomy_links = self::get_taxonomy_links( $taxonomy, self::BATCH_SIZE );
-			$offset         = 0;
-
-			while ( ! empty( $taxonomy_links ) ) {
-				self::validate_urls( $taxonomy_links );
-				$offset        += self::BATCH_SIZE;
-				$taxonomy_links = self::get_taxonomy_links( $taxonomy, self::BATCH_SIZE, $offset );
+			foreach ( $amp_enabled_taxonomies as $taxonomy ) {
+				self::validate_urls( self::get_taxonomy_links( $taxonomy, $offset, 1 ) );
 			}
+
+			self::validate_urls( self::get_author_page_urls( $offset, 1 ) );
+
+			$offset++;
 		}
 
-		self::validate_urls( self::get_author_page_urls( 0, 1 ) );
+		// Validate the homepage and search page outside the loop, as there is only one of each here.
+		self::validate_urls( array( home_url( '/' ) ) );
 		self::validate_urls( array( self::get_search_page() ) );
 	}
 
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 32e7f9e84db..d9a68c278b2 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -286,7 +286,7 @@ public function test_get_taxonomy_links() {
 				array_map( 'get_term_link', $terms_for_current_taxonomy )
 			);
 			$number_of_links = 100;
-			$actual_links    = AMP_Site_Validation::get_taxonomy_links( $taxonomy, $number_of_links );
+			$actual_links    = AMP_Site_Validation::get_taxonomy_links( $taxonomy, 0, $number_of_links );
 
 			// The get_terms() call in get_taxonomy_links() returns an array with a first index of 1, so correct for that with array_values().
 			$this->assertEquals( $expected_links, array_values( $actual_links ) );
@@ -294,7 +294,7 @@ public function test_get_taxonomy_links() {
 
 			$number_of_links           = 5;
 			$offset                    = 10;
-			$actual_links_using_offset = AMP_Site_Validation::get_taxonomy_links( $taxonomy, $number_of_links, $offset );
+			$actual_links_using_offset = AMP_Site_Validation::get_taxonomy_links( $taxonomy, $offset, $number_of_links );
 			$this->assertEquals( array_slice( $expected_links, $offset, $number_of_links ), array_values( $actual_links_using_offset ) );
 			$this->assertEquals( $number_of_links, count( $actual_links_using_offset ) );
 		}

From 1387c5b3cbd9193243d126ade7ccc8510a8aa6bc Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 16 Aug 2018 19:45:22 -0500
Subject: [PATCH 59/85] Apply the maximum URL property to
 count_urls_to_validate()

This shouldn't count over the maximum URL number,
as they won't be validated.
---
 .../validation/class-amp-site-validation.php  | 125 +++++++-----------
 .../test-class-amp-site-validation.php        |  24 ++--
 2 files changed, 60 insertions(+), 89 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index c6337abc830..2c1b568ef84 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -15,14 +15,6 @@
  */
 class AMP_Site_Validation {
 
-	/**
-	 * The size of the batch of URLs to query and validate.
-	 * Grouped in a batch to avoid passing 'posts_per_page' => -1 to WP_Query.
-	 *
-	 * @var int
-	 */
-	const BATCH_SIZE = 100;
-
 	/**
 	 * The WP-CLI argument to validate the site.
 	 * The full command is: wp amp validate-site.
@@ -177,6 +169,8 @@ public static function init() {
 	 */
 	public static function crawl_site( $args, $assoc_args ) {
 		unset( $args );
+
+		// Handle the argument and flag passed to the command: --include and --force-validation.
 		if ( isset( $assoc_args[ self::INCLUDE_ARGUMENT ] ) ) {
 			self::$include_conditionals = explode( ',', $assoc_args[ self::INCLUDE_ARGUMENT ] );
 			self::$force_crawl_urls     = true;
@@ -184,12 +178,12 @@ public static function crawl_site( $args, $assoc_args ) {
 			self::$force_crawl_urls = true;
 		}
 
-		$number_urls_to_crawl = self::count_posts_and_terms();
+		$number_urls_to_crawl = self::count_urls_to_validate();
 		if ( ! $number_urls_to_crawl ) {
 			WP_CLI::error(
 				sprintf(
 					/* translators: %s is the command line argument to force validation */
-					__( 'All of your template might be unchecked in AMP Settings > Supported Templates. You might pass --%s to this command.', 'amp' ),
+					__( 'All of your templates might be unchecked in AMP Settings > Supported Templates. You might pass --%s to this command.', 'amp' ),
 					self::FLAG_NAME_FORCE_VALIDATE_ALL
 				)
 			);
@@ -202,7 +196,7 @@ public static function crawl_site( $args, $assoc_args ) {
 			sprintf( __( 'Validating %d URLs...', 'amp' ), $number_urls_to_crawl ),
 			$number_urls_to_crawl
 		);
-		self::validate_entire_site_urls();
+		self::validate_site();
 		self::$wp_cli_progress->finish();
 
 		$url_more_details = add_query_arg(
@@ -231,55 +225,35 @@ public static function crawl_site( $args, $assoc_args ) {
 	 *
 	 * @return int The number of posts and terms.
 	 */
-	public static function count_posts_and_terms() {
+	public static function count_urls_to_validate() {
 		/*
 		 * If the homepage is set to 'Your latest posts,' start the $total_count at 1.
-		 * Otherwise, the homepage wouldn't be counted here, even though validate_entire_site_urls() visits it.
+		 * Otherwise, the homepage wouldn't be counted here, even though validate_site() visits it.
 		 * If it's not set to that, it will probably be counted in the query for pages.
 		 */
-		$total_count       = 'posts' === get_option( 'show_on_front' ) ? 1 : 0;
-		$public_post_types = get_post_types( array( 'public' => true ), 'names' );
+		$total_count = 'posts' === get_option( 'show_on_front' ) ? 1 : 0;
 
 		$amp_enabled_taxonomies = array_filter(
 			get_taxonomies( array( 'public' => true ) ),
 			array( 'AMP_Site_Validation', 'does_taxonomy_support_amp' )
 		);
 
-		if ( ! empty( $amp_enabled_taxonomies ) ) {
-			// Count all public taxonomy terms.
+		// Count all public taxonomy terms.
+		foreach ( $amp_enabled_taxonomies as $taxonomy ) {
 			$term_query   = new WP_Term_Query( array(
-				'taxonomy' => $amp_enabled_taxonomies,
+				'taxonomy' => $taxonomy,
 				'fields'   => 'ids',
+				'number'   => self::$maximum_urls_to_validate_for_each_type,
 			) );
-			$total_count += count( $term_query->terms );
-		}
-
-		/**
-		 * Count all public posts.
-		 * This batches the queries, to avoid passing posts_per_page => -1 to WP_Query.
-		 * After the first iteration, it passes an 'offset' value to WP_Query.
-		 * And by passing 'orderby' => 'ID' to WP_Query, it ensures there isn't an issue if a post is added while counting them.
-		 */
-		$offset   = 0;
-		$post_ids = self::get_posts_by_type( $public_post_types );
-		while ( ! empty( $post_ids ) ) {
-			$offset      += self::BATCH_SIZE;
-			$total_count += count( self::get_posts_that_support_amp( $post_ids ) );
-			$post_ids     = self::get_posts_by_type( $public_post_types, $offset );
+			// If $term_query->terms is an empty array, passing it to count() will throw an error.
+			$total_count += ! empty( $term_query->terms ) ? count( $term_query->terms ) : 0;
 		}
 
-		/**
-		 * Count all attachments.
-		 * Attachment posts usually have the post_status of 'inherit,' so they can use the status of the post they're attached to.
-		 */
-		if ( in_array( 'attachment', $public_post_types, true ) ) {
-			$offset         = 0;
-			$attachment_ids = self::get_posts_by_type( 'attachment' );
-			while ( ! empty( $attachment_ids ) ) {
-				$offset        += self::BATCH_SIZE;
-				$total_count   += count( self::get_posts_that_support_amp( $attachment_ids ) );
-				$attachment_ids = self::get_posts_by_type( 'attachment', $offset );
-			}
+		// Count posts by type, like post, page, attachment, etc.
+		$public_post_types = get_post_types( array( 'public' => true ), 'names' );
+		foreach ( $public_post_types as $post_type ) {
+			$posts        = self::get_posts_that_support_amp( self::get_posts_by_type( $post_type ) );
+			$total_count += ! empty( $posts ) ? count( $posts ) : 0;
 		}
 
 		// Count author pages, like https://example.com/author/admin/.
@@ -385,7 +359,7 @@ public static function is_template_supported( $template ) {
 	public static function get_posts_by_type( $post_type, $offset = null, $number = null ) {
 		$args = array(
 			'post_type'      => $post_type,
-			'posts_per_page' => isset( $number ) ? $number : self::BATCH_SIZE,
+			'posts_per_page' => isset( $number ) ? $number : self::$maximum_urls_to_validate_for_each_type,
 			'post_status'    => 'publish',
 			'orderby'        => 'ID',
 			'order'          => 'ASC',
@@ -411,22 +385,23 @@ public static function get_posts_by_type( $post_type, $offset = null, $number =
 	 * This includes categories and tags, and any more that are registered.
 	 * But it excludes post_format terms.
 	 *
-	 * @param string $taxonomy     The name of the taxonomy, like 'category' or 'post_tag'.
-	 * @param int    $offset       The number at which to offset the query (optional).
-	 * @param int    $number_links The maximum amount of links to get (optional).
-	 * @return string[] $links The term links in an array.
+	 * @param string     $taxonomy The name of the taxonomy, like 'category' or 'post_tag'.
+	 * @param int|string $offset The number at which to offset the query (optional).
+	 * @param int        $number The maximum amount of links to get (optional).
+	 * @return string[]  The term links in an array.
 	 */
-	public static function get_taxonomy_links( $taxonomy, $offset = null, $number_links = 200 ) {
-		$args = array(
-			'taxonomy' => $taxonomy,
-			'orderby'  => 'id',
-			'number'   => $number_links,
+	public static function get_taxonomy_links( $taxonomy, $offset = '', $number = 200 ) {
+		return array_map(
+			'get_term_link',
+			get_terms(
+				array_merge(
+					compact( 'taxonomy', 'offset', 'number' ),
+					array(
+						'orderby' => 'id',
+					)
+				)
+			)
 		);
-		if ( is_int( $offset ) ) {
-			$args = array_merge( $args, compact( 'offset' ) );
-		}
-
-		return array_map( 'get_term_link', get_terms( $args ) );
 	}
 
 	/**
@@ -435,23 +410,18 @@ public static function get_taxonomy_links( $taxonomy, $offset = null, $number_li
 	 * Accepts an $offset parameter, for the query of authors.
 	 * 0 is the first author in the query, and 1 is the second.
 	 *
-	 * @param int $offset The offset for the URL to query for.
-	 * @param int $number The total number to query for.
+	 * @param int|string $offset The offset for the URL to query for, should be an int if passing an argument.
+	 * @param int|string $number The total number to query for, should be an int if passing an argument.
 	 * @return array The author page URLs, or an empty array.
 	 */
-	public static function get_author_page_urls( $offset = 0, $number = null ) {
+	public static function get_author_page_urls( $offset = '', $number = '' ) {
 		$author_page_urls = array();
 		if ( ! self::is_template_supported( 'is_author' ) ) {
 			return $author_page_urls;
 		}
 
-		$get_users_args = compact( 'offset' );
-		if ( isset( $number ) ) {
-			$get_users_args['number'] = $number;
-		}
-		$users = get_users( $get_users_args );
-
-		foreach ( $users as $author ) {
+		$number = ! empty( $number ) ? $number : self::$maximum_urls_to_validate_for_each_type;
+		foreach ( get_users( compact( 'offset', 'number' ) ) as $author ) {
 			$author_page_urls[] = get_author_posts_url( $author->ID, $author->user_nicename );
 		}
 
@@ -478,30 +448,31 @@ public static function get_search_page() {
 	 * This validates one of each type at a time.
 	 * And continues this until it reaches the maximum number of URLs for each type.
 	 */
-	public static function validate_entire_site_urls() {
+	public static function validate_site() {
 		$amp_enabled_taxonomies = array_filter(
 			get_taxonomies( array( 'public' => true ) ),
 			array( 'AMP_Site_Validation', 'does_taxonomy_support_amp' )
 		);
 		$public_post_types      = get_post_types( array( 'public' => true ), 'names' );
-		$offset                 = 0;
+		$i                      = 0;
 
-		while ( $offset < self::$maximum_urls_to_validate_for_each_type ) {
+		// Validate one URL of each type at a time, then another URL of each type on the next iteration.
+		while ( $i < self::$maximum_urls_to_validate_for_each_type ) {
 			// Validate all public, published posts.
 			foreach ( $public_post_types as $post_type ) {
-				$post_ids = self::get_posts_that_support_amp( self::get_posts_by_type( $post_type, $offset, 1 ) );
+				$post_ids = self::get_posts_that_support_amp( self::get_posts_by_type( $post_type, $i, 1 ) );
 				if ( ! empty( $post_ids ) ) {
 					self::validate_urls( array_map( 'get_permalink', $post_ids ) );
 				}
 			}
 
 			foreach ( $amp_enabled_taxonomies as $taxonomy ) {
-				self::validate_urls( self::get_taxonomy_links( $taxonomy, $offset, 1 ) );
+				self::validate_urls( self::get_taxonomy_links( $taxonomy, $i, 1 ) );
 			}
 
-			self::validate_urls( self::get_author_page_urls( $offset, 1 ) );
+			self::validate_urls( self::get_author_page_urls( $i, 1 ) );
 
-			$offset++;
+			$i++;
 		}
 
 		// Validate the homepage and search page outside the loop, as there is only one of each here.
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index d9a68c278b2..506914faf21 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -34,19 +34,19 @@ public function tearDown() {
 	}
 
 	/**
-	 * Test count_posts_and_terms.
+	 * Test count_urls_to_validate.
 	 *
-	 * @covers AMP_Site_Validation::count_posts_and_terms()
+	 * @covers AMP_Site_Validation::count_urls_to_validate()
 	 */
-	public function test_count_posts_and_terms() {
+	public function test_count_urls_to_validate() {
 		// The number of original URLs present before adding these test URLs.
 		$number_original_urls = $this->get_inital_url_count();
 		$number_author_pages  = count( AMP_Site_Validation::get_author_page_urls() );
 		$number_search_pages  = is_string( AMP_Site_Validation::get_search_page() ) ? 1 : 0;
-		$this->assertEquals( $number_original_urls + $number_author_pages + $number_search_pages, AMP_Site_Validation::count_posts_and_terms() );
+		$this->assertEquals( $number_original_urls + $number_author_pages + $number_search_pages, AMP_Site_Validation::count_urls_to_validate() );
 
 		$category         = $this->factory()->term->create( array( 'taxonomy' => 'category' ) );
-		$number_new_posts = AMP_Site_Validation::BATCH_SIZE * 3;
+		$number_new_posts = AMP_Site_Validation::$maximum_urls_to_validate_for_each_type / 2;
 		$post_ids         = array();
 		for ( $i = 0; $i < $number_new_posts; $i++ ) {
 			$post_ids[] = $this->factory()->post->create( array(
@@ -59,7 +59,7 @@ public function test_count_posts_and_terms() {
 		 * And ensure that the tested method finds a URL for all of them.
 		 */
 		$expected_url_count = $number_new_posts + $number_original_urls + $number_author_pages + $number_search_pages + 1;
-		$this->assertEquals( $expected_url_count, AMP_Site_Validation::count_posts_and_terms() );
+		$this->assertEquals( $expected_url_count, AMP_Site_Validation::count_urls_to_validate() );
 
 		$number_of_new_terms        = 20;
 		$expected_url_count        += $number_of_new_terms;
@@ -78,7 +78,7 @@ public function test_count_posts_and_terms() {
 			$taxonomy
 		);
 
-		$this->assertEquals( $expected_url_count, AMP_Site_Validation::count_posts_and_terms() );
+		$this->assertEquals( $expected_url_count, AMP_Site_Validation::count_urls_to_validate() );
 	}
 
 	/**
@@ -352,11 +352,11 @@ public function test_get_search_page() {
 	}
 
 	/**
-	 * Test validate_entire_site_urls.
+	 * Test validate_site.
 	 *
-	 * @covers AMP_Site_Validation::validate_entire_site_urls()
+	 * @covers AMP_Site_Validation::validate_site()
 	 */
-	public function test_validate_entire_site_urls() {
+	public function test_validate_site() {
 		$number_of_posts = 20;
 		$number_of_terms = 30;
 		$posts           = array();
@@ -368,7 +368,7 @@ public function test_validate_entire_site_urls() {
 			$posts[]           = $post_id;
 			$post_permalinks[] = get_permalink( $post_id );
 		}
-		AMP_Site_Validation::validate_entire_site_urls();
+		AMP_Site_Validation::validate_site();
 
 		// All of the posts created above should be present in $validated_urls.
 		$this->assertEmpty( array_diff( $post_permalinks, self::get_validated_urls() ) );
@@ -379,7 +379,7 @@ public function test_validate_entire_site_urls() {
 
 		// Terms need to be associated with a post in order to be returned in get_terms().
 		wp_set_post_terms( $posts[0], $terms, 'category' );
-		AMP_Site_Validation::validate_entire_site_urls();
+		AMP_Site_Validation::validate_site();
 		$expected_validated_urls = array_map( 'get_term_link', $terms );
 		$actual_validated_urls   = self::get_validated_urls();
 

From 41cffdc145a74f2f90bcb75b4a5ec7671dbfcbe6 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 16 Aug 2018 20:01:34 -0500
Subject: [PATCH 60/85] Add a --max-url-count argument

Thanks to Alberto's suggestion
This sets the maximum number of URLs
that are validated for each type.
For example, if it's 10,
this validates 10 categories, 10 tags, etc...
---
 .../validation/class-amp-site-validation.php  | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 2c1b568ef84..f6570200189 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -57,6 +57,16 @@ class AMP_Site_Validation {
 	 */
 	const INCLUDE_ARGUMENT = 'include';
 
+	/**
+	 * The WP-CLI argument for the maximum URLs to validate for each type.
+	 *
+	 * If this is passed in the command,
+	 * it's applied to self::$maximum_urls_to_validate_for_each_type.
+	 *
+	 * @var string
+	 */
+	const MAXIMUM_URLS_ARGUMENT = 'max-url-count';
+
 	/**
 	 * The supportable templates, mainly based on a user's selection in 'AMP Settings' > 'Supported Templates'.
 	 *
@@ -150,7 +160,13 @@ public static function init() {
 						array(
 							'type'        => 'assoc',
 							'name'        => self::INCLUDE_ARGUMENT,
-							'description' => __( 'Only validate if one of the conditionals is true', 'amp' ),
+							'description' => __( 'Only validates a URL if one of the conditionals is true', 'amp' ),
+							'optional'    => true,
+						),
+						array(
+							'type'        => 'assoc',
+							'name'        => self::MAXIMUM_URLS_ARGUMENT,
+							'description' => __( 'The maximum number of URLs to validate for each template and content type', 'amp' ),
 							'optional'    => true,
 						),
 					),
@@ -171,13 +187,17 @@ public static function crawl_site( $args, $assoc_args ) {
 		unset( $args );
 
 		// Handle the argument and flag passed to the command: --include and --force-validation.
-		if ( isset( $assoc_args[ self::INCLUDE_ARGUMENT ] ) ) {
+		if ( ! empty( $assoc_args[ self::INCLUDE_ARGUMENT ] ) ) {
 			self::$include_conditionals = explode( ',', $assoc_args[ self::INCLUDE_ARGUMENT ] );
 			self::$force_crawl_urls     = true;
 		} elseif ( isset( $assoc_args[ self::FLAG_NAME_FORCE_VALIDATE_ALL ] ) ) {
 			self::$force_crawl_urls = true;
 		}
 
+		if ( ! empty( $assoc_args[ self::MAXIMUM_URLS_ARGUMENT ] ) ) {
+			self::$maximum_urls_to_validate_for_each_type = intval( $assoc_args[ self::MAXIMUM_URLS_ARGUMENT ] );
+		}
+
 		$number_urls_to_crawl = self::count_urls_to_validate();
 		if ( ! $number_urls_to_crawl ) {
 			WP_CLI::error(
@@ -240,7 +260,7 @@ public static function count_urls_to_validate() {
 
 		// Count all public taxonomy terms.
 		foreach ( $amp_enabled_taxonomies as $taxonomy ) {
-			$term_query   = new WP_Term_Query( array(
+			$term_query = new WP_Term_Query( array(
 				'taxonomy' => $taxonomy,
 				'fields'   => 'ids',
 				'number'   => self::$maximum_urls_to_validate_for_each_type,

From 0202432a70120e75a68d28a6aa81f4157a998abe Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 16 Aug 2018 20:21:51 -0500
Subject: [PATCH 61/85] Account for the homepage in the --include argument

If there's an argument and is_home is not in it,
don't validate the homepage.
Also, only validate it specifically
if the user has selected
Your homepage displays > Your latest posts.
---
 .../validation/class-amp-site-validation.php     | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index f6570200189..ea512ee949b 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -248,10 +248,9 @@ public static function crawl_site( $args, $assoc_args ) {
 	public static function count_urls_to_validate() {
 		/*
 		 * If the homepage is set to 'Your latest posts,' start the $total_count at 1.
-		 * Otherwise, the homepage wouldn't be counted here, even though validate_site() visits it.
-		 * If it's not set to that, it will probably be counted in the query for pages.
+		 * Otherwise, it will probably be counted in the query for pages below.
 		 */
-		$total_count = 'posts' === get_option( 'show_on_front' ) ? 1 : 0;
+		$total_count = 'posts' === get_option( 'show_on_front' ) && self::is_template_supported( 'is_home' ) ? 1 : 0;
 
 		$amp_enabled_taxonomies = array_filter(
 			get_taxonomies( array( 'public' => true ) ),
@@ -495,8 +494,15 @@ public static function validate_site() {
 			$i++;
 		}
 
-		// Validate the homepage and search page outside the loop, as there is only one of each here.
-		self::validate_urls( array( home_url( '/' ) ) );
+		/**
+		 * If 'Your homepage displays' is set to 'Your latest posts',
+		 * validate the homepage.
+		 * It would not have been validated above in the page validation.
+		 */
+		if ( 'posts' === get_option( 'show_on_front' ) && self::is_template_supported( 'is_home' ) ) {
+			self::validate_urls( array( home_url( '/' ) ) );
+		}
+
 		self::validate_urls( array( self::get_search_page() ) );
 	}
 

From bff8fc79699120d8679b6853d4133b989a274d4a Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 16 Aug 2018 20:56:36 -0500
Subject: [PATCH 62/85] Refactor validate_urls() to validate a single URL

Because validation is round-robin,
only validating a single URL at a time,
---
 .../validation/class-amp-site-validation.php  | 77 ++++++++++---------
 .../test-class-amp-site-validation.php        | 13 ++--
 2 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index ea512ee949b..b7c1e7813df 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -475,21 +475,28 @@ public static function validate_site() {
 		$public_post_types      = get_post_types( array( 'public' => true ), 'names' );
 		$i                      = 0;
 
-		// Validate one URL of each type at a time, then another URL of each type on the next iteration.
+		// Validate one URL of each type, then another URL of each type on the next iteration.
 		while ( $i < self::$maximum_urls_to_validate_for_each_type ) {
 			// Validate all public, published posts.
 			foreach ( $public_post_types as $post_type ) {
 				$post_ids = self::get_posts_that_support_amp( self::get_posts_by_type( $post_type, $i, 1 ) );
-				if ( ! empty( $post_ids ) ) {
-					self::validate_urls( array_map( 'get_permalink', $post_ids ) );
+				if ( ! empty( $post_ids[0] ) ) {
+					self::validate_and_store_url( get_permalink( $post_ids[0] ) );
 				}
 			}
 
 			foreach ( $amp_enabled_taxonomies as $taxonomy ) {
-				self::validate_urls( self::get_taxonomy_links( $taxonomy, $i, 1 ) );
+				$taxonomy_links = self::get_taxonomy_links( $taxonomy, $i, 1 );
+				$link           = reset( $taxonomy_links );
+				if ( ! empty( $link ) ) {
+					self::validate_and_store_url( $link );
+				}
 			}
 
-			self::validate_urls( self::get_author_page_urls( $i, 1 ) );
+			$author_page_urls = self::get_author_page_urls( $i, 1 );
+			if ( ! empty( $author_page_urls[0] ) ) {
+				self::validate_and_store_url( $author_page_urls[0] );
+			}
 
 			$i++;
 		}
@@ -500,48 +507,46 @@ public static function validate_site() {
 		 * It would not have been validated above in the page validation.
 		 */
 		if ( 'posts' === get_option( 'show_on_front' ) && self::is_template_supported( 'is_home' ) ) {
-			self::validate_urls( array( home_url( '/' ) ) );
+			self::validate_and_store_url( home_url( '/' ) );
 		}
 
-		self::validate_urls( array( self::get_search_page() ) );
+		self::validate_and_store_url( self::get_search_page() );
 	}
 
 	/**
-	 * Validates the URLs, and increments the counts.
+	 * Validates the URL, stores the results, and increments the counts.
 	 *
-	 * @param array $urls The URLs to validate.
+	 * @param string $url The URL to validate.
 	 */
-	public static function validate_urls( $urls ) {
-		foreach ( $urls as $url ) {
-			if ( self::$force_crawl_urls ) {
-				$url = add_query_arg( self::FORCE_VALIDATION_QUERY_VAR, '', $url );
-			}
-			$validity = AMP_Validation_Manager::validate_url( $url );
-
-			if ( is_wp_error( $validity ) ) {
-				continue;
-			}
-			if ( self::$wp_cli_progress ) {
-				self::$wp_cli_progress->tick();
-			}
+	public static function validate_and_store_url( $url ) {
+		if ( self::$force_crawl_urls ) {
+			$url = add_query_arg( self::FORCE_VALIDATION_QUERY_VAR, '', $url );
+		}
+		$validity = AMP_Validation_Manager::validate_url( $url );
 
-			AMP_Invalid_URL_Post_Type::store_validation_errors( $validity['validation_errors'], $validity['url'] );
-			$error_count            = count( $validity['validation_errors'] );
-			$unaccepted_error_count = count( array_filter(
-				$validity['validation_errors'],
-				function( $error ) {
-					return ! AMP_Validation_Error_Taxonomy::is_validation_error_sanitized( $error );
-				}
-			) );
+		if ( is_wp_error( $validity ) ) {
+			return;
+		}
+		if ( self::$wp_cli_progress ) {
+			self::$wp_cli_progress->tick();
+		}
 
-			if ( $error_count > 0 ) {
-				self::$total_errors++;
-			}
-			if ( $unaccepted_error_count > 0 ) {
-				self::$unaccepted_errors++;
+		AMP_Invalid_URL_Post_Type::store_validation_errors( $validity['validation_errors'], $validity['url'] );
+		$error_count            = count( $validity['validation_errors'] );
+		$unaccepted_error_count = count( array_filter(
+			$validity['validation_errors'],
+			function( $error ) {
+				return ! AMP_Validation_Error_Taxonomy::is_validation_error_sanitized( $error );
 			}
+		) );
 
-			self::$number_crawled++;
+		if ( $error_count > 0 ) {
+			self::$total_errors++;
+		}
+		if ( $unaccepted_error_count > 0 ) {
+			self::$unaccepted_errors++;
 		}
+
+		self::$number_crawled++;
 	}
 }
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 506914faf21..a0b18807876 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -389,22 +389,23 @@ public function test_validate_site() {
 	}
 
 	/**
-	 * Test validate_urls.
+	 * Test validate_and_store_url.
 	 *
-	 * @covers AMP_Site_Validation::validate_urls()
+	 * @covers AMP_Site_Validation::validate_and_store_url()
 	 */
-	public function test_validate_urls() {
+	public function test_validate_and_store_url() {
 		$single_post_permalink = get_permalink( $this->factory()->post->create() );
-		AMP_Site_Validation::validate_urls( array( $single_post_permalink ) );
+		AMP_Site_Validation::validate_and_store_url( $single_post_permalink );
 		$this->assertTrue( in_array( $single_post_permalink, self::get_validated_urls(), true ) );
 
 		$number_of_posts = 30;
 		$post_permalinks = array();
 
 		for ( $i = 0; $i < $number_of_posts; $i++ ) {
-			$post_permalinks[] = get_permalink( $this->factory()->post->create() );
+			$permalink         = get_permalink( $this->factory()->post->create() );
+			$post_permalinks[] = $permalink;
+			AMP_Site_Validation::validate_and_store_url( $permalink );
 		}
-		AMP_Site_Validation::validate_urls( $post_permalinks );
 
 		// All of the posts created should be present in the validated URLs.
 		$this->assertEmpty( array_diff( $post_permalinks, self::get_validated_urls() ) );

From 5d0d4643a5d5e6309bcd2d6879515615d94c1e3a Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Fri, 17 Aug 2018 16:33:21 -0500
Subject: [PATCH 63/85] Display the validity by template type, like category:
 15/16

This is probably more useful to know
than simply how many total URLs are valid.
---
 .../validation/class-amp-site-validation.php  | 72 ++++++++++++++-----
 .../test-class-amp-site-validation.php        | 32 ++++++++-
 2 files changed, 84 insertions(+), 20 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index b7c1e7813df..bd24dbdf13b 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -139,6 +139,13 @@ class AMP_Site_Validation {
 	 */
 	public static $maximum_urls_to_validate_for_each_type = 100;
 
+	/**
+	 * The validation errors by type, like template or post type.
+	 *
+	 * @var array
+	 */
+	public static $validity_by_type = array();
+
 	/**
 	 * Adds the WP-CLI command to validate the site.
 	 */
@@ -225,13 +232,19 @@ public static function crawl_site( $args, $assoc_args ) {
 			admin_url( 'edit.php' )
 		);
 
+		$validation_by_type = __( "Number of valid URLs by type:\n", 'amp' );
+		foreach ( self::$validity_by_type as $type_name => $validity ) {
+			$validation_by_type .= sprintf( "%1\$s: %2\$d/%3\$d\n", $type_name, $validity['valid'], $validity['total'] );
+		}
+
 		WP_CLI::success(
 			sprintf(
-				/* translators: $1%d is the number of URls crawled, $2%d is the number of validation issues, $3%d is the number of unaccepted issues, $4%s is the link for more details */
-				__( "Of the %1\$d URLs crawled, %2\$d have AMP validation issue(s), and %3\$d have unaccepted issue(s).\nFor more details, please see: \n%4\$s", 'amp' ),
+				/* translators: $1%d is the number of URls crawled, $2%d is the number of validation issues, $3%d is the number of unaccepted issues, $4%s is the list of validation by type, $5%s is the link for more details */
+				__( "Of the %1\$d URLs crawled, %2\$d have AMP validation issue(s), and %3\$d have unaccepted issue(s).\n\n%4\$s \nFor more details, please see: \n%5\$s", 'amp' ),
 				self::$number_crawled,
 				self::$total_errors,
 				self::$unaccepted_errors,
+				$validation_by_type,
 				$url_more_details
 			)
 		);
@@ -321,6 +334,26 @@ function( $id ) {
 		);
 	}
 
+	/**
+	 * Handles the error count, based on the validation results.
+	 *
+	 * @param bool   $is_error Whether the validation resulted in an error.
+	 * @param string $key The key to store the validation result.
+	 */
+	public static function handle_error_count( $is_error, $key ) {
+		if ( ! isset( self::$validity_by_type[ $key ] ) ) {
+			self::$validity_by_type[ $key ] = array(
+				'valid' => $is_error ? 0 : 1,
+				'total' => 1,
+			);
+		} else {
+			self::$validity_by_type[ $key ]['total']++;
+			if ( ! $is_error ) {
+				self::$validity_by_type[ $key ]['valid']++;
+			}
+		}
+	}
+
 	/**
 	 * Gets whether the taxonomy supports AMP.
 	 *
@@ -468,6 +501,16 @@ public static function get_search_page() {
 	 * And continues this until it reaches the maximum number of URLs for each type.
 	 */
 	public static function validate_site() {
+		/**
+		 * If 'Your homepage displays' is set to 'Your latest posts',
+		 * validate the homepage.
+		 * It would not have been validated above in the page validation.
+		 */
+		if ( 'posts' === get_option( 'show_on_front' ) && self::is_template_supported( 'is_home' ) ) {
+			self::validate_and_store_url( home_url( '/' ), 'home' );
+		}
+		self::validate_and_store_url( self::get_search_page(), 'search' );
+
 		$amp_enabled_taxonomies = array_filter(
 			get_taxonomies( array( 'public' => true ) ),
 			array( 'AMP_Site_Validation', 'does_taxonomy_support_amp' )
@@ -481,7 +524,7 @@ public static function validate_site() {
 			foreach ( $public_post_types as $post_type ) {
 				$post_ids = self::get_posts_that_support_amp( self::get_posts_by_type( $post_type, $i, 1 ) );
 				if ( ! empty( $post_ids[0] ) ) {
-					self::validate_and_store_url( get_permalink( $post_ids[0] ) );
+					self::validate_and_store_url( get_permalink( $post_ids[0] ), $post_type );
 				}
 			}
 
@@ -489,41 +532,32 @@ public static function validate_site() {
 				$taxonomy_links = self::get_taxonomy_links( $taxonomy, $i, 1 );
 				$link           = reset( $taxonomy_links );
 				if ( ! empty( $link ) ) {
-					self::validate_and_store_url( $link );
+					self::validate_and_store_url( $link, $taxonomy );
 				}
 			}
 
 			$author_page_urls = self::get_author_page_urls( $i, 1 );
 			if ( ! empty( $author_page_urls[0] ) ) {
-				self::validate_and_store_url( $author_page_urls[0] );
+				self::validate_and_store_url( $author_page_urls[0], 'author' );
 			}
 
 			$i++;
 		}
-
-		/**
-		 * If 'Your homepage displays' is set to 'Your latest posts',
-		 * validate the homepage.
-		 * It would not have been validated above in the page validation.
-		 */
-		if ( 'posts' === get_option( 'show_on_front' ) && self::is_template_supported( 'is_home' ) ) {
-			self::validate_and_store_url( home_url( '/' ) );
-		}
-
-		self::validate_and_store_url( self::get_search_page() );
 	}
 
 	/**
 	 * Validates the URL, stores the results, and increments the counts.
 	 *
 	 * @param string $url The URL to validate.
+	 * @param string $type The type of template, post, or taxonomy.
 	 */
-	public static function validate_and_store_url( $url ) {
+	public static function validate_and_store_url( $url, $type ) {
 		if ( self::$force_crawl_urls ) {
 			$url = add_query_arg( self::FORCE_VALIDATION_QUERY_VAR, '', $url );
 		}
 		$validity = AMP_Validation_Manager::validate_url( $url );
 
+		// If there is an error in the request to validate this, return true.
 		if ( is_wp_error( $validity ) ) {
 			return;
 		}
@@ -533,6 +567,7 @@ public static function validate_and_store_url( $url ) {
 
 		AMP_Invalid_URL_Post_Type::store_validation_errors( $validity['validation_errors'], $validity['url'] );
 		$error_count            = count( $validity['validation_errors'] );
+		$has_error              = $error_count > 0;
 		$unaccepted_error_count = count( array_filter(
 			$validity['validation_errors'],
 			function( $error ) {
@@ -540,7 +575,7 @@ function( $error ) {
 			}
 		) );
 
-		if ( $error_count > 0 ) {
+		if ( $has_error ) {
 			self::$total_errors++;
 		}
 		if ( $unaccepted_error_count > 0 ) {
@@ -548,5 +583,6 @@ function( $error ) {
 		}
 
 		self::$number_crawled++;
+		self::handle_error_count( $has_error, $type );
 	}
 }
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index a0b18807876..2232427cf62 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -145,6 +145,34 @@ public function test_get_posts_that_support_amp() {
 		AMP_Site_Validation::$include_conditionals = null;
 	}
 
+	/**
+	 * Test handle_error_count.
+	 *
+	 * @covers AMP_Site_Validation::handle_error_count()
+	 */
+	public function test_handle_error_count() {
+		$custom_post_type = 'foo_custom_post';
+		$expected_errors  = array(
+			$custom_post_type => array(
+				'valid' => 0,
+				'total' => 1,
+			),
+		);
+		AMP_Site_Validation::handle_error_count( true, $custom_post_type );
+		$this->assertEquals( $expected_errors, AMP_Site_Validation::$validity_by_type );
+
+		// When the first argument is true, there was a validation error, and this shouldn't increment the 'valid' count.
+		AMP_Site_Validation::handle_error_count( true, $custom_post_type );
+		$expected_errors[ $custom_post_type ]['total']++;
+		$this->assertEquals( $expected_errors, AMP_Site_Validation::$validity_by_type );
+
+		// When the first argument is false, there was no validation error, and both counts should be incremented.
+		AMP_Site_Validation::handle_error_count( false, $custom_post_type );
+		$expected_errors[ $custom_post_type ]['total']++;
+		$expected_errors[ $custom_post_type ]['valid']++;
+		$this->assertEquals( $expected_errors, AMP_Site_Validation::$validity_by_type );
+	}
+
 	/**
 	 * Test does_taxonomy_support_amp.
 	 *
@@ -395,7 +423,7 @@ public function test_validate_site() {
 	 */
 	public function test_validate_and_store_url() {
 		$single_post_permalink = get_permalink( $this->factory()->post->create() );
-		AMP_Site_Validation::validate_and_store_url( $single_post_permalink );
+		AMP_Site_Validation::validate_and_store_url( $single_post_permalink, 'post' );
 		$this->assertTrue( in_array( $single_post_permalink, self::get_validated_urls(), true ) );
 
 		$number_of_posts = 30;
@@ -404,7 +432,7 @@ public function test_validate_and_store_url() {
 		for ( $i = 0; $i < $number_of_posts; $i++ ) {
 			$permalink         = get_permalink( $this->factory()->post->create() );
 			$post_permalinks[] = $permalink;
-			AMP_Site_Validation::validate_and_store_url( $permalink );
+			AMP_Site_Validation::validate_and_store_url( $permalink, 'post' );
 		}
 
 		// All of the posts created should be present in the validated URLs.

From 86cd224fbc63249076a2b4c0038015094baef705 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 21 Aug 2018 01:28:23 -0500
Subject: [PATCH 64/85] Get the date template, and validate it

Use a simply mock query string, like:
https://example.com/?year=2018
---
 .../validation/class-amp-site-validation.php  | 16 +++++++++++++-
 .../test-class-amp-site-validation.php        | 22 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index bd24dbdf13b..1ade5d74d55 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -65,7 +65,7 @@ class AMP_Site_Validation {
 	 *
 	 * @var string
 	 */
-	const MAXIMUM_URLS_ARGUMENT = 'max-url-count';
+	const MAXIMUM_URLS_ARGUMENT = 'n';
 
 	/**
 	 * The supportable templates, mainly based on a user's selection in 'AMP Settings' > 'Supported Templates'.
@@ -493,6 +493,19 @@ public static function get_search_page() {
 		return add_query_arg( 's', 'example', home_url( '/' ) );
 	}
 
+	/**
+	 * Gets a date page URL, like https://example.com/?year=2018.
+	 *
+	 * @return string|null An example search page, or null.
+	 */
+	public static function get_date_page() {
+		if ( ! self::is_template_supported( 'is_date' ) ) {
+			return null;
+		}
+
+		return add_query_arg( 'year', date( 'Y' ), home_url( '/' ) );
+	}
+
 	/**
 	 * Validates the URLs of the entire site.
 	 *
@@ -510,6 +523,7 @@ public static function validate_site() {
 			self::validate_and_store_url( home_url( '/' ), 'home' );
 		}
 		self::validate_and_store_url( self::get_search_page(), 'search' );
+		self::validate_and_store_url( self::get_date_page(), 'date' );
 
 		$amp_enabled_taxonomies = array_filter(
 			get_taxonomies( array( 'public' => true ) ),
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 2232427cf62..3655fc649ad 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -379,6 +379,28 @@ public function test_get_search_page() {
 		AMP_Site_Validation::$include_conditionals = null;
 	}
 
+	/**
+	 * Test get_date_page.
+	 *
+	 * @covers AMP_Site_Validation::get_date_page()
+	 */
+	public function test_get_date_page() {
+		$year = date( 'Y' );
+
+		// Normally, this should return the date page, unless the user has opted out of the page template.
+		$this->assertContains( $year, AMP_Site_Validation::get_date_page() );
+
+		// If $include_conditionals is set and does not have is_date, this should not return a URL.
+		AMP_Site_Validation::$include_conditionals = array( 'is_search' );
+		$this->assertEquals( null, AMP_Site_Validation::get_date_page() );
+
+		// If $include_conditionals has is_date, this should return a URL.
+		AMP_Site_Validation::$include_conditionals = array( 'is_date' );
+		$parsed_page_url                           = wp_parse_url( AMP_Site_Validation::get_date_page() );
+		$this->assertContains( $year, $parsed_page_url['query'] );
+		AMP_Site_Validation::$include_conditionals = null;
+	}
+
 	/**
 	 * Test validate_site.
 	 *

From c31fa0e17918ce23bd8e3e5dde5e113a05417106 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 21 Aug 2018 13:47:17 -0500
Subject: [PATCH 65/85] Remove default value in get_taxonomy_links()

There was always an argument for $number,
so there's no need for a default value in the definition.
Also, improve inline documentation.
---
 .../validation/class-amp-site-validation.php  | 155 ++++++++++--------
 1 file changed, 87 insertions(+), 68 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 1ade5d74d55..7a5e54a3064 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -8,7 +8,7 @@
 /**
  * Class AMP_Site_Validation
  *
- * Registers a WP-CLI command to crawl the entire site to check for AMP validity.
+ * Registers and implements a WP-CLI command to crawl the entire site for AMP validity.
  * To use this, run: wp amp validate-site.
  *
  * @since 1.0
@@ -16,31 +16,31 @@
 class AMP_Site_Validation {
 
 	/**
-	 * The WP-CLI argument to validate the site.
-	 * The full command is: wp amp validate-site.
+	 * The WP-CLI command to validate the site.
+	 * To use this, run: wp amp validate-site.
 	 *
 	 * @var string
 	 */
 	const WP_CLI_COMMAND = 'amp validate-site';
 
 	/**
-	 * The WP-CLI flag to force validation of all URLs.
+	 * The WP-CLI flag to force validation.
 	 *
-	 * By default, this does not validate templates that the user has opted-out of.
+	 * By default, the WP-CLI command does not validate templates that the user has opted-out of.
 	 * For example, by unchecking 'Categories' in 'AMP Settings' > 'Supported Templates'.
-	 * But with this command flag, this will validate all URLs.
+	 * But with this flag, validation will ignore these options.
 	 *
 	 * @var string
 	 */
-	const FLAG_NAME_FORCE_VALIDATE_ALL = 'force-validation';
+	const FLAG_NAME_FORCE_VALIDATION = 'force-validation';
 
 	/**
 	 * The query var key to force AMP validation, regardless or whether the user has deselected support for a URL.
 	 *
 	 * If the WP-CLI flag above is present in the command,
-	 * this query var is added to the URL.
-	 * Then, this forces validation, no matter whether the user has deselected a certain template.
-	 * Like by unchecking 'Categories' in 'AMP Settings' > 'Supported Templates'.
+	 * this query var is added to the validation URL.
+	 * Then, this forces validation, no matter whether the user has deselected a certain template,
+	 * like by unchecking 'Categories' in 'AMP Settings' > 'Supported Templates'.
 	 *
 	 * @var string
 	 */
@@ -61,7 +61,7 @@ class AMP_Site_Validation {
 	 * The WP-CLI argument for the maximum URLs to validate for each type.
 	 *
 	 * If this is passed in the command,
-	 * it's applied to self::$maximum_urls_to_validate_for_each_type.
+	 * it overrides the value of self::$maximum_urls_to_validate_for_each_type.
 	 *
 	 * @var string
 	 */
@@ -110,9 +110,9 @@ class AMP_Site_Validation {
 	 * Whether to force crawling of URLs.
 	 *
 	 * By default, this script only crawls URLs that support AMP,
-	 * where the user hasn't opted-out of AMP for the URL.
-	 * For example, by unchecking 'Posts' in 'AMP Settings' > 'Supported Templates'.
-	 * Or unchecking 'Enable AMP' in the post's editor.
+	 * where the user has not opted-out of AMP for the URL.
+	 * For example, by un-checking 'Posts' in 'AMP Settings' > 'Supported Templates'.
+	 * Or un-checking 'Enable AMP' in the post's editor.
 	 *
 	 * @var int
 	 */
@@ -123,6 +123,7 @@ class AMP_Site_Validation {
 	 *
 	 * Usually, this script will validate all of the templates that don't have AMP disabled.
 	 * But this allows validating based on only these conditionals.
+	 * This is set if the WP-CLI command has an --include argument.
 	 *
 	 * @var array
 	 */
@@ -132,17 +133,22 @@ class AMP_Site_Validation {
 	 * The maximum number of URLs to validate for each type.
 	 *
 	 * Templates are each a separate type, like those for is_category() and is_tag().
-	 * Also, post types are a separate type.
-	 * So by default, this validates 100 posts of each post type.
+	 * Also, each post type is a separate type.
+	 * This value is overridden if the WP-CLI command has an --n argument, like --n=10.
 	 *
 	 * @var int
 	 */
 	public static $maximum_urls_to_validate_for_each_type = 100;
 
 	/**
-	 * The validation errors by type, like template or post type.
+	 * The validation counts by type, like template or post type.
 	 *
-	 * @var array
+	 * @var array[][] {
+	 *     Validity by type.
+	 *
+	 *     @type int $valid The number of valid URLs for this type.
+	 *     @type int $total The total number of URLs for this type, valid or invalid.
+	 * }
 	 */
 	public static $validity_by_type = array();
 
@@ -161,7 +167,7 @@ public static function init() {
 					'synopsis'  => array(
 						array(
 							'type'     => 'flag',
-							'name'     => self::FLAG_NAME_FORCE_VALIDATE_ALL,
+							'name'     => self::FLAG_NAME_FORCE_VALIDATION,
 							'optional' => true,
 						),
 						array(
@@ -193,11 +199,15 @@ public static function init() {
 	public static function crawl_site( $args, $assoc_args ) {
 		unset( $args );
 
-		// Handle the argument and flag passed to the command: --include and --force-validation.
+		/**
+		 * Handle the argument and flag passed to the command: --include and --force-validation.
+		 * If the self::INCLUDE_ARGUMENT is present, force crawling or URLs.
+		 * The WP-CLI command should indicate which templates are crawled, not the /wp-admin options.
+		 */
 		if ( ! empty( $assoc_args[ self::INCLUDE_ARGUMENT ] ) ) {
 			self::$include_conditionals = explode( ',', $assoc_args[ self::INCLUDE_ARGUMENT ] );
 			self::$force_crawl_urls     = true;
-		} elseif ( isset( $assoc_args[ self::FLAG_NAME_FORCE_VALIDATE_ALL ] ) ) {
+		} elseif ( isset( $assoc_args[ self::FLAG_NAME_FORCE_VALIDATION ] ) ) {
 			self::$force_crawl_urls = true;
 		}
 
@@ -211,7 +221,7 @@ public static function crawl_site( $args, $assoc_args ) {
 				sprintf(
 					/* translators: %s is the command line argument to force validation */
 					__( 'All of your templates might be unchecked in AMP Settings > Supported Templates. You might pass --%s to this command.', 'amp' ),
-					self::FLAG_NAME_FORCE_VALIDATE_ALL
+					self::FLAG_NAME_FORCE_VALIDATION
 				)
 			);
 		}
@@ -232,31 +242,44 @@ public static function crawl_site( $args, $assoc_args ) {
 			admin_url( 'edit.php' )
 		);
 
-		$validation_by_type = __( "Number of valid URLs by type:\n", 'amp' );
+		$key_template_type        = __( 'Template or content type', 'amp' );
+		$key_valid_ratio          = __( 'Valid URLs', 'amp' );
+		$table_validation_by_type = array();
 		foreach ( self::$validity_by_type as $type_name => $validity ) {
-			$validation_by_type .= sprintf( "%1\$s: %2\$d/%3\$d\n", $type_name, $validity['valid'], $validity['total'] );
+			$table_validation_by_type[] = array(
+				$key_template_type => $type_name,
+				$key_valid_ratio   => sprintf( '%1$s/%2$d', $validity['valid'], $validity['total'] ),
+			);
 		}
 
 		WP_CLI::success(
 			sprintf(
 				/* translators: $1%d is the number of URls crawled, $2%d is the number of validation issues, $3%d is the number of unaccepted issues, $4%s is the list of validation by type, $5%s is the link for more details */
-				__( "Of the %1\$d URLs crawled, %2\$d have AMP validation issue(s), and %3\$d have unaccepted issue(s).\n\n%4\$s \nFor more details, please see: \n%5\$s", 'amp' ),
+				__( "Of the %1\$d URLs crawled, %2\$d have AMP validation issue(s), and %3\$d have unaccepted issue(s). \n\nFor more details, please see: \n%4\$s \n", 'amp' ),
 				self::$number_crawled,
 				self::$total_errors,
 				self::$unaccepted_errors,
-				$validation_by_type,
 				$url_more_details
 			)
 		);
+
+		// Output a table of validity by template/content type.
+		WP_CLI\Utils\format_items(
+			'table',
+			$table_validation_by_type,
+			array( $key_template_type, $key_valid_ratio )
+		);
 	}
 
 	/**
-	 * Gets the total number of posts and terms on the site.
+	 * Gets the total number of URLs to validate.
 	 *
 	 * By default, this only counts AMP-enabled posts and terms.
 	 * But if $force_crawl_urls is true, it counts all of them, regardless of their AMP status.
+	 * It also uses self::$maximum_urls_to_validate_for_each_type,
+	 * which can be overridden with a command line argument.
 	 *
-	 * @return int The number of posts and terms.
+	 * @return int The number of URLs to validate.
 	 */
 	public static function count_urls_to_validate() {
 		/*
@@ -277,6 +300,7 @@ public static function count_urls_to_validate() {
 				'fields'   => 'ids',
 				'number'   => self::$maximum_urls_to_validate_for_each_type,
 			) );
+
 			// If $term_query->terms is an empty array, passing it to count() will throw an error.
 			$total_count += ! empty( $term_query->terms ) ? count( $term_query->terms ) : 0;
 		}
@@ -302,22 +326,15 @@ public static function count_urls_to_validate() {
 	/**
 	 * Gets the posts IDs that support AMP.
 	 *
-	 * By default, only get the post IDs if they support AMP.
+	 * By default, this only gets the post IDs if they support AMP.
 	 * This means that 'Posts' isn't deselected in 'AMP Settings' > 'Supported Templates'.
 	 * And 'Enable AMP' isn't unchecked in the post's editor.
 	 * But if $force_crawl_urls is true, this simply returns all of the IDs.
 	 *
-	 * @param array $ids The post or term IDs.
-	 * @return array The post IDs that support AMP.
+	 * @param array $ids THe post IDs to check for AMP support.
+	 * @return array The post IDs that support AMP, or an empty array.
 	 */
 	public static function get_posts_that_support_amp( $ids ) {
-		/**
-		 * If the user has passed an include argument to the WP-CLI command,
-		 * is_singular must be present in that argument.
-		 * For example, wp amp validate-site --include=is_singular,is_tag,is_category
-		 * That argument is a whitelist of conditionals, one of which must be true to validate a URL.
-		 * And is_singular must be true to access posts.
-		 */
 		if ( ! self::is_template_supported( 'is_singular' ) ) {
 			return array();
 		}
@@ -337,6 +354,9 @@ function( $id ) {
 	/**
 	 * Handles the error count, based on the validation results.
 	 *
+	 * Increments the template's 'total' count,
+	 * and increments the 'valid' count if there is no error.
+	 *
 	 * @param bool   $is_error Whether the validation resulted in an error.
 	 * @param string $key The key to store the validation result.
 	 */
@@ -357,9 +377,10 @@ public static function handle_error_count( $is_error, $key ) {
 	/**
 	 * Gets whether the taxonomy supports AMP.
 	 *
-	 * Only get the term IDs if they support AMP.
-	 * If their taxonomy is unchecked in 'AMP Settings' > 'Supported Templates,' don't return them.
-	 * For example, if 'Categories' is unchecked there, don't return any category IDs.
+	 * This only gets the term IDs if they support AMP.
+	 * If their taxonomy is unchecked in 'AMP Settings' > 'Supported Templates,' this does not return them.
+	 * For example, if 'Categories' is unchecked.
+	 * This can be overridden by passing the self::FLAG_NAME_FORCE_VALIDATION argument to the WP-CLI command.
 	 *
 	 * @param string $taxonomy The taxonomy.
 	 * @return boolean Wether the taxonomy supports AMP.
@@ -379,13 +400,13 @@ public static function does_taxonomy_support_amp( $taxonomy ) {
 	 * If the user has passed an include argument to the WP-CLI command, use that to find if this template supports AMP.
 	 * For example, wp amp validate-site --include=is_tag,is_category
 	 * would return true only if is_tag() or is_category().
-	 * Then, if the user has not unchecked the template in 'AMP Settings' > 'Supported Templates', return false.
+	 * But passing the self::FLAG_NAME_FORCE_VALIDATION argument to the WP-CLI command overrides this.
 	 *
 	 * @param string $template The template to check.
 	 * @return bool Whether the template is supported.
 	 */
 	public static function is_template_supported( $template ) {
-		// If the include argument is present in the WP-CLI command, this template conditional must be present in it.
+		// If the --include argument is present in the WP-CLI command, this template conditional must be present in it.
 		if ( isset( self::$include_conditionals ) && ! in_array( $template, self::$include_conditionals, true ) ) {
 			return false;
 		}
@@ -393,25 +414,22 @@ public static function is_template_supported( $template ) {
 			return true;
 		}
 
-		/**
-		 * Check whether this taxonomy's template is supported, including in the 'AMP Settings' > 'Supported Templates' UI.
-		 * This first conditional is for default taxonomies like categories.
-		 */
+		// Check whether this taxonomy's template is supported, including in the 'AMP Settings' > 'Supported Templates' UI.
 		return isset( self::$supportable_templates[ $template ]['supported'] ) && self::$supportable_templates[ $template ]['supported'];
 	}
 
 	/**
-	 * Gets the permalinks of public, published posts.
+	 * Gets the IDs of public, published posts.
 	 *
-	 * @param string $post_type The post type.
-	 * @param int    $offset The offset of the query (optional).
-	 * @param int    $number The number of posts to query for (optional).
-	 * @return int[] $post_ids The post IDs in an array.
+	 * @param string   $post_type The post type.
+	 * @param int|null $offset The offset of the query (optional).
+	 * @param int|null $number The number of posts to query for (optional).
+	 * @return int[]   $post_ids The post IDs in an array.
 	 */
 	public static function get_posts_by_type( $post_type, $offset = null, $number = null ) {
 		$args = array(
 			'post_type'      => $post_type,
-			'posts_per_page' => isset( $number ) ? $number : self::$maximum_urls_to_validate_for_each_type,
+			'posts_per_page' => is_int( $number ) ? $number : self::$maximum_urls_to_validate_for_each_type,
 			'post_status'    => 'publish',
 			'orderby'        => 'ID',
 			'order'          => 'ASC',
@@ -431,18 +449,15 @@ public static function get_posts_by_type( $post_type, $offset = null, $number =
 	}
 
 	/**
-	 * Gets the front-end links for public taxonomy terms, like categories and tags.
-	 *
+	 * Gets the front-end links for taxonomy terms.
 	 * For example, https://example.org/?cat=2
-	 * This includes categories and tags, and any more that are registered.
-	 * But it excludes post_format terms.
 	 *
 	 * @param string     $taxonomy The name of the taxonomy, like 'category' or 'post_tag'.
 	 * @param int|string $offset The number at which to offset the query (optional).
 	 * @param int        $number The maximum amount of links to get (optional).
-	 * @return string[]  The term links in an array.
+	 * @return string[]  The term links, as an array of strings.
 	 */
-	public static function get_taxonomy_links( $taxonomy, $offset = '', $number = 200 ) {
+	public static function get_taxonomy_links( $taxonomy, $offset = '', $number ) {
 		return array_map(
 			'get_term_link',
 			get_terms(
@@ -510,20 +525,17 @@ public static function get_date_page() {
 	 * Validates the URLs of the entire site.
 	 *
 	 * Includes the URLs of public, published posts, public taxonomies, and other templates.
-	 * This validates one of each type at a time.
-	 * And continues this until it reaches the maximum number of URLs for each type.
+	 * This validates one of each type at a time,
+	 * and iterates until it reaches the maximum number of URLs for each type.
 	 */
 	public static function validate_site() {
 		/**
-		 * If 'Your homepage displays' is set to 'Your latest posts',
-		 * validate the homepage.
-		 * It would not have been validated above in the page validation.
+		 * If 'Your homepage displays' is set to 'Your latest posts', validate the homepage.
+		 * It will not be part of the page validation below.
 		 */
 		if ( 'posts' === get_option( 'show_on_front' ) && self::is_template_supported( 'is_home' ) ) {
 			self::validate_and_store_url( home_url( '/' ), 'home' );
 		}
-		self::validate_and_store_url( self::get_search_page(), 'search' );
-		self::validate_and_store_url( self::get_date_page(), 'date' );
 
 		$amp_enabled_taxonomies = array_filter(
 			get_taxonomies( array( 'public' => true ) ),
@@ -532,7 +544,7 @@ public static function validate_site() {
 		$public_post_types      = get_post_types( array( 'public' => true ), 'names' );
 		$i                      = 0;
 
-		// Validate one URL of each type, then another URL of each type on the next iteration.
+		// Validate one URL of each template/content type, then another URL of each type on the next iteration.
 		while ( $i < self::$maximum_urls_to_validate_for_each_type ) {
 			// Validate all public, published posts.
 			foreach ( $public_post_types as $post_type ) {
@@ -557,6 +569,10 @@ public static function validate_site() {
 
 			$i++;
 		}
+
+		// Only validate 1 date and 1 search page.
+		self::validate_and_store_url( self::get_date_page(), 'date' );
+		self::validate_and_store_url( self::get_search_page(), 'search' );
 	}
 
 	/**
@@ -571,7 +587,10 @@ public static function validate_and_store_url( $url, $type ) {
 		}
 		$validity = AMP_Validation_Manager::validate_url( $url );
 
-		// If there is an error in the request to validate this, return true.
+		/**
+		 * If the request to validate this returns a WP_Error, return.
+		 * One cause of an error is if the validation request results in a 404 response code.
+		 */
 		if ( is_wp_error( $validity ) ) {
 			return;
 		}

From be8d552c6f221d237b83f32103bb6f563026d500 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 21 Aug 2018 15:46:28 -0500
Subject: [PATCH 66/85] Remove exclusion of attachments from tests, other
 documentations

The test still passes when testing attachments.
Also, other minor changes,
and documentation improvements.
---
 .../test-class-amp-site-validation.php        | 50 +++++++++----------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 3655fc649ad..cd70794c3d1 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -41,9 +41,7 @@ public function tearDown() {
 	public function test_count_urls_to_validate() {
 		// The number of original URLs present before adding these test URLs.
 		$number_original_urls = $this->get_inital_url_count();
-		$number_author_pages  = count( AMP_Site_Validation::get_author_page_urls() );
-		$number_search_pages  = is_string( AMP_Site_Validation::get_search_page() ) ? 1 : 0;
-		$this->assertEquals( $number_original_urls + $number_author_pages + $number_search_pages, AMP_Site_Validation::count_urls_to_validate() );
+		$this->assertEquals( $number_original_urls, AMP_Site_Validation::count_urls_to_validate() );
 
 		$category         = $this->factory()->term->create( array( 'taxonomy' => 'category' ) );
 		$number_new_posts = AMP_Site_Validation::$maximum_urls_to_validate_for_each_type / 2;
@@ -58,7 +56,7 @@ public function test_count_urls_to_validate() {
 		 * Add the number of new posts, original URLs, and 1 for the $category that all of them have.
 		 * And ensure that the tested method finds a URL for all of them.
 		 */
-		$expected_url_count = $number_new_posts + $number_original_urls + $number_author_pages + $number_search_pages + 1;
+		$expected_url_count = $number_new_posts + $number_original_urls + 1;
 		$this->assertEquals( $expected_url_count, AMP_Site_Validation::count_urls_to_validate() );
 
 		$number_of_new_terms        = 20;
@@ -93,7 +91,7 @@ public function test_get_posts_that_support_amp() {
 			$ids[] = $this->factory()->post->create();
 		}
 
-		// This should count all of the newly-created posts as supporting AMP (when you add the query ary).
+		// This should count all of the newly-created posts as supporting AMP.
 		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
 
 		// Simulate 'Enable AMP' being unchecked in the post editor, in which case get_url_count() should not count it.
@@ -111,19 +109,16 @@ public function test_get_posts_that_support_amp() {
 			AMP_Post_Meta_Box::ENABLED_STATUS
 		);
 
-		/**
-		 * When the second $force_count_all_urls argument is true, all of the newly-created posts should be part of the URL count,
-		 * even though they're not AMP endpoints.
-		 */
+		// When the second $force_count_all_urls argument is true, all of the newly-created posts should be part of the URL count.
 		AMP_Site_Validation::$force_crawl_urls = true;
 		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids, true ) );
 		AMP_Site_Validation::$force_crawl_urls = false;
 
-		// In Native AMP, the URL count should include all of the newly-created posts.
+		// In Native AMP, the IDs should include all of the newly-created posts.
 		add_theme_support( 'amp' );
 		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
 
-		// In Paired Mode, the URL count should also include all of the newly-created posts.
+		// In Paired Mode, the IDs should also include all of the newly-created posts.
 		add_theme_support( 'amp', array(
 			'paired' => true,
 		) );
@@ -131,7 +126,7 @@ public function test_get_posts_that_support_amp() {
 
 		/**
 		 * If the WP-CLI command has an include argument, and is_singular isn't in it, no posts will have AMP enabled.
-		 * For example, wp amp validate-site include=is_tag,is_category
+		 * For example, wp amp validate-site --include=is_tag,is_category
 		 */
 		AMP_Site_Validation::$include_conditionals = array( 'is_tag', 'is_category' );
 		$this->assertEquals( array(), AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
@@ -191,8 +186,8 @@ public function test_does_taxonomy_support_amp() {
 		}
 
 		// When the user has not checked the boxes for 'Categories' and 'Tags,' this should be false.
-		AMP_Options_Manager::update_option( 'all_templates_supported', false );
 		AMP_Options_Manager::update_option( 'supported_templates', array( 'is_author' ) );
+		AMP_Options_Manager::update_option( 'all_templates_supported', false );
 		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 		foreach ( $taxonomies_to_test as $taxonomy ) {
 			$this->assertFalse( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
@@ -205,13 +200,13 @@ public function test_does_taxonomy_support_amp() {
 		}
 		AMP_Site_Validation::$force_crawl_urls = false;
 
-		// When the user has the 'all_templates_supported' box, this should always be true.
+		// When the user has checked the 'all_templates_supported' box, this should always be true.
 		AMP_Options_Manager::update_option( 'all_templates_supported', true );
 		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 		foreach ( $taxonomies_to_test as $taxonomy ) {
 			$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
 		}
-		AMP_Options_Manager::update_option( 'all_templates_supported', null );
+		AMP_Options_Manager::update_option( 'all_templates_supported', false );
 
 		/**
 		 * If the user passed allowed conditionals to the WP-CLI command like wp amp validate-site --include=is_category,is_tag
@@ -220,6 +215,8 @@ public function test_does_taxonomy_support_amp() {
 		AMP_Site_Validation::$include_conditionals = array( 'is_category', 'is_tag' );
 		$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( 'category' ) );
 		$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( 'tag' ) );
+		$this->assertFalse( AMP_Site_Validation::does_taxonomy_support_amp( 'author' ) );
+		$this->assertFalse( AMP_Site_Validation::does_taxonomy_support_amp( 'search' ) );
 		AMP_Site_Validation::$include_conditionals = null;
 	}
 
@@ -231,10 +228,12 @@ public function test_does_taxonomy_support_amp() {
 	public function test_is_template_supported() {
 		$author_conditional = 'is_author';
 		$search_conditional = 'is_search';
+
 		AMP_Options_Manager::update_option( 'supported_templates', array( $author_conditional ) );
 		AMP_Options_Manager::update_option( 'all_templates_supported', false );
 		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 		$this->assertTrue( AMP_Site_Validation::is_template_supported( $author_conditional ) );
+		$this->assertFalse( AMP_Site_Validation::is_template_supported( $search_conditional ) );
 
 		AMP_Options_Manager::update_option( 'supported_templates', array( $search_conditional ) );
 		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
@@ -251,14 +250,8 @@ public function test_get_posts_by_type() {
 		$number_posts_each_post_type = 20;
 		$post_types                  = get_post_types( array( 'public' => true ), 'names' );
 
-		/**
-		 * Exclude attachment permalinks from the test.
-		 * They have a default status of 'inherit,' to depend on the status of their parent post.
-		 */
-		unset( $post_types['attachment'] );
-
 		foreach ( $post_types as $post_type ) {
-			// Start the expected posts with the existing post.
+			// Start the expected posts with the existing post(s).
 			$query          = new WP_Query( array(
 				'fields'    => 'ids',
 				'post_type' => $post_type,
@@ -274,10 +267,10 @@ public function test_get_posts_by_type() {
 			$actual_posts = AMP_Site_Validation::get_posts_by_type( $post_type );
 			$this->assertEquals( $expected_posts, array_values( $actual_posts ) );
 
-			// Test with the 2 optional arguments for AMP_Site_Validation::get_posts_by_type().
-			$number_of_posts = $number_posts_each_post_type / 2;
-			$actual_posts    = AMP_Site_Validation::get_posts_by_type( $post_type, $number_of_posts );
-			$this->assertEquals( array_slice( $expected_posts, $number_of_posts ), $actual_posts );
+			// Test with the $offset and $number arguments.
+			$offset       = 0;
+			$actual_posts = AMP_Site_Validation::get_posts_by_type( $post_type, $offset, $number_posts_each_post_type );
+			$this->assertEquals( array_slice( $expected_posts, $offset, $number_posts_each_post_type ), $actual_posts );
 		}
 	}
 
@@ -387,7 +380,7 @@ public function test_get_search_page() {
 	public function test_get_date_page() {
 		$year = date( 'Y' );
 
-		// Normally, this should return the date page, unless the user has opted out of the page template.
+		// Normally, this should return the date page, unless the user has opted out of that template.
 		$this->assertContains( $year, AMP_Site_Validation::get_date_page() );
 
 		// If $include_conditionals is set and does not have is_date, this should not return a URL.
@@ -477,6 +470,9 @@ public function get_inital_url_count() {
 		) );
 
 		$total_count += count( $term_query->terms );
+		$total_count += count( AMP_Site_Validation::get_author_page_urls() );
+		$total_count += is_string( AMP_Site_Validation::get_search_page() ) ? 1 : 0;
+
 		return $total_count;
 	}
 

From 3dac2fd2a8736f8a147dd5c4cd1c288d9da1f7bc Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 21 Aug 2018 16:21:28 -0500
Subject: [PATCH 67/85] Test removing the array_merge() call (will probably
 revert)

A unit test is failing,
so test removing the array_merge() call.
---
 includes/validation/class-amp-validation-manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php
index d5f83fa8762..d1270809f73 100644
--- a/includes/validation/class-amp-validation-manager.php
+++ b/includes/validation/class-amp-validation-manager.php
@@ -1655,7 +1655,7 @@ public static function validate_url( $url ) {
 		}
 
 		$url = remove_query_arg(
-			array_merge( array_keys( $added_query_vars ), array( AMP_Site_Validation::FORCE_VALIDATION_QUERY_VAR ) ),
+			array_keys( $added_query_vars ),
 			$validation_url
 		);
 

From fe8eab380c216f572cf9c3d0aba7145183bfc54b Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 21 Aug 2018 16:30:07 -0500
Subject: [PATCH 68/85] Revert "Test removing the array_merge() call (will
 probably revert)"

This reverts commit 3dac2fd2a8736f8a147dd5c4cd1c288d9da1f7bc.
---
 includes/validation/class-amp-validation-manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php
index d1270809f73..d5f83fa8762 100644
--- a/includes/validation/class-amp-validation-manager.php
+++ b/includes/validation/class-amp-validation-manager.php
@@ -1655,7 +1655,7 @@ public static function validate_url( $url ) {
 		}
 
 		$url = remove_query_arg(
-			array_keys( $added_query_vars ),
+			array_merge( array_keys( $added_query_vars ), array( AMP_Site_Validation::FORCE_VALIDATION_QUERY_VAR ) ),
 			$validation_url
 		);
 

From 4cf9e9dd170f2791350a69053ca68e2b19a1824a Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 21 Aug 2018 17:38:22 -0500
Subject: [PATCH 69/85] Account for the date page in the initial count

In count_urls_to_validate(),
this should count the example date page,
as it's being validated.
---
 includes/validation/class-amp-site-validation.php   | 5 +++++
 tests/validation/test-class-amp-site-validation.php | 1 +
 2 files changed, 6 insertions(+)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index 7a5e54a3064..c92f4d299bb 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -315,6 +315,11 @@ public static function count_urls_to_validate() {
 		// Count author pages, like https://example.com/author/admin/.
 		$total_count += count( self::get_author_page_urls() );
 
+		// Count a single example date page, like https://example.com/?year=2019.
+		if ( self::get_date_page() ) {
+			$total_count++;
+		}
+
 		// Count a single example search page, like https://example.com/?s=example.
 		if ( self::get_search_page() ) {
 			$total_count++;
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index cd70794c3d1..6b4afdddb98 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -472,6 +472,7 @@ public function get_inital_url_count() {
 		$total_count += count( $term_query->terms );
 		$total_count += count( AMP_Site_Validation::get_author_page_urls() );
 		$total_count += is_string( AMP_Site_Validation::get_search_page() ) ? 1 : 0;
+		$total_count += is_string( AMP_Site_Validation::get_date_page() ) ? 1 : 0;
 
 		return $total_count;
 	}

From 907facd78848a8bff643fb20479a205b2091daca Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 21 Aug 2018 17:51:15 -0500
Subject: [PATCH 70/85] If there are no matched templates from --include,
 output error.

Before, the error message suggested that this
was an issue in the /wp-admin UI.
But this outputs a message that's more accurate for this case.
---
 .../validation/class-amp-site-validation.php  | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index c92f4d299bb..e68a97c2b14 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -217,13 +217,23 @@ public static function crawl_site( $args, $assoc_args ) {
 
 		$number_urls_to_crawl = self::count_urls_to_validate();
 		if ( ! $number_urls_to_crawl ) {
-			WP_CLI::error(
-				sprintf(
-					/* translators: %s is the command line argument to force validation */
-					__( 'All of your templates might be unchecked in AMP Settings > Supported Templates. You might pass --%s to this command.', 'amp' ),
-					self::FLAG_NAME_FORCE_VALIDATION
-				)
-			);
+			if ( self::$include_conditionals ) {
+				WP_CLI::error(
+					sprintf(
+						/* translators: %s is the command line argument to include certain templates */
+						__( 'The templates passed via the --%s argument did not match any URLs. You might try passing different templates to it.', 'amp' ),
+						self::INCLUDE_ARGUMENT
+					)
+				);
+			} else {
+				WP_CLI::error(
+					sprintf(
+						/* translators: %s is the command line argument to force validation */
+						__( 'All of your templates might be unchecked in AMP Settings > Supported Templates. You might pass --%s to this command.', 'amp' ),
+						self::FLAG_NAME_FORCE_VALIDATION
+					)
+				);
+			}
 		}
 
 		WP_CLI::log( __( 'Crawling the site for AMP validity.', 'amp' ) );

From ab9c2d94d9a4b24151687cb052ade8f2d4a9601f Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Thu, 23 Aug 2018 17:04:12 -0700
Subject: [PATCH 71/85] Tidy static analysis complaints

---
 includes/validation/class-amp-site-validation.php   | 8 ++++++--
 tests/validation/test-class-amp-site-validation.php | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/includes/validation/class-amp-site-validation.php b/includes/validation/class-amp-site-validation.php
index e68a97c2b14..b47a60cb059 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/validation/class-amp-site-validation.php
@@ -78,7 +78,7 @@ class AMP_Site_Validation {
 	 * The WP CLI progress bar.
 	 *
 	 * @see https://make.wordpress.org/cli/handbook/internal-api/wp-cli-utils-make-progress-bar/
-	 * @var cli\progress\Bar|WP_CLI\NoOp
+	 * @var \cli\progress\Bar|\WP_CLI\NoOp
 	 */
 	public static $wp_cli_progress;
 
@@ -154,6 +154,8 @@ class AMP_Site_Validation {
 
 	/**
 	 * Adds the WP-CLI command to validate the site.
+	 *
+	 * @throws Exception If adding command fails.
 	 */
 	public static function init() {
 		if ( class_exists( 'WP_CLI' ) ) {
@@ -193,6 +195,8 @@ public static function init() {
 	/**
 	 * Crawls the entire site to validate it, and gets the results.
 	 *
+	 * @throws Exception If WP_CLI::error() captures exit.
+	 *
 	 * @param array $args The arguments for the command.
 	 * @param array $assoc_args The associative arguments, which can also include command flags like --force-validate-all.
 	 */
@@ -472,7 +476,7 @@ public static function get_posts_by_type( $post_type, $offset = null, $number =
 	 * @param int        $number The maximum amount of links to get (optional).
 	 * @return string[]  The term links, as an array of strings.
 	 */
-	public static function get_taxonomy_links( $taxonomy, $offset = '', $number ) {
+	public static function get_taxonomy_links( $taxonomy, $offset = '', $number = 1 ) {
 		return array_map(
 			'get_term_link',
 			get_terms(
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/validation/test-class-amp-site-validation.php
index 6b4afdddb98..bfa07a032db 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/validation/test-class-amp-site-validation.php
@@ -111,7 +111,7 @@ public function test_get_posts_that_support_amp() {
 
 		// When the second $force_count_all_urls argument is true, all of the newly-created posts should be part of the URL count.
 		AMP_Site_Validation::$force_crawl_urls = true;
-		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids, true ) );
+		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
 		AMP_Site_Validation::$force_crawl_urls = false;
 
 		// In Native AMP, the IDs should include all of the newly-created posts.
@@ -485,7 +485,7 @@ public function get_inital_url_count() {
 	public function get_validated_urls() {
 		$query = new WP_Query( array(
 			'post_type'      => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
-			'posts_per_page' => 150,
+			'posts_per_page' => 100,
 			'fields'         => 'ids',
 		) );
 

From 1f8f40b89e648a14f83633be251ec7c31f1ba285 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Thu, 23 Aug 2018 18:06:04 -0700
Subject: [PATCH 72/85] Rename AMP_Site_Validation to AMP_CLI; init even in
 Classic mode

---
 amp.php                                       |   1 +
 includes/amp-helper-functions.php             |   2 +-
 includes/class-amp-autoloader.php             |   2 +-
 ...-site-validation.php => class-amp-cli.php} |  10 +-
 .../class-amp-validation-manager.php          |   3 +-
 tests/test-amp-helper-functions.php           |   4 +-
 ...-validation.php => test-class-amp-cli.php} | 180 +++++++++---------
 7 files changed, 101 insertions(+), 101 deletions(-)
 rename includes/{validation/class-amp-site-validation.php => class-amp-cli.php} (98%)
 rename tests/{validation/test-class-amp-site-validation.php => test-class-amp-cli.php} (66%)

diff --git a/amp.php b/amp.php
index 276950c3f78..457006a3cce 100644
--- a/amp.php
+++ b/amp.php
@@ -146,6 +146,7 @@ function amp_init() {
 
 	AMP_Theme_Support::init();
 	AMP_Post_Type_Support::add_post_type_support();
+	AMP_CLI::init();
 	add_filter( 'request', 'amp_force_query_var_value' );
 	add_action( 'admin_init', 'AMP_Options_Manager::register_settings' );
 	add_action( 'wp_loaded', 'amp_editor_core_blocks' );
diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index 306597d0aad..1ce1d8c6274 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -293,7 +293,7 @@ function is_amp_endpoint() {
 	 * like by unchecking 'Categories' in 'AMP Settings' > 'Supported Templates'.
 	 * But there's a flag for the WP-CLI command that sets this query var to validate all URLs.
 	 */
-	if ( isset( $_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ], $_GET[ AMP_Site_Validation::FORCE_VALIDATION_QUERY_VAR ] ) ) { // WPCS: CSRF OK.
+	if ( isset( $_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ], $_GET[ AMP_CLI::FORCE_VALIDATION_QUERY_VAR ] ) ) { // WPCS: CSRF OK.
 		return true;
 	}
 
diff --git a/includes/class-amp-autoloader.php b/includes/class-amp-autoloader.php
index 98db5de30f3..e13f006bac9 100644
--- a/includes/class-amp-autoloader.php
+++ b/includes/class-amp-autoloader.php
@@ -100,7 +100,7 @@ class AMP_Autoloader {
 		'AMP_Validation_Manager'                      => 'includes/validation/class-amp-validation-manager',
 		'AMP_Invalid_URL_Post_Type'                   => 'includes/validation/class-amp-invalid-url-post-type',
 		'AMP_Validation_Error_Taxonomy'               => 'includes/validation/class-amp-validation-error-taxonomy',
-		'AMP_Site_Validation'                         => 'includes/validation/class-amp-site-validation',
+		'AMP_CLI'                                     => 'includes/class-amp-cli',
 		'AMP_String_Utils'                            => 'includes/utils/class-amp-string-utils',
 		'AMP_WP_Utils'                                => 'includes/utils/class-amp-wp-utils',
 		'AMP_Widget_Archives'                         => 'includes/widgets/class-amp-widget-archives',
diff --git a/includes/validation/class-amp-site-validation.php b/includes/class-amp-cli.php
similarity index 98%
rename from includes/validation/class-amp-site-validation.php
rename to includes/class-amp-cli.php
index b47a60cb059..18ed5065599 100644
--- a/includes/validation/class-amp-site-validation.php
+++ b/includes/class-amp-cli.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * Class AMP_Site_Validation
+ * Class AMP_CLI
  *
  * @package AMP
  */
 
 /**
- * Class AMP_Site_Validation
+ * Class AMP_CLI
  *
  * Registers and implements a WP-CLI command to crawl the entire site for AMP validity.
  * To use this, run: wp amp validate-site.
  *
  * @since 1.0
  */
-class AMP_Site_Validation {
+class AMP_CLI {
 
 	/**
 	 * The WP-CLI command to validate the site.
@@ -304,7 +304,7 @@ public static function count_urls_to_validate() {
 
 		$amp_enabled_taxonomies = array_filter(
 			get_taxonomies( array( 'public' => true ) ),
-			array( 'AMP_Site_Validation', 'does_taxonomy_support_amp' )
+			array( 'AMP_CLI', 'does_taxonomy_support_amp' )
 		);
 
 		// Count all public taxonomy terms.
@@ -558,7 +558,7 @@ public static function validate_site() {
 
 		$amp_enabled_taxonomies = array_filter(
 			get_taxonomies( array( 'public' => true ) ),
-			array( 'AMP_Site_Validation', 'does_taxonomy_support_amp' )
+			array( 'AMP_CLI', 'does_taxonomy_support_amp' )
 		);
 		$public_post_types      = get_post_types( array( 'public' => true ), 'names' );
 		$i                      = 0;
diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php
index d5f83fa8762..b0eee7cf4aa 100644
--- a/includes/validation/class-amp-validation-manager.php
+++ b/includes/validation/class-amp-validation-manager.php
@@ -157,7 +157,6 @@ public static function init( $args = array() ) {
 
 		AMP_Invalid_URL_Post_Type::register();
 		AMP_Validation_Error_Taxonomy::register();
-		AMP_Site_Validation::init();
 
 		add_action( 'save_post', array( __CLASS__, 'handle_save_post_prompting_validation' ) );
 		add_action( 'enqueue_block_editor_assets', array( __CLASS__, 'enqueue_block_validation' ) );
@@ -1655,7 +1654,7 @@ public static function validate_url( $url ) {
 		}
 
 		$url = remove_query_arg(
-			array_merge( array_keys( $added_query_vars ), array( AMP_Site_Validation::FORCE_VALIDATION_QUERY_VAR ) ),
+			array_merge( array_keys( $added_query_vars ), array( AMP_CLI::FORCE_VALIDATION_QUERY_VAR ) ),
 			$validation_url
 		);
 
diff --git a/tests/test-amp-helper-functions.php b/tests/test-amp-helper-functions.php
index 6c92036017d..a1a718f0c64 100644
--- a/tests/test-amp-helper-functions.php
+++ b/tests/test-amp-helper-functions.php
@@ -362,8 +362,8 @@ public function test_is_amp_endpoint() {
 		$this->assertFalse( is_amp_endpoint() );
 
 		// When the user passes a flag to the WP-CLI command, it forces AMP validation no matter whether the user disabled AMP on any template.
-		$_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ]      = 1;
-		$_GET[ AMP_Site_Validation::FORCE_VALIDATION_QUERY_VAR ] = 1;
+		$_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ] = 1;
+		$_GET[ AMP_CLI::FORCE_VALIDATION_QUERY_VAR ]        = 1;
 		$this->assertTrue( is_amp_endpoint() );
 	}
 
diff --git a/tests/validation/test-class-amp-site-validation.php b/tests/test-class-amp-cli.php
similarity index 66%
rename from tests/validation/test-class-amp-site-validation.php
rename to tests/test-class-amp-cli.php
index bfa07a032db..0c258396446 100644
--- a/tests/validation/test-class-amp-site-validation.php
+++ b/tests/test-class-amp-cli.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * Tests for AMP_Site_Validation class.
+ * Tests for AMP_CLI class.
  *
  * @package AMP
  */
 
 /**
- * Tests for AMP_Site_Validation class.
+ * Tests for AMP_CLI class.
  *
  * @since 1.0
  */
-class Test_AMP_Site_Validation extends \WP_UnitTestCase {
+class Test_AMP_CLI extends \WP_UnitTestCase {
 
 	/**
 	 * Setup.
@@ -20,7 +20,7 @@ class Test_AMP_Site_Validation extends \WP_UnitTestCase {
 	public function setUp() {
 		parent::setUp();
 		add_filter( 'pre_http_request', array( $this, 'add_comment' ) );
-		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
+		AMP_CLI::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 	}
 
 	/**
@@ -29,22 +29,22 @@ public function setUp() {
 	 * @inheritdoc
 	 */
 	public function tearDown() {
-		AMP_Site_Validation::$total_errors = 0;
+		AMP_CLI::$total_errors = 0;
 		parent::tearDown();
 	}
 
 	/**
 	 * Test count_urls_to_validate.
 	 *
-	 * @covers AMP_Site_Validation::count_urls_to_validate()
+	 * @covers AMP_CLI::count_urls_to_validate()
 	 */
 	public function test_count_urls_to_validate() {
 		// The number of original URLs present before adding these test URLs.
 		$number_original_urls = $this->get_inital_url_count();
-		$this->assertEquals( $number_original_urls, AMP_Site_Validation::count_urls_to_validate() );
+		$this->assertEquals( $number_original_urls, AMP_CLI::count_urls_to_validate() );
 
 		$category         = $this->factory()->term->create( array( 'taxonomy' => 'category' ) );
-		$number_new_posts = AMP_Site_Validation::$maximum_urls_to_validate_for_each_type / 2;
+		$number_new_posts = AMP_CLI::$maximum_urls_to_validate_for_each_type / 2;
 		$post_ids         = array();
 		for ( $i = 0; $i < $number_new_posts; $i++ ) {
 			$post_ids[] = $this->factory()->post->create( array(
@@ -57,7 +57,7 @@ public function test_count_urls_to_validate() {
 		 * And ensure that the tested method finds a URL for all of them.
 		 */
 		$expected_url_count = $number_new_posts + $number_original_urls + 1;
-		$this->assertEquals( $expected_url_count, AMP_Site_Validation::count_urls_to_validate() );
+		$this->assertEquals( $expected_url_count, AMP_CLI::count_urls_to_validate() );
 
 		$number_of_new_terms        = 20;
 		$expected_url_count        += $number_of_new_terms;
@@ -76,13 +76,13 @@ public function test_count_urls_to_validate() {
 			$taxonomy
 		);
 
-		$this->assertEquals( $expected_url_count, AMP_Site_Validation::count_urls_to_validate() );
+		$this->assertEquals( $expected_url_count, AMP_CLI::count_urls_to_validate() );
 	}
 
 	/**
 	 * Test get_posts_that_support_amp.
 	 *
-	 * @covers AMP_Site_Validation::get_posts_that_support_amp()
+	 * @covers AMP_CLI::get_posts_that_support_amp()
 	 */
 	public function test_get_posts_that_support_amp() {
 		$number_of_posts = 20;
@@ -92,7 +92,7 @@ public function test_get_posts_that_support_amp() {
 		}
 
 		// This should count all of the newly-created posts as supporting AMP.
-		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
+		$this->assertEquals( $ids, AMP_CLI::get_posts_that_support_amp( $ids ) );
 
 		// Simulate 'Enable AMP' being unchecked in the post editor, in which case get_url_count() should not count it.
 		$first_id = $ids[0];
@@ -101,7 +101,7 @@ public function test_get_posts_that_support_amp() {
 			AMP_Post_Meta_Box::STATUS_POST_META_KEY,
 			AMP_Post_Meta_Box::DISABLED_STATUS
 		);
-		$this->assertEquals( array(), AMP_Site_Validation::get_posts_that_support_amp( array( $first_id ) ) );
+		$this->assertEquals( array(), AMP_CLI::get_posts_that_support_amp( array( $first_id ) ) );
 
 		update_post_meta(
 			$first_id,
@@ -110,40 +110,40 @@ public function test_get_posts_that_support_amp() {
 		);
 
 		// When the second $force_count_all_urls argument is true, all of the newly-created posts should be part of the URL count.
-		AMP_Site_Validation::$force_crawl_urls = true;
-		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
-		AMP_Site_Validation::$force_crawl_urls = false;
+		AMP_CLI::$force_crawl_urls = true;
+		$this->assertEquals( $ids, AMP_CLI::get_posts_that_support_amp( $ids ) );
+		AMP_CLI::$force_crawl_urls = false;
 
 		// In Native AMP, the IDs should include all of the newly-created posts.
 		add_theme_support( 'amp' );
-		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
+		$this->assertEquals( $ids, AMP_CLI::get_posts_that_support_amp( $ids ) );
 
 		// In Paired Mode, the IDs should also include all of the newly-created posts.
 		add_theme_support( 'amp', array(
 			'paired' => true,
 		) );
-		$this->assertEquals( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
+		$this->assertEquals( $ids, AMP_CLI::get_posts_that_support_amp( $ids ) );
 
 		/**
 		 * If the WP-CLI command has an include argument, and is_singular isn't in it, no posts will have AMP enabled.
 		 * For example, wp amp validate-site --include=is_tag,is_category
 		 */
-		AMP_Site_Validation::$include_conditionals = array( 'is_tag', 'is_category' );
-		$this->assertEquals( array(), AMP_Site_Validation::get_posts_that_support_amp( $ids ) );
+		AMP_CLI::$include_conditionals = array( 'is_tag', 'is_category' );
+		$this->assertEquals( array(), AMP_CLI::get_posts_that_support_amp( $ids ) );
 
 		/*
 		 * If is_singular is in the WP-CLI argument, it should allow return these posts as being AMP-enabled.
 		 * For example, wp amp validate-site include=is_singular,is_category
 		 */
-		AMP_Site_Validation::$include_conditionals = array( 'is_singular', 'is_category' );
-		$this->assertEmpty( array_diff( $ids, AMP_Site_Validation::get_posts_that_support_amp( $ids ) ) );
-		AMP_Site_Validation::$include_conditionals = null;
+		AMP_CLI::$include_conditionals = array( 'is_singular', 'is_category' );
+		$this->assertEmpty( array_diff( $ids, AMP_CLI::get_posts_that_support_amp( $ids ) ) );
+		AMP_CLI::$include_conditionals = null;
 	}
 
 	/**
 	 * Test handle_error_count.
 	 *
-	 * @covers AMP_Site_Validation::handle_error_count()
+	 * @covers AMP_CLI::handle_error_count()
 	 */
 	public function test_handle_error_count() {
 		$custom_post_type = 'foo_custom_post';
@@ -153,58 +153,58 @@ public function test_handle_error_count() {
 				'total' => 1,
 			),
 		);
-		AMP_Site_Validation::handle_error_count( true, $custom_post_type );
-		$this->assertEquals( $expected_errors, AMP_Site_Validation::$validity_by_type );
+		AMP_CLI::handle_error_count( true, $custom_post_type );
+		$this->assertEquals( $expected_errors, AMP_CLI::$validity_by_type );
 
 		// When the first argument is true, there was a validation error, and this shouldn't increment the 'valid' count.
-		AMP_Site_Validation::handle_error_count( true, $custom_post_type );
+		AMP_CLI::handle_error_count( true, $custom_post_type );
 		$expected_errors[ $custom_post_type ]['total']++;
-		$this->assertEquals( $expected_errors, AMP_Site_Validation::$validity_by_type );
+		$this->assertEquals( $expected_errors, AMP_CLI::$validity_by_type );
 
 		// When the first argument is false, there was no validation error, and both counts should be incremented.
-		AMP_Site_Validation::handle_error_count( false, $custom_post_type );
+		AMP_CLI::handle_error_count( false, $custom_post_type );
 		$expected_errors[ $custom_post_type ]['total']++;
 		$expected_errors[ $custom_post_type ]['valid']++;
-		$this->assertEquals( $expected_errors, AMP_Site_Validation::$validity_by_type );
+		$this->assertEquals( $expected_errors, AMP_CLI::$validity_by_type );
 	}
 
 	/**
 	 * Test does_taxonomy_support_amp.
 	 *
-	 * @covers AMP_Site_Validation::does_taxonomy_support_amp()
+	 * @covers AMP_CLI::does_taxonomy_support_amp()
 	 */
 	public function test_does_taxonomy_support_amp() {
 		$custom_taxonomy = 'foo_custom_taxonomy';
 		register_taxonomy( $custom_taxonomy, 'post' );
 		$taxonomies_to_test = array( $custom_taxonomy, 'category', 'post_tag' );
 		AMP_Options_Manager::update_option( 'supported_templates', array( 'is_category', 'is_tag', sprintf( 'is_tax[%s]', $custom_taxonomy ) ) );
-		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
+		AMP_CLI::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 
 		// When these templates are not unchecked in the 'AMP Settings' UI, these should be supported.
 		foreach ( $taxonomies_to_test as $taxonomy ) {
-			$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
+			$this->assertTrue( AMP_CLI::does_taxonomy_support_amp( $taxonomy ) );
 		}
 
 		// When the user has not checked the boxes for 'Categories' and 'Tags,' this should be false.
 		AMP_Options_Manager::update_option( 'supported_templates', array( 'is_author' ) );
 		AMP_Options_Manager::update_option( 'all_templates_supported', false );
-		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
+		AMP_CLI::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 		foreach ( $taxonomies_to_test as $taxonomy ) {
-			$this->assertFalse( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
+			$this->assertFalse( AMP_CLI::does_taxonomy_support_amp( $taxonomy ) );
 		}
 
 		// When $force_crawl_urls is true, all taxonomies should be supported.
-		AMP_Site_Validation::$force_crawl_urls = true;
+		AMP_CLI::$force_crawl_urls = true;
 		foreach ( $taxonomies_to_test as $taxonomy ) {
-			$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
+			$this->assertTrue( AMP_CLI::does_taxonomy_support_amp( $taxonomy ) );
 		}
-		AMP_Site_Validation::$force_crawl_urls = false;
+		AMP_CLI::$force_crawl_urls = false;
 
 		// When the user has checked the 'all_templates_supported' box, this should always be true.
 		AMP_Options_Manager::update_option( 'all_templates_supported', true );
-		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
+		AMP_CLI::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 		foreach ( $taxonomies_to_test as $taxonomy ) {
-			$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( $taxonomy ) );
+			$this->assertTrue( AMP_CLI::does_taxonomy_support_amp( $taxonomy ) );
 		}
 		AMP_Options_Manager::update_option( 'all_templates_supported', false );
 
@@ -212,18 +212,18 @@ public function test_does_taxonomy_support_amp() {
 		 * If the user passed allowed conditionals to the WP-CLI command like wp amp validate-site --include=is_category,is_tag
 		 * these should be supported taxonomies.
 		 */
-		AMP_Site_Validation::$include_conditionals = array( 'is_category', 'is_tag' );
-		$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( 'category' ) );
-		$this->assertTrue( AMP_Site_Validation::does_taxonomy_support_amp( 'tag' ) );
-		$this->assertFalse( AMP_Site_Validation::does_taxonomy_support_amp( 'author' ) );
-		$this->assertFalse( AMP_Site_Validation::does_taxonomy_support_amp( 'search' ) );
-		AMP_Site_Validation::$include_conditionals = null;
+		AMP_CLI::$include_conditionals = array( 'is_category', 'is_tag' );
+		$this->assertTrue( AMP_CLI::does_taxonomy_support_amp( 'category' ) );
+		$this->assertTrue( AMP_CLI::does_taxonomy_support_amp( 'tag' ) );
+		$this->assertFalse( AMP_CLI::does_taxonomy_support_amp( 'author' ) );
+		$this->assertFalse( AMP_CLI::does_taxonomy_support_amp( 'search' ) );
+		AMP_CLI::$include_conditionals = null;
 	}
 
 	/**
 	 * Test is_template_supported.
 	 *
-	 * @covers AMP_Site_Validation::is_template_supported()
+	 * @covers AMP_CLI::is_template_supported()
 	 */
 	public function test_is_template_supported() {
 		$author_conditional = 'is_author';
@@ -231,20 +231,20 @@ public function test_is_template_supported() {
 
 		AMP_Options_Manager::update_option( 'supported_templates', array( $author_conditional ) );
 		AMP_Options_Manager::update_option( 'all_templates_supported', false );
-		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
-		$this->assertTrue( AMP_Site_Validation::is_template_supported( $author_conditional ) );
-		$this->assertFalse( AMP_Site_Validation::is_template_supported( $search_conditional ) );
+		AMP_CLI::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
+		$this->assertTrue( AMP_CLI::is_template_supported( $author_conditional ) );
+		$this->assertFalse( AMP_CLI::is_template_supported( $search_conditional ) );
 
 		AMP_Options_Manager::update_option( 'supported_templates', array( $search_conditional ) );
-		AMP_Site_Validation::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
-		$this->assertTrue( AMP_Site_Validation::is_template_supported( $search_conditional ) );
-		$this->assertFalse( AMP_Site_Validation::is_template_supported( $author_conditional ) );
+		AMP_CLI::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
+		$this->assertTrue( AMP_CLI::is_template_supported( $search_conditional ) );
+		$this->assertFalse( AMP_CLI::is_template_supported( $author_conditional ) );
 	}
 
 	/**
 	 * Test get_posts_by_type.
 	 *
-	 * @covers AMP_Site_Validation::get_posts_by_type()
+	 * @covers AMP_CLI::get_posts_by_type()
 	 */
 	public function test_get_posts_by_type() {
 		$number_posts_each_post_type = 20;
@@ -264,12 +264,12 @@ public function test_get_posts_by_type() {
 				) );
 			}
 
-			$actual_posts = AMP_Site_Validation::get_posts_by_type( $post_type );
+			$actual_posts = AMP_CLI::get_posts_by_type( $post_type );
 			$this->assertEquals( $expected_posts, array_values( $actual_posts ) );
 
 			// Test with the $offset and $number arguments.
 			$offset       = 0;
-			$actual_posts = AMP_Site_Validation::get_posts_by_type( $post_type, $offset, $number_posts_each_post_type );
+			$actual_posts = AMP_CLI::get_posts_by_type( $post_type, $offset, $number_posts_each_post_type );
 			$this->assertEquals( array_slice( $expected_posts, $offset, $number_posts_each_post_type ), $actual_posts );
 		}
 	}
@@ -277,7 +277,7 @@ public function test_get_posts_by_type() {
 	/**
 	 * Test get_taxonomy_links.
 	 *
-	 * @covers AMP_Site_Validation::get_taxonomy_links()
+	 * @covers AMP_CLI::get_taxonomy_links()
 	 */
 	public function test_get_taxonomy_links() {
 		$number_links_each_taxonomy = 20;
@@ -307,7 +307,7 @@ public function test_get_taxonomy_links() {
 				array_map( 'get_term_link', $terms_for_current_taxonomy )
 			);
 			$number_of_links = 100;
-			$actual_links    = AMP_Site_Validation::get_taxonomy_links( $taxonomy, 0, $number_of_links );
+			$actual_links    = AMP_CLI::get_taxonomy_links( $taxonomy, 0, $number_of_links );
 
 			// The get_terms() call in get_taxonomy_links() returns an array with a first index of 1, so correct for that with array_values().
 			$this->assertEquals( $expected_links, array_values( $actual_links ) );
@@ -315,7 +315,7 @@ public function test_get_taxonomy_links() {
 
 			$number_of_links           = 5;
 			$offset                    = 10;
-			$actual_links_using_offset = AMP_Site_Validation::get_taxonomy_links( $taxonomy, $offset, $number_of_links );
+			$actual_links_using_offset = AMP_CLI::get_taxonomy_links( $taxonomy, $offset, $number_of_links );
 			$this->assertEquals( array_slice( $expected_links, $offset, $number_of_links ), array_values( $actual_links_using_offset ) );
 			$this->assertEquals( $number_of_links, count( $actual_links_using_offset ) );
 		}
@@ -324,7 +324,7 @@ public function test_get_taxonomy_links() {
 	/**
 	 * Test get_author_page_urls.
 	 *
-	 * @covers AMP_Site_Validation::get_author_page_urls()
+	 * @covers AMP_CLI::get_author_page_urls()
 	 */
 	public function test_get_author_page_urls() {
 		$this->factory()->user->create();
@@ -335,69 +335,69 @@ public function test_get_author_page_urls() {
 		$second_author_url = get_author_posts_url( $second_author->ID, $second_author->user_nicename );
 
 		// Passing 0 as the offset argument should get the first author.
-		$this->assertEquals( array( $first_author_url ), $actual_urls = AMP_Site_Validation::get_author_page_urls( 0, 1 ) );
+		$this->assertEquals( array( $first_author_url ), $actual_urls = AMP_CLI::get_author_page_urls( 0, 1 ) );
 
 		// Passing 1 as the offset argument should get the second author.
-		$this->assertEquals( array( $second_author_url ), $actual_urls = AMP_Site_Validation::get_author_page_urls( 1, 1 ) );
+		$this->assertEquals( array( $second_author_url ), $actual_urls = AMP_CLI::get_author_page_urls( 1, 1 ) );
 
 		// If $include_conditionals is set and does not have is_author, this should not return a URL.
-		AMP_Site_Validation::$include_conditionals = array( 'is_category' );
-		$this->assertEquals( array(), AMP_Site_Validation::get_author_page_urls() );
+		AMP_CLI::$include_conditionals = array( 'is_category' );
+		$this->assertEquals( array(), AMP_CLI::get_author_page_urls() );
 
 		// If $include_conditionals is set and has is_author, this should return URLs.
-		AMP_Site_Validation::$include_conditionals = array( 'is_author' );
+		AMP_CLI::$include_conditionals = array( 'is_author' );
 		$this->assertEquals(
 			array( $first_author_url, $second_author_url ),
-			AMP_Site_Validation::get_author_page_urls()
+			AMP_CLI::get_author_page_urls()
 		);
-		AMP_Site_Validation::$include_conditionals = null;
+		AMP_CLI::$include_conditionals = null;
 	}
 
 	/**
 	 * Test get_search_page.
 	 *
-	 * @covers AMP_Site_Validation::get_search_page()
+	 * @covers AMP_CLI::get_search_page()
 	 */
 	public function test_get_search_page() {
 		// Normally, this should return a string, unless the user has opted out of the search template.
-		$this->assertTrue( is_string( AMP_Site_Validation::get_search_page() ) );
+		$this->assertTrue( is_string( AMP_CLI::get_search_page() ) );
 
 		// If $include_conditionals is set and does not have is_search, this should not return a URL.
-		AMP_Site_Validation::$include_conditionals = array( 'is_author' );
-		$this->assertEquals( null, AMP_Site_Validation::get_search_page() );
+		AMP_CLI::$include_conditionals = array( 'is_author' );
+		$this->assertEquals( null, AMP_CLI::get_search_page() );
 
 		// If $include_conditionals has is_search, this should return a URL.
-		AMP_Site_Validation::$include_conditionals = array( 'is_search' );
-		$this->assertTrue( is_string( AMP_Site_Validation::get_search_page() ) );
-		AMP_Site_Validation::$include_conditionals = null;
+		AMP_CLI::$include_conditionals = array( 'is_search' );
+		$this->assertTrue( is_string( AMP_CLI::get_search_page() ) );
+		AMP_CLI::$include_conditionals = null;
 	}
 
 	/**
 	 * Test get_date_page.
 	 *
-	 * @covers AMP_Site_Validation::get_date_page()
+	 * @covers AMP_CLI::get_date_page()
 	 */
 	public function test_get_date_page() {
 		$year = date( 'Y' );
 
 		// Normally, this should return the date page, unless the user has opted out of that template.
-		$this->assertContains( $year, AMP_Site_Validation::get_date_page() );
+		$this->assertContains( $year, AMP_CLI::get_date_page() );
 
 		// If $include_conditionals is set and does not have is_date, this should not return a URL.
-		AMP_Site_Validation::$include_conditionals = array( 'is_search' );
-		$this->assertEquals( null, AMP_Site_Validation::get_date_page() );
+		AMP_CLI::$include_conditionals = array( 'is_search' );
+		$this->assertEquals( null, AMP_CLI::get_date_page() );
 
 		// If $include_conditionals has is_date, this should return a URL.
-		AMP_Site_Validation::$include_conditionals = array( 'is_date' );
-		$parsed_page_url                           = wp_parse_url( AMP_Site_Validation::get_date_page() );
+		AMP_CLI::$include_conditionals = array( 'is_date' );
+		$parsed_page_url               = wp_parse_url( AMP_CLI::get_date_page() );
 		$this->assertContains( $year, $parsed_page_url['query'] );
-		AMP_Site_Validation::$include_conditionals = null;
+		AMP_CLI::$include_conditionals = null;
 	}
 
 	/**
 	 * Test validate_site.
 	 *
-	 * @covers AMP_Site_Validation::validate_site()
+	 * @covers AMP_CLI::validate_site()
 	 */
 	public function test_validate_site() {
 		$number_of_posts = 20;
@@ -411,7 +411,7 @@ public function test_validate_site() {
 			$posts[]           = $post_id;
 			$post_permalinks[] = get_permalink( $post_id );
 		}
-		AMP_Site_Validation::validate_site();
+		AMP_CLI::validate_site();
 
 		// All of the posts created above should be present in $validated_urls.
 		$this->assertEmpty( array_diff( $post_permalinks, self::get_validated_urls() ) );
@@ -422,7 +422,7 @@ public function test_validate_site() {
 
 		// Terms need to be associated with a post in order to be returned in get_terms().
 		wp_set_post_terms( $posts[0], $terms, 'category' );
-		AMP_Site_Validation::validate_site();
+		AMP_CLI::validate_site();
 		$expected_validated_urls = array_map( 'get_term_link', $terms );
 		$actual_validated_urls   = self::get_validated_urls();
 
@@ -434,11 +434,11 @@ public function test_validate_site() {
 	/**
 	 * Test validate_and_store_url.
 	 *
-	 * @covers AMP_Site_Validation::validate_and_store_url()
+	 * @covers AMP_CLI::validate_and_store_url()
 	 */
 	public function test_validate_and_store_url() {
 		$single_post_permalink = get_permalink( $this->factory()->post->create() );
-		AMP_Site_Validation::validate_and_store_url( $single_post_permalink, 'post' );
+		AMP_CLI::validate_and_store_url( $single_post_permalink, 'post' );
 		$this->assertTrue( in_array( $single_post_permalink, self::get_validated_urls(), true ) );
 
 		$number_of_posts = 30;
@@ -447,7 +447,7 @@ public function test_validate_and_store_url() {
 		for ( $i = 0; $i < $number_of_posts; $i++ ) {
 			$permalink         = get_permalink( $this->factory()->post->create() );
 			$post_permalinks[] = $permalink;
-			AMP_Site_Validation::validate_and_store_url( $permalink, 'post' );
+			AMP_CLI::validate_and_store_url( $permalink, 'post' );
 		}
 
 		// All of the posts created should be present in the validated URLs.
@@ -470,9 +470,9 @@ public function get_inital_url_count() {
 		) );
 
 		$total_count += count( $term_query->terms );
-		$total_count += count( AMP_Site_Validation::get_author_page_urls() );
-		$total_count += is_string( AMP_Site_Validation::get_search_page() ) ? 1 : 0;
-		$total_count += is_string( AMP_Site_Validation::get_date_page() ) ? 1 : 0;
+		$total_count += count( AMP_CLI::get_author_page_urls() );
+		$total_count += is_string( AMP_CLI::get_search_page() ) ? 1 : 0;
+		$total_count += is_string( AMP_CLI::get_date_page() ) ? 1 : 0;
 
 		return $total_count;
 	}

From aca16f4ad19e045ab6fd23195522f9c69d16db58 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Thu, 23 Aug 2018 22:30:21 -0700
Subject: [PATCH 73/85] Refactor AMP_CLI to use methods as subcommands

---
 amp.php                      |   6 ++-
 includes/class-amp-cli.php   | 102 +++++++++++------------------------
 tests/test-class-amp-cli.php |  31 +++++------
 3 files changed, 50 insertions(+), 89 deletions(-)

diff --git a/amp.php b/amp.php
index 457006a3cce..91ca59a6fc7 100644
--- a/amp.php
+++ b/amp.php
@@ -146,7 +146,11 @@ function amp_init() {
 
 	AMP_Theme_Support::init();
 	AMP_Post_Type_Support::add_post_type_support();
-	AMP_CLI::init();
+
+	if ( defined( 'WP_CLI' ) ) {
+		WP_CLI::add_command( 'amp', new AMP_CLI() );
+	}
+
 	add_filter( 'request', 'amp_force_query_var_value' );
 	add_action( 'admin_init', 'AMP_Options_Manager::register_settings' );
 	add_action( 'wp_loaded', 'amp_editor_core_blocks' );
diff --git a/includes/class-amp-cli.php b/includes/class-amp-cli.php
index 18ed5065599..befee8ab8b0 100644
--- a/includes/class-amp-cli.php
+++ b/includes/class-amp-cli.php
@@ -15,14 +15,6 @@
  */
 class AMP_CLI {
 
-	/**
-	 * The WP-CLI command to validate the site.
-	 * To use this, run: wp amp validate-site.
-	 *
-	 * @var string
-	 */
-	const WP_CLI_COMMAND = 'amp validate-site';
-
 	/**
 	 * The WP-CLI flag to force validation.
 	 *
@@ -32,7 +24,7 @@ class AMP_CLI {
 	 *
 	 * @var string
 	 */
-	const FLAG_NAME_FORCE_VALIDATION = 'force-validation';
+	const FLAG_NAME_FORCE_VALIDATION = 'force';
 
 	/**
 	 * The query var key to force AMP validation, regardless or whether the user has deselected support for a URL.
@@ -65,14 +57,7 @@ class AMP_CLI {
 	 *
 	 * @var string
 	 */
-	const MAXIMUM_URLS_ARGUMENT = 'n';
-
-	/**
-	 * The supportable templates, mainly based on a user's selection in 'AMP Settings' > 'Supported Templates'.
-	 *
-	 * @var array
-	 */
-	public static $supportable_templates;
+	const MAXIMUM_URLS_ARGUMENT = 'limit';
 
 	/**
 	 * The WP CLI progress bar.
@@ -127,7 +112,7 @@ class AMP_CLI {
 	 *
 	 * @var array
 	 */
-	public static $include_conditionals;
+	public static $include_conditionals = array();
 
 	/**
 	 * The maximum number of URLs to validate for each type.
@@ -153,58 +138,33 @@ class AMP_CLI {
 	public static $validity_by_type = array();
 
 	/**
-	 * Adds the WP-CLI command to validate the site.
+	 * Crawl the entire site to get AMP validation results.
 	 *
-	 * @throws Exception If adding command fails.
-	 */
-	public static function init() {
-		if ( class_exists( 'WP_CLI' ) ) {
-			self::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
-
-			WP_CLI::add_command(
-				self::WP_CLI_COMMAND,
-				array( __CLASS__, 'crawl_site' ),
-				array(
-					'shortdesc' => __( 'Crawl the entire site to get AMP validation results', 'amp' ),
-					'synopsis'  => array(
-						array(
-							'type'     => 'flag',
-							'name'     => self::FLAG_NAME_FORCE_VALIDATION,
-							'optional' => true,
-						),
-						array(
-							'type'        => 'assoc',
-							'name'        => self::INCLUDE_ARGUMENT,
-							'description' => __( 'Only validates a URL if one of the conditionals is true', 'amp' ),
-							'optional'    => true,
-						),
-						array(
-							'type'        => 'assoc',
-							'name'        => self::MAXIMUM_URLS_ARGUMENT,
-							'description' => __( 'The maximum number of URLs to validate for each template and content type', 'amp' ),
-							'optional'    => true,
-						),
-					),
-					'when'      => 'after_wp_load',
-					'longdesc'  => '## EXAMPLES' . "\n\n" . 'wp ' . self::WP_CLI_COMMAND . ' --include=is_author,is_tag',
-				)
-			);
-		}
-	}
-
-	/**
-	 * Crawls the entire site to validate it, and gets the results.
+	 * ## OPTIONS
+	 *
+	 * [--limit=<templates>]
+	 * : The maximum number of URLs to validate for each template and content type.
 	 *
-	 * @throws Exception If WP_CLI::error() captures exit.
+	 * [--include=<templates>]
+	 * : Only validates a URL if one of the conditionals is true.
 	 *
-	 * @param array $args The arguments for the command.
-	 * @param array $assoc_args The associative arguments, which can also include command flags like --force-validate-all.
+	 * [--force]
+	 * : Force validation of URLs even if their associated templates or object types do not have AMP enabled.
+	 *
+	 * ## EXAMPLES
+	 *
+	 *     wp amp validate-site --include=is_author,is_tag
+	 *
+	 * @subcommand validate-site
+	 * @param array $args       Positional args.
+	 * @param array $assoc_args Associative args.
+	 * @throws Exception If an error happens.
 	 */
-	public static function crawl_site( $args, $assoc_args ) {
+	public function validate_site( $args, $assoc_args ) {
 		unset( $args );
 
-		/**
-		 * Handle the argument and flag passed to the command: --include and --force-validation.
+		/*
+		 * Handle the argument and flag passed to the command: --include and --force.
 		 * If the self::INCLUDE_ARGUMENT is present, force crawling or URLs.
 		 * The WP-CLI command should indicate which templates are crawled, not the /wp-admin options.
 		 */
@@ -221,7 +181,7 @@ public static function crawl_site( $args, $assoc_args ) {
 
 		$number_urls_to_crawl = self::count_urls_to_validate();
 		if ( ! $number_urls_to_crawl ) {
-			if ( self::$include_conditionals ) {
+			if ( ! empty( self::$include_conditionals ) ) {
 				WP_CLI::error(
 					sprintf(
 						/* translators: %s is the command line argument to include certain templates */
@@ -247,7 +207,7 @@ public static function crawl_site( $args, $assoc_args ) {
 			sprintf( __( 'Validating %d URLs...', 'amp' ), $number_urls_to_crawl ),
 			$number_urls_to_crawl
 		);
-		self::validate_site();
+		self::crawl_site();
 		self::$wp_cli_progress->finish();
 
 		$url_more_details = add_query_arg(
@@ -426,15 +386,17 @@ public static function does_taxonomy_support_amp( $taxonomy ) {
 	 */
 	public static function is_template_supported( $template ) {
 		// If the --include argument is present in the WP-CLI command, this template conditional must be present in it.
-		if ( isset( self::$include_conditionals ) && ! in_array( $template, self::$include_conditionals, true ) ) {
-			return false;
+		if ( ! empty( self::$include_conditionals ) ) {
+			return in_array( $template, self::$include_conditionals, true );
 		}
 		if ( self::$force_crawl_urls ) {
 			return true;
 		}
 
+		$supportable_templates = AMP_Theme_Support::get_supportable_templates();
+
 		// Check whether this taxonomy's template is supported, including in the 'AMP Settings' > 'Supported Templates' UI.
-		return isset( self::$supportable_templates[ $template ]['supported'] ) && self::$supportable_templates[ $template ]['supported'];
+		return ! empty( $supportable_templates[ $template ]['supported'] );
 	}
 
 	/**
@@ -547,7 +509,7 @@ public static function get_date_page() {
 	 * This validates one of each type at a time,
 	 * and iterates until it reaches the maximum number of URLs for each type.
 	 */
-	public static function validate_site() {
+	public static function crawl_site() {
 		/**
 		 * If 'Your homepage displays' is set to 'Your latest posts', validate the homepage.
 		 * It will not be part of the page validation below.
diff --git a/tests/test-class-amp-cli.php b/tests/test-class-amp-cli.php
index 0c258396446..3c38db06ec1 100644
--- a/tests/test-class-amp-cli.php
+++ b/tests/test-class-amp-cli.php
@@ -20,7 +20,7 @@ class Test_AMP_CLI extends \WP_UnitTestCase {
 	public function setUp() {
 		parent::setUp();
 		add_filter( 'pre_http_request', array( $this, 'add_comment' ) );
-		AMP_CLI::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
+		AMP_CLI::$include_conditionals = array();
 	}
 
 	/**
@@ -52,7 +52,7 @@ public function test_count_urls_to_validate() {
 			) );
 		}
 
-		/**
+		/*
 		 * Add the number of new posts, original URLs, and 1 for the $category that all of them have.
 		 * And ensure that the tested method finds a URL for all of them.
 		 */
@@ -124,7 +124,7 @@ public function test_get_posts_that_support_amp() {
 		) );
 		$this->assertEquals( $ids, AMP_CLI::get_posts_that_support_amp( $ids ) );
 
-		/**
+		/*
 		 * If the WP-CLI command has an include argument, and is_singular isn't in it, no posts will have AMP enabled.
 		 * For example, wp amp validate-site --include=is_tag,is_category
 		 */
@@ -137,7 +137,7 @@ public function test_get_posts_that_support_amp() {
 		 */
 		AMP_CLI::$include_conditionals = array( 'is_singular', 'is_category' );
 		$this->assertEmpty( array_diff( $ids, AMP_CLI::get_posts_that_support_amp( $ids ) ) );
-		AMP_CLI::$include_conditionals = null;
+		AMP_CLI::$include_conditionals = array();
 	}
 
 	/**
@@ -178,7 +178,6 @@ public function test_does_taxonomy_support_amp() {
 		register_taxonomy( $custom_taxonomy, 'post' );
 		$taxonomies_to_test = array( $custom_taxonomy, 'category', 'post_tag' );
 		AMP_Options_Manager::update_option( 'supported_templates', array( 'is_category', 'is_tag', sprintf( 'is_tax[%s]', $custom_taxonomy ) ) );
-		AMP_CLI::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 
 		// When these templates are not unchecked in the 'AMP Settings' UI, these should be supported.
 		foreach ( $taxonomies_to_test as $taxonomy ) {
@@ -188,7 +187,6 @@ public function test_does_taxonomy_support_amp() {
 		// When the user has not checked the boxes for 'Categories' and 'Tags,' this should be false.
 		AMP_Options_Manager::update_option( 'supported_templates', array( 'is_author' ) );
 		AMP_Options_Manager::update_option( 'all_templates_supported', false );
-		AMP_CLI::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 		foreach ( $taxonomies_to_test as $taxonomy ) {
 			$this->assertFalse( AMP_CLI::does_taxonomy_support_amp( $taxonomy ) );
 		}
@@ -202,13 +200,12 @@ public function test_does_taxonomy_support_amp() {
 
 		// When the user has checked the 'all_templates_supported' box, this should always be true.
 		AMP_Options_Manager::update_option( 'all_templates_supported', true );
-		AMP_CLI::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 		foreach ( $taxonomies_to_test as $taxonomy ) {
 			$this->assertTrue( AMP_CLI::does_taxonomy_support_amp( $taxonomy ) );
 		}
 		AMP_Options_Manager::update_option( 'all_templates_supported', false );
 
-		/**
+		/*
 		 * If the user passed allowed conditionals to the WP-CLI command like wp amp validate-site --include=is_category,is_tag
 		 * these should be supported taxonomies.
 		 */
@@ -217,7 +214,7 @@ public function test_does_taxonomy_support_amp() {
 		$this->assertTrue( AMP_CLI::does_taxonomy_support_amp( 'tag' ) );
 		$this->assertFalse( AMP_CLI::does_taxonomy_support_amp( 'author' ) );
 		$this->assertFalse( AMP_CLI::does_taxonomy_support_amp( 'search' ) );
-		AMP_CLI::$include_conditionals = null;
+		AMP_CLI::$include_conditionals = array();
 	}
 
 	/**
@@ -231,12 +228,10 @@ public function test_is_template_supported() {
 
 		AMP_Options_Manager::update_option( 'supported_templates', array( $author_conditional ) );
 		AMP_Options_Manager::update_option( 'all_templates_supported', false );
-		AMP_CLI::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 		$this->assertTrue( AMP_CLI::is_template_supported( $author_conditional ) );
 		$this->assertFalse( AMP_CLI::is_template_supported( $search_conditional ) );
 
 		AMP_Options_Manager::update_option( 'supported_templates', array( $search_conditional ) );
-		AMP_CLI::$supportable_templates = AMP_Theme_Support::get_supportable_templates();
 		$this->assertTrue( AMP_CLI::is_template_supported( $search_conditional ) );
 		$this->assertFalse( AMP_CLI::is_template_supported( $author_conditional ) );
 	}
@@ -350,7 +345,7 @@ public function test_get_author_page_urls() {
 			array( $first_author_url, $second_author_url ),
 			AMP_CLI::get_author_page_urls()
 		);
-		AMP_CLI::$include_conditionals = null;
+		AMP_CLI::$include_conditionals = array();
 	}
 
 	/**
@@ -369,7 +364,7 @@ public function test_get_search_page() {
 		// If $include_conditionals has is_search, this should return a URL.
 		AMP_CLI::$include_conditionals = array( 'is_search' );
 		$this->assertTrue( is_string( AMP_CLI::get_search_page() ) );
-		AMP_CLI::$include_conditionals = null;
+		AMP_CLI::$include_conditionals = array();
 	}
 
 	/**
@@ -391,13 +386,13 @@ public function test_get_date_page() {
 		AMP_CLI::$include_conditionals = array( 'is_date' );
 		$parsed_page_url               = wp_parse_url( AMP_CLI::get_date_page() );
 		$this->assertContains( $year, $parsed_page_url['query'] );
-		AMP_CLI::$include_conditionals = null;
+		AMP_CLI::$include_conditionals = array();
 	}
 
 	/**
-	 * Test validate_site.
+	 * Test crawl_site.
 	 *
-	 * @covers AMP_CLI::validate_site()
+	 * @covers AMP_CLI::crawl_site()
 	 */
 	public function test_validate_site() {
 		$number_of_posts = 20;
@@ -411,7 +406,7 @@ public function test_validate_site() {
 			$posts[]           = $post_id;
 			$post_permalinks[] = get_permalink( $post_id );
 		}
-		AMP_CLI::validate_site();
+		AMP_CLI::crawl_site();
 
 		// All of the posts created above should be present in $validated_urls.
 		$this->assertEmpty( array_diff( $post_permalinks, self::get_validated_urls() ) );
@@ -422,7 +417,7 @@ public function test_validate_site() {
 
 		// Terms need to be associated with a post in order to be returned in get_terms().
 		wp_set_post_terms( $posts[0], $terms, 'category' );
-		AMP_CLI::validate_site();
+		AMP_CLI::crawl_site();
 		$expected_validated_urls = array_map( 'get_term_link', $terms );
 		$actual_validated_urls   = self::get_validated_urls();
 

From 2637fb803d611743d907ddf56e4addf297808f82 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Thu, 23 Aug 2018 23:10:35 -0700
Subject: [PATCH 74/85] Ignore auto-sanitization when looking for unaccepted
 errors

Show URL count and validity rate as two columns, as opposed to single ratio column.
---
 includes/class-amp-cli.php   | 83 ++++++++++++++++--------------------
 tests/test-class-amp-cli.php | 34 ++-------------
 2 files changed, 41 insertions(+), 76 deletions(-)

diff --git a/includes/class-amp-cli.php b/includes/class-amp-cli.php
index befee8ab8b0..69d1862b07b 100644
--- a/includes/class-amp-cli.php
+++ b/includes/class-amp-cli.php
@@ -57,7 +57,7 @@ class AMP_CLI {
 	 *
 	 * @var string
 	 */
-	const MAXIMUM_URLS_ARGUMENT = 'limit';
+	const LIMIT_URLS_ARGUMENT = 'limit';
 
 	/**
 	 * The WP CLI progress bar.
@@ -123,7 +123,7 @@ class AMP_CLI {
 	 *
 	 * @var int
 	 */
-	public static $maximum_urls_to_validate_for_each_type = 100;
+	public static $limit_type_validate_count;
 
 	/**
 	 * The validation counts by type, like template or post type.
@@ -144,6 +144,9 @@ class AMP_CLI {
 	 *
 	 * [--limit=<templates>]
 	 * : The maximum number of URLs to validate for each template and content type.
+	 * ----
+	 * default: 100
+	 * ----
 	 *
 	 * [--include=<templates>]
 	 * : Only validates a URL if one of the conditionals is true.
@@ -162,6 +165,9 @@ class AMP_CLI {
 	 */
 	public function validate_site( $args, $assoc_args ) {
 		unset( $args );
+		self::$include_conditionals      = array();
+		self::$force_crawl_urls          = false;
+		self::$limit_type_validate_count = (int) $assoc_args[ self::LIMIT_URLS_ARGUMENT ];
 
 		/*
 		 * Handle the argument and flag passed to the command: --include and --force.
@@ -175,10 +181,6 @@ public function validate_site( $args, $assoc_args ) {
 			self::$force_crawl_urls = true;
 		}
 
-		if ( ! empty( $assoc_args[ self::MAXIMUM_URLS_ARGUMENT ] ) ) {
-			self::$maximum_urls_to_validate_for_each_type = intval( $assoc_args[ self::MAXIMUM_URLS_ARGUMENT ] );
-		}
-
 		$number_urls_to_crawl = self::count_urls_to_validate();
 		if ( ! $number_urls_to_crawl ) {
 			if ( ! empty( self::$include_conditionals ) ) {
@@ -216,20 +218,23 @@ public function validate_site( $args, $assoc_args ) {
 			admin_url( 'edit.php' )
 		);
 
-		$key_template_type        = __( 'Template or content type', 'amp' );
-		$key_valid_ratio          = __( 'Valid URLs', 'amp' );
+		$key_template_type = __( 'Template or content type', 'amp' );
+		$key_url_count     = __( 'URL Count', 'amp' );
+		$key_validity_rate = __( 'Validity Rate', 'amp' );
+
 		$table_validation_by_type = array();
 		foreach ( self::$validity_by_type as $type_name => $validity ) {
 			$table_validation_by_type[] = array(
 				$key_template_type => $type_name,
-				$key_valid_ratio   => sprintf( '%1$s/%2$d', $validity['valid'], $validity['total'] ),
+				$key_url_count     => $validity['total'],
+				$key_validity_rate => sprintf( '%d%%', 100.0 * ( $validity['valid'] / $validity['total'] ) ),
 			);
 		}
 
 		WP_CLI::success(
 			sprintf(
 				/* translators: $1%d is the number of URls crawled, $2%d is the number of validation issues, $3%d is the number of unaccepted issues, $4%s is the list of validation by type, $5%s is the link for more details */
-				__( "Of the %1\$d URLs crawled, %2\$d have AMP validation issue(s), and %3\$d have unaccepted issue(s). \n\nFor more details, please see: \n%4\$s \n", 'amp' ),
+				__( "%3\$d crawled URLs have unaccepted issue(s) out of %2\$d total which AMP validation issue(s); %1\$d URLs were crawled. \n\nFor more details, please see: \n%4\$s \n", 'amp' ),
 				self::$number_crawled,
 				self::$total_errors,
 				self::$unaccepted_errors,
@@ -241,7 +246,7 @@ public function validate_site( $args, $assoc_args ) {
 		WP_CLI\Utils\format_items(
 			'table',
 			$table_validation_by_type,
-			array( $key_template_type, $key_valid_ratio )
+			array( $key_template_type, $key_url_count, $key_validity_rate )
 		);
 	}
 
@@ -272,7 +277,7 @@ public static function count_urls_to_validate() {
 			$term_query = new WP_Term_Query( array(
 				'taxonomy' => $taxonomy,
 				'fields'   => 'ids',
-				'number'   => self::$maximum_urls_to_validate_for_each_type,
+				'number'   => self::$limit_type_validate_count,
 			) );
 
 			// If $term_query->terms is an empty array, passing it to count() will throw an error.
@@ -330,29 +335,6 @@ function( $id ) {
 		);
 	}
 
-	/**
-	 * Handles the error count, based on the validation results.
-	 *
-	 * Increments the template's 'total' count,
-	 * and increments the 'valid' count if there is no error.
-	 *
-	 * @param bool   $is_error Whether the validation resulted in an error.
-	 * @param string $key The key to store the validation result.
-	 */
-	public static function handle_error_count( $is_error, $key ) {
-		if ( ! isset( self::$validity_by_type[ $key ] ) ) {
-			self::$validity_by_type[ $key ] = array(
-				'valid' => $is_error ? 0 : 1,
-				'total' => 1,
-			);
-		} else {
-			self::$validity_by_type[ $key ]['total']++;
-			if ( ! $is_error ) {
-				self::$validity_by_type[ $key ]['valid']++;
-			}
-		}
-	}
-
 	/**
 	 * Gets whether the taxonomy supports AMP.
 	 *
@@ -362,7 +344,7 @@ public static function handle_error_count( $is_error, $key ) {
 	 * This can be overridden by passing the self::FLAG_NAME_FORCE_VALIDATION argument to the WP-CLI command.
 	 *
 	 * @param string $taxonomy The taxonomy.
-	 * @return boolean Wether the taxonomy supports AMP.
+	 * @return boolean Whether the taxonomy supports AMP.
 	 */
 	public static function does_taxonomy_support_amp( $taxonomy ) {
 		if ( 'post_tag' === $taxonomy ) {
@@ -410,7 +392,7 @@ public static function is_template_supported( $template ) {
 	public static function get_posts_by_type( $post_type, $offset = null, $number = null ) {
 		$args = array(
 			'post_type'      => $post_type,
-			'posts_per_page' => is_int( $number ) ? $number : self::$maximum_urls_to_validate_for_each_type,
+			'posts_per_page' => is_int( $number ) ? $number : self::$limit_type_validate_count,
 			'post_status'    => 'publish',
 			'orderby'        => 'ID',
 			'order'          => 'ASC',
@@ -468,7 +450,7 @@ public static function get_author_page_urls( $offset = '', $number = '' ) {
 			return $author_page_urls;
 		}
 
-		$number = ! empty( $number ) ? $number : self::$maximum_urls_to_validate_for_each_type;
+		$number = ! empty( $number ) ? $number : self::$limit_type_validate_count;
 		foreach ( get_users( compact( 'offset', 'number' ) ) as $author ) {
 			$author_page_urls[] = get_author_posts_url( $author->ID, $author->user_nicename );
 		}
@@ -510,7 +492,7 @@ public static function get_date_page() {
 	 * and iterates until it reaches the maximum number of URLs for each type.
 	 */
 	public static function crawl_site() {
-		/**
+		/*
 		 * If 'Your homepage displays' is set to 'Your latest posts', validate the homepage.
 		 * It will not be part of the page validation below.
 		 */
@@ -526,7 +508,7 @@ public static function crawl_site() {
 		$i                      = 0;
 
 		// Validate one URL of each template/content type, then another URL of each type on the next iteration.
-		while ( $i < self::$maximum_urls_to_validate_for_each_type ) {
+		while ( $i < self::$limit_type_validate_count ) {
 			// Validate all public, published posts.
 			foreach ( $public_post_types as $post_type ) {
 				$post_ids = self::get_posts_that_support_amp( self::get_posts_by_type( $post_type, $i, 1 ) );
@@ -568,7 +550,7 @@ public static function validate_and_store_url( $url, $type ) {
 		}
 		$validity = AMP_Validation_Manager::validate_url( $url );
 
-		/**
+		/*
 		 * If the request to validate this returns a WP_Error, return.
 		 * One cause of an error is if the validation request results in a 404 response code.
 		 */
@@ -580,16 +562,15 @@ public static function validate_and_store_url( $url, $type ) {
 		}
 
 		AMP_Invalid_URL_Post_Type::store_validation_errors( $validity['validation_errors'], $validity['url'] );
-		$error_count            = count( $validity['validation_errors'] );
-		$has_error              = $error_count > 0;
 		$unaccepted_error_count = count( array_filter(
 			$validity['validation_errors'],
 			function( $error ) {
-				return ! AMP_Validation_Error_Taxonomy::is_validation_error_sanitized( $error );
+				$validation_status = AMP_Validation_Error_Taxonomy::get_validation_error_sanitization( $error );
+				return AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_ACCEPTED_STATUS !== $validation_status['term_status'];
 			}
 		) );
 
-		if ( $has_error ) {
+		if ( count( $validity['validation_errors'] ) > 0 ) {
 			self::$total_errors++;
 		}
 		if ( $unaccepted_error_count > 0 ) {
@@ -597,6 +578,16 @@ function( $error ) {
 		}
 
 		self::$number_crawled++;
-		self::handle_error_count( $has_error, $type );
+
+		if ( ! isset( self::$validity_by_type[ $type ] ) ) {
+			self::$validity_by_type[ $type ] = array(
+				'valid' => 0,
+				'total' => 0,
+			);
+		}
+		self::$validity_by_type[ $type ]['total']++;
+		if ( 0 === $unaccepted_error_count ) {
+			self::$validity_by_type[ $type ]['valid']++;
+		}
 	}
 }
diff --git a/tests/test-class-amp-cli.php b/tests/test-class-amp-cli.php
index 3c38db06ec1..0f5c71d8c04 100644
--- a/tests/test-class-amp-cli.php
+++ b/tests/test-class-amp-cli.php
@@ -20,7 +20,8 @@ class Test_AMP_CLI extends \WP_UnitTestCase {
 	public function setUp() {
 		parent::setUp();
 		add_filter( 'pre_http_request', array( $this, 'add_comment' ) );
-		AMP_CLI::$include_conditionals = array();
+		AMP_CLI::$include_conditionals      = array();
+		AMP_CLI::$limit_type_validate_count = 100;
 	}
 
 	/**
@@ -42,9 +43,10 @@ public function test_count_urls_to_validate() {
 		// The number of original URLs present before adding these test URLs.
 		$number_original_urls = $this->get_inital_url_count();
 		$this->assertEquals( $number_original_urls, AMP_CLI::count_urls_to_validate() );
+		AMP_CLI::$limit_type_validate_count = 100;
 
 		$category         = $this->factory()->term->create( array( 'taxonomy' => 'category' ) );
-		$number_new_posts = AMP_CLI::$maximum_urls_to_validate_for_each_type / 2;
+		$number_new_posts = AMP_CLI::$limit_type_validate_count / 2;
 		$post_ids         = array();
 		for ( $i = 0; $i < $number_new_posts; $i++ ) {
 			$post_ids[] = $this->factory()->post->create( array(
@@ -140,34 +142,6 @@ public function test_get_posts_that_support_amp() {
 		AMP_CLI::$include_conditionals = array();
 	}
 
-	/**
-	 * Test handle_error_count.
-	 *
-	 * @covers AMP_CLI::handle_error_count()
-	 */
-	public function test_handle_error_count() {
-		$custom_post_type = 'foo_custom_post';
-		$expected_errors  = array(
-			$custom_post_type => array(
-				'valid' => 0,
-				'total' => 1,
-			),
-		);
-		AMP_CLI::handle_error_count( true, $custom_post_type );
-		$this->assertEquals( $expected_errors, AMP_CLI::$validity_by_type );
-
-		// When the first argument is true, there was a validation error, and this shouldn't increment the 'valid' count.
-		AMP_CLI::handle_error_count( true, $custom_post_type );
-		$expected_errors[ $custom_post_type ]['total']++;
-		$this->assertEquals( $expected_errors, AMP_CLI::$validity_by_type );
-
-		// When the first argument is false, there was no validation error, and both counts should be incremented.
-		AMP_CLI::handle_error_count( false, $custom_post_type );
-		$expected_errors[ $custom_post_type ]['total']++;
-		$expected_errors[ $custom_post_type ]['valid']++;
-		$this->assertEquals( $expected_errors, AMP_CLI::$validity_by_type );
-	}
-
 	/**
 	 * Test does_taxonomy_support_amp.
 	 *

From da22efca3b30f8ba47eae3a6cb0a645401f674ed Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Fri, 24 Aug 2018 14:18:08 -0500
Subject: [PATCH 75/85] In Classic Mode, call WP_CLI::error() if the --force
 flag isn't present

On Weston's suggestion, as this would not be
able to validate any URL without the --force flag.
---
 includes/class-amp-cli.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/includes/class-amp-cli.php b/includes/class-amp-cli.php
index 69d1862b07b..d5f416ea2f8 100644
--- a/includes/class-amp-cli.php
+++ b/includes/class-amp-cli.php
@@ -181,6 +181,16 @@ public function validate_site( $args, $assoc_args ) {
 			self::$force_crawl_urls = true;
 		}
 
+		if ( 'disabled' === AMP_Options_Manager::get_option( 'theme_support' ) && ! self::$force_crawl_urls ) {
+			WP_CLI::error(
+				sprintf(
+					/* translators: %s is the flag to force validation */
+					__( 'The current template mode is Classic, which does not allow crawling the site. Please pass the --%s flag in order to force crawling for validation.', 'amp' ),
+					self::FLAG_NAME_FORCE_VALIDATION
+				)
+			);
+		}
+
 		$number_urls_to_crawl = self::count_urls_to_validate();
 		if ( ! $number_urls_to_crawl ) {
 			if ( ! empty( self::$include_conditionals ) ) {

From bfadbe203ae3607fa6eb24342265497470a4ec42 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Fri, 24 Aug 2018 15:14:01 -0500
Subject: [PATCH 76/85] Allow validating the site in 'Classic' mode

As Weston suggested,
if in Classic mode and --force is passed,
force theme support in the crawled URLs.
This is now done in read_theme_support(),
thought there might be a better way.
---
 includes/class-amp-cli.php             | 30 +++++++++++++++++---------
 includes/class-amp-theme-support.php   |  2 ++
 tests/test-class-amp-theme-support.php |  8 +++++++
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/includes/class-amp-cli.php b/includes/class-amp-cli.php
index d5f416ea2f8..715ecdcbff9 100644
--- a/includes/class-amp-cli.php
+++ b/includes/class-amp-cli.php
@@ -181,14 +181,24 @@ public function validate_site( $args, $assoc_args ) {
 			self::$force_crawl_urls = true;
 		}
 
-		if ( 'disabled' === AMP_Options_Manager::get_option( 'theme_support' ) && ! self::$force_crawl_urls ) {
-			WP_CLI::error(
-				sprintf(
-					/* translators: %s is the flag to force validation */
-					__( 'The current template mode is Classic, which does not allow crawling the site. Please pass the --%s flag in order to force crawling for validation.', 'amp' ),
-					self::FLAG_NAME_FORCE_VALIDATION
-				)
-			);
+		if ( ! current_theme_supports( 'amp' ) ) {
+			if ( self::$force_crawl_urls ) {
+				/**
+				 * There is no theme support added programatically or via options.
+				 * So the validation taxonomy and post type would not normally be registered.
+				 * Register them here in order to use them to crawl the site.
+				 */
+				AMP_Validation_Error_Taxonomy::register();
+				AMP_Invalid_URL_Post_Type::register();
+			} else {
+				WP_CLI::error(
+					sprintf(
+						/* translators: %s is the flag to force validation */
+						__( 'The current template mode is Classic, which does not allow crawling the site. Please pass the --%s flag in order to force crawling for validation.', 'amp' ),
+						self::FLAG_NAME_FORCE_VALIDATION
+					)
+				);
+			}
 		}
 
 		$number_urls_to_crawl = self::count_urls_to_validate();
@@ -469,7 +479,7 @@ public static function get_author_page_urls( $offset = '', $number = '' ) {
 	}
 
 	/**
-	 * Gets a search page URLs, like https://example.com/?s=example.
+	 * Gets a single search page URL, like https://example.com/?s=example.
 	 *
 	 * @return string|null An example search page, or null.
 	 */
@@ -482,7 +492,7 @@ public static function get_search_page() {
 	}
 
 	/**
-	 * Gets a date page URL, like https://example.com/?year=2018.
+	 * Gets a single date page URL, like https://example.com/?year=2018.
 	 *
 	 * @return string|null An example search page, or null.
 	 */
diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 0ba680cf7cb..305d46441d8 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -204,6 +204,8 @@ public static function read_theme_support() {
 				'paired' => ( 'paired' === $theme_support_option ),
 			) );
 			self::$support_added_via_option = true;
+		} elseif ( isset( $_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ], $_GET[ AMP_CLI::FORCE_VALIDATION_QUERY_VAR ] ) ) { // WPCS: CSRF OK.
+			add_theme_support( 'amp' );
 		}
 	}
 
diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 527708a9989..2790bf5849e 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -140,6 +140,14 @@ public function test_read_theme_support_and_support_args() {
 		AMP_Theme_Support::read_theme_support();
 		$this->assertTrue( AMP_Theme_Support::is_support_added_via_option() );
 		$this->assertTrue( current_theme_supports( 'amp' ) );
+
+		remove_theme_support( 'amp' );
+		AMP_Options_Manager::update_option( 'theme_support', 'disabled' );
+		$_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ] = '';
+		$_GET[ AMP_CLI::FORCE_VALIDATION_QUERY_VAR ]        = '';
+		AMP_Theme_Support::read_theme_support();
+		$this->assertTrue( AMP_Theme_Support::is_support_added_via_option() );
+		$this->assertTrue( get_theme_support( 'amp' ) );
 	}
 
 	/**

From 30f7522be179c9c6b80b1bdb8a3d1b460a3cf368 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 28 Aug 2018 15:13:56 -0700
Subject: [PATCH 77/85] Fix phpdoc for WP-CLI

---
 includes/class-amp-cli.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/includes/class-amp-cli.php b/includes/class-amp-cli.php
index 715ecdcbff9..cf4116cdddf 100644
--- a/includes/class-amp-cli.php
+++ b/includes/class-amp-cli.php
@@ -119,7 +119,7 @@ class AMP_CLI {
 	 *
 	 * Templates are each a separate type, like those for is_category() and is_tag().
 	 * Also, each post type is a separate type.
-	 * This value is overridden if the WP-CLI command has an --n argument, like --n=10.
+	 * This value is overridden if the WP-CLI command has an --limit argument, like --limit=10.
 	 *
 	 * @var int
 	 */
@@ -142,11 +142,11 @@ class AMP_CLI {
 	 *
 	 * ## OPTIONS
 	 *
-	 * [--limit=<templates>]
+	 * [--limit=<count>]
 	 * : The maximum number of URLs to validate for each template and content type.
-	 * ----
+	 * ---
 	 * default: 100
-	 * ----
+	 * ---
 	 *
 	 * [--include=<templates>]
 	 * : Only validates a URL if one of the conditionals is true.
@@ -183,8 +183,8 @@ public function validate_site( $args, $assoc_args ) {
 
 		if ( ! current_theme_supports( 'amp' ) ) {
 			if ( self::$force_crawl_urls ) {
-				/**
-				 * There is no theme support added programatically or via options.
+				/*
+				 * There is no theme support added programmatically or via options.
 				 * So the validation taxonomy and post type would not normally be registered.
 				 * Register them here in order to use them to crawl the site.
 				 */

From e1760aa9184e174fbc01a05b4008e10a273c63c7 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 28 Aug 2018 15:24:57 -0700
Subject: [PATCH 78/85] Prevent crawling search or date URLs if empty; use for
 loop

---
 includes/class-amp-cli.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/includes/class-amp-cli.php b/includes/class-amp-cli.php
index cf4116cdddf..cbc2f8aacb7 100644
--- a/includes/class-amp-cli.php
+++ b/includes/class-amp-cli.php
@@ -525,10 +525,9 @@ public static function crawl_site() {
 			array( 'AMP_CLI', 'does_taxonomy_support_amp' )
 		);
 		$public_post_types      = get_post_types( array( 'public' => true ), 'names' );
-		$i                      = 0;
 
 		// Validate one URL of each template/content type, then another URL of each type on the next iteration.
-		while ( $i < self::$limit_type_validate_count ) {
+		for ( $i = 0; $i < self::$limit_type_validate_count; $i++ ) {
 			// Validate all public, published posts.
 			foreach ( $public_post_types as $post_type ) {
 				$post_ids = self::get_posts_that_support_amp( self::get_posts_by_type( $post_type, $i, 1 ) );
@@ -549,13 +548,17 @@ public static function crawl_site() {
 			if ( ! empty( $author_page_urls[0] ) ) {
 				self::validate_and_store_url( $author_page_urls[0], 'author' );
 			}
-
-			$i++;
 		}
 
 		// Only validate 1 date and 1 search page.
-		self::validate_and_store_url( self::get_date_page(), 'date' );
-		self::validate_and_store_url( self::get_search_page(), 'search' );
+		$url = self::get_date_page();
+		if ( $url ) {
+			self::validate_and_store_url( $url, 'date' );
+		}
+		$url = self::get_search_page();
+		if ( $url ) {
+			self::validate_and_store_url( $url, 'search' );
+		}
 	}
 
 	/**

From ad7e0e2212899878aa5094d227718f319014c2c0 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 28 Aug 2018 15:40:46 -0700
Subject: [PATCH 79/85] Show warning when validate_url call fails

---
 includes/class-amp-cli.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/class-amp-cli.php b/includes/class-amp-cli.php
index cbc2f8aacb7..1365bf494c0 100644
--- a/includes/class-amp-cli.php
+++ b/includes/class-amp-cli.php
@@ -564,7 +564,7 @@ public static function crawl_site() {
 	/**
 	 * Validates the URL, stores the results, and increments the counts.
 	 *
-	 * @param string $url The URL to validate.
+	 * @param string $url  The URL to validate.
 	 * @param string $type The type of template, post, or taxonomy.
 	 */
 	public static function validate_and_store_url( $url, $type ) {
@@ -578,6 +578,8 @@ public static function validate_and_store_url( $url, $type ) {
 		 * One cause of an error is if the validation request results in a 404 response code.
 		 */
 		if ( is_wp_error( $validity ) ) {
+			/* translators: %1$s is error code, %2$s is error message, and %3$s is the actual URL. */
+			WP_CLI::warning( sprintf( __( 'Validate URL error (%1$s): %2$s URL: %3$s', 'amp' ), $validity->get_error_code(), $validity->get_error_message(), $url ) );
 			return;
 		}
 		if ( self::$wp_cli_progress ) {

From 7a5275142f68f7efe0d68c993bdbc7040f27b8ca Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 28 Aug 2018 15:49:05 -0700
Subject: [PATCH 80/85] Fix classic mode site validation by forcing native mode

* Only show admin URL to review results if theme support initially present.
* Skip showing table if no results obtained.
---
 includes/class-amp-cli.php | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/includes/class-amp-cli.php b/includes/class-amp-cli.php
index 1365bf494c0..3d930b85a40 100644
--- a/includes/class-amp-cli.php
+++ b/includes/class-amp-cli.php
@@ -181,13 +181,16 @@ public function validate_site( $args, $assoc_args ) {
 			self::$force_crawl_urls = true;
 		}
 
-		if ( ! current_theme_supports( 'amp' ) ) {
+		$theme_support_amp = current_theme_supports( 'amp' );
+
+		if ( ! $theme_support_amp ) {
 			if ( self::$force_crawl_urls ) {
 				/*
 				 * There is no theme support added programmatically or via options.
 				 * So the validation taxonomy and post type would not normally be registered.
 				 * Register them here in order to use them to crawl the site.
 				 */
+				add_theme_support( 'amp' );
 				AMP_Validation_Error_Taxonomy::register();
 				AMP_Invalid_URL_Post_Type::register();
 			} else {
@@ -232,12 +235,6 @@ public function validate_site( $args, $assoc_args ) {
 		self::crawl_site();
 		self::$wp_cli_progress->finish();
 
-		$url_more_details = add_query_arg(
-			'post_type',
-			AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
-			admin_url( 'edit.php' )
-		);
-
 		$key_template_type = __( 'Template or content type', 'amp' );
 		$key_url_count     = __( 'URL Count', 'amp' );
 		$key_validity_rate = __( 'Validity Rate', 'amp' );
@@ -251,18 +248,34 @@ public function validate_site( $args, $assoc_args ) {
 			);
 		}
 
+		if ( empty( $table_validation_by_type ) ) {
+			WP_CLI::error( __( 'No validation results were obtained from the URLs.', 'amp' ) );
+			return;
+		}
+
 		WP_CLI::success(
 			sprintf(
 				/* translators: $1%d is the number of URls crawled, $2%d is the number of validation issues, $3%d is the number of unaccepted issues, $4%s is the list of validation by type, $5%s is the link for more details */
-				__( "%3\$d crawled URLs have unaccepted issue(s) out of %2\$d total which AMP validation issue(s); %1\$d URLs were crawled. \n\nFor more details, please see: \n%4\$s \n", 'amp' ),
+				__( '%3$d crawled URLs have unaccepted issue(s) out of %2$d total which AMP validation issue(s); %1$d URLs were crawled.', 'amp' ),
 				self::$number_crawled,
 				self::$total_errors,
-				self::$unaccepted_errors,
-				$url_more_details
+				self::$unaccepted_errors
 			)
 		);
 
 		// Output a table of validity by template/content type.
+		if ( $theme_support_amp ) {
+			$url_more_details = add_query_arg(
+				'post_type',
+				AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+				admin_url( 'edit.php' )
+			);
+			/* translators: %s is the URL to the admin */
+			WP_CLI::line( sprintf( __( 'For more details, please see: %s', 'amp' ), $url_more_details ) );
+		} else {
+			WP_CLI::warning( __( 'You cannot currently access the detailed validation results because you have not switched to native or paired AMP template modes.', 'amp' ) );
+		}
+
 		WP_CLI\Utils\format_items(
 			'table',
 			$table_validation_by_type,

From 8e2d028c4cb2225d79b57910e339362f0dc514f7 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 28 Aug 2018 16:11:11 -0700
Subject: [PATCH 81/85] Re-use amp_validate query param for forcing AMP theme
 support in classic mode

---
 includes/amp-helper-functions.php               |  4 ++--
 includes/class-amp-cli.php                      | 15 ---------------
 includes/class-amp-theme-support.php            |  2 +-
 .../validation/class-amp-validation-manager.php | 17 ++++++++++++++++-
 tests/test-amp-helper-functions.php             |  3 +--
 tests/test-class-amp-theme-support.php          |  3 +--
 6 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index 1ce1d8c6274..57f232d11d3 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -287,13 +287,13 @@ function is_amp_endpoint() {
 		return false;
 	}
 
-	/**
+	/*
 	 * If this is a URL for validation, and validation is forced for all URLs, return true.
 	 * Normally, this would be false if the user has deselected a template,
 	 * like by unchecking 'Categories' in 'AMP Settings' > 'Supported Templates'.
 	 * But there's a flag for the WP-CLI command that sets this query var to validate all URLs.
 	 */
-	if ( isset( $_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ], $_GET[ AMP_CLI::FORCE_VALIDATION_QUERY_VAR ] ) ) { // WPCS: CSRF OK.
+	if ( AMP_Validation_Manager::is_theme_support_forced() ) {
 		return true;
 	}
 
diff --git a/includes/class-amp-cli.php b/includes/class-amp-cli.php
index 3d930b85a40..f257eb5e825 100644
--- a/includes/class-amp-cli.php
+++ b/includes/class-amp-cli.php
@@ -26,18 +26,6 @@ class AMP_CLI {
 	 */
 	const FLAG_NAME_FORCE_VALIDATION = 'force';
 
-	/**
-	 * The query var key to force AMP validation, regardless or whether the user has deselected support for a URL.
-	 *
-	 * If the WP-CLI flag above is present in the command,
-	 * this query var is added to the validation URL.
-	 * Then, this forces validation, no matter whether the user has deselected a certain template,
-	 * like by unchecking 'Categories' in 'AMP Settings' > 'Supported Templates'.
-	 *
-	 * @var string
-	 */
-	const FORCE_VALIDATION_QUERY_VAR = 'amp_force_validation';
-
 	/**
 	 * The WP-CLI argument to validate based on certain conditionals
 	 *
@@ -581,9 +569,6 @@ public static function crawl_site() {
 	 * @param string $type The type of template, post, or taxonomy.
 	 */
 	public static function validate_and_store_url( $url, $type ) {
-		if ( self::$force_crawl_urls ) {
-			$url = add_query_arg( self::FORCE_VALIDATION_QUERY_VAR, '', $url );
-		}
 		$validity = AMP_Validation_Manager::validate_url( $url );
 
 		/*
diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 305d46441d8..d489756b57a 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -204,7 +204,7 @@ public static function read_theme_support() {
 				'paired' => ( 'paired' === $theme_support_option ),
 			) );
 			self::$support_added_via_option = true;
-		} elseif ( isset( $_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ], $_GET[ AMP_CLI::FORCE_VALIDATION_QUERY_VAR ] ) ) { // WPCS: CSRF OK.
+		} elseif ( AMP_Validation_Manager::is_theme_support_forced() ) {
 			add_theme_support( 'amp' );
 		}
 	}
diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php
index b0eee7cf4aa..c8cca429149 100644
--- a/includes/validation/class-amp-validation-manager.php
+++ b/includes/validation/class-amp-validation-manager.php
@@ -186,6 +186,21 @@ public static function init( $args = array() ) {
 		}
 	}
 
+	/**
+	 * Determine whether AMP theme support is forced via the amp_validate query param.
+	 *
+	 * @since 1.0
+	 *
+	 * @return bool Whether theme support forced.
+	 */
+	public static function is_theme_support_forced() {
+		return (
+			isset( $_GET[ self::VALIDATE_QUERY_VAR ] ) // WPCS: CSRF OK.
+			&&
+			( self::has_cap() || self::get_amp_validate_nonce() === $_GET[ self::VALIDATE_QUERY_VAR ] ) // WPCS: CSRF OK.
+		);
+	}
+
 	/**
 	 * Return whether sanitization is forcibly accepted, whether because in native mode or via user option.
 	 *
@@ -1654,7 +1669,7 @@ public static function validate_url( $url ) {
 		}
 
 		$url = remove_query_arg(
-			array_merge( array_keys( $added_query_vars ), array( AMP_CLI::FORCE_VALIDATION_QUERY_VAR ) ),
+			array_keys( $added_query_vars ),
 			$validation_url
 		);
 
diff --git a/tests/test-amp-helper-functions.php b/tests/test-amp-helper-functions.php
index a1a718f0c64..5e8ef409dae 100644
--- a/tests/test-amp-helper-functions.php
+++ b/tests/test-amp-helper-functions.php
@@ -362,8 +362,7 @@ public function test_is_amp_endpoint() {
 		$this->assertFalse( is_amp_endpoint() );
 
 		// When the user passes a flag to the WP-CLI command, it forces AMP validation no matter whether the user disabled AMP on any template.
-		$_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ] = 1;
-		$_GET[ AMP_CLI::FORCE_VALIDATION_QUERY_VAR ]        = 1;
+		$_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ] = AMP_Validation_Manager::get_amp_validate_nonce();
 		$this->assertTrue( is_amp_endpoint() );
 	}
 
diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 2790bf5849e..13f9c1425b6 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -143,8 +143,7 @@ public function test_read_theme_support_and_support_args() {
 
 		remove_theme_support( 'amp' );
 		AMP_Options_Manager::update_option( 'theme_support', 'disabled' );
-		$_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ] = '';
-		$_GET[ AMP_CLI::FORCE_VALIDATION_QUERY_VAR ]        = '';
+		$_GET[ AMP_Validation_Manager::VALIDATE_QUERY_VAR ] = AMP_Validation_Manager::get_amp_validate_nonce();
 		AMP_Theme_Support::read_theme_support();
 		$this->assertTrue( AMP_Theme_Support::is_support_added_via_option() );
 		$this->assertTrue( get_theme_support( 'amp' ) );

From edcb23aed859848bb3babcdeea29a1cb86c57c8e Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 28 Aug 2018 17:28:45 -0700
Subject: [PATCH 82/85] Unconditionally initialize validation manager w/
 registered post type and taxonomy

* Hide the admin menu links for invalid URLs and validation errors by default in classic mode.
* Invoking `wp amp validate-site` will cause the post type and taxonomy to be populated.
* When in classic mode, show links to invalid pages and validation errors with template mode as opposed to in admin menu.
* When viewing the admin screens for the post type and taxonomy, show the admin menu links for both.
---
 amp.php                                       |  1 +
 includes/class-amp-cli.php                    | 30 +++++++----------
 includes/class-amp-theme-support.php          |  4 ---
 includes/options/class-amp-options-menu.php   | 33 +++++++++++++++++++
 .../class-amp-invalid-url-post-type.php       | 18 +++++++++-
 .../class-amp-validation-error-taxonomy.php   | 22 +++++++++++--
 .../class-amp-validation-manager.php          |  7 +++-
 .../test-class-amp-invalid-url-post-type.php  | 22 +++++++++++++
 ...st-class-amp-validation-error-taxonomy.php | 24 ++++++++++++++
 9 files changed, 134 insertions(+), 27 deletions(-)

diff --git a/amp.php b/amp.php
index 91ca59a6fc7..8c7924c56c4 100644
--- a/amp.php
+++ b/amp.php
@@ -145,6 +145,7 @@ function amp_init() {
 	add_rewrite_endpoint( amp_get_slug(), EP_PERMALINK );
 
 	AMP_Theme_Support::init();
+	AMP_Validation_Manager::init();
 	AMP_Post_Type_Support::add_post_type_support();
 
 	if ( defined( 'WP_CLI' ) ) {
diff --git a/includes/class-amp-cli.php b/includes/class-amp-cli.php
index f257eb5e825..e06204b6efa 100644
--- a/includes/class-amp-cli.php
+++ b/includes/class-amp-cli.php
@@ -169,18 +169,14 @@ public function validate_site( $args, $assoc_args ) {
 			self::$force_crawl_urls = true;
 		}
 
-		$theme_support_amp = current_theme_supports( 'amp' );
-
-		if ( ! $theme_support_amp ) {
+		if ( ! current_theme_supports( 'amp' ) ) {
 			if ( self::$force_crawl_urls ) {
 				/*
 				 * There is no theme support added programmatically or via options.
-				 * So the validation taxonomy and post type would not normally be registered.
-				 * Register them here in order to use them to crawl the site.
+				 * So make sure that theme support is present so that AMP_Validation_Manager::validate_url()
+				 * will use a canonical URL as the basis for obtaining validation results.
 				 */
 				add_theme_support( 'amp' );
-				AMP_Validation_Error_Taxonomy::register();
-				AMP_Invalid_URL_Post_Type::register();
 			} else {
 				WP_CLI::error(
 					sprintf(
@@ -252,23 +248,19 @@ public function validate_site( $args, $assoc_args ) {
 		);
 
 		// Output a table of validity by template/content type.
-		if ( $theme_support_amp ) {
-			$url_more_details = add_query_arg(
-				'post_type',
-				AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
-				admin_url( 'edit.php' )
-			);
-			/* translators: %s is the URL to the admin */
-			WP_CLI::line( sprintf( __( 'For more details, please see: %s', 'amp' ), $url_more_details ) );
-		} else {
-			WP_CLI::warning( __( 'You cannot currently access the detailed validation results because you have not switched to native or paired AMP template modes.', 'amp' ) );
-		}
-
 		WP_CLI\Utils\format_items(
 			'table',
 			$table_validation_by_type,
 			array( $key_template_type, $key_url_count, $key_validity_rate )
 		);
+
+		$url_more_details = add_query_arg(
+			'post_type',
+			AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+			admin_url( 'edit.php' )
+		);
+		/* translators: %s is the URL to the admin */
+		WP_CLI::line( sprintf( __( 'For more details, please see: %s', 'amp' ), $url_more_details ) );
 	}
 
 	/**
diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index d489756b57a..b213d055eb1 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -137,10 +137,6 @@ public static function init() {
 			return;
 		}
 
-		AMP_Validation_Manager::init( array(
-			'should_locate_sources' => AMP_Validation_Manager::should_validate_response(),
-		) );
-
 		self::$init_start_time = microtime( true );
 
 		self::purge_amp_query_vars();
diff --git a/includes/options/class-amp-options-menu.php b/includes/options/class-amp-options-menu.php
index 860fba5a9f7..4cb64373050 100644
--- a/includes/options/class-amp-options-menu.php
+++ b/includes/options/class-amp-options-menu.php
@@ -190,6 +190,39 @@ public function render_theme_support() {
 					</dt>
 					<dd>
 						<?php esc_html_e( 'Display AMP responses in classic (legacy) post templates in a basic design that does not match your theme\'s templates.', 'amp' ); ?>
+
+						<?php if ( ! current_theme_supports( 'amp' ) && wp_count_posts( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG )->publish > 0 ) : ?>
+							<div class="notice notice-info inline notice-alt">
+								<p>
+									<?php
+									echo wp_kses_post(
+										sprintf(
+											/* translators: %1$s is link to invalid URLs and %2$s is link to validation errors */
+											__( 'View current site compatibility results for native and paired modes: %1$s and %2$s', 'amp' ),
+											sprintf(
+												'<a href="%s">%s</a>',
+												esc_url( add_query_arg( 'post_type', AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG, admin_url( 'edit.php' ) ) ),
+												esc_html( get_post_type_object( AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG )->labels->name )
+											),
+											sprintf(
+												'<a href="%s">%s</a>',
+												esc_url(
+													add_query_arg(
+														array(
+															'taxonomy' => AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG,
+															'post_type' => AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG,
+														),
+														admin_url( 'edit-tags.php' )
+													)
+												),
+												esc_html( get_taxonomy( AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG )->labels->name )
+											)
+										)
+									);
+									?>
+								</p>
+							</div>
+						<?php endif; ?>
 					</dd>
 				</dl>
 			</fieldset>
diff --git a/includes/validation/class-amp-invalid-url-post-type.php b/includes/validation/class-amp-invalid-url-post-type.php
index 58ead72abce..785928e4054 100644
--- a/includes/validation/class-amp-invalid-url-post-type.php
+++ b/includes/validation/class-amp-invalid-url-post-type.php
@@ -96,7 +96,7 @@ public static function register() {
 				'supports'     => false,
 				'public'       => false,
 				'show_ui'      => true,
-				'show_in_menu' => AMP_Options_Manager::OPTION_NAME,
+				'show_in_menu' => ( self::should_show_in_menu() || AMP_Validation_Error_Taxonomy::should_show_in_menu() ) ? AMP_Options_Manager::OPTION_NAME : false,
 				// @todo Show in rest.
 			)
 		);
@@ -109,6 +109,22 @@ public static function register() {
 		}
 	}
 
+	/**
+	 * Determine whether the admin menu item should be included.
+	 *
+	 * @return bool Whether to show in menu.
+	 */
+	public static function should_show_in_menu() {
+		global $pagenow;
+		if ( current_theme_supports( 'amp' ) ) {
+			return true;
+		}
+		if ( 'edit.php' === $pagenow && ( isset( $_GET['post_type'] ) && self::POST_TYPE_SLUG === $_GET['post_type'] ) ) { // WPCS: CSRF OK.
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * Add admin hooks.
 	 */
diff --git a/includes/validation/class-amp-validation-error-taxonomy.php b/includes/validation/class-amp-validation-error-taxonomy.php
index 9c8414dc7b7..fa19ec7f8ab 100644
--- a/includes/validation/class-amp-validation-error-taxonomy.php
+++ b/includes/validation/class-amp-validation-error-taxonomy.php
@@ -146,7 +146,7 @@ public static function register() {
 			'show_tagcloud'      => false,
 			'show_in_quick_edit' => false,
 			'hierarchical'       => false, // Or true? Code could be the parent term?
-			'show_in_menu'       => true,
+			'show_in_menu'       => ( self::should_show_in_menu() || AMP_Invalid_URL_Post_Type::should_show_in_menu() ),
 			'meta_box_cb'        => false, // See print_validation_errors_meta_box().
 			'capabilities'       => array(
 				'assign_terms' => 'do_not_allow',
@@ -162,6 +162,22 @@ public static function register() {
 		self::accept_validation_errors( AMP_Core_Theme_Sanitizer::get_acceptable_errors( get_template() ) );
 	}
 
+	/**
+	 * Determine whether the admin menu item should be included.
+	 *
+	 * @return bool Whether to show in menu.
+	 */
+	public static function should_show_in_menu() {
+		global $pagenow;
+		if ( current_theme_supports( 'amp' ) ) {
+			return true;
+		}
+		if ( 'edit-tags.php' === $pagenow && ( isset( $_GET['taxonomy'] ) && self::TAXONOMY_SLUG === $_GET['taxonomy'] ) ) { // WPCS: CSRF OK.
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * Prepare a validation error for lookup or insertion as taxonomy term.
 	 *
@@ -459,7 +475,9 @@ public static function add_admin_hooks() {
 		add_filter( 'terms_clauses', array( __CLASS__, 'filter_terms_clauses_for_description_search' ), 10, 3 );
 		add_action( 'admin_notices', array( __CLASS__, 'add_admin_notices' ) );
 		add_filter( 'tag_row_actions', array( __CLASS__, 'filter_tag_row_actions' ), 10, 2 );
-		add_action( 'admin_menu', array( __CLASS__, 'add_admin_menu_validation_error_item' ) );
+		if ( get_taxonomy( self::TAXONOMY_SLUG )->show_in_menu ) {
+			add_action( 'admin_menu', array( __CLASS__, 'add_admin_menu_validation_error_item' ) );
+		}
 		add_filter( 'manage_' . self::TAXONOMY_SLUG . '_custom_column', array( __CLASS__, 'filter_manage_custom_columns' ), 10, 3 );
 		add_filter( 'views_edit-' . self::TAXONOMY_SLUG, array( __CLASS__, 'filter_views_edit' ) );
 		add_filter( 'posts_where', array( __CLASS__, 'filter_posts_where_for_validation_error_status' ), 10, 2 );
diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php
index c8cca429149..42f3b0dc5d8 100644
--- a/includes/validation/class-amp-validation-manager.php
+++ b/includes/validation/class-amp-validation-manager.php
@@ -148,7 +148,7 @@ class AMP_Validation_Manager {
 	public static function init( $args = array() ) {
 		$args = array_merge(
 			array(
-				'should_locate_sources' => false,
+				'should_locate_sources' => self::should_validate_response(),
 			),
 			$args
 		);
@@ -158,6 +158,11 @@ public static function init( $args = array() ) {
 		AMP_Invalid_URL_Post_Type::register();
 		AMP_Validation_Error_Taxonomy::register();
 
+		// Short-circuit if AMP is not supported as only the post types should be available.
+		if ( ! current_theme_supports( 'amp' ) ) {
+			return;
+		}
+
 		add_action( 'save_post', array( __CLASS__, 'handle_save_post_prompting_validation' ) );
 		add_action( 'enqueue_block_editor_assets', array( __CLASS__, 'enqueue_block_validation' ) );
 
diff --git a/tests/validation/test-class-amp-invalid-url-post-type.php b/tests/validation/test-class-amp-invalid-url-post-type.php
index c2ab90ae52e..9d53e0d908a 100644
--- a/tests/validation/test-class-amp-invalid-url-post-type.php
+++ b/tests/validation/test-class-amp-invalid-url-post-type.php
@@ -30,6 +30,7 @@ public function tearDown() {
 	 * @covers \AMP_Invalid_URL_Post_Type::add_admin_hooks()
 	 */
 	public function test_register() {
+		add_theme_support( 'amp' );
 		$this->assertFalse( is_admin() );
 
 		AMP_Invalid_URL_Post_Type::register();
@@ -51,6 +52,27 @@ public function test_register() {
 		$this->assertContains( AMP_Invalid_URL_Post_Type::REMAINING_ERRORS, wp_removable_query_args() );
 	}
 
+	/**
+	 * Test should_show_in_menu.
+	 *
+	 * @covers AMP_Invalid_URL_Post_Type::should_show_in_menu()
+	 */
+	public function test_should_show_in_menu() {
+		global $pagenow;
+		add_theme_support( 'amp' );
+		$this->assertTrue( AMP_Invalid_URL_Post_Type::should_show_in_menu() );
+
+		remove_theme_support( 'amp' );
+		$this->assertFalse( AMP_Invalid_URL_Post_Type::should_show_in_menu() );
+
+		$pagenow           = 'edit.php'; // WPCS: override ok.
+		$_GET['post_type'] = 'post';
+		$this->assertFalse( AMP_Invalid_URL_Post_Type::should_show_in_menu() );
+
+		$_GET['post_type'] = AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG;
+		$this->assertTrue( AMP_Invalid_URL_Post_Type::should_show_in_menu() );
+	}
+
 	/**
 	 * Test add_admin_hooks.
 	 *
diff --git a/tests/validation/test-class-amp-validation-error-taxonomy.php b/tests/validation/test-class-amp-validation-error-taxonomy.php
index 4d625b0f48a..d18d0618f4d 100644
--- a/tests/validation/test-class-amp-validation-error-taxonomy.php
+++ b/tests/validation/test-class-amp-validation-error-taxonomy.php
@@ -44,6 +44,7 @@ public function tearDown() {
 	 */
 	public function test_register() {
 		global $wp_taxonomies;
+		add_theme_support( 'amp' );
 
 		AMP_Validation_Error_Taxonomy::register();
 		$taxonomy_object = $wp_taxonomies[ AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG ];
@@ -79,6 +80,27 @@ public function test_register() {
 		$this->assertEquals( 'Most Used Validation Errors', $labels->most_used );
 	}
 
+	/**
+	 * Test should_show_in_menu.
+	 *
+	 * @covers AMP_Validation_Error_Taxonomy::should_show_in_menu()
+	 */
+	public function test_should_show_in_menu() {
+		global $pagenow;
+		add_theme_support( 'amp' );
+		$this->assertTrue( AMP_Validation_Error_Taxonomy::should_show_in_menu() );
+
+		remove_theme_support( 'amp' );
+		$this->assertFalse( AMP_Validation_Error_Taxonomy::should_show_in_menu() );
+
+		$pagenow          = 'edit-tags.php'; // WPCS: override ok.
+		$_GET['taxonomy'] = 'post_tag';
+		$this->assertFalse( AMP_Validation_Error_Taxonomy::should_show_in_menu() );
+
+		$_GET['taxonomy'] = AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG;
+		$this->assertTrue( AMP_Validation_Error_Taxonomy::should_show_in_menu() );
+	}
+
 	/**
 	 * Test prepare_validation_error_taxonomy_term.
 	 *
@@ -315,6 +337,8 @@ public function test_summarize_validation_errors() {
 	 * @covers \AMP_Validation_Error_Taxonomy::add_admin_hooks()
 	 */
 	public function test_add_admin_hooks() {
+		add_theme_support( 'amp' );
+		AMP_Validation_Error_Taxonomy::register();
 
 		// add_group_terms_clauses_filter() needs the screen to be set.
 		set_current_screen( 'front' );

From 0e9bf1b484826f813631f31054bb37f7c0cf45fa Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 28 Aug 2018 17:55:25 -0700
Subject: [PATCH 83/85] Switch to query posts in descending order for improved
 recency relevance with limit

---
 includes/class-amp-cli.php   | 2 +-
 tests/test-class-amp-cli.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/class-amp-cli.php b/includes/class-amp-cli.php
index e06204b6efa..40c7fb23bf1 100644
--- a/includes/class-amp-cli.php
+++ b/includes/class-amp-cli.php
@@ -408,7 +408,7 @@ public static function get_posts_by_type( $post_type, $offset = null, $number =
 			'posts_per_page' => is_int( $number ) ? $number : self::$limit_type_validate_count,
 			'post_status'    => 'publish',
 			'orderby'        => 'ID',
-			'order'          => 'ASC',
+			'order'          => 'DESC',
 			'fields'         => 'ids',
 		);
 		if ( is_int( $offset ) ) {
diff --git a/tests/test-class-amp-cli.php b/tests/test-class-amp-cli.php
index 0f5c71d8c04..c8a518b4f76 100644
--- a/tests/test-class-amp-cli.php
+++ b/tests/test-class-amp-cli.php
@@ -228,9 +228,9 @@ public function test_get_posts_by_type() {
 			$expected_posts = $query->posts;
 
 			for ( $i = 0; $i < $number_posts_each_post_type; $i++ ) {
-				$expected_posts[] = $this->factory()->post->create( array(
+				array_unshift( $expected_posts, $this->factory()->post->create( array(
 					'post_type' => $post_type,
-				) );
+				) ) );
 			}
 
 			$actual_posts = AMP_CLI::get_posts_by_type( $post_type );

From a83a569fd14eeb1c685571177e940f511ca11f08 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 28 Aug 2018 17:58:23 -0700
Subject: [PATCH 84/85] Simplify should_show_in_menu return condition

---
 includes/validation/class-amp-invalid-url-post-type.php     | 5 +----
 includes/validation/class-amp-validation-error-taxonomy.php | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/includes/validation/class-amp-invalid-url-post-type.php b/includes/validation/class-amp-invalid-url-post-type.php
index 785928e4054..65b4597db31 100644
--- a/includes/validation/class-amp-invalid-url-post-type.php
+++ b/includes/validation/class-amp-invalid-url-post-type.php
@@ -119,10 +119,7 @@ public static function should_show_in_menu() {
 		if ( current_theme_supports( 'amp' ) ) {
 			return true;
 		}
-		if ( 'edit.php' === $pagenow && ( isset( $_GET['post_type'] ) && self::POST_TYPE_SLUG === $_GET['post_type'] ) ) { // WPCS: CSRF OK.
-			return true;
-		}
-		return false;
+		return ( 'edit.php' === $pagenow && ( isset( $_GET['post_type'] ) && self::POST_TYPE_SLUG === $_GET['post_type'] ) ); // WPCS: CSRF OK.
 	}
 
 	/**
diff --git a/includes/validation/class-amp-validation-error-taxonomy.php b/includes/validation/class-amp-validation-error-taxonomy.php
index fa19ec7f8ab..8505e0f5669 100644
--- a/includes/validation/class-amp-validation-error-taxonomy.php
+++ b/includes/validation/class-amp-validation-error-taxonomy.php
@@ -172,10 +172,7 @@ public static function should_show_in_menu() {
 		if ( current_theme_supports( 'amp' ) ) {
 			return true;
 		}
-		if ( 'edit-tags.php' === $pagenow && ( isset( $_GET['taxonomy'] ) && self::TAXONOMY_SLUG === $_GET['taxonomy'] ) ) { // WPCS: CSRF OK.
-			return true;
-		}
-		return false;
+		return ( 'edit-tags.php' === $pagenow && ( isset( $_GET['taxonomy'] ) && self::TAXONOMY_SLUG === $_GET['taxonomy'] ) ); // WPCS: CSRF OK.
 	}
 
 	/**

From 19ead16c1a0f43be69c7a9eac7731f67f02755f0 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 28 Aug 2018 18:29:57 -0700
Subject: [PATCH 85/85] Fix grammar typo in CLI success message

---
 includes/class-amp-cli.php                  | 2 +-
 includes/options/class-amp-options-menu.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/class-amp-cli.php b/includes/class-amp-cli.php
index 40c7fb23bf1..77a7f8aeed0 100644
--- a/includes/class-amp-cli.php
+++ b/includes/class-amp-cli.php
@@ -240,7 +240,7 @@ public function validate_site( $args, $assoc_args ) {
 		WP_CLI::success(
 			sprintf(
 				/* translators: $1%d is the number of URls crawled, $2%d is the number of validation issues, $3%d is the number of unaccepted issues, $4%s is the list of validation by type, $5%s is the link for more details */
-				__( '%3$d crawled URLs have unaccepted issue(s) out of %2$d total which AMP validation issue(s); %1$d URLs were crawled.', 'amp' ),
+				__( '%3$d crawled URLs have unaccepted issue(s) out of %2$d total with AMP validation issue(s); %1$d URLs were crawled.', 'amp' ),
 				self::$number_crawled,
 				self::$total_errors,
 				self::$unaccepted_errors
diff --git a/includes/options/class-amp-options-menu.php b/includes/options/class-amp-options-menu.php
index 4cb64373050..327cb9f17d8 100644
--- a/includes/options/class-amp-options-menu.php
+++ b/includes/options/class-amp-options-menu.php
@@ -198,7 +198,7 @@ public function render_theme_support() {
 									echo wp_kses_post(
 										sprintf(
 											/* translators: %1$s is link to invalid URLs and %2$s is link to validation errors */
-											__( 'View current site compatibility results for native and paired modes: %1$s and %2$s', 'amp' ),
+											__( 'View current site compatibility results for native and paired modes: %1$s and %2$s.', 'amp' ),
 											sprintf(
 												'<a href="%s">%s</a>',
 												esc_url( add_query_arg( 'post_type', AMP_Invalid_URL_Post_Type::POST_TYPE_SLUG, admin_url( 'edit.php' ) ) ),