Omit AMP status from classic post editor when post type not supported

Author: westonruter

includes/admin/class-amp-post-meta-box.php

@@ -146,8 +146,8 @@ public function enqueue_admin_assets() {
 		$validate = (
 			isset( $screen->base ) &&
 			'post' === $screen->base &&
-			( ! isset( $screen->is_block_editor ) || ! $screen->is_block_editor ) &&
-			in_array( $post->post_type, AMP_Post_Type_Support::get_eligible_post_types(), true )
+			empty( $screen->is_block_editor ) &&
+			in_array( $post->post_type, AMP_Post_Type_Support::get_supported_post_types(), true )
 		);
 
 		if ( ! $validate ) {
@@ -344,7 +344,7 @@ public function render_status( $post ) {
 		$verify = (
 			isset( $post->ID )
 			&&
-			in_array( $post->post_type, AMP_Post_Type_Support::get_eligible_post_types(), true )
+			in_array( $post->post_type, AMP_Post_Type_Support::get_supported_post_types(), true )
 			&&
 			current_user_can( 'edit_post', $post->ID )
 		);

tests/php/test-class-amp-meta-box.php

@@ -284,16 +284,11 @@ public function test_render_status() {
 			$this->assertStringContainsString( $no_support_notice, $output );
 		}
 
-		// Post type no longer supports AMP, so no status input.
+		// Post type no longer supports AMP, so no status input (and no mention of AMP at all).
 		$supported_post_types = array_diff( AMP_Options_Manager::get_option( Option::SUPPORTED_POST_TYPES ), [ 'post' ] );
 		AMP_Options_Manager::update_option( Option::SUPPORTED_POST_TYPES, $supported_post_types );
 		$output = get_echo( [ $this->instance, 'render_status' ], [ $post ] );
-		if ( Services::get( 'dependency_support' )->has_support_from_core() ) {
-			$this->assertStringContainsString( 'This post type is not', $output );
-			$this->assertStringNotContainsString( $checkbox_enabled, $output );
-		} else {
-			$this->assertStringContainsString( $no_support_notice, $output );
-		}
+		$this->assertEmpty( $output );
 		$supported_post_types[] = 'post';
 		AMP_Options_Manager::update_option( Option::SUPPORTED_POST_TYPES, $supported_post_types );