Changeset 64236

Timestamp:

10/07/2026 09:36:26 PM (2 weeks ago)

Author:

SergeyBiryukov

Message:

Code Quality: Remove a no-op assignment of $addl_path in redirect_canonical().

$addl_path is initialized to an empty string, and the feed branch then sets it to itself with a trailing slash if it is not empty. Since it is always empty at that point, the assignment always results in an empty string and is removed. There is no change in behavior.

This resolves one error in the empty.variable PHPStan baseline.

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

Follow-up to r9697, r9883.

Props Soean.
See #65817.

Location:

trunk

Files:

• src/wp-includes/canonical.php (modified) (1 diff)
• tests/phpstan/baselines/empty.variable.neon (modified) (1 diff)

trunk/src/wp-includes/canonical.php

@@ -457 +457 @@
 
                         if ( is_feed() && in_array( $feed, $wp_rewrite->feeds, true ) ) {
-                                $addl_path = ! empty( $addl_path ) ? trailingslashit( $addl_path ) : '';
-
                                 if ( ! is_singular() && get_query_var( 'withcomments' ) ) {
                                         $addl_path .= 'comments/';

trunk/tests/phpstan/baselines/empty.variable.neon

@@ -30 +30 @@
                         path: ../../../src/wp-admin/themes.php
                 -
-                        message: '#^Variable \$addl_path in empty\(\) always exists and is always falsy\.$#'
-                        identifier: empty.variable
-                        count: 1
-                        path: ../../../src/wp-includes/canonical.php
-                -
                         message: '#^Variable \$search in empty\(\) always exists and is not falsy\.$#'
                         identifier: empty.variable