Skip to content

Theme JSON: Check for null values to cater for blockGap#6169

Closed
ramonjd wants to merge 3 commits into
WordPress:trunkfrom
ramonjd:add/theme-json-resolve-vars-null-check
Closed

Theme JSON: Check for null values to cater for blockGap#6169
ramonjd wants to merge 3 commits into
WordPress:trunkfrom
ramonjd:add/theme-json-resolve-vars-null-check

Conversation

@ramonjd

@ramonjd ramonjd commented Feb 23, 2024

Copy link
Copy Markdown
Member

Syncs changes from

When resolving theme.json preset variables, add a check to make sure the value is not empty before we run it through strpos() and preg_match_all().

Run the tests:

npm run test:php -- --filter Tests_Theme_wpThemeJson

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

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

github-actions Bot commented Feb 23, 2024 •
edited
Loading

Copy link
Copy Markdown

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

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

Props ramonopoly, mukesh27, get_dave.

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

@github-actions

github-actions Bot commented Feb 23, 2024

Copy link
Copy Markdown

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

  • The Plugin and Theme Directories cannot be accessed within Playground.
  • 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.

mukeshpanchal27
mukeshpanchal27 reviewed Feb 23, 2024
View reviewed changes
Comment thread tests/phpunit/tests/theme/wpThemeJson.php
/**
* Tests that the theme.json file is correctly parsed and the variables are resolved.
*
* @ticket 58588

@mukeshpanchal27 mukeshpanchal27 Feb 23, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This ticket was committed in 6.3 why we mention it here?

@ramonjd ramonjd Feb 23, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I added it because it wasn't there when the test was originally added.

It was just for the sake of completeness. I guess it's not really related to this PR and can be removed. 👍🏻

getdave
getdave approved these changes Feb 23, 2024
View reviewed changes

@getdave getdave left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests passed for me and this matches the original PR.

I left two nits.

Comment thread tests/phpunit/tests/theme/wpThemeJson.php Outdated
Comment thread tests/phpunit/tests/theme/wpThemeJson.php Outdated
@getdave

getdave commented Feb 23, 2024

Copy link
Copy Markdown
Contributor

@youknowriad I think this one is ready once the nits are addressed.

@ramonjd ramonjd force-pushed the add/theme-json-resolve-vars-null-check branch from 384607c to 31b09d8 Compare February 23, 2024 21:12
getdave
getdave approved these changes Feb 24, 2024
View reviewed changes

@getdave getdave left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@youknowriad LGTM

@getdave getdave mentioned this pull request Feb 27, 2024
Merged
@swissspidy

swissspidy commented Feb 27, 2024

Copy link
Copy Markdown
Member

https://core.trac.wordpress.org/changeset/57716

@swissspidy swissspidy closed this Feb 27, 2024
@youknowriad

youknowriad commented Feb 27, 2024

Copy link
Copy Markdown
Contributor

Commit https://core.trac.wordpress.org/changeset/57716

@ramonjd ramonjd mentioned this pull request May 2, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@getdave getdave getdave approved these changes

+1 more reviewer

@mukeshpanchal27 mukeshpanchal27 mukeshpanchal27 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

No open projects
WordPress 6.6 Editor Tasks
Status: ✅ Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ramonjd @getdave @swissspidy @youknowriad @mukeshpanchal27