[westonruter]

✅ Committed in r65220 (140b182).

---

This is a dependency for:

• PHPStan: Fix next_tag() string query false positives and quiet the stubs generator gutenberg#86109

This adds PHPStan types for tag queries and tag names in the HTML API. The changes are to PHPDoc only; runtime behavior is unchanged.

$query in next_tag() is documented as array|string|null, but the hash notation only describes the array form. Generated stubs, such as those Gutenberg uses, turn that hash into an array shape and drop the string form, so next_tag( 'FIGURE' ) gets reported as an error. See WordPress/gutenberg#86088 (comment). Adding an explicit @phpstan-param keeps the bare tag-name form.

Changes:

• A Query type alias in WP_HTML_Tag_Processor covers tag_name, match_offset, class_name, and tag_closers, or a bare tag name, or null. It is used for next_tag(), parse_query(), and $last_query. Each key may be null, as documented.
• WP_HTML_Processor gets its own Query alias with the extra breadcrumbs key, since type aliases are not inherited. matches_breadcrumbs() uses the same element type.
• The $sought_tag_name, $sought_class_name, and $sought_match_offset properties are narrowed to match.
• Inputs accept non-empty-string, outputs promise non-falsy-string. A tag name can never be '0', but a '' !== $tag check only narrows to non-empty-string, and a '0' query is harmless, as it simply matches nothing. This also matches class_name and attribute names, which can legitimately be '0'.
• get_tag(), get_token_name(), and get_qualified_tag_name() return non-falsy-string|null, and get_breadcrumbs() returns list<non-falsy-string>. One inline @var in WP_HTML_Tag_Processor::get_tag() states why the name read from the HTML is never empty or '0', since PHPStan cannot infer that from substr(). Everything else follows from it, including WP_HTML_Token::$node_name.

With this, WP_Interactivity_API_Directives_Processor::next_balanced_tag_closer_tag() type-checks when it passes get_tag() as the tag_name. A full level 10 PHPStan run reports no new errors.

Related: #15121 (discussion)

Trac ticket: https://core.trac.wordpress.org/ticket/65817

Use of AI Tools

AI assistance: Yes
Tool(s): Claude Code
Model(s): Claude Opus 5.5 (medium effort)
Used for: Reviewing the initial commit, extending the narrowing to WP_HTML_Processor and the tag name getters, and checking the results with PHPStan. The direction and type choices were reviewed and decided by me.

---

This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See GitHub Pull Requests for Code Review in the Core Handbook for more details.

[github-actions]

Test using WordPress Playground

The changes in this pull request can previewed and tested using a WordPress Playground instance.

WordPress Playground is an experimental project that creates a full WordPress instance entirely within the browser.

Some things to be aware of

• All changes will be lost when closing a tab with a Playground instance.
• All changes will be lost when refreshing the page.
• A fresh instance is created each time the link below is clicked.
• Every time this pull request is updated, a new ZIP file containing all changes is created. If changes are not reflected in the Playground instance,
  it's possible that the most recent build failed, or has not completed. Check the list of workflow runs to be sure.

For more details about these limitations and more, check out the Limitations page in the WordPress Playground documentation.

Test this pull request with WordPress Playground.

[github-actions]

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs.

Core Committers: Use this line as a base for the props when committing in SVN:

Props westonruter.

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

---

Props Bot commands

You can trigger Props Bot actions by commenting on this PR:

• @propsbot add <username> to give props to a GitHub user. Requires write access.
• @propsbot remove <username> to leave a user out of the props. Requires write access.
• @propsbot refresh to refresh this list. Adding the props-bot label works too.

[Copilot]

🟢 Approval recommended

No active review issues were identified for the PHPDoc annotation refinements supporting HTML API query typing.

No open issues 🎉

What changed in this PR

This PR refines PHPStan annotations in the HTML API so generated stubs preserve bare tag-name queries, supporting Gutenberg’s type checking. All changes are PHPDoc-only; runtime behavior is unchanged.

Changes:

• Add query type aliases covering array, bare tag-name, and null inputs.
• Narrow query properties and tag-name outputs with more precise string types.
• Annotate processor breadcrumbs and token node names consistently.

File	Description
src/​wp-includes/​html-api/​class-wp-html-token.php	Annotates token node names as non-falsy strings.
src/​wp-includes/​html-api/​class-wp-html-tag-processor.php	Defines query types and refines query properties and tag-name return annotations.
src/​wp-includes/​html-api/​class-wp-html-processor.php	Adds breadcrumb-aware query types and refines breadcrumb and tag-name annotations.

_{Review effort: Balanced}

[sirreal]

Looks good, just a question.