From 25508a1d8054b5125fd721f7dbda47317f25c9e6 Mon Sep 17 00:00:00 2001
From: unknown <martin1v93@gmail.com>
Date: Tue, 21 Nov 2017 21:36:11 -0500
Subject: [PATCH 1/7] Added meta tag for identifying AMP pages generated by
 plugin. Issue #807

---
 back-compat/templates-v0-3/single.php | 1 +
 templates/single.php                  | 1 +
 2 files changed, 2 insertions(+)
diff --git a/back-compat/templates-v0-3/single.php b/back-compat/templates-v0-3/single.php
index c85147c4d91..f1e24a9a59b 100644
--- a/back-compat/templates-v0-3/single.php
+++ b/back-compat/templates-v0-3/single.php
@@ -3,6 +3,7 @@
 <head>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
+	<meta name="generator" content="<?php echo esc_attr('AMP Plugin v' . AMP__VERSION);?>" />
 	<?php do_action( 'amp_post_template_head', $this ); ?>
 
 	<style amp-custom>
diff --git a/templates/single.php b/templates/single.php
index 9b1348618d6..13b32a142ff 100644
--- a/templates/single.php
+++ b/templates/single.php
@@ -3,6 +3,7 @@
 <head>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
+	<meta name="generator" content="<?php echo esc_attr('AMP Plugin v' . AMP__VERSION);?>" />
 	<?php do_action( 'amp_post_template_head', $this ); ?>
 	<style amp-custom>
 		<?php $this->load_parts( array( 'style' ) ); ?>

From 5089b236f97bd159be97dfdd4a7bc446d9ae43e0 Mon Sep 17 00:00:00 2001
From: unknown <martin1v93@gmail.com>
Date: Wed, 22 Nov 2017 19:51:32 -0500
Subject: [PATCH 2/7] Add a function that outputs the generated by meta tag at
 the amp_post_template_head action Issue #807

---
 back-compat/templates-v0-3/single.php              | 1 -
 includes/actions/class-amp-actions.php             | 1 +
 includes/actions/class-amp-paired-post-actions.php | 7 +++++++
 includes/class-amp-post-template.php               | 1 +
 templates/single.php                               | 1 -
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/back-compat/templates-v0-3/single.php b/back-compat/templates-v0-3/single.php
index f1e24a9a59b..c85147c4d91 100644
--- a/back-compat/templates-v0-3/single.php
+++ b/back-compat/templates-v0-3/single.php
@@ -3,7 +3,6 @@
 <head>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
-	<meta name="generator" content="<?php echo esc_attr('AMP Plugin v' . AMP__VERSION);?>" />
 	<?php do_action( 'amp_post_template_head', $this ); ?>
 
 	<style amp-custom>
diff --git a/includes/actions/class-amp-actions.php b/includes/actions/class-amp-actions.php
index 4294334c422..c5ce6cf8b97 100644
--- a/includes/actions/class-amp-actions.php
+++ b/includes/actions/class-amp-actions.php
@@ -9,4 +9,5 @@ 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 ) {}
+	public static function add_generatedby_metadata( $template ) {}
 }
diff --git a/includes/actions/class-amp-paired-post-actions.php b/includes/actions/class-amp-paired-post-actions.php
index 238cf1e0d6a..028fea85d64 100644
--- a/includes/actions/class-amp-paired-post-actions.php
+++ b/includes/actions/class-amp-paired-post-actions.php
@@ -5,6 +5,7 @@
 class AMP_Paired_Post_Actions extends AMP_Actions {
 	
 	public static function register_hooks() {
+		add_action( 'amp_post_template_head', 'AMP_Paired_Post_Actions::add_generatedby_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' );
@@ -104,4 +105,10 @@ public static  function add_analytics_data( $amp_template ) {
 			echo AMP_HTML_Utils::build_tag( 'amp-analytics', $amp_analytics_attr, $script_element );
 		}
 	}
+
+	public static function add_generatedby_metadata( $amp_template ) {
+		?>
+		<meta name="generator" content="<?php echo esc_attr( $amp_template->get( 'generatedby_metadata' ) );?>" />
+		<?php
+	}
 }
