From 0300898c34efa89cf9d0b225a9a682f8e5eb0edb Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Fri, 12 Jan 2018 17:49:54 -0800
Subject: [PATCH] Revert "Merge pull request #725 from
 Automattic/amedina/add-amp-actions-class-hierarchy"

This reverts commit c5237e6b87411da0aa66f5dcc0d1e6b0c9c219f9, reversing
changes made to 41af09690eae54a3e832bf31ad5938a1a2d26dfa.

Fixes merge conflicts introduced by #810 and #828.
---
 amp.php                                       |   7 +-
 includes/actions/class-amp-actions.php        |  20 --
 .../actions/class-amp-frontend-actions.php    |  32 ----
 .../actions/class-amp-paired-post-actions.php | 178 ------------------
 includes/amp-frontend-actions.php             |  28 +++
 includes/amp-post-template-actions.php        | 170 +++++++++++++++++
 includes/class-amp-autoloader.php             |   3 -
 7 files changed, 202 insertions(+), 236 deletions(-)
 delete mode 100644 includes/actions/class-amp-actions.php
 delete mode 100644 includes/actions/class-amp-frontend-actions.php
 delete mode 100644 includes/actions/class-amp-paired-post-actions.php
 create mode 100644 includes/amp-frontend-actions.php
 create mode 100644 includes/amp-post-template-actions.php

