Phan: Handle PhanPluginDuplicateIfCondition violations (#45733)

tbradsha · matticbot · commit 2b1719130df0 · 2025-11-04T19:46:27.000Z
Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/19080514443 Upstream-Ref: Automattic/jetpack@43ba7b8
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ This is an alpha version! The changes listed here are not final.
 
 ### Fixed
 - Phan: Address PhanRedundantCondition, PhanRedundantArrayValuesCall, and PhanPluginRedundantAssignment violations.
+- Remove redundant code.
 
 ## [3.0.2] - 2025-10-10
 ### Added
diff --git a/wp-cache-phase2.php b/wp-cache-phase2.php
@@ -2153,9 +2153,6 @@ function wp_cache_ob_callback( $buffer ) {
 	} elseif ( wpsc_is_caching_user_disabled() ) {
 		wp_cache_debug( 'wp_cache_ob_callback: Caching disabled for known user. User logged in or cookie found.' );
 		$cache_this_page = false;
-	} elseif ( wp_cache_user_agent_is_rejected() ) {
-		wp_cache_debug( 'wp_cache_ob_callback: Caching disabled because user agent was rejected.' );
-		$cache_this_page = false;
 	}
 
 	if ( isset( $wpsc_save_headers ) && $wpsc_save_headers ) {

Original file line number	Diff line number	Diff line change
`@@ -2153,9 +2153,6 @@ function wp_cache_ob_callback( $buffer ) {`
`2153`	`2153`	`} elseif ( wpsc_is_caching_user_disabled() ) {`
`2154`	`2154`	`wp_cache_debug( 'wp_cache_ob_callback: Caching disabled for known user. User logged in or cookie found.' );`
`2155`	`2155`	`$cache_this_page = false;`
`2156`		`- } elseif ( wp_cache_user_agent_is_rejected() ) {`
`2157`		`- wp_cache_debug( 'wp_cache_ob_callback: Caching disabled because user agent was rejected.' );`
`2158`		`- $cache_this_page = false;`
`2159`	`2156`	`}`
`2160`	`2157`
`2161`	`2158`	`if ( isset( $wpsc_save_headers ) && $wpsc_save_headers ) {`