Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport spacing presets #3255

Closed

Conversation

glendaviesnz
Copy link

@glendaviesnz glendaviesnz commented Sep 15, 2022

❗ BLOCKED by #3204 Edit: #3204 has been merged.

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

@glendaviesnz glendaviesnz marked this pull request as ready for review September 15, 2022 02:26
Copy link
Contributor

@costdev costdev left a comment

Choose a reason for hiding this comment

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

Thanks for handling this PR @glendaviesnz! I've left some thoughts below.

src/wp-includes/class-wp-theme-json.php Outdated Show resolved Hide resolved
src/wp-includes/class-wp-theme-json.php Outdated Show resolved Hide resolved
src/wp-includes/class-wp-theme-json.php Outdated Show resolved Hide resolved
src/wp-includes/class-wp-theme-json.php Outdated Show resolved Hide resolved
src/wp-includes/class-wp-theme-json.php Outdated Show resolved Hide resolved
tests/phpunit/tests/theme/wpThemeJson.php Outdated Show resolved Hide resolved
tests/phpunit/tests/theme/wpThemeJson.php Outdated Show resolved Hide resolved
tests/phpunit/tests/theme/wpThemeJson.php Outdated Show resolved Hide resolved
tests/phpunit/tests/theme/wpThemeJson.php Outdated Show resolved Hide resolved
tests/phpunit/tests/theme/wpThemeJson.php Outdated Show resolved Hide resolved
src/wp-includes/class-wp-theme-json.php Show resolved Hide resolved
tests/phpunit/tests/theme/wpThemeJson.php Outdated Show resolved Hide resolved
tests/phpunit/tests/theme/wpThemeJson.php Outdated Show resolved Hide resolved
tests/phpunit/tests/theme/wpThemeJson.php Outdated Show resolved Hide resolved
Copy link
Contributor

@costdev costdev left a comment

Choose a reason for hiding this comment

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

Thanks for the updates @glendaviesnz! A few more thoughts and a comment on the spacingScale discussion from my last review.

@glendaviesnz
Copy link
Author

glendaviesnz commented Sep 19, 2022

@costdev fyi there is now some discussion going about whether the t-shirt size style labels will be dropped for 6.1, so need to wait for a decision on that and will then update this PR accordingly.

@costdev
Copy link
Contributor

costdev commented Sep 19, 2022

Thanks for the update @glendaviesnz!

@glendaviesnz
Copy link
Author

spacingScale in this context is the name of the test method's argument rather than the method being tested, which should match $spacing_scale in the test method's signature.

🤦 so it is, doh! fixed.

@glendaviesnz
Copy link
Author

I think this should be good to merge, pending @costdev double checking the switch to (string) casting

Copy link
Contributor

@costdev costdev left a comment

Choose a reason for hiding this comment

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

LGTM 👍 Thanks @glendaviesnz

Copy link
Member

@mukeshpanchal27 mukeshpanchal27 left a comment

Choose a reason for hiding this comment

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

LGTM. left minor document change.

src/wp-includes/class-wp-theme-json.php Outdated Show resolved Hide resolved
Co-authored-by: Mukesh Panchal <mukeshpanchal27@users.noreply.github.com>
@audrasjb audrasjb self-assigned this Sep 21, 2022
@audrasjb
Copy link
Contributor

Committed in https://core.trac.wordpress.org/changeset/54272

@audrasjb audrasjb closed this Sep 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

5 participants