diff --git a/includes/class-amp-post-template.php b/includes/class-amp-post-template.php
index db86cc4a924..728ee0a3ab1 100644
--- a/includes/class-amp-post-template.php
+++ b/includes/class-amp-post-template.php
@@ -57,6 +57,7 @@ public function __construct( $post_id ) {
 			'canonical_url' => get_permalink( $post_id ),
 			'home_url' => home_url(),
 			'blog_name' => get_bloginfo( 'name' ),
+			'generatedby_metadata' => 'AMP Plugin v' . AMP__VERSION,
 
 			'html_tag_attributes' => array(),
 			'body_class' => '',
diff --git a/templates/single.php b/templates/single.php
index 13b32a142ff..9b1348618d6 100644
--- a/templates/single.php
+++ b/templates/single.php
@@ -3,7 +3,6 @@
 <head>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
-	<meta name="generator" content="<?php echo esc_attr('AMP Plugin v' . AMP__VERSION);?>" />
 	<?php do_action( 'amp_post_template_head', $this ); ?>
 	<style amp-custom>
 		<?php $this->load_parts( array( 'style' ) ); ?>

From b2271ff16ac2f8648505dc9ae28f8c85195bb366 Mon Sep 17 00:00:00 2001
From: Victor Martinez <martin1v93@gmail.com>
Date: Tue, 28 Nov 2017 17:51:01 -0500
Subject: [PATCH 3/7] Fix WPCS error (Squiz.Commenting.FunctionComment.Missing)
 Fix WPCS error (Squiz.PHP.EmbeddedPhp.SpacingBeforeClose) Fix WPCS error
 (WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned)

---
 includes/actions/class-amp-actions.php             | 2 +-
 includes/actions/class-amp-paired-post-actions.php | 6 +++---
 includes/class-amp-post-template.php               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/actions/class-amp-actions.php b/includes/actions/class-amp-actions.php
index c5ce6cf8b97..6008f3308cf 100644
--- a/includes/actions/class-amp-actions.php
+++ b/includes/actions/class-amp-actions.php
@@ -9,5 +9,5 @@ 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 ) {}
-	public static function add_generatedby_metadata( $template ) {}
+	public static function add_generator_metadata( $template ) {}
 }
