Changeset 63351

Timestamp:

08/26/2026 09:44:34 PM (11 hours ago)

Author:

westonruter

Message:

Code Quality: Resolve the isset.variable PHPStan errors.

Each of the six baselined errors was an isset() on a variable that is always defined and not nullable, or never defined at all. The $_POST superglobal is always set, so the checks on it in Custom_Image_Header::step_2() and get_media_item() were unconditional; the latter becomes ! empty( $_POST ), which is what isset() plus count() already meant. PHP_VERSION_ID is constant within a request, so the guard above the $loader check in WP_oEmbed::_parse_xml() already decides it. The namespace group in WP_Block_Parser::next_token() is a non-trailing optional group under PREG_OFFSET_CAPTURE, which PHP always populates. In wp_edit_theme_plugin_file() the only assignment to $stylesheet is guarded by a ! empty() on the argument it comes from, so a truthiness test cannot diverge from isset().

The remaining error is the reverse case: $s in load_template() is undefined to static analysis because it arrives through extract(). Assigning the query vars to a local first, and annotating that local as array{ s?: scalar, ... }, resolves both that report and the inline @phpstan-ignore above it. The annotation is deliberately local rather than on WP_Query::$query_vars, where an unsealed shape makes every unnamed key "might not exist" and reports more than it resolves. scalar rather than string is what WP_Query::parse_query() actually guarantees, since it gates the value only with is_scalar().

With the last entry fixed, the baseline file and its entry in the includes of phpstan.neon.dist are removed.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/13023.
Follow-up to r28407, r32298, r41721, r48789, r60351, r61504, r61699, r63019.

Props westonruter, apermo.
See #65817.

Location:

trunk

Files:

• phpstan.neon.dist (modified) (1 diff)
• src/wp-admin/includes/class-custom-image-header.php (modified) (1 diff)
• src/wp-admin/includes/file.php (modified) (2 diffs)
• src/wp-admin/includes/media.php (modified) (1 diff)
• src/wp-includes/class-wp-block-parser.php (modified) (1 diff)
• src/wp-includes/class-wp-oembed.php (modified) (2 diffs)
• src/wp-includes/template.php (modified) (2 diffs)
• tests/phpstan/baselines/isset.variable.neon (deleted)

trunk/phpstan.neon.dist

@@ -56 +56 @@
         - tests/phpstan/baselines/isset.offset.neon
         - tests/phpstan/baselines/isset.property.neon
-        - tests/phpstan/baselines/isset.variable.neon
         - tests/phpstan/baselines/method.childParameterType.neon
         - tests/phpstan/baselines/method.nonObject.neon

trunk/src/wp-admin/includes/class-custom-image-header.php

@@ -842 +842 @@
                         $url           = wp_get_attachment_image_src( $attachment_id, 'full' );
                         $url           = $url[0];
-                } elseif ( isset( $_POST ) ) {
+                } else {
                         $data          = $this->step_2_manage_upload();
                         $attachment_id = $data['attachment_id'];

trunk/src/wp-admin/includes/file.php

@@ -398 +398 @@
         $content = $args['newcontent'];
 
-        $plugin    = null;
-        $theme     = null;
-        $real_file = null;
+        $plugin     = null;
+        $stylesheet = null;
+        $theme      = null;
+        $real_file  = null;
 
         if ( ! empty( $args['plugin'] ) ) {
@@ -561 +562 @@
                 if ( $plugin ) {
                         $url = add_query_arg( compact( 'plugin', 'file' ), admin_url( 'plugin-editor.php' ) );
-                } elseif ( isset( $stylesheet ) ) {
+                } elseif ( $stylesheet ) {
                         $url = add_query_arg(
                                 array(

trunk/src/wp-admin/includes/media.php

@@ -1774 +1774 @@
         if ( isset( $_GET['post_id'] ) ) {
                 $calling_post_id = absint( $_GET['post_id'] );
-        } elseif ( isset( $_POST ) && count( $_POST ) ) {// Like for async-upload where $_GET['post_id'] isn't set.
+        } elseif ( ! empty( $_POST ) ) { // Like for async-upload where $_GET['post_id'] isn't set.
                 $calling_post_id = $post->post_parent;
         }

trunk/src/wp-includes/class-wp-block-parser.php

@@ -269 +269 @@
                 $is_void   = isset( $matches['void'] ) && -1 !== $matches['void'][1];
                 $namespace = $matches['namespace'];
-                $namespace = ( isset( $namespace ) && -1 !== $namespace[1] ) ? $namespace[0] : 'core/';
+                $namespace = ( -1 !== $namespace[1] ) ? $namespace[0] : 'core/';
                 $name      = $namespace . $matches['name'][0];
                 $has_attrs = isset( $matches['attrs'] ) && -1 !== $matches['attrs'][1];

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

@@ -675 +675 @@
                 }
 
+                $loader = null;
                 if ( PHP_VERSION_ID < 80000 ) {
                         /*
@@ -689 +690 @@
                 libxml_use_internal_errors( $errors );
 
-                if ( PHP_VERSION_ID < 80000 && isset( $loader ) ) {
+                if ( PHP_VERSION_ID < 80000 ) {
                         // phpcs:ignore PHPCompatibility.FunctionUse.RemovedFunctions.libxml_disable_entity_loaderDeprecated
                         libxml_disable_entity_loader( $loader );

trunk/src/wp-includes/template.php

@@ -783 +783 @@
         global $posts, $post, $wp_did_header, $wp_query, $wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment, $user_ID;
 
-        if ( is_array( $wp_query->query_vars ) ) {
+        /** @var array{ s?: scalar, ... } $query_vars */
+        $query_vars = $wp_query->query_vars;
+        if ( is_array( $query_vars ) ) {
                 /*
                  * This use of extract() cannot be removed. There are many possible ways that
@@ -793 +795 @@
                  */
                 // phpcs:ignore WordPress.PHP.DontExtract.extract_extract
-                extract( $wp_query->query_vars, EXTR_SKIP );
+                extract( $query_vars, EXTR_SKIP );
         }
 
         if ( isset( $s ) ) {
-                $s = esc_attr( $s ); // @phpstan-ignore variable.undefined (It's extracted from query vars.)
+                $s = esc_attr( (string) $s );
         }