From 11f30a677a1095778bdcec61ad838d097d5e6b14 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 28 Sep 2023 00:04:24 +0000 Subject: [PATCH] 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. Built from https://develop.svn.wordpress.org/trunk@56738 git-svn-id: http://core.svn.wordpress.org/trunk@56250 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/block-patterns.php | 4 ++-- wp-includes/canonical.php | 1 - wp-includes/version.php | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/wp-includes/block-patterns.php b/wp-includes/block-patterns.php index 5c7fc59f89..6f18672505 100644 --- a/wp-includes/block-patterns.php +++ b/wp-includes/block-patterns.php @@ -468,10 +468,10 @@ function _register_theme_block_patterns() { // 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 ); } diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index 4913613084..040567fd0e 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -957,7 +957,6 @@ function redirect_guess_404_permalink() { // If any of post_type, year, monthnum, or day are set, use them to refine the query. 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 { $where .= $wpdb->prepare( ' AND post_type = %s', get_query_var( 'post_type' ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 38dd76e972..e99cb19cd1 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.4-beta1-56736'; +$wp_version = '6.4-beta1-56738'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.