Fix check_for_page_caching to account for wp_remote_retrieve_header() returning arrays

westonruter · westonruter · commit 37d9c194e037 · 2022-03-03T08:47:58.000-08:00
diff --git a/src/Admin/SiteHealth.php b/src/Admin/SiteHealth.php
@@ -624,17 +624,21 @@ public function check_for_page_caching() {
 			$response_headers = [];
 
 			foreach ( $caching_headers as $header => $callback ) {
-				$header_value = wp_remote_retrieve_header( $http_response, $header );
+				$header_values = wp_remote_retrieve_header( $http_response, $header );
+				if ( empty( $header_values ) ) {
+					continue;
+				}
+				$header_values = (array) $header_values;
 				if (
-					$header_value
-					&&
+					empty( $callback )
+					||
 					(
-						empty( $callback )
-						||
-						( is_callable( $callback ) && true === $callback( $header_value ) )
+						is_callable( $callback )
+						&&
+						count( array_filter( $header_values, $callback ) ) > 0
 					)
 				) {
-					$response_headers[ $header ] = $header_value;
+					$response_headers[ $header ] = $header_values;
 				}
 			}
 
diff --git a/tests/php/src/Admin/SiteHealthTest.php b/tests/php/src/Admin/SiteHealthTest.php
@@ -751,6 +751,11 @@ public function get_page_cache_data() {
 				'expected_status' => 'recommended',
 				'expected_label'  => $recommended_label,
 			],
+			'no-cache-arrays'                          => [
+				'responses'       => array_fill( 0, 3, [ 'cache-control' => [ 'no-cache', 'no-store' ] ] ),
+				'expected_status' => 'recommended',
+				'expected_label'  => $recommended_label,
+			],
 			'no-cache-with-delayed-response'           => [
 				'responses'          => array_fill( 0, 3, [ 'cache-control' => 'no-cache' ] ),
 				'expected_status'    => 'critical',
