Separate and simplify the output for the object cache and opcode cach…

…e statuses. Fixes #413.
johnbillion · Feb 23, 2019 · a6a5467 · a6a5467
1 parent 9be700b
commit a6a5467
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 63 deletions.
diff --git a/collectors/cache.php b/collectors/cache.php
@@ -88,12 +88,7 @@ public function process() {
 			$this->data['opcode_cache_extensions'] = array();
 		}
 
-		$this->data['has_opcode_cache'] = false;
-
-		if ( array_filter( $this->data['opcode_cache_extensions'] ) && function_exists( 'opcache_get_status' ) ) {
-			$status = opcache_get_status();
-			$this->data['has_opcode_cache'] = $status && ! empty( $status['opcache_enabled'] );
-		}
+		$this->data['has_opcode_cache'] = !! array_filter( $this->data['opcode_cache_extensions'] );
 	}
 
 }

diff --git a/output/html/overview.php b/output/html/overview.php
@@ -16,7 +16,6 @@ public function output() {
 		$data = $this->collector->get_data();
 
 		$db_query_num   = null;
-		$db_query_types = array();
 		$db_queries     = QM_Collectors::get( 'db_queries' );
 
 		if ( $db_queries ) {
@@ -169,76 +168,53 @@ public function output() {
 				number_format_i18n( $cache_data['stats']['cache_hits'], 0 ),
 				number_format_i18n( $cache_data['stats']['cache_misses'], 0 )
 			) );
-
-			if ( $cache_data['display_hit_rate_warning'] ) {
-				printf(
-					'<br><a href="%s" class="qm-external-link">%s</a>',
-					'https://github.com/johnbillion/query-monitor/wiki/Cache-Hit-Rate',
-					esc_html__( 'Why is this value 100%?', 'query-monitor' )
-				);
-			}
-
 			echo '</p>';
+		} else {
+			echo '<p>';
+			echo esc_html__( 'Object cache statistics are not available', 'query-monitor' );
+			echo '</p>';
+		}
 
-			$installed_opcode_caches = array_filter( $cache_data['opcode_cache_extensions'] );
+		if ( $cache_data['has_object_cache'] ) {
+			echo '<p><span class="qm-info">';
+			printf(
+				'<a href="%s" class="qm-link">%s</a>',
+				esc_url( network_admin_url( 'plugins.php?plugin_status=dropins' ) ),
+				esc_html__( 'External object cache in use', 'query-monitor' )
+			);
+			echo '</span></p>';
+		} else {
+			echo '<p><span class="qm-warn"><span class="dashicons dashicons-warning" aria-hidden="true"></span>';
+			echo esc_html__( 'External object cache not in use', 'query-monitor' );
+			echo '</span></p>';
 
-			if ( $cache_data['has_opcode_cache'] ) {
-				foreach ( $installed_opcode_caches as $opcache_name => $opcache_state ) {
-					echo '<p>';
-					echo esc_html( sprintf(
-						/* translators: %s: Name of cache driver */
-						__( 'Opcode cache in use: %s', 'query-monitor' ),
-						$opcache_name
-					) );
-					echo '</p>';
-				}
-			} elseif ( ! empty( $installed_opcode_caches ) ) {
+			$potentials = array_filter( $cache_data['object_cache_extensions'] );
+
+			if ( ! empty( $potentials ) ) {
 				echo '<ul>';
-				foreach ( $installed_opcode_caches as $name => $value ) {
+				foreach ( $potentials as $name => $value ) {
 					echo '<li><span class="qm-warn">';
 					echo esc_html( sprintf(
-						/* translators: %s: PHP opcode cache extension name */
-						__( 'The %s opcode cache is installed but not enabled', 'query-monitor' ),
+						/* translators: %s: PHP extension name */
+						__( 'The %s extension for PHP is installed but is not in use by WordPress', 'query-monitor' ),
 						$name
 					) );
 					echo '</span></li>';
 				}
 				echo '</ul>';
 			}
+		}
 
-			if ( $cache_data['has_object_cache'] ) {
-				echo '<p><span class="qm-info">';
-				printf(
-					'<a href="%s" class="qm-link">%s</a>',
-					esc_url( network_admin_url( 'plugins.php?plugin_status=dropins' ) ),
-					esc_html__( 'External object cache in use', 'query-monitor' )
-				);
-				echo '</span></p>';
-			} else {
-				echo '<p><span class="qm-warn"><span class="dashicons dashicons-warning" aria-hidden="true"></span>';
-				echo esc_html__( 'External object cache not in use', 'query-monitor' );
-				echo '</span></p>';
-
-				$potentials = array_filter( $cache_data['object_cache_extensions'] );
-
-				if ( ! empty( $potentials ) ) {
-					echo '<ul>';
-					foreach ( $potentials as $name => $value ) {
-						echo '<li><span class="qm-warn">';
-						echo esc_html( sprintf(
-							/* translators: %s: PHP extension name */
-							__( 'The %s extension for PHP is installed but is not in use by WordPress', 'query-monitor' ),
-							$name
-						) );
-						echo '</span></li>';
-					}
-					echo '</ul>';
-				}
+		if ( $cache_data['has_opcode_cache'] ) {
+			foreach ( array_filter( $cache_data['opcode_cache_extensions'] ) as $opcache_name => $opcache_state ) {
+				echo '<p>';
+				echo esc_html( sprintf(
+					/* translators: %s: Name of cache driver */
+					__( 'Opcode cache in use: %s', 'query-monitor' ),
+					$opcache_name
+				) );
+				echo '</p>';
 			}
-		} else {
-			echo '<p>';
-			echo esc_html__( 'Object cache information is not available', 'query-monitor' );
-			echo '</p>';
 		}
 
 		echo '</section>';