Changeset 56738

Timestamp:

09/28/2023 12:02:47 AM (16 months ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Remove redundant ignore annotations.

This removes ignore annotations which are ignoring an error which would not be thrown for that code.

Includes tidying up the format of the ignore annotation:

• Customary one space between the // and the start of the comment.
• There should be no spaces in the comma-separated sniff list.

Follow-up to [45607], [47185], [49200], [53152].

Props jrf.
See #59161.

Location:

trunk

Files:

• src/wp-includes/block-patterns.php (modified) (1 diff)
• src/wp-includes/canonical.php (modified) (1 diff)
• tests/phpunit/tests/db/dbDelta.php (modified) (1 diff)
• tests/phpunit/tests/import/import.php (modified) (1 diff)

trunk/src/wp-includes/block-patterns.php

@@ -469 +469 @@
                     // Translate the pattern metadata.
                     $text_domain = $theme->get( 'TextDomain' );
-                    // phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText, WordPress.WP.I18n.NonSingularStringLiteralContext, WordPress.WP.I18n.NonSingularStringLiteralDomain, WordPress.WP.I18n.LowLevelTranslationFunction
+                    // phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText,WordPress.WP.I18n.NonSingularStringLiteralDomain,WordPress.WP.I18n.LowLevelTranslationFunction
                     $pattern_data['title'] = translate_with_gettext_context( $pattern_data['title'], 'Pattern title', $text_domain );
                     if ( ! empty( $pattern_data['description'] ) ) {
-                        // phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText, WordPress.WP.I18n.NonSingularStringLiteralContext, WordPress.WP.I18n.NonSingularStringLiteralDomain, WordPress.WP.I18n.LowLevelTranslationFunction
+                        // phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText,WordPress.WP.I18n.NonSingularStringLiteralDomain,WordPress.WP.I18n.LowLevelTranslationFunction
                         $pattern_data['description'] = translate_with_gettext_context( $pattern_data['description'], 'Pattern description', $text_domain );
                     }

trunk/src/wp-includes/canonical.php

@@ -958 +958 @@
         if ( get_query_var( 'post_type' ) ) {
             if ( is_array( get_query_var( 'post_type' ) ) ) {
-                // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare
                 $where .= " AND post_type IN ('" . join( "', '", esc_sql( get_query_var( 'post_type' ) ) ) . "')";
             } else {

trunk/tests/phpunit/tests/db/dbDelta.php

@@ -69 +69 @@
                 "
                 CREATE TABLE {$wpdb->prefix}dbdelta_test (" .
-                    // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
                     'id bigint(20) NOT NULL AUTO_INCREMENT,
                     column_1 varchar(255) NOT NULL,

trunk/tests/phpunit/tests/import/import.php

@@ -29 +29 @@
         // Crude but effective: make sure there's no residual data in the main tables.
         foreach ( array( 'posts', 'postmeta', 'comments', 'terms', 'term_taxonomy', 'term_relationships', 'users', 'usermeta' ) as $table ) {
-            // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
             $wpdb->query( "DELETE FROM {$wpdb->$table}" );
         }