Changeset 61643

Timestamp:

02/14/2026 11:45:50 PM (4 weeks ago)

Author:

SergeyBiryukov

Message:

Twenty Twenty: Remove EscapeOutput annotations.

These are from the WordPress-Extra standard, which is not included in the phpcs.xml.dist configuration (the repository uses WordPress-Core).

Includes removing unnecessary WordPress.WP.CapitalPDangit.Misspelled annotation on the wordpress array key, as the CapitalPDangit sniff skips array definitions by design.

Follow-up to [46271], [46445].

Props rodrigosprimo.
See #64627.

Location:

trunk/src/wp-content/themes/twentytwenty

Files:

• classes/class-twentytwenty-svg-icons.php (modified) (1 diff)
• classes/class-twentytwenty-walker-comment.php (modified) (3 diffs)
• comments.php (modified) (1 diff)
• inc/custom-css.php (modified) (1 diff)
• inc/svg-icons.php (modified) (1 diff)
• inc/template-tags.php (modified) (3 diffs)
• searchform.php (modified) (1 diff)
• template-parts/content-cover.php (modified) (1 diff)
• template-parts/entry-header.php (modified) (1 diff)
• template-parts/featured-image.php (modified) (1 diff)
• template-parts/footer-menus-widgets.php (modified) (1 diff)
• template-parts/pagination.php (modified) (1 diff)

trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php

@@ -328 +328 @@
 </svg>',
 
-            // phpcs:disable WordPress.WP.CapitalPDangit.Misspelled
             'wordpress'  => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12.158,12.786L9.46,20.625c0.806,0.237,1.657,0.366,2.54,0.366c1.047,0,2.051-0.181,2.986-0.51 c-0.024-0.038-0.046-0.079-0.065-0.124L12.158,12.786z M3.009,12c0,3.559,2.068,6.634,5.067,8.092L3.788,8.341 C3.289,9.459,3.009,10.696,3.009,12z M18.069,11.546c0-1.112-0.399-1.881-0.741-2.48c-0.456-0.741-0.883-1.368-0.883-2.109 c0-0.826,0.627-1.596,1.51-1.596c0.04,0,0.078,0.005,0.116,0.007C16.472,3.904,14.34,3.009,12,3.009 c-3.141,0-5.904,1.612-7.512,4.052c0.211,0.007,0.41,0.011,0.579,0.011c0.94,0,2.396-0.114,2.396-0.114 C7.947,6.93,8.004,7.642,7.52,7.699c0,0-0.487,0.057-1.029,0.085l3.274,9.739l1.968-5.901l-1.401-3.838 C9.848,7.756,9.389,7.699,9.389,7.699C8.904,7.67,8.961,6.93,9.446,6.958c0,0,1.484,0.114,2.368,0.114 c0.94,0,2.397-0.114,2.397-0.114c0.485-0.028,0.542,0.684,0.057,0.741c0,0-0.488,0.057-1.029,0.085l3.249,9.665l0.897-2.996 C17.841,13.284,18.069,12.316,18.069,11.546z M19.889,7.686c0.039,0.286,0.06,0.593,0.06,0.924c0,0.912-0.171,1.938-0.684,3.22 l-2.746,7.94c2.673-1.558,4.47-4.454,4.47-7.771C20.991,10.436,20.591,8.967,19.889,7.686z M12,22C6.486,22,2,17.514,2,12 C2,6.486,6.486,2,12,2c5.514,0,10,4.486,10,10C22,17.514,17.514,22,12,22z"></path></svg>',
 

trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-comment.php

@@ -38 +38 @@
 
             ?>
-            <<?php echo $tag; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?>>
+            <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?>>
                 <article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
                     <footer class="comment-meta">
