Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
b2e4137
Add defaultFontSizes option to theme.json (#56661)
ajlende Jan 11, 2024
3b79149
Add migration for theme.json v2 to v3
ajlende Jan 26, 2024
71f2514
Use 'merge' to mimic old behavior
ajlende Jan 29, 2024
c02d54c
WIP
ajlende Feb 6, 2024
b2e9522
Fix PHP lint
ajlende Feb 6, 2024
365b9a8
Simplify logic
ajlende Feb 7, 2024
11e69f1
Tidy up comments
ajlende Feb 7, 2024
6a50fa6
Revert phpunit for now
ajlende Feb 7, 2024
1fb673f
Optimize prevent_override logic
ajlende Feb 7, 2024
9b0147a
preset -> preset_metadata
ajlende Feb 7, 2024
59c93c3
Bump core theme.json version
ajlende Feb 7, 2024
37d5910
Bump theme.json version in schema
ajlende Feb 7, 2024
5abb4e5
Reimplement old logic for "merge" value
ajlende Feb 7, 2024
6fcb936
Remove uniqByProperty
ajlende Feb 7, 2024
a0488fe
Fix WP_Theme_JSON_Gutenberg_Test failures
ajlende Feb 7, 2024
c60fb1c
Update WP_Theme_JSON_Schema_Gutenberg_Test with new migration
ajlende Feb 7, 2024
f26f484
Update migration docs
ajlende Feb 7, 2024
4e8dd5e
Update phpunit theme fixtures
ajlende Feb 7, 2024
4f36ed0
Try fixing WP_REST_Global_Styles_Controller_Gutenberg_Test failure
ajlende Feb 7, 2024
0ca202a
Fix PHP lint
ajlende Feb 7, 2024
ed2ec35
Default missing theme.json to latest schema
ajlende Feb 7, 2024
3e6aafd
Fix living docs title
ajlende Feb 7, 2024
e4d41f9
Refactor typography-panel a bit
ajlende Feb 7, 2024
6136799
Fix docs manifest
ajlende Feb 7, 2024
5148bf4
Clarify migration docs
ajlende Feb 7, 2024
c6bf672
Revert "Remove uniqByProperty"
ajlende Feb 7, 2024
044a6f9
Fix getUniqueFontSizesBySlug
ajlende Feb 7, 2024
3d2f8df
Update default schema elsewhere
ajlende Feb 7, 2024
78c55b9
Order the presets default, theme, custom
ajlende Feb 7, 2024
7f0577a
Reword the theme.json v2 backwards compatibility comment
ajlende Feb 9, 2024
cc530d6
Update rest controller test theme
ajlende Feb 9, 2024
b2c3882
PHP Lint
ajlende Feb 9, 2024
1105ad2
Update a few more theme.json files for tests
ajlende Feb 9, 2024
10081c1
Merge branch 'trunk' into fix/default-font-sizes-override
ajlende Feb 14, 2024
214e8f3
Remove the merge keyword that is no longer needed since #58951
ajlende Feb 14, 2024
84d3b5d
Merge branch 'trunk' into fix/default-font-sizes-override
ajlende Mar 6, 2024
d7e80e6
Merge branch 'trunk' into fix/default-font-sizes-override
ajlende Mar 12, 2024
1a7da7f
Merge branch 'trunk' into fix/default-font-sizes-override
ajlende Mar 13, 2024
b0cff00
Hacky way to fix DB save issues
ajlende Mar 13, 2024
a0e0831
Use $new instead of $old
ajlende Mar 18, 2024
14f4ae2
Skip defaultFontSizes migration for custom origin theme.json files
ajlende Mar 18, 2024
cdfd751
Merge branch 'trunk' into fix/default-font-sizes-override
ajlende Mar 18, 2024
70cccb7
Merge branch 'trunk' into fix/default-font-sizes-override
ajlende Apr 16, 2024
0472561
Fix missing textAlign in docs from merge
ajlende Apr 16, 2024
1dc4715
Remove empty line change
ajlende Apr 16, 2024
35e8eb8
Fix user styles not migrating correctly
ajlende Apr 17, 2024
a46414a
Reorder font size dropdown
ajlende Apr 17, 2024
d494c2e
Only run migration on themes with font sizes defined
ajlende Apr 17, 2024
930f297
Add more details to comment
ajlende Apr 17, 2024
ec14150
Ensure isGlobalStylesUserThemeJSON is set for migrations
ajlende Apr 17, 2024
e4459f0
Update tests since skipping for missing font sizes
ajlende Apr 23, 2024
b971b6e
Fix phpcs
ajlende Apr 23, 2024
c0db46c
Update migration docs
ajlende Apr 25, 2024
52bb2ca
Merge branch 'trunk' into fix/default-font-sizes-override
ajlende Apr 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update phpunit theme fixtures
  • Loading branch information
ajlende committed Feb 9, 2024
commit 4e8dd5e841cdd02ca6b8b2f53030c4e92d7f98ae
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public function test_get_theme_items() {
$data = $response->get_data();
$expected = array(
array(
'version' => 2,
'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
'settings' => array(
'color' => array(
'palette' => array(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"version": 2,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think there's a good way to avoid having to update the theme.json version in all of the fixtures.

Many of the tests use deep equivalence to check what they are testing which means the addition of "defaultFontSizes": false breaks those tests even though that's not what they're testing. Rather than going through and fixing all the tests, it seemed easier to just update the fixtures.

"version": 3,
"settings": {
"appearanceTools": true,
"layout": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"version": 2,
"version": 3,
"settings": {
"appearanceTools": true,
"layout": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"version": 2,
"version": 3,
"settings": {
"appearanceTools": true,
"typography": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 2,
"version": 3,
"settings": {
"blocks": {
"core/paragraph": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 2,
"version": 3,
"settings": {
"blocks": {
"core/post-title": {
Expand Down
2 changes: 1 addition & 1 deletion phpunit/data/themedir1/block-theme-child/theme.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"version": 2,
"version": 3,
"settings": {
"color": {
"palette": [
Expand Down
2 changes: 1 addition & 1 deletion phpunit/data/themedir1/block-theme/styles/variation-a.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 2,
"version": 3,
"settings": {
"blocks": {
"core/paragraph": {
Expand Down
2 changes: 1 addition & 1 deletion phpunit/data/themedir1/block-theme/styles/variation-b.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 2,
"version": 3,
"settings": {
"blocks": {
"core/post-title": {
Expand Down
2 changes: 1 addition & 1 deletion phpunit/data/themedir1/block-theme/styles/variation.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 2,
"version": 3,
"title": "Block theme variation",
"settings": {
"color": {
Expand Down
2 changes: 1 addition & 1 deletion phpunit/data/themedir1/block-theme/theme.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"version": 2,
"version": 3,
"title": "Block theme",
"settings": {
"color": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 2,
"version": 3,
"title": "Variation: duplicate fonts",
"settings": {
"typography": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 2,
"version": 3,
"title": "Variation: new font family",
"settings": {
"typography": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 2,
"version": 3,
"title": "Variation: new font variations",
"settings": {
"typography": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 2,
"version": 3,
"title": "Variation - no fonts",
"styles": {
"typography": {
Expand Down
2 changes: 1 addition & 1 deletion phpunit/data/themedir1/fonts-block-theme/theme.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"version": 2,
"version": 3,
"settings": {
"appearanceTools": true,
"color": {
Expand Down