Changeset 63510

Timestamp:

09/07/2026 12:10:14 AM (24 hours ago)

Author:

westonruter

Message:

Build/Test Tools: Update PHPStan to 2.2.13.

Recent PHPStan releases bring substantial performance improvements. The baselines are regenerated for the new version.

The docblock of _wp_die_process_input() is also corrected to admit the integer message that wp_die() accepts for the legacy Ajax responses, which the helper passes through untouched. This removes a baseline entry for a guard in _default_wp_die_handler() that the incomplete type made look unreachable.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/13410.
Follow-up to r44666, r53144, r62703, r62798.

Props markusstaab, westonruter.
See #65817.
Fixes #66051.

Location:

trunk

Files:

• composer.json (modified) (1 diff)
• src/wp-includes/formatting.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpstan/baselines/argument.type.neon (modified) (2 diffs)
• tests/phpstan/baselines/empty.variable.neon (modified) (1 diff)
• tests/phpstan/baselines/function.alreadyNarrowedType.neon (modified) (3 diffs)
• tests/phpstan/baselines/if.alwaysFalse.neon (modified) (1 diff)
• tests/phpstan/baselines/property.notFound.neon (modified) (1 diff)

trunk/composer.json

@@ -52 +52 @@
                 "wp-coding-standards/wpcs": "~3.4.1",
                 "phpcompatibility/phpcompatibility-wp": "~2.1.3",
-                "phpstan/phpstan": "2.2.5",
+                "phpstan/phpstan": "2.2.13",
                 "phpstan/phpstan-phpunit": "2.0.18",
                 "yoast/phpunit-polyfills": "^1.1.0"

trunk/src/wp-includes/formatting.php

@@ -4849 +4849 @@
                 $regex,
                 static function ( $matches ) {
-                        if ( ! isset( $matches[0] ) ) {
-                                return '';
-                        }
-
                         if ( isset( $matches['non_cdata'] ) ) {
                                 // escape HTML entities in the non-CDATA Section.

trunk/src/wp-includes/functions.php

@@ -4361 +4361 @@
  * @access private
  *
- * @param string|WP_Error $message Error message or WP_Error object.
- * @param string          $title   Optional. Error title. Default empty string.
- * @param string|array    $args    Optional. Arguments to control behavior. Default empty array.
+ * @param string|WP_Error|int $message Error message, WP_Error object, or integer response.
+ * @param string              $title   Optional. Error title. Default empty string.
+ * @param string|array        $args    Optional. Arguments to control behavior. Default empty array.
  * @return array {
  *     Processed arguments.
  *
- *     @type string $0 Error message.
- *     @type string $1 Error title.
- *     @type array  $2 Arguments to control behavior.
+ *     @type string|int $0 Error message, or integer response.
+ *     @type string     $1 Error title.
+ *     @type array      $2 Arguments to control behavior.
  * }
  */

trunk/tests/phpstan/baselines/argument.type.neon

@@ -775 +775 @@
                         path: ../../../src/wp-includes/class-wp-embed.php
                 -
+                        message: '#^Parameter \#1 \$handle of function curl_getinfo expects resource, \(resource\|false\) given\.$#'
+                        identifier: argument.type
+                        count: 2
+                        path: ../../../src/wp-includes/class-wp-http-curl.php
+                -
                         message: '#^Parameter \#3 \$value of function curl_setopt expects int, string given\.$#'
                         identifier: argument.type
@@ -929 +934 @@
                         count: 1
                         path: ../../../src/wp-includes/formatting.php
+                -
+                        message: '#^Parameter \#1 \$finfo of function finfo_file expects resource, resource\|false given\.$#'
+                        identifier: argument.type
+                        count: 2
+                        path: ../../../src/wp-includes/functions.php
                 -
                         message: '#^Parameter \#1 \$prefix of function uniqid expects string, int\<0, max\> given\.$#'

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

@@ -24 +24 @@
                         count: 1
                         path: ../../../src/wp-admin/includes/class-wp-posts-list-table.php
-                -
-                        message: '#^Variable \$title in empty\(\) always exists and is always falsy\.$#'
-                        identifier: empty.variable
-                        count: 1
-                        path: ../../../src/wp-admin/includes/plugin.php
                 -
                         message: '#^Variable \$parent_file in empty\(\) always exists and is not falsy\.$#'

trunk/tests/phpstan/baselines/function.alreadyNarrowedType.neon

@@ -25 +25 @@
                         path: ../../../src/wp-admin/includes/ajax-actions.php
                 -
-                        message: '#^Call to function is_wp_error\(\) with WP_Error will always evaluate to true\.$#'
-                        identifier: function.alreadyNarrowedType
-                        count: 1
-                        path: ../../../src/wp-admin/includes/ajax-actions.php
-                -
                         message: '#^Call to function method_exists\(\) with ''ParagonIE_Sodium…'' and ''runtime_speed_test'' will always evaluate to true\.$#'
                         identifier: function.alreadyNarrowedType
@@ -49 +44 @@
                         count: 1
                         path: ../../../src/wp-admin/includes/plugin.php
-                -
-                        message: '#^Call to function is_string\(\) with string will always evaluate to true\.$#'
-                        identifier: function.alreadyNarrowedType
-                        count: 1
-                        path: ../../../src/wp-includes/block-editor.php
                 -
                         message: '#^Call to function is_string\(\) with string will always evaluate to true\.$#'
@@ -80 +70 @@
                         path: ../../../src/wp-includes/functions.php
                 -
+                        message: '#^Call to function is_scalar\(\) with int\|string will always evaluate to true\.$#'
+                        identifier: function.alreadyNarrowedType
+                        count: 3
+                        path: ../../../src/wp-includes/functions.php
+                -
                         message: '#^Call to function is_array\(\) with array will always evaluate to true\.$#'
                         identifier: function.alreadyNarrowedType

trunk/tests/phpstan/baselines/if.alwaysFalse.neon

@@ -33 +33 @@
                         identifier: if.alwaysFalse
                         count: 1
-                        path: ../../../src/wp-includes/load.php
-                -
-                        message: '#^If condition is always false\.$#'
-                        identifier: if.alwaysFalse
-                        count: 1
                         path: ../../../src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php
                 -

trunk/tests/phpstan/baselines/property.notFound.neon

@@ -177 +177 @@
                         message: '#^Access to an undefined property WP_Theme\:\:\$version\.$#'
                         identifier: property.notFound
-                        count: 5
+                        count: 6
                         path: ../../../src/wp-admin/includes/class-wp-debug-data.php
                 -