Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update phpcs ignore statements #605

Merged
merged 3 commits into from
Mar 19, 2021
Merged

Update phpcs ignore statements #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
199becf
Update phpcs ignore statements
bradp Mar 17, 2021
35d0086
Update phpcs ignore statements
bradp Mar 18, 2021
a34a309
Merge branch 'main' into feature/581-update-wpcs-comments
coreymcollins Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions comments.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
?>
<h3 class="comments-title">
<?php
printf( // WPCS: XSS OK.
printf(
/* translators: the number of comments */
esc_html( _nx( '%1$s thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', '_s' ) ),
number_format_i18n( get_comments_number() ),
'<span>' . get_the_title() . '</span>'
number_format_i18n( get_comments_number() ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- XSS OK.
'<span>' . get_the_title() . '</span>' // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- XSS OK.
);
?>
</h3>
Expand Down
3 changes: 2 additions & 1 deletion inc/extras.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ function _s_get_attachment_id_from_url( $attachment_url = '' ) {
$attachment_url = str_replace( $upload_dir_paths['baseurl'] . '/', '', $attachment_url );

// Do something with $result.
$attachment_id = $wpdb->get_var( $wpdb->prepare( "SELECT wposts.ID FROM $wpdb->posts wposts, $wpdb->postmeta wpostmeta WHERE wposts.ID = wpostmeta.post_id AND wpostmeta.meta_key = '_wp_attached_file' AND wpostmeta.meta_value = %s AND wposts.post_type = 'attachment'", $attachment_url ) ); // WPCS db call ok, cache ok, placeholder ok.
// phpcs:ignore phpcs:ignore WordPress.DB -- db call ok, cache ok, placeholder ok.
$attachment_id = $wpdb->get_var( $wpdb->prepare( "SELECT wposts.ID FROM $wpdb->posts wposts, $wpdb->postmeta wpostmeta WHERE wposts.ID = wpostmeta.post_id AND wpostmeta.meta_key = '_wp_attached_file' AND wpostmeta.meta_value = %s AND wposts.post_type = 'attachment'", $attachment_url ) );
}

return $attachment_id;
Expand Down
6 changes: 4 additions & 2 deletions inc/hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ function _s_display_customizer_header_scripts() {
}

// Otherwise, echo the scripts!
echo _s_get_the_content( $scripts ); // WPCS XSS OK.
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- XSS OK.
echo _s_get_the_content( $scripts );
}
add_action( 'wp_head', '_s_display_customizer_header_scripts', 999 );

Expand All @@ -198,7 +199,8 @@ function _s_display_customizer_footer_scripts() {
}

// Otherwise, echo the scripts!
echo _s_get_the_content( $scripts ); // WPCS XSS OK.
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- XSS OK.
echo _s_get_the_content( $scripts );
}
add_action( 'wp_footer', '_s_display_customizer_footer_scripts', 999 );

Expand Down
4 changes: 2 additions & 2 deletions inc/scripts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ function _s_scripts() {
/**
* If WP is in script debug, or we pass ?script_debug in a URL - set debug to true.
*/
$debug = ( defined( 'SCRIPT_DEBUG' ) && true === SCRIPT_DEBUG ) || ( isset( $_GET['script_debug'] ) ) ? true : false; // WPCS: CSRF OK.

// phpcs:ignore WordPress.Security.NonceVerification -- CSRF OK
$debug = ( defined( 'SCRIPT_DEBUG' ) && true === SCRIPT_DEBUG ) || ( isset( $_GET['script_debug'] ) ) ? true : false;
/**
* If we are debugging the site, use a unique version every page load so as to ensure no cache issues.
*/
Expand Down
17 changes: 12 additions & 5 deletions inc/template-tags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ function _s_posted_on() {
'<span class="author vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . esc_html( get_the_author() ) . '</a></span>'
);

echo '<span class="posted-on">' . $posted_on . '</span><span class="byline"> ' . $byline . '</span>'; // WPCS: XSS OK.
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- XSS OK.
echo '<span class="posted-on">' . $posted_on . '</span><span class="byline"> ' . $byline . '</span>';
}

/**
Expand All @@ -52,15 +53,17 @@ function _s_entry_footer() {
/* translators: used between list items, there is a space after the comma */
$categories_list = get_the_category_list( esc_html__( ', ', '_s' ) );
if ( $categories_list && _s_categorized_blog() ) {

/* translators: the post category */
printf( '<span class="cat-links">' . esc_html__( 'Posted in %1$s', '_s' ) . '</span>', $categories_list ); // WPCS: XSS OK.
printf( '<span class="cat-links">' . esc_html__( 'Posted in %1$s', '_s' ) . '</span>', $categories_list ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- XSS OK.
}

/* translators: used between list items, there is a space after the comma */
$tags_list = get_the_tag_list( '', esc_html__( ', ', '_s' ) );
if ( $tags_list ) {

/* translators: the post tags */
printf( '<span class="tags-links">' . esc_html__( 'Tagged %1$s', '_s' ) . '</span>', $tags_list ); // WPCS: XSS OK.
printf( '<span class="tags-links">' . esc_html__( 'Tagged %1$s', '_s' ) . '</span>', $tags_list ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- XSS OK.
}
}

Expand Down Expand Up @@ -299,7 +302,8 @@ function _s_display_social_network_links() {
?>
<span class="screen-reader-text">
<?php
echo /* translators: the social network name */ sprintf( esc_html( 'Link to %s', '_s' ), ucwords( esc_html( $network ) ) ); // WPCS: XSS OK.
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- XSS OK.
echo /* translators: the social network name */ sprintf( esc_html( 'Link to %s', '_s' ), ucwords( esc_html( $network ) ) );
?>
</span>
</a>
Expand Down Expand Up @@ -349,7 +353,10 @@ function _s_display_numeric_pagination( $args = array(), $query = null ) {
?>

<nav class="pagination-container container" aria-label="<?php esc_attr_e( 'numeric pagination', '_s' ); ?>">
<?php echo paginate_links( $args ); // WPCS: XSS OK. ?>
<?php
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- XSS OK.
echo paginate_links( $args );
?>
</nav>

<?php
Expand Down
5 changes: 4 additions & 1 deletion template-parts/content-password-protected.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
</header><!-- .entry-header -->

<div class="entry-content">
<?php echo get_the_password_form(); // WPCS XSS OK. ?>
<?php
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
echo get_the_password_form();
?>
</div><!-- .entry-content -->

</article><!-- #post-## -->
4 changes: 2 additions & 2 deletions template-parts/scaffolding/scaffolding-globals.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<?php
// Theme colors.
_s_display_global_scaffolding_section(
array( // WPCS: XSS OK.
array(
'global_type' => 'colors',
'title' => 'Colors',
'arguments' => array(
Expand All @@ -29,7 +29,7 @@

// Theme fonts.
_s_display_global_scaffolding_section(
array( // WPCS: XSS OK.
array(
'global_type' => 'fonts',
'title' => 'Fonts',
'arguments' => array(
Expand Down