Repository navigation
Theme JSON Resolver: Document cached static properties as nullable - #86111
Merged
westonruter merged 2 commits intoNov 3, 2026
Merged
westonruter merged 2 commits into
westonruter merged 2 commits into
Conversation
noruzzamans
requested review from
manzoorwanijk and
spacedmonkey
as code owners
November 1, 2026 03:57
🤖 PR meta 🤖🎉 PropsIf you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message. To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. Props Bot commandsYou can trigger Props Bot actions by commenting on this PR:
Updated as activity occurs, without notifying anyone named here. Add the |
huzaifaalmesbah
added
[Type] Code Quality
Member
|
Looks good. Core's |
westonruter
approved these changes
Nov 3, 2026
westonruter
left a comment
westonruter
left a comment
Member
There was a problem hiding this comment.
I've opened WordPress/wordpress-develop#15385 to apply the same fixes to core.
wporg-sync
pushed a commit
to WordPress/wordpress-develop
that referenced
this pull request
Nov 3, 2026
The cached static properties of `WP_Theme_JSON_Resolver` all default to `null` and are reset to `null` in `clean_cached_data()`, and the getters check them against `null` to decide whether to rebuild the cache, but their `@var` tags omitted `null`. Adding it removes the six resulting `assign.propertyType` entries from the PHPStan baseline. There is no runtime change. This mirrors the same fix to `WP_Theme_JSON_Resolver_Gutenberg` in the Gutenberg plugin, developed in WordPress/gutenberg#86111. Developed in #15385. Follow-up to r50959, r52049, r54493, r63022. Props noruzzaman, huzaifaalmesbah. See #65817. git-svn-id: https://develop.svn.wordpress.org/trunk@65218 602fd350-edb4-49c9-b593-d223f7449a82
wporg-sync
pushed a commit
to WordPress/WordPress
that referenced
this pull request
Nov 3, 2026
The cached static properties of `WP_Theme_JSON_Resolver` all default to `null` and are reset to `null` in `clean_cached_data()`, and the getters check them against `null` to decide whether to rebuild the cache, but their `@var` tags omitted `null`. Adding it removes the six resulting `assign.propertyType` entries from the PHPStan baseline. There is no runtime change. This mirrors the same fix to `WP_Theme_JSON_Resolver_Gutenberg` in the Gutenberg plugin, developed in WordPress/gutenberg#86111. Developed in WordPress/wordpress-develop#15385. Follow-up to r50959, r52049, r54493, r63022. Props noruzzaman, huzaifaalmesbah. See #65817. Built from https://develop.svn.wordpress.org/trunk@65218 git-svn-id: http://core.svn.wordpress.org/trunk@64367 1a063a9b-81f0-0310-95a4-ce76da25c4cd
ingeniumed
added
the
Global Styles
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What?
See #86088
Documents cached static properties on WP_Theme_JSON_Resolver_Gutenberg as nullable in their @var docblocks, and removes the resolved entries from the PHPStan baseline.
Why?
The static properties $core, $blocks, $theme, $user, $user_custom_post_type_id, and $i18n_schema are all initialized to null and reset to null in clean_cached_data(). Because their @var docblocks documented them without |null, PHPStan reported assign.propertyType errors when they are reset. This resolves 6 of the 226 errors initially baselined in #66693.
How?
There is no runtime logic change, only docblock corrections.
Testing Instructions
Testing Instructions for Keyboard
Not applicable. There are no UI changes.
Screenshots or screencast
Not applicable.
Use of AI Tools
I used Claude Code to identify the affected occurrences and draft the change. I reviewed the diff and take responsibility for it.