Merge pull request #3886 from ampproject/add/2199-site-health

Integrate with Site Health

Author: westonruter

amp.php

@@ -368,8 +368,7 @@ function amp_init() {
 	AMP_Service_Worker::init();
 	add_action( 'admin_init', 'AMP_Options_Manager::register_settings' );
 	add_action( 'wp_loaded', 'amp_add_options_menu' );
-	add_action( 'wp_loaded', 'amp_admin_pointer' );
-	add_action( 'wp_loaded', 'amp_post_meta_box' ); // Used in both Website and Stories experiences.
+	add_action( 'wp_loaded', 'amp_bootstrap_admin' );
 
 	if ( AMP_Options_Manager::is_website_experience_enabled() ) {
 		add_rewrite_endpoint( amp_get_slug(), EP_PERMALINK );

includes/admin/functions.php

@@ -5,6 +5,8 @@
  * @package AMP
  */
 
+use Amp\AmpWP\Admin\SiteHealth;
+
 /**
  * Obsolete constant for flagging when Customizer is opened for AMP.
  *
@@ -169,18 +171,6 @@ function amp_add_custom_analytics( $analytics = [] ) {
 	return $analytics;
 }
 
-/**
- * Bootstrap AMP post meta box.
- *
- * This function must be invoked only once through the 'wp_loaded' action.
- *
- * @since 0.6
- */
-function amp_post_meta_box() {
-	$post_meta_box = new AMP_Post_Meta_Box();
-	$post_meta_box->init();
-}
-
 /**
  * Bootstrap AMP Editor core blocks.
  */
@@ -190,13 +180,19 @@ function amp_editor_core_blocks() {
 }
 
 /**
- * Bootstrap the AMP admin pointer class.
+ * Bootstraps AMP admin classes.
  *
- * @since 1.0
+ * @since 1.5.0
  */
-function amp_admin_pointer() {
+function amp_bootstrap_admin() {
 	$admin_pointers = new AMP_Admin_Pointers();
 	$admin_pointers->init();
+
+	$post_meta_box = new AMP_Post_Meta_Box();
+	$post_meta_box->init();
+
+	$site_health = new SiteHealth();
+	$site_health->init();
 }
 
 /**

includes/deprecated.php

@@ -221,3 +221,25 @@ function amp_post_template_add_schemaorg_metadata() {
 	_deprecated_function( __FUNCTION__, '0.7', 'amp_print_schemaorg_metadata' );
 	amp_print_schemaorg_metadata();
 }
+
+/**
+ * Bootstrap AMP post meta box.
+ *
+ * This function must be invoked only once through the 'wp_loaded' action.
+ *
+ * @since 0.6
+ * @deprecated Since 1.5.0, as admin class bootstrapping is moved to amp_bootstrap_admin().
+ */
+function amp_post_meta_box() {
+	_deprecated_function( __FUNCTION__, '1.5.0' );
+}
+
+/**
+ * Bootstrap the AMP admin pointer class.
+ *
+ * @since 1.0
+ * @deprecated Since 1.5.0, as admin class bootstrapping is moved to amp_bootstrap_admin().
+ */
+function amp_admin_pointer() {
+	_deprecated_function( __FUNCTION__, '1.5.0' );
+}

includes/options/class-amp-options-manager.php

@@ -550,17 +550,15 @@ public static function render_welcome_notice() {
 	 */
 	public static function persistent_object_caching_notice() {
 		if ( ! wp_using_ext_object_cache() && 'toplevel_page_' . self::OPTION_NAME === get_current_screen()->id ) {
+			echo '<div class="notice notice-warning"><p>';
+			esc_html_e( 'The AMP plugin performs at its best when persistent object cache is enabled. Object caching is used to more effectively store image dimensions and parsed CSS. It also allows for post-processor caching to be used.', 'amp' );
+			echo ' ';
 			printf(
-				'<div class="notice notice-warning"><p>%s</p></div>',
-				wp_kses(
-					sprintf(
-						/* translators: %s: Persistent object cache support URL */
-						__( 'The AMP plugin performs at its best when persistent object cache is enabled. <a href="%s">More details</a>', 'amp' ),
-						esc_url( __( 'https://codex.wordpress.org/Class_Reference/WP_Object_Cache#Persistent_Caching', 'amp' ) )
-					),
-					[ 'a' => [ 'href' => true ] ]
-				)
+				'<a href="%s">%s</a>',
+				esc_url( __( 'https://codex.wordpress.org/Class_Reference/WP_Object_Cache#Persistent_Caching', 'amp' ) ),
+				esc_html__( 'More details', 'amp' )
 			);
+			echo '</p></div>';
 		}
 	}
 
@@ -578,17 +576,15 @@ public static function render_cache_miss_notice() {
 			return;
 		}
 
+		echo '<div class="notice notice-warning is-dismissible"><p>';
+		esc_html_e( 'The AMP plugin&lsquo;s post-processor cache was disabled due to the detection of highly-variable content.', 'amp' );
+		echo ' ';
 		printf(
-			'<div class="notice notice-warning is-dismissible"><p>%s</p></div>',
-			wp_kses(
-				sprintf(
-					/* translators: %s: post-processor cache support URL */
-					__( 'The AMP plugin&lsquo;s post-processor cache was disabled due to the detection of highly-variable content. <a href="%s">More details</a>', 'amp' ),
-					esc_url( __( 'https://github.com/ampproject/amp-wp/wiki/Post-Processor-Cache', 'amp' ) )
-				),
-				[ 'a' => [ 'href' => true ] ]
-			)
+			'<a href="%s">%s</a>',
+			esc_url( __( 'https://github.com/ampproject/amp-wp/wiki/Post-Processor-Cache', 'amp' ) ),
+			esc_html__( 'More details', 'amp' )
 		);
+		echo '</p></div>';
 	}
 
 	/**