@@ -50 +50 @@
                                     echo wp_kses_post( $avatar );
                                 } else {
-                                    printf( '<a href="%s" rel="external nofollow" class="url">', $comment_author_url ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped --Escaped in https://developer.wordpress.org/reference/functions/get_comment_author_url/
+                                    printf( '<a href="%s" rel="external nofollow" class="url">', $comment_author_url );
                                     echo wp_kses_post( $avatar );
                                 }
@@ -132 +132 @@
                             <?php
                             if ( $comment_reply_link ) {
-                                echo $comment_reply_link; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Link is escaped in https://developer.wordpress.org/reference/functions/get_comment_reply_link/
+                                echo $comment_reply_link;
                             }
                             if ( $by_post_author ) {

trunk/src/wp-content/themes/twentytwenty/comments.php

@@ -86 +86 @@
                 ?>
 
-                <nav class="comments-pagination pagination<?php echo $pagination_classes; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>" aria-label="<?php esc_attr_e( 'Comments', 'twentytwenty' ); ?>">
+                <nav class="comments-pagination pagination<?php echo $pagination_classes; ?>" aria-label="<?php esc_attr_e( 'Comments', 'twentytwenty' ); ?>">
                     <?php echo wp_kses_post( $comment_pagination ); ?>
                 </nav>

trunk/src/wp-content/themes/twentytwenty/inc/custom-css.php

@@ -39 +39 @@
         if ( $display ) {
 
-            echo $return; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- We need to double check this, but for now, we want to pass PHPCS ;)
+            echo $return;
 
         }

trunk/src/wp-content/themes/twentytwenty/inc/svg-icons.php

@@ -19 +19 @@
      */
     function twentytwenty_the_theme_svg( $svg_name, $group = 'ui', $color = '' ) {
-        echo twentytwenty_get_theme_svg( $svg_name, $group, $color ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped in twentytwenty_get_theme_svg().
+        echo twentytwenty_get_theme_svg( $svg_name, $group, $color );
     }
 }

trunk/src/wp-content/themes/twentytwenty/inc/template-tags.php

@@ -99 +99 @@
     }
 
-    echo $html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+    echo $html;
 }
 
@@ -136 +136 @@
     }
 
-    echo $html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+    echo $html;
 }
 
@@ -202 +202 @@
 function twentytwenty_the_post_meta( $post_id = null, $location = 'single-top' ) {
 
-    echo twentytwenty_get_post_meta( $post_id, $location ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped in twentytwenty_get_post_meta().
+    echo twentytwenty_get_post_meta( $post_id, $location );
 }
 

trunk/src/wp-content/themes/twentytwenty/searchform.php

@@ -24 +24 @@
 }
 ?>
-<form role="search" <?php echo $twentytwenty_aria_label; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped above. ?> method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
+<form role="search" <?php echo $twentytwenty_aria_label; ?> method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
     <label for="<?php echo esc_attr( $twentytwenty_unique_id ); ?>">
         <span class="screen-reader-text">

trunk/src/wp-content/themes/twentytwenty/template-parts/content-cover.php

@@ -45 +45 @@
     ?>
 
-    <div class="cover-header <?php echo $cover_header_classes; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>"<?php echo $cover_header_style; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- We need to double check this, but for now, we want to pass PHPCS ;) ?>>
+    <div class="cover-header <?php echo $cover_header_classes; ?>"<?php echo $cover_header_style; ?>>
         <div class="cover-header-inner-wrapper screen-height">
             <div class="cover-header-inner">
-                <div class="cover-color-overlay color-accent<?php echo esc_attr( $color_overlay_classes ); ?>"<?php echo $color_overlay_style; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- We need to double check this, but for now, we want to pass PHPCS ;) ?>></div>
+                <div class="cover-color-overlay color-accent<?php echo esc_attr( $color_overlay_classes ); ?>"<?php echo $color_overlay_style; ?>></div>
 
                     <header class="entry-header has-text-align-center">

trunk/src/wp-content/themes/twentytwenty/template-parts/entry-header.php

@@ -65 +65 @@
             ?>
 
-            <div class="intro-text section-inner max-percentage<?php echo $intro_text_width; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>">
+            <div class="intro-text section-inner max-percentage<?php echo $intro_text_width; ?>">
                 <?php the_excerpt(); ?>
             </div>

trunk/src/wp-content/themes/twentytwenty/template-parts/featured-image.php

@@ -20 +20 @@
     <figure class="featured-media">
 
-        <div class="featured-media-inner section-inner<?php echo $featured_media_inner_classes; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>">
+        <div class="featured-media-inner section-inner<?php echo $featured_media_inner_classes; ?>">
 
             <?php

trunk/src/wp-content/themes/twentytwenty/template-parts/footer-menus-widgets.php

@@ -32 +32 @@
             if ( $has_footer_menu || $has_social_menu ) {
                 ?>
-                <div class="footer-top<?php echo $footer_top_classes; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>">
+                <div class="footer-top<?php echo $footer_top_classes; ?>">
                     <?php if ( $has_footer_menu ) { ?>
 

trunk/src/wp-content/themes/twentytwenty/template-parts/pagination.php

@@ -59 +59 @@
         <hr class="styled-separator pagination-separator is-style-wide" aria-hidden="true" />
 
-        <?php echo $posts_pagination; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- already escaped during generation. ?>
+        <?php echo $posts_pagination; ?>
 
     </div><!-- .pagination-wrapper -->