Fix if.condNotBoolean

WordPress · westonruter · Jul 23, 2024 · May 23, 2024 · May 23, 2024 · May 23, 2024
commit dad531239a9309f1d74a4204e8cd21979a8da229
@@ -153,11 +153,11 @@ function dominant_color_img_tag_add_dominant_color( $filtered_image, string $con
 		$extra_class  = $image_meta['has_transparency'] ? 'has-transparency' : 'not-transparent';
 	}
 
-	if ( $data ) {
+	if ( '' !== $data ) {
 		$filtered_image = str_replace( '<img ', '<img ' . $data, $filtered_image );
 	}
 
-	if ( $extra_class ) {
+	if ( '' !== $extra_class ) {
 		$filtered_image = str_replace( ' class="', ' class="' . $extra_class . ' ', $filtered_image );
 	}
 

@@ -63,7 +63,7 @@ function embed_optimizer_filter_oembed_html( string $html ): string {
 	if ( 1 === $script_count && ! $has_inline_script && $html_processor->has_bookmark( 'script' ) ) {
 		add_action( 'wp_footer', 'embed_optimizer_lazy_load_scripts' );
 		if ( $html_processor->seek( 'script' ) ) {
-			if ( $html_processor->get_attribute( 'type' ) ) {
+			if ( is_string( $html_processor->get_attribute( 'type' ) ) ) {
-			if ( is_string( $html_processor->get_attribute( 'type' ) ) ) {
+			if ( null !== $html_processor->get_attribute( 'type' ) ) ) {
-			if ( is_string( $html_processor->get_attribute( 'type' ) ) ) {
+			if ( null !== $html_processor->get_attribute( 'type' ) ) ) {
 				$html_processor->set_attribute( 'data-original-type', $html_processor->get_attribute( 'type' ) );
 			}
 			$html_processor->set_attribute( 'type', 'application/vnd.embed-optimizer.javascript' );
@@ -79,7 +79,7 @@ function embed_optimizer_filter_oembed_html( string $html ): string {
 			// For post embeds, use visibility:hidden instead of clip since browsers will consistently load the
 			// lazy-loaded iframe (where Chromium is unreliably with clip) while at the same time improve accessibility
 			// by preventing links in the hidden iframe from receiving focus.
-			if ( $html_processor->has_class( 'wp-embedded-content' ) ) {
+			if ( true === $html_processor->has_class( 'wp-embedded-content' ) ) {
 				$style = $html_processor->get_attribute( 'style' );
 				if ( is_string( $style ) ) {
 					// WordPress core injects this clip CSS property:

@@ -302,7 +302,7 @@ public function get_lcp_element(): ?array {
 			}
 
 			// Now sort by the breadcrumb counts in descending order, so the remaining first key is the most common breadcrumb.
-			if ( $seen_breadcrumbs ) {
+			if ( count( $seen_breadcrumbs ) > 0 ) {
 				arsort( $breadcrumb_counts );
 				$most_common_breadcrumb_index = key( $breadcrumb_counts );
 

@@ -123,7 +123,7 @@ public static function get_url_metrics_from_post( WP_Post $post ): array {
 		};
 
 		$url_metrics_data = json_decode( $post->post_content, true );
-		if ( json_last_error() ) {
+		if ( json_last_error() !== 0 ) {
 			$trigger_warning(
 				sprintf(
 					/* translators: 1: Post type slug, 2: Post ID, 3: JSON error message */

@@ -363,7 +363,7 @@ private function get_valid_params( array $extras = array() ): array {
 			$data
 		);
 		unset( $data['timestamp'] ); // Since provided by default args.
-		if ( $extras ) {
+		if ( count( $extras ) > 0 ) {
 			$data = $this->recursive_merge( $data, $extras );
 		}
 		return $data;

@@ -127,7 +127,7 @@ public function data_provider(): array {
 	 * @param string               $error Error.
 	 */
 	public function test_constructor( array $data, string $error = '' ): void {
-		if ( $error ) {
+		if ( '' !== $error ) {
 			$this->expectException( OD_Data_Validation_Exception::class );
 			$this->expectExceptionMessage( $error );
 		}

@@ -98,7 +98,7 @@ public function data_provider_test_construction(): array {
 	 * @param int             $sample_size Sample size.
 	 */
 	public function test_construction( array $url_metrics, array $breakpoints, int $sample_size, int $freshness_ttl, string $exception ): void {
-		if ( $exception ) {
+		if ( '' !== $exception ) {
 			$this->expectException( $exception );
 		}
 		$group_collection = new OD_URL_Metrics_Group_Collection( $url_metrics, $breakpoints, $sample_size, $freshness_ttl );

@@ -107,7 +107,7 @@ public function data_provider_test_construction(): array {
 	 * @param string          $exception Expected exception.
 	 */
 	public function test_construction( array $url_metrics, int $minimum_viewport_width, int $maximum_viewport_width, int $sample_size, int $freshness_ttl, string $exception ): void {
-		if ( $exception ) {
+		if ( '' !== $exception ) {
 			$this->expectException( $exception );
 		}
 		$group = new OD_URL_Metrics_Group( $url_metrics, $minimum_viewport_width, $maximum_viewport_width, $sample_size, $freshness_ttl );
@@ -195,7 +195,7 @@ public function data_provider_test_add_url_metric(): array {
 	 * @dataProvider data_provider_test_add_url_metric
 	 */
 	public function test_add_url_metric( int $viewport_width, string $exception ): void {
-		if ( $exception ) {
+		if ( '' !== $exception ) {
 			$this->expectException( $exception );
 		}
 		$group = new OD_URL_Metrics_Group( array(), 100, 200, 1, HOUR_IN_SECONDS );

@@ -369,11 +369,11 @@ static function ( $name ) {
 		$activated_plugin_slug = perflab_sanitize_plugin_slug( wp_unslash( $_GET['activate'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 	}
 
-	if ( $activated_plugin_slug ) {
+	if ( null !== $activated_plugin_slug ) {
 		$message = __( 'Feature activated.', 'performance-lab' );
 
 		$plugin_settings_url = perflab_get_plugin_settings_url( $activated_plugin_slug );
-		if ( $plugin_settings_url ) {
+		if ( null !== $plugin_settings_url ) {
 			/* translators: %s is the settings URL */
 			$message .= ' ' . sprintf( __( 'Review <a href="%s">settings</a>.', 'performance-lab' ), esc_url( $plugin_settings_url ) );
 		}

@@ -21,7 +21,12 @@
 function perflab_query_plugin_info( string $plugin_slug ) {
 	$plugin = get_transient( 'perflab_plugin_info_' . $plugin_slug );
 
-	if ( $plugin ) {
+	if ( is_array( $plugin ) ) {
+		/**
+		 * Validated (mostly) plugin data.
+		 *
+		 * @var array{name: string, slug: string, short_description: string, requires: string|false, requires_php: string|false, requires_plugins: string[], download_link: string, version: string} $plugin
+		 */
 		return $plugin;
 	}
 
@@ -400,7 +405,7 @@ function perflab_render_plugin_card( array $plugin_data ): void {
 
 	if ( $availability['activated'] ) {
 		$settings_url = perflab_get_plugin_settings_url( $plugin_data['slug'] );
-		if ( $settings_url ) {
+		if ( null !== $settings_url ) {
 			/* translators: %s is the settings URL */
 			$action_links[] = sprintf( '<a href="%s">%s</a>', esc_url( $settings_url ), esc_html__( 'Settings', 'performance-lab' ) );
 		}

@@ -32,7 +32,7 @@ function perflab_rest_post_dispatch_add_server_timing( $response ) {
 
 	$header_value = $server_timing->get_header();
 
-	if ( $header_value ) {
+	if ( '' !== $header_value ) {
 		$response->header( 'Server-Timing', $header_value, false );
 	}
 

@@ -249,7 +249,7 @@ function perflab_aea_get_total_size_bytes_enqueued_scripts() {
 function perflab_aea_get_total_enqueued_styles() {
 	$enqueued_styles      = false;
 	$list_enqueued_styles = get_transient( 'aea_enqueued_front_page_styles' );
-	if ( $list_enqueued_styles ) {
+	if ( is_array( $list_enqueued_styles ) ) {
 		$enqueued_styles = count( $list_enqueued_styles );
 	}
 	return $enqueued_styles;

@@ -35,7 +35,7 @@ class PLSR_URL_Pattern_Prefixer {
 	 *                                        by the {@see PLSR_URL_Pattern_Prefixer::get_default_contexts()} method.
 	 */
 	public function __construct( array $contexts = array() ) {
-		if ( $contexts ) {
+		if ( count( $contexts ) > 0 ) {
 			$this->contexts = array_map(
 				static function ( string $str ): string {
 					return self::escape_pattern_string( trailingslashit( $str ) );

@@ -148,13 +148,13 @@ function webp_uploads_create_sources_property( array $metadata, int $attachment_
 			if ( ! empty( $metadata['original_image'] ) ) {
 				$uploadpath    = wp_get_upload_dir();
 				$attached_file = get_attached_file( $attachment_id );
-				if ( $attached_file ) {
+				if ( false !== $attached_file ) {
 					wp_delete_file_from_directory( $attached_file, $uploadpath['basedir'] );
 				}
 			}
 
 			// Replace the attached file with the custom MIME type version.
-			if ( $original_image ) {
+			if ( false !== $original_image ) {
 				$metadata = _wp_image_meta_replace_original( $saved_data, $original_image, $metadata, $attachment_id );
 			}
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -67,7 +67,7 @@
 		exit( 1 );
 	}
 
-	if ( preg_match( '/^ \* Requires Plugins:\s*(.+)$/m', (string) file_get_contents( $plugin_file ), $matches ) ) {
+	if ( 0 < (int) preg_match( '/^ \* Requires Plugins:\s*(.+)$/m', (string) file_get_contents( $plugin_file ), $matches ) ) {
 		foreach ( (array) preg_split( '/\s*,\s*/', $matches[1] ) as $requires_plugin ) {
 			$load_plugin( (string) $requires_plugin );
 		}