From 0f0d34ed55049ecdfb946e026f9c15389e17b556 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 29 Sep 2023 12:19:29 +0000 Subject: [PATCH] Coding Standards: Remove redundant ignore annotations, take 2. This removes ignore annotations which are unnecessary due to the configuration in the `phpcs.xml.dist` ruleset already taking care of this. Follow-up to [45611], [50146], [50148], [50586], [50822], [56738]. Props jrf. See #59161. git-svn-id: https://develop.svn.wordpress.org/trunk@56743 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/image.php | 4 ++-- src/wp-includes/functions.php | 1 - src/wp-includes/media.php | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/wp-admin/includes/image.php b/src/wp-admin/includes/image.php index 5f9141c4d6..2bdcc505e4 100644 --- a/src/wp-admin/includes/image.php +++ b/src/wp-admin/includes/image.php @@ -782,7 +782,7 @@ function wp_read_image_metadata( $file ) { ) { $iptc = iptcparse( $info['APP13'] ); } else { - // phpcs:ignore WordPress.PHP.NoSilencedErrors -- Silencing notice and warning is intentional. See https://core.trac.wordpress.org/ticket/42480 + // Silencing notice and warning is intentional. See https://core.trac.wordpress.org/ticket/42480 $iptc = @iptcparse( $info['APP13'] ); } @@ -855,7 +855,7 @@ function wp_read_image_metadata( $file ) { ) { $exif = exif_read_data( $file ); } else { - // phpcs:ignore WordPress.PHP.NoSilencedErrors -- Silencing notice and warning is intentional. See https://core.trac.wordpress.org/ticket/42480 + // Silencing notice and warning is intentional. See https://core.trac.wordpress.org/ticket/42480 $exif = @exif_read_data( $file ); } diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php index a57623f52a..d7c0a9bbdf 100644 --- a/src/wp-includes/functions.php +++ b/src/wp-includes/functions.php @@ -3317,7 +3317,6 @@ function wp_get_image_mime( $file ) { // Not using wp_getimagesize() here to avoid an infinite loop. $imagesize = getimagesize( $file ); } else { - // phpcs:ignore WordPress.PHP.NoSilencedErrors $imagesize = @getimagesize( $file ); } diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php index 988086e009..c383a8c586 100644 --- a/src/wp-includes/media.php +++ b/src/wp-includes/media.php @@ -5477,10 +5477,8 @@ function wp_getimagesize( $filename, array &$image_info = null ) { * See https://core.trac.wordpress.org/ticket/42480 */ if ( 2 === func_num_args() ) { - // phpcs:ignore WordPress.PHP.NoSilencedErrors $info = @getimagesize( $filename, $image_info ); } else { - // phpcs:ignore WordPress.PHP.NoSilencedErrors $info = @getimagesize( $filename ); } }