Changeset 61676

Timestamp:

02/18/2026 04:46:25 PM (8 months ago)

Author:

westonruter

Message:

Themes: Fix type issues in core themes and remove PHPStan suppression comments.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/10951

Props westonruter, sabernhardt, justlevine.
See #64238, #61175.

Location:

trunk/src

Files:

• wp-content/themes/twentyfourteen/inc/featured-content.php (modified) (1 diff)
• wp-content/themes/twentytwenty/inc/template-tags.php (modified) (3 diffs)
• wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize.php (modified) (1 diff)
• wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php (modified) (1 diff)
• wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php (modified) (1 diff)
• wp-content/themes/twentytwentyone/inc/template-functions.php (modified) (1 diff)
• wp-includes/class-wp-theme.php (modified) (1 diff)

trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php

@@ -213 +213 @@
          *
          * @param WP_Query $query WP_Query object.
-         * @return WP_Query Possibly-modified WP_Query.
+         * @return void
          */
         public static function pre_get_posts( $query ) {

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

@@ -30 +30 @@
  * @param array $args    Arguments for displaying the site logo either as an image or text.
  * @param bool  $display Display or return the HTML.
- * @return string Compiled HTML based on our arguments.
+ * @return string|void Compiled HTML based on our arguments.
  */
 function twentytwenty_site_logo( $args = array(), $display = true ) {
@@ -108 +108 @@
  *
  * @param bool $display Display or return the HTML.
- * @return string The HTML to display.
+ * @return string|void The HTML to display.
  */
 function twentytwenty_site_description( $display = true ) {
@@ -250 +250 @@
  * @param int    $post_id  The ID of the post.
  * @param string $location The location where the meta is shown.
- * @return string Post meta HTML.
+ * @return string|void Post meta HTML.
  */
 function twentytwenty_get_post_meta( $post_id = null, $location = 'single-top' ) {

trunk/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize.php

@@ -36 +36 @@
 
                         // Change site-title & description to postMessage.
-                        $wp_customize->get_setting( 'blogname' )->transport        = 'postMessage'; // @phpstan-ignore-line. Assume that this setting exists.
-                        $wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage'; // @phpstan-ignore-line. Assume that this setting exists.
+                        foreach ( array( 'blogname', 'blogdescription' ) as $setting_id ) {
+                                $setting = $wp_customize->get_setting( $setting_id );
+                                if ( $setting ) {
+                                        $setting->transport = 'postMessage';
+                                }
+                        }
 
                         // Add partial for blogname.

trunk/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php

@@ -99 +99 @@
                         $url = get_template_directory_uri() . '/assets/css/style-dark-mode-rtl.css';
                 }
-                wp_enqueue_style( 'tt1-dark-mode', $url, array( 'twenty-twenty-one-style' ), wp_get_theme()->get( 'Version' ) ); // @phpstan-ignore-line. Version is always a string.
+                wp_enqueue_style( 'tt1-dark-mode', $url, array( 'twenty-twenty-one-style' ), wp_get_theme()->get( 'Version' ) );
         }
 

trunk/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php

@@ -182 +182 @@
                  * @since Twenty Twenty-One 1.0
                  *
-                 * @param array $arr Array of icons.
+                 * @param array<string, string> $arr Array of icons.
                  */
                 $arr = apply_filters( "twenty_twenty_one_svg_icons_{$group}", $arr );
 
                 $svg = '';
-                if ( array_key_exists( $icon, $arr ) ) {
+                if ( isset( $arr[ $icon ] ) && is_string( $arr[ $icon ] ) ) {
                         $repl = sprintf( '<svg class="svg-icon" width="%d" height="%d" aria-hidden="true" role="img" focusable="false" ', $size, $size );
 
-                        $svg = preg_replace( '/^<svg /', $repl, trim( $arr[ $icon ] ) ); // Add extra attributes to SVG code.
-                }
-
-                // @phpstan-ignore-next-line.
+                        $svg = (string) preg_replace( '/^<svg /', $repl, trim( $arr[ $icon ] ) ); // Add extra attributes to SVG code.
+                }
+
                 return $svg;
         }

trunk/src/wp-content/themes/twentytwentyone/inc/template-functions.php

@@ -340 +340 @@
 
         // Return the specified styles.
-        return twenty_twenty_one_generate_css( // @phpstan-ignore-line.
+        return twenty_twenty_one_generate_css(
                 implode( ',', $elements[ $type ] ),
                 'font-family',
                 implode( ',', $font_family[ $locale ] ),
-                null,
-                null,
+                '',
+                '',
                 false
         );

trunk/src/wp-includes/class-wp-theme.php

@@ -867 +867 @@
          * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
          * @return string|array|false String or array (for Tags header) on success, false on failure.
+         *
+         * @phpstan-return (
+         *     $header is 'Tags'
+         *         ? string[]|false
+         *         : ( $header is 'Name'|'ThemeURI'|'Description'|'Author'|'AuthorURI'|'Version'|'Template'|'Status'|'TextDomain'|'DomainPath'|'RequiresWP'|'RequiresPHP'|'UpdateURI'
+         *             ? string|false
+         *             : false )
+         * )
          */
         public function get( $header ) {