Changeset 64072

Timestamp:

10/02/2026 11:29:44 PM (8 days ago)

Author:

SergeyBiryukov

Message:

Code Quality: Resolve variable.undefined errors in wp-mail.php and wp-trackback.php.

1. src/wp-mail.php: Initialize $subject = ''; alongside the other per-message variables ($bodysignal, $boundary, $charset, etc.) before the foreach ( $message as $line ) loop. Without this, $subject is only assigned when a line matches /Subject: /i, so PHPStan correctly flags it as potentially undefined when the loop completes without a match.

2. src/wp-trackback.php: Add global $wpdb, $posts; with @global docblocks in file scope. $wpdb is used four times (two prepare calls, one get_results, one insert_id) and $posts once ($posts[0]->ID), all reachable after require wp-load.php.

3. tests/phpstan/baselines/variable.undefined.neon: Remove the three resolved suppression entries (6 errors total).

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

Follow-up to r51850, r53719.

Props therssoftware, mukesh27.
See #65817.

Location:

trunk

Files:

• src/wp-mail.php (modified) (1 diff)
• src/wp-trackback.php (modified) (1 diff)
• tests/phpstan/baselines/variable.undefined.neon (modified) (2 diffs)

trunk/src/wp-mail.php

@@ -84 +84 @@
 
         $bodysignal                = false;
-        $boundary                  = '';
         $charset                   = '';
         $content                   = '';
         $content_type              = '';
         $content_transfer_encoding = '';
+        $boundary                  = '';
+        $subject                   = '';
         $post_author               = 1;
         $author_found              = false;
-        $post_date                 = null;
-        $post_date_gmt             = null;
+        $post_date                 = '';
+        $post_date_gmt             = '';
 
         foreach ( $message as $line ) {

trunk/src/wp-trackback.php

@@ -92 +92 @@
 $blog_name = wp_slash( $blog_name );
 
+/**
+ * @global wpdb      $wpdb  WordPress database abstraction object.
+ * @global WP_Post[] $posts Array of post objects.
+ */
+global $wpdb, $posts;
+
 if ( is_single() || is_page() ) {
         $post_id = $posts[0]->ID;

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

@@ -910 +910 @@
                         path: ../../../src/wp-login.php
                 -
-                        message: '#^Variable \$subject might not be defined\.$#'
-                        identifier: variable.undefined
-                        count: 1
-                        path: ../../../src/wp-mail.php
-                -
                         message: '#^Variable \$table_prefix might not be defined\.$#'
                         identifier: variable.undefined
@@ -924 +919 @@
                         count: 1
                         path: ../../../src/wp-settings.php
-                -
-                        message: '#^Variable \$posts might not be defined\.$#'
-                        identifier: variable.undefined
-                        count: 1
-                        path: ../../../src/wp-trackback.php
-                -
-                        message: '#^Variable \$wpdb might not be defined\.$#'
-                        identifier: variable.undefined
-                        count: 4
-                        path: ../../../src/wp-trackback.php