Changeset 63542

Timestamp:

09/08/2026 08:05:22 PM (5 days ago)

Author:

westonruter

Message:

Code Quality: Remove redundant boolean sub-expressions.

Each of three conditions re-tests something the surrounding expression has already established, so PHPStan reports the redundant operand as always true:

1. In wp_render_typography_support(), ! empty() already requires the fitText attribute to be truthy, so a following truthiness check on the same value can never fail.
2. In _get_block_templates_files(), the right operand of an || is only evaluated when ! $post_type was false, so a leading $post_type && there is always true.
3. In Walker::display_element(), $newlevel is a local variable that is only ever assigned the literal true, so the truthiness test adds nothing to the isset().

All three are simplifications with no change in behavior. This resolves two booleanAnd.rightAlwaysTrue occurrences and one booleanAnd.leftAlwaysTrue occurrence, and the corresponding PHPStan baselines are regenerated.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/13086.
Follow-up to r55687, r61246, r63023.

Props tstokes8040.
See #65817.

Location:

trunk

Files:

• src/wp-includes/block-supports/typography.php (modified) (1 diff)
• src/wp-includes/block-template-utils.php (modified) (1 diff)
• src/wp-includes/class-wp-walker.php (modified) (1 diff)
• tests/phpstan/baselines/booleanAnd.leftAlwaysTrue.neon (modified) (1 diff)
• tests/phpstan/baselines/booleanAnd.rightAlwaysTrue.neon (modified) (1 diff)

trunk/src/wp-includes/block-supports/typography.php

@@ -305 +305 @@
  */
 function wp_render_typography_support( $block_content, $block ) {
-        if ( ! empty( $block['attrs']['fitText'] ) && $block['attrs']['fitText'] && ! is_admin() ) {
+        if ( ! empty( $block['attrs']['fitText'] ) && ! is_admin() ) {
                 wp_enqueue_script_module( '@wordpress/block-editor/utils/fit-text-frontend' );
 

trunk/src/wp-includes/block-template-utils.php

@@ -460 +460 @@
                                 if (
                                         ! $post_type ||
-                                        ( $post_type && isset( $candidate['postTypes'] ) && in_array( $post_type, $candidate['postTypes'], true ) )
+                                        ( isset( $candidate['postTypes'] ) && in_array( $post_type, $candidate['postTypes'], true ) )
                                 ) {
                                         $template_files[ $template_slug ] = $candidate;

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

@@ -165 +165 @@
                 }
 
-                if ( isset( $newlevel ) && $newlevel ) {
+                if ( isset( $newlevel ) ) {
                         // End the child delimiter.
                         $this->end_lvl( $output, $depth, ...array_values( $args ) );

trunk/tests/phpstan/baselines/booleanAnd.leftAlwaysTrue.neon

@@ -33 +33 @@
                         identifier: booleanAnd.leftAlwaysTrue
                         count: 1
-                        path: ../../../src/wp-includes/block-template-utils.php
-                -
-                        message: '#^Left side of && is always true\.$#'
-                        identifier: booleanAnd.leftAlwaysTrue
-                        count: 1
                         path: ../../../src/wp-includes/canonical.php
                 -

trunk/tests/phpstan/baselines/booleanAnd.rightAlwaysTrue.neon

@@ -33 +33 @@
                         identifier: booleanAnd.rightAlwaysTrue
                         count: 1
-                        path: ../../../src/wp-includes/block-supports/typography.php
-                -
-                        message: '#^Right side of && is always true\.$#'
-                        identifier: booleanAnd.rightAlwaysTrue
-                        count: 1
-                        path: ../../../src/wp-includes/class-wp-walker.php
-                -
-                        message: '#^Right side of && is always true\.$#'
-                        identifier: booleanAnd.rightAlwaysTrue
-                        count: 1
                         path: ../../../src/wp-includes/functions.php