Merge pull request #1099 from humanmade/backport-1091-to-v25-branch

[Backport v25] Add support for Afterburner 1.0

Author: joehoyle

composer.json

@@ -39,7 +39,8 @@
 		"humanmade/ludicrousdb": "~5.0.7",
 		"humanmade/aws-ses-wp-mail": "~1.3.1",
 		"monolog/monolog": "^2.11",
-		"maxbanton/cwh": "^2.0"
+		"maxbanton/cwh": "^2.0",
+		"humanmade/afterburner-object-cache": "^1.0.0"
 	},
 	"extra": {
 		"altis": {

inc/afterburner/class-qm-output-html.php

@@ -43,6 +43,7 @@ public function name() {
 	 */
 	public function output() {
 		$stats = Afterburner\ObjectCache\getStats();
+		$request_stats = Afterburner\ObjectCache\getRequestStats();
 		?>
 		<?php $this->before_tabular_output(); ?>
 
@@ -72,8 +73,17 @@ public function output() {
 				<td><code><?php echo esc_html( round( $stats->redis_total_time / 1000 ) ) ?>ms</code></td>
 			</tr>
 			<tr>
-			<td><?php echo esc_html__( 'All stats for this PHP worker', 'altis' ); ?></td>
-				<td><pre><?php echo esc_html( print_r( $stats, true ) ) // phpcs:ignore ?></pre></td>
+				<td><?php echo esc_html__( 'All stats for this PHP worker', 'altis' ); ?></td>
+				<td>
+					<pre><?php echo esc_html( print_r( $stats, true ) ) // phpcs:ignore ?></pre>
+				</td>
+			</tr>
+			<tr>
+				<td><?php echo esc_html__( 'All stats for this request', 'altis' ); ?></td>
+				<td>
+					<pre><?php echo esc_html( print_r( $request_stats, true ) ) // phpcs:ignore ?></pre>
+				</td>
+			</tr>
 		</tbody>
 
 		<?php

inc/namespace.php

@@ -451,6 +451,10 @@ function load_object_cache_afterburner() {
 	require __DIR__ . '/alloptions_fix/namespace.php';
 	Alloptions_Fix\bootstrap();
 	// cache must be initted once it's included, else we'll get a fatal.
+
+	if ( class_exists( 'Afterburner\\LocalRedisCache' ) ) {
+		require Altis\ROOT_DIR . '/vendor/humanmade/afterburner-object-cache/object-cache.php';
+	}
 	wp_cache_init();
 }