diff --git a/includes/actions/class-amp-paired-post-actions.php b/includes/actions/class-amp-paired-post-actions.php
index 028fea85d64..c6331441bdf 100644
--- a/includes/actions/class-amp-paired-post-actions.php
+++ b/includes/actions/class-amp-paired-post-actions.php
@@ -5,7 +5,7 @@
 class AMP_Paired_Post_Actions extends AMP_Actions {
 	
 	public static function register_hooks() {
-		add_action( 'amp_post_template_head', 'AMP_Paired_Post_Actions::add_generatedby_metadata' );
+		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' );
@@ -106,9 +106,9 @@ public static  function add_analytics_data( $amp_template ) {
 		}
 	}
 
-	public static function add_generatedby_metadata( $amp_template ) {
+	public static function add_generator_metadata( $amp_template ) {
 		?>
-		<meta name="generator" content="<?php echo esc_attr( $amp_template->get( 'generatedby_metadata' ) );?>" />
+		<meta name="generator" content="<?php echo esc_attr( $amp_template->get( 'generator_metadata' ) ); ?>" />
 		<?php
 	}
 }
diff --git a/includes/class-amp-post-template.php b/includes/class-amp-post-template.php
index 728ee0a3ab1..f27c52b22f3 100644
--- a/includes/class-amp-post-template.php
+++ b/includes/class-amp-post-template.php
@@ -57,7 +57,7 @@ public function __construct( $post_id ) {
 			'canonical_url' => get_permalink( $post_id ),
 			'home_url' => home_url(),
 			'blog_name' => get_bloginfo( 'name' ),
-			'generatedby_metadata' => 'AMP Plugin v' . AMP__VERSION,
+			'generator_metadata'  => 'AMP Plugin v' . AMP__VERSION,
 
 			'html_tag_attributes' => array(),
 			'body_class' => '',

From f400b66d010dfdde957255fe81dd0298d3505553 Mon Sep 17 00:00:00 2001
From: Victor Martinez <martin1v93@gmail.com>
Date: Tue, 28 Nov 2017 18:03:37 -0500
Subject: [PATCH 4/7] Fix WPCS error
 (WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned) Fix WPCS
 error (Squiz.Commenting.FunctionComment.Missing)

---
 includes/actions/class-amp-paired-post-actions.php | 6 ++++++
 includes/class-amp-post-template.php               | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/includes/actions/class-amp-paired-post-actions.php b/includes/actions/class-amp-paired-post-actions.php
index c6331441bdf..7ce9b60e02c 100644
--- a/includes/actions/class-amp-paired-post-actions.php
+++ b/includes/actions/class-amp-paired-post-actions.php
@@ -106,6 +106,12 @@ public static  function add_analytics_data( $amp_template ) {
 		}
 	}
 
+	/**
+	 * Add AMP generator metadata.
+	 *
+	 * @param object $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' ) ); ?>" />
diff --git a/includes/class-amp-post-template.php b/includes/class-amp-post-template.php
index f27c52b22f3..8c1adc7cdc6 100644
--- a/includes/class-amp-post-template.php
+++ b/includes/class-amp-post-template.php
@@ -57,7 +57,7 @@ public function __construct( $post_id ) {
 			'canonical_url' => get_permalink( $post_id ),
 			'home_url' => home_url(),
 			'blog_name' => get_bloginfo( 'name' ),
-			'generator_metadata'  => 'AMP Plugin v' . AMP__VERSION,
+			'generator_metadata'    => 'AMP Plugin v' . AMP__VERSION,
 
 			'html_tag_attributes' => array(),
 			'body_class' => '',

From f6cbcb3638ca301750a1d1cebd7cd6b02e7f989f Mon Sep 17 00:00:00 2001
From: Victor Martinez <martin1v93@gmail.com>
Date: Mon, 4 Dec 2017 21:21:30 -0500
Subject: [PATCH 5/7] Fix WPCS error FuctionComment.Missing

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

diff --git a/includes/actions/class-amp-actions.php b/includes/actions/class-amp-actions.php
index 6008f3308cf..6320c772d25 100644
--- a/includes/actions/class-amp-actions.php
+++ b/includes/actions/class-amp-actions.php
@@ -9,5 +9,11 @@ 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 $amp_template AMP_Post_Template object.
+	 * @since 0.6
+	 */
 	public static function add_generator_metadata( $template ) {}
 }

From 045dc3575b7f1a904a65b0fa1d3d18db6cb83bc0 Mon Sep 17 00:00:00 2001
From: Victor Martinez <martin1v93@gmail.com>
Date: Mon, 4 Dec 2017 21:24:31 -0500
Subject: [PATCH 6/7] Fix WPCS error FuctionComment.ParamNameNoMatch

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

diff --git a/includes/actions/class-amp-actions.php b/includes/actions/class-amp-actions.php
index 6320c772d25..9916bca599e 100644
--- a/includes/actions/class-amp-actions.php
+++ b/includes/actions/class-amp-actions.php
@@ -12,7 +12,7 @@ public static function add_canonical_link( $template ) {}
 	/**
 	 * Add AMP generator metadata.
 	 *
-	 * @param object $amp_template AMP_Post_Template object.
+	 * @param object $template AMP_Post_Template object.
 	 * @since 0.6
 	 */
 	public static function add_generator_metadata( $template ) {}

From e169bc0e7fc97fa354ed141d2ddd14d4e80ae427 Mon Sep 17 00:00:00 2001
From: ThierryA <thierry@getbeans.io>
Date: Tue, 5 Dec 2017 09:32:59 +0100
Subject: [PATCH 7/7] Code formatting

---
 includes/actions/class-amp-actions.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/includes/actions/class-amp-actions.php b/includes/actions/class-amp-actions.php
index 9916bca599e..4a95034e66d 100644
--- a/includes/actions/class-amp-actions.php
+++ b/includes/actions/class-amp-actions.php
@@ -9,6 +9,7 @@ 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.
 	 *