diff --git a/amp.php b/amp.php
index c357adb6409..b773c77e7a7 100644
--- a/amp.php
+++ b/amp.php
@@ -150,12 +150,13 @@ function amp_load_classes() {
 }
 
 function amp_add_frontend_actions() {
-	AMP_Frontend_Actions::register_hooks();
+	require_once AMP__DIR__ . '/includes/amp-frontend-actions.php';
 }
 
 function amp_add_post_template_actions() {
-	AMP_Paired_Post_Actions::register_hooks();
-	require_once( AMP__DIR__ . '/includes/amp-post-template-functions.php' );
+	require_once AMP__DIR__ . '/includes/amp-post-template-actions.php';
+	require_once AMP__DIR__ . '/includes/amp-post-template-functions.php';
+	amp_post_template_init_hooks();
 }
 
 function amp_prepare_render() {
diff --git a/includes/actions/class-amp-actions.php b/includes/actions/class-amp-actions.php
deleted file mode 100644
index 4a95034e66d..00000000000
--- a/includes/actions/class-amp-actions.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-abstract class AMP_Actions {
-	public static function add_scripts( $template ) {}
-	public static function add_styles( $template ) {}
-	public static function add_fonts( $template ) {}
-	public static function add_boilerplate_css( $template ) {}
-	public static function add_schemaorg_metadata( $template ) {}
-	public static function add_analytics_scripts( $template ) {}
-	public static function add_analytics_data( $template ) {}
-	public static function add_canonical_link( $template ) {}
-
-	/**
-	 * Add AMP generator metadata.
-	 *
-	 * @param object $template AMP_Post_Template object.
-	 * @since 0.6
-	 */
-	public static function add_generator_metadata( $template ) {}
-}
diff --git a/includes/actions/class-amp-frontend-actions.php b/includes/actions/class-amp-frontend-actions.php
deleted file mode 100644
index 8fa8ef1cfab..00000000000
--- a/includes/actions/class-amp-frontend-actions.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Class AMP_Frontend_Actions
- *
- * @package AMP
- */
-
-/**
- * Class AMP_Frontend_Actions
- *
- * Callbacks for adding AMP-related things to the main theme
- */
-class AMP_Frontend_Actions {
-
-	/**
-	 * Register hooks.
-	 */
-	public static function register_hooks() {
-		add_action( 'wp_head', 'AMP_Frontend_Actions::add_canonical' );
-	}
-
-	/**
-	 * Add canonical link.
-	 */
-	public static function add_canonical() {
-		if ( false === apply_filters( 'add_canonical_link', true ) ) {
-			return;
-		}
-		$amp_url = amp_get_permalink( get_queried_object_id() );
-		printf( '<link rel="amphtml" href="%s" />', esc_url( $amp_url ) );
-	}
-}
diff --git a/includes/actions/class-amp-paired-post-actions.php b/includes/actions/class-amp-paired-post-actions.php
deleted file mode 100644
index a544ac878f6..00000000000
--- a/includes/actions/class-amp-paired-post-actions.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/**
- * Class AMP_Paired_Post_Actions
- *
- * @package AMP
- */
-
-/**
- * Class AMP_Paired_Post_Actions
- */
-class AMP_Paired_Post_Actions extends AMP_Actions {
-
-	/**
-	 * Register hooks.
-	 */
-	public static function register_hooks() {
-		add_action( 'amp_post_template_head', 'AMP_Paired_Post_Actions::add_generator_metadata' );
-		add_action( 'amp_post_template_head', 'AMP_Paired_Post_Actions::add_title' );
-		add_action( 'amp_post_template_head', 'AMP_Paired_Post_Actions::add_canonical_link' );
-		add_action( 'amp_post_template_head', 'AMP_Paired_Post_Actions::add_scripts' );
-		add_action( 'amp_post_template_head', 'AMP_Paired_Post_Actions::add_fonts' );
-		add_action( 'amp_post_template_head', 'AMP_Paired_Post_Actions::add_boilerplate_css' );
-		add_action( 'amp_post_template_head', 'AMP_Paired_Post_Actions::add_schemaorg_metadata' );
-		add_action( 'amp_post_template_css', 'AMP_Paired_Post_Actions::add_styles', 99 );
-		add_action( 'amp_post_template_data', 'AMP_Paired_Post_Actions::add_analytics_scripts' );
-		add_action( 'amp_post_template_footer', 'AMP_Paired_Post_Actions::add_analytics_data' );
-	}
-
-	/**
-	 * Add title.
-	 *
-	 * @param AMP_Post_Template $amp_template template.
-	 */
-	public static function add_title( $amp_template ) {
-		?>
-		<title><?php echo esc_html( $amp_template->get( 'document_title' ) ); ?></title>
-		<?php
-	}
-
-	/**
-	 * Add canonical link.
-	 *
-	 * @param AMP_Post_Template $amp_template Template.
-	 */
-	public static function add_canonical_link( $amp_template ) {
-		?>
-		<link rel="canonical" href="<?php echo esc_url( $amp_template->get( 'canonical_url' ) ); ?>" />
-		<?php
-	}
-
-	/**
-	 * Print scripts.
-	 *
-	 * @param AMP_Post_Template $amp_template Template.
-	 */
-	public static function add_scripts( $amp_template ) {
-		$scripts = $amp_template->get( 'amp_component_scripts', array() );
-		foreach ( $scripts as $element => $script ) :
-			$custom_type = ( 'amp-mustache' === $element ) ? 'template' : 'element';
-			?>
-			<script custom-<?php echo esc_attr( $custom_type ); ?>="<?php echo esc_attr( $element ); ?>" src="<?php echo esc_url( $script ); ?>" async></script>
-		<?php endforeach; ?>
-		<script src="<?php echo esc_url( $amp_template->get( 'amp_runtime_script' ) ); ?>" async></script>
-		<?php
-	}
-
-	/**
-	 * Print fonts.
-	 *
-	 * @param AMP_Post_Template $amp_template Template.
-	 */
-	public static function add_fonts( $amp_template ) {
-		$font_urls = $amp_template->get( 'font_urls', array() );
-		?>
-		<?php foreach ( $font_urls as $slug => $url ) : ?>
-			<link rel="stylesheet" href="<?php echo esc_url( $url ); ?>">
-		<?php endforeach; ?>
-		<?php
-	}
-
-	/**
-	 * Print boilerplate CSS.
-	 *
-	 * @param AMP_Post_Template $amp_template Template.
-	 */
-	public static function add_boilerplate_css( $amp_template ) {
-		?>
-		<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-		<?php
-	}
-
-	/**
-	 * Print Schema.org metadata.
-	 *
-	 * @param AMP_Post_Template $amp_template Template.
-	 */
-	public static function add_schemaorg_metadata( $amp_template ) {
-		$metadata = $amp_template->get( 'metadata' );
-		if ( empty( $metadata ) ) {
-			return;
-		}
-		?>
-		<script type="application/ld+json"><?php echo wp_json_encode( $metadata ); ?></script>
-		<?php
-	}
-
-	/**
-	 * Print styles.
-	 *
-	 * @param AMP_Post_Template $amp_template Template.
-	 */
-	public static function add_styles( $amp_template ) {
-		$styles = $amp_template->get( 'post_amp_styles' );
-		if ( ! empty( $styles ) ) {
-			echo '/* Inline styles */' . PHP_EOL; // WPCS: XSS OK.
-			foreach ( $styles as $selector => $declarations ) {
-				$declarations = implode( ';', $declarations ) . ';';
-				printf( '%1$s{%2$s}', $selector, $declarations ); // WPCS: XSS OK.
-			}
-		}
-	}
-
-	/**
-	 * Add analytics scripts.
-	 *
-	 * @param array $data Data.
-	 * @return array Data.
-	 */
-	public static function add_analytics_scripts( $data ) {
-		if ( ! empty( $data['amp_analytics'] ) ) {
-			$data['amp_component_scripts']['amp-analytics'] = 'https://cdn.ampproject.org/v0/amp-analytics-0.1.js';
-		}
-		return $data;
-	}
-
-	/**
-	 * Print analytics data.
-	 *
-	 * @param AMP_Post_Template $amp_template Template.
-	 */
-	public static function add_analytics_data( $amp_template ) {
-		$analytics_entries = $amp_template->get( 'amp_analytics' );
-		if ( empty( $analytics_entries ) ) {
-			return;
-		}
-
-		foreach ( $analytics_entries as $id => $analytics_entry ) {
-			if ( ! isset( $analytics_entry['type'], $analytics_entry['attributes'], $analytics_entry['config_data'] ) ) {
-				/* translators: %1$s is analytics entry ID, %2$s is actual entry keys. */
-				_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'Analytics entry for %1$s is missing one of the following keys: `type`, `attributes`, or `config_data` (array keys: %2$s)', 'amp' ), esc_html( $id ), esc_html( implode( ', ', array_keys( $analytics_entry ) ) ) ), '0.3.2' );
-				continue;
-			}
-
-			$script_element = AMP_HTML_Utils::build_tag( 'script', array(
-				'type' => 'application/json',
-			), wp_json_encode( $analytics_entry['config_data'] ) );
-
-			$amp_analytics_attr = array_merge( array(
-				'id' => $id,
-				'type' => $analytics_entry['type'],
-			), $analytics_entry['attributes'] );
-
-			echo AMP_HTML_Utils::build_tag( 'amp-analytics', $amp_analytics_attr, $script_element ); // WPCS: XSS OK.
-		}
-	}
-
-	/**
-	 * Print AMP generator metadata.
-	 *
-	 * @param AMP_Post_Template $amp_template AMP_Post_Template object.
-	 * @since 0.6
-	 */
-	public static function add_generator_metadata( $amp_template ) {
-		?>
-		<meta name="generator" content="<?php echo esc_attr( $amp_template->get( 'generator_metadata' ) ); ?>" />
-		<?php
-	}
-}
diff --git a/includes/amp-frontend-actions.php b/includes/amp-frontend-actions.php
new file mode 100644
index 00000000000..76a6af178fe
--- /dev/null
+++ b/includes/amp-frontend-actions.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Callbacks for adding AMP-related things to the main theme.
+ *
+ * @package AMP
+ */
+
+add_action( 'wp_head', 'amp_frontend_add_canonical' );
+
+/**
+ * Add amphtml link to frontend.
+ *
+ * @since 0.2
+ */
+function amp_frontend_add_canonical() {
+
+	/**
+	 * Filters whether to show the amphtml link on the frontend.
+	 *
+	 * @since 0.2
+	 */
+	if ( false === apply_filters( 'amp_frontend_show_canonical', true ) ) {
+		return;
+	}
+
+	$amp_url = amp_get_permalink( get_queried_object_id() );
+	printf( '<link rel="amphtml" href="%s">', esc_url( $amp_url ) );
+}
diff --git a/includes/amp-post-template-actions.php b/includes/amp-post-template-actions.php
new file mode 100644
index 00000000000..711e5bbe023
--- /dev/null
+++ b/includes/amp-post-template-actions.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * Callbacks for adding content to an AMP template.
+ *
+ * @package AMP
+ */
+
+/**
+ * Register hooks.
+ */
+function amp_post_template_init_hooks() {
+	add_action( 'amp_post_template_head', 'amp_post_template_add_title' );
+	add_action( 'amp_post_template_head', 'amp_post_template_add_canonical' );
+	add_action( 'amp_post_template_head', 'amp_post_template_add_scripts' );
+	add_action( 'amp_post_template_head', 'amp_post_template_add_fonts' );
+	add_action( 'amp_post_template_head', 'amp_post_template_add_boilerplate_css' );
+	add_action( 'amp_post_template_head', 'amp_post_template_add_schemaorg_metadata' );
+	add_action( 'amp_post_template_head', 'amp_add_generator_metadata' );
+	add_action( 'amp_post_template_css', 'amp_post_template_add_styles', 99 );
+	add_action( 'amp_post_template_data', 'amp_post_template_add_analytics_script' );
+	add_action( 'amp_post_template_footer', 'amp_post_template_add_analytics_data' );
+}
+
+/**
+ * Add title.
+ *
+ * @param AMP_Post_Template $amp_template template.
+ */
+function amp_post_template_add_title( $amp_template ) {
+	?>
+	<title><?php echo esc_html( $amp_template->get( 'document_title' ) ); ?></title>
+	<?php
+}
+
+/**
+ * Add canonical link.
+ *
+ * @param AMP_Post_Template $amp_template Template.
+ */
+function amp_post_template_add_canonical( $amp_template ) {
+	?>
+	<link rel="canonical" href="<?php echo esc_url( $amp_template->get( 'canonical_url' ) ); ?>" />
+	<?php
+}
+
+/**
+ * Print scripts.
+ *
+ * @param AMP_Post_Template $amp_template Template.
+ */
+function amp_post_template_add_scripts( $amp_template ) {
+	$scripts = $amp_template->get( 'amp_component_scripts', array() );
+	foreach ( $scripts as $element => $script ) {
+		$custom_type = ( 'amp-mustache' === $element ) ? 'template' : 'element';
+		printf(
+			'<script custom-%s="%s" src="%s" async></script>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
+			esc_attr( $custom_type ),
+			esc_attr( $element ),
+			esc_url( $script )
+		);
+	}
+	printf(
+		'<script src="%s" async></script>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
+		esc_url( $amp_template->get( 'amp_runtime_script' ) )
+	);
+}
+
+/**
+ * Print fonts.
+ *
+ * @param AMP_Post_Template $amp_template Template.
+ */
+function amp_post_template_add_fonts( $amp_template ) {
+	$font_urls = $amp_template->get( 'font_urls', array() );
+	foreach ( $font_urls as $slug => $url ) {
+		printf( '<link rel="stylesheet" href="%s">', esc_url( esc_url( $url ) ) ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
+	}
+}
+
+/**
+ * Print boilerplate CSS.
+ */
+function amp_post_template_add_boilerplate_css() {
+	?>
+	<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+	<?php
+}
+
+/**
+ * Print Schema.org metadata.
+ *
+ * @param AMP_Post_Template $amp_template Template.
+ */
+function amp_post_template_add_schemaorg_metadata( $amp_template ) {
+	$metadata = $amp_template->get( 'metadata' );
+	if ( empty( $metadata ) ) {
+		return;
+	}
+	?>
+	<script type="application/ld+json"><?php echo wp_json_encode( $metadata ); ?></script>
+	<?php
+}
+
+/**
+ * Print styles.
+ *
+ * @param AMP_Post_Template $amp_template Template.
+ */
+function amp_post_template_add_styles( $amp_template ) {
+	$styles = $amp_template->get( 'post_amp_styles' );
+	if ( ! empty( $styles ) ) {
+		echo '/* Inline styles */' . PHP_EOL; // WPCS: XSS OK.
+		foreach ( $styles as $selector => $declarations ) {
+			$declarations = implode( ';', $declarations ) . ';';
+			printf( '%1$s{%2$s}', $selector, $declarations ); // WPCS: XSS OK.
+		}
+	}
+}
+
+/**
+ * Add analytics scripts.
+ *
+ * @param array $data Data.
+ * @return array Data.
+ */
+function amp_post_template_add_analytics_script( $data ) {
+	if ( ! empty( $data['amp_analytics'] ) ) {
+		$data['amp_component_scripts']['amp-analytics'] = 'https://cdn.ampproject.org/v0/amp-analytics-0.1.js';
+	}
+	return $data;
+}
+
+/**
+ * Print analytics data.
+ *
+ * @param AMP_Post_Template $amp_template Template.
+ */
+function amp_post_template_add_analytics_data( $amp_template ) {
+	$analytics_entries = $amp_template->get( 'amp_analytics' );
+	if ( empty( $analytics_entries ) ) {
+		return;
+	}
+
+	foreach ( $analytics_entries as $id => $analytics_entry ) {
+		if ( ! isset( $analytics_entry['type'], $analytics_entry['attributes'], $analytics_entry['config_data'] ) ) {
+			/* translators: %1$s is analytics entry ID, %2$s is actual entry keys. */
+			_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'Analytics entry for %1$s is missing one of the following keys: `type`, `attributes`, or `config_data` (array keys: %2$s)', 'amp' ), esc_html( $id ), esc_html( implode( ', ', array_keys( $analytics_entry ) ) ) ), '0.3.2' );
+			continue;
+		}
+		$script_element = AMP_HTML_Utils::build_tag( 'script', array(
+			'type' => 'application/json',
+		), wp_json_encode( $analytics_entry['config_data'] ) );
+
+		$amp_analytics_attr = array_merge( array(
+			'id'   => $id,
+			'type' => $analytics_entry['type'],
+		), $analytics_entry['attributes'] );
+
+		echo AMP_HTML_Utils::build_tag( 'amp-analytics', $amp_analytics_attr, $script_element ); // WPCS: XSS OK.
+	}
+}
+
+/**
+ * Add generator metadata.
+ *
+ * @since 6.0
+ */
+function amp_add_generator_metadata() {
+	printf( '<meta name="generator" content="%s" />', esc_attr( 'AMP Plugin v' . AMP__VERSION ) );
+}
diff --git a/includes/class-amp-autoloader.php b/includes/class-amp-autoloader.php
index 082988c34a4..281126786f8 100644
--- a/includes/class-amp-autoloader.php
+++ b/includes/class-amp-autoloader.php
@@ -29,9 +29,6 @@ class AMP_Autoloader {
 	 * @var string[]
 	 */
 	private static $_classmap = array(
-		'AMP_Actions'                                 => 'includes/actions/class-amp-actions',
-		'AMP_Frontend_Actions'                        => 'includes/actions/class-amp-frontend-actions',
-		'AMP_Paired_Post_Actions'                     => 'includes/actions/class-amp-paired-post-actions',
 		'AMP_Template_Customizer'                     => 'includes/admin/class-amp-customizer',
 		'AMP_Post_Meta_Box'                           => 'includes/admin/class-amp-post-meta-box',
 		'AMP_Post_Type_Support'                       => 'includes/class-amp-post-type-support',