Skip to content

Fix PHPStan undefined variable errors at level 3 #11189

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

Open
huzaifaalmesbah wants to merge 6 commits into
base: trunk
Choose a base branch
from
+4 −1
Open

Fix PHPStan undefined variable errors at level 3 #11189

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f86194a
Fix PHPStan undefined variable errors at level 3
huzaifaalmesbah Mar 6, 2026
8b93b41
Code Quality: Fix PHPStan undefined variable errors in ms-settings.php
huzaifaalmesbah Mar 7, 2026
30d971c
Merge branch 'trunk' into fix/phpstan-undefined-variables
huzaifaalmesbah Mar 7, 2026
9d9dd59
Code Quality: Fix PHPStan undefined variables using isset/empty checks
huzaifaalmesbah Mar 8, 2026
e6bbbfc
Apply alternative suggestion
huzaifaalmesbah Mar 9, 2026
eef6fa5
Apply alternative suggestion
huzaifaalmesbah Mar 9, 2026
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
10 changes: 7 additions & 3 deletions src/wp-includes/ms-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,13 @@
wp_load_core_site_options( $site_id );
}

$wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php.
$wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
$table_prefix = $wpdb->get_blog_prefix();
if ( isset( $wpdb ) ) {
if ( isset( $table_prefix ) ) {
$wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php.
}
$wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
$table_prefix = $wpdb->get_blog_prefix();
}
Comment thread
huzaifaalmesbah marked this conversation as resolved.
Outdated
$_wp_switched_stack = array();
$switched = false;

Expand Down
4 changes: 2 additions & 2 deletions src/wp-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
include WP_CONTENT_DIR . '/advanced-cache.php';

// Re-initialize any hooks added manually by advanced-cache.php.
if ( $wp_filter ) {
if ( ! empty( $wp_filter ) ) {
Copy link
Copy Markdown

@Ninos Ninos Mar 10, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May use isset() instead?

if ( isset( $wp_filter ) ) {

Copy link
Copy Markdown
Member

@westonruter westonruter Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would be not the same though. Before it was checking for a truthy value, which is what ! empty() does. On the other hand, isset() would return true for an empty array.

Copy link
Copy Markdown

@Ninos Ninos Mar 10, 2026 •
edited by westonruter
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh, true! I'm just trying to avoid non-strict type functions like empty() :D Following should also be possible, but what u prefer :-)

Suggested change
if ( ! empty( $wp_filter ) ) {
if ( $wp_filter ?? null ) {

$wp_filter = WP_Hook::build_preinitialized_hooks( $wp_filter );
}
}
Expand Down Expand Up @@ -140,7 +140,7 @@
*
* @global string $table_prefix The database table prefix.
*/
if ( ! isset( $GLOBALS['table_prefix'] ) ) {
if ( ! isset( $GLOBALS['table_prefix'] ) && isset( $table_prefix ) ) {
Comment thread
huzaifaalmesbah marked this conversation as resolved.
Outdated
$GLOBALS['table_prefix'] = $table_prefix;
}

Expand Down
Loading