Ticket #53359: 53359-10-CS-remove-redundant-ignore-annotations.patch

src/wp-admin/includes/schema.php

@@ -390 +390 @@
          * or a valid timezone string (America/New_York). See https://www.php.net/manual/en/timezones.php
          * for all timezone strings supported by PHP.
          */
-        $offset_or_tz = _x( '0', 'default GMT offset or timezone string' ); // phpcs:ignore WordPress.WP.I18n.NoEmptyStrings
+        $offset_or_tz = _x( '0', 'default GMT offset or timezone string' );
         if ( is_numeric( $offset_or_tz ) ) {
                 $gmt_offset = $offset_or_tz;
         } elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list(), true ) ) {

src/wp-includes/blocks/calendar.php

@@ -24 +24 @@
                         strpos( $permalink_structure, '%monthnum%' ) !== false &&
                         strpos( $permalink_structure, '%year%' ) !== false
                 ) {
-                        // phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
                         $monthnum = $attributes['month'];
-                        // phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
-                        $year = $attributes['year'];
+                        $year     = $attributes['year'];
                 }
         }
 
@@ -38 +36 @@
                 get_calendar( true, false )
         );
 
-        // phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
         $monthnum = $previous_monthnum;
-        // phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
-        $year = $previous_year;
+        $year     = $previous_year;
 
         return $output;
 }