cx 🐞 修复审查发现的失败路径

Author: Hai Zheng

changelog.txt

@@ -1,3 +1,9 @@
+= 8.0 - Coming soon 2026 =
+* 🌱**OptiMax** OptiMax to maximize the page score.
+* **Core** Aligned the runtime PHP and WordPress guards with the published minimum requirements.
+* 🐞**Image Optimize** Fixed a fatal error when the WordPress HTTP fallback could not download an image.
+* 🐞**Avatar** Prevented failed on-demand avatar downloads from redirecting visitors to the WordPress admin area.
+
 = 7.7 - Dec 16 2025 =
 * **Task** Increased default cron interval from 1 minute to 15 minutes.
 * **Conf** Enabled `litespeed_conf_load_option_{$option}` to allow modifying configuration values.

composer.json

@@ -11,7 +11,8 @@
 	},
 	"prefer-stable": true,
 	"scripts": {
-		"sniff-check": "vendor/bin/phpcs --standard=phpcs.ruleset.xml --no-cache cli/ lib/ src/ tpl/ thirdparty autoload.php litespeed-cache.php"
+		"sniff-check": "vendor/bin/phpcs --standard=phpcs.ruleset.xml --no-cache cli/ lib/ src/ tpl/ thirdparty tests autoload.php litespeed-cache.php",
+		"test-regression": "php tests/regression/img-optm-pull-wp-error.php"
 	},
 	"config": {
 		"allow-plugins": {

litespeed-cache.php

@@ -224,13 +224,13 @@ function wp_nonce_tick_litespeed_esi( $action = -1 ) {
 	 * @since    1.0.0
 	 */
 	function run_litespeed_cache() {
-		// Check minimum PHP requirements, which is 7.2 at the moment.
-		if ( version_compare( PHP_VERSION, '7.2.0', '<' ) ) {
+		// Check minimum PHP requirements, which is 7.4 at the moment.
+		if ( version_compare( PHP_VERSION, '7.4.0', '<' ) ) {
 			return;
 		}
 
-		// Check minimum WP requirements, which is 5.3 at the moment.
-		if ( version_compare( $GLOBALS['wp_version'], '5.3', '<' ) ) {
+		// Check minimum WP requirements, which is 6.0 at the moment.
+		if ( version_compare( $GLOBALS['wp_version'], '6.0', '<' ) ) {
 			return;
 		}
 

readme.txt

@@ -259,6 +259,9 @@ You can report security bugs through the Patchstack Vulnerability Disclosure Pro
 
 = 8.0 - Coming soon 2026 =
 * 🌱**OptiMax** OptiMax to maximize the page score.
+* **Core** Aligned the runtime PHP and WordPress guards with the published minimum requirements.
+* 🐞**Image Optimize** Fixed a fatal error when the WordPress HTTP fallback could not download an image.
+* 🐞**Avatar** Prevented failed on-demand avatar downloads from redirecting visitors to the WordPress admin area.
 
 = 7.9 - Aug 5 2026 =
 * **Cloud** Changed Health service to run asynchronously, resuming through WP cron when the cloud defers the request.

src/avatar.cls.php

@@ -110,9 +110,13 @@ public function serve_static( $md5 ) {
 			return;
 		}
 
-		$url = $this->_generate( $url );
+		$generated_url = $this->_generate( $url );
+		if ( $generated_url === $url ) {
+			self::debug( '[Avatar] generation failed; bypassing redirect' );
+			return;
+		}
 
-		wp_safe_redirect( $url );
+		wp_safe_redirect( $generated_url );
 		exit;
 	}
 

src/img-optm-pull.trait.php

@@ -275,6 +275,33 @@ private function _calc_pull_threads() {
 		return $imgs_per_req;
 	}
 
+	/**
+	 * Normalize a WordPress HTTP response for the shared pull completion callback.
+	 *
+	 * @param array|\WP_Error $wp_response WordPress HTTP response.
+	 * @param string          $url         Requested URL for diagnostics.
+	 * @return object
+	 */
+	private function _parse_wp_pull_response( $wp_response, $url ) {
+		$request_response = [
+			'success'     => false,
+			'status_code' => 0,
+			'body'        => null,
+			'sslverify'   => false,
+		];
+
+		if ( is_wp_error( $wp_response ) ) {
+			self::debug( '❌ failed to pull image: ' . $wp_response->get_error_message() );
+		} else {
+			$request_response['success']     = true;
+			$request_response['status_code'] = $wp_response['response']['code'];
+			$request_response['body']        = $wp_response['body'];
+			self::debug( 'response code [code] ' . $wp_response['response']['code'] . ' [url] ' . $url );
+		}
+
+		return (object) $request_response;
+	}
+
 	/**
 	 * Pull optimized img
 	 *
@@ -552,23 +579,7 @@ public function pull( $manual = false ) {
 				} else {
 					foreach ( $requests as $cnt => $req ) {
 						$wp_response      = wp_safe_remote_get( $req['url'], [ 'timeout' => 60 ] );
-						$request_response = [
-							'success'     => false,
-							'status_code' => 0,
-							'body'        => null,
-							'sslverify'   => false,
-						];
-						if ( is_wp_error( $wp_response ) ) {
-							$error_message = $wp_response->get_error_message();
-							self::debug( '❌ failed to pull image: ' . $error_message );
-						} else {
-							$request_response['success']     = true;
-							$request_response['status_code'] = $wp_response['response']['code'];
-							$request_response['body']        = $wp_response['body'];
-						}
-						self::debug( 'response code [code] ' . $wp_response['response']['code'] . ' [url] ' . $req['url'] );
-
-						$request_response = (object) $request_response;
+						$request_response = $this->_parse_wp_pull_response( $wp_response, $req['url'] );
 
 						$complete_action( $request_response, $cnt );
 					}

tests/regression/img-optm-pull-wp-error.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Regression test for the image pull WordPress HTTP fallback.
+ *
+ * @package LiteSpeed
+ */
+
+namespace LiteSpeed;
+
+define( 'WPINC', 'regression-test' );
+
+require __DIR__ . '/wp-error-stub.php';
+require dirname( __DIR__, 2 ) . '/src/img-optm-pull.trait.php';
+
+	/**
+	 * Expose the response normalizer without loading WordPress.
+	 */
+final class Img_Optm_Pull_Harness {
+	use Img_Optm_Pull;
+
+		/**
+		 * Discard debug output during the regression test.
+		 *
+		 * @param string $message Debug message.
+		 * @return void
+		 */
+	public static function debug( $message ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.Found
+	}
+
+		/**
+		 * Normalize a simulated HTTP response.
+		 *
+		 * @param mixed  $response Simulated response.
+		 * @param string $url      Requested URL.
+		 * @return object
+		 */
+	public function parse( $response, $url ) {
+		return $this->_parse_wp_pull_response( $response, $url );
+	}
+}
+
+$test_error = new class() {
+	/**
+	 * Return the simulated network error.
+	 *
+	 * @return string
+	 */
+	public function get_error_message() {
+		return 'simulated network failure';
+	}
+};
+
+$harness = new Img_Optm_Pull_Harness();
+$result  = $harness->parse( $test_error, 'https://example.test/image.jpg' );
+
+if ( false !== $result->success || 0 !== $result->status_code || null !== $result->body ) {
+	throw new \RuntimeException( 'WP_Error responses must remain failed without array access.' );
+}
+
+$result = $harness->parse(
+	[
+		'response' => [ 'code' => 200 ],
+		'body'     => 'image-data',
+	],
+	'https://example.test/image.jpg'
+);
+
+if ( true !== $result->success || 200 !== $result->status_code || 'image-data' !== $result->body ) {
+	throw new \RuntimeException( 'Successful WordPress HTTP responses must retain status and body.' );
+}
+
+echo "img-optm WP_Error regression: ok\n";

tests/regression/wp-error-stub.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Minimal WordPress error helper for regression tests.
+ *
+ * @package LiteSpeed
+ */
+
+/**
+ * Identify the anonymous WP_Error test double.
+ *
+ * @param mixed $value Candidate response.
+ * @return bool
+ */
+function is_wp_error( $value ) {
+	return is_object( $value ) && method_exists( $value, 'get_error_message' );
+}