Allow child classes to use the private methods and constants #38625

oandregal · 2022-02-08T13:49:45Z

This PR allows #37140 to override the WP_Theme_JSON_Resolver_Gutenberg class and the VALID_TOP_LEVEL_SETTINGS for this #38323

youknowriad · 2022-02-08T17:18:26Z

I guess this needs to be backported to 5.9.1 ideally right?

oandregal · 2022-02-08T17:48:13Z

I guess this needs to be backported to 5.9.1 ideally right?

Yeah, that's my thinking. Otherwise, we need to copy a lot of things to the compat/6.0 folder and do the same changes there.

youknowriad

This looks good to me but It's very hard to know if it's enough or if we're missing anything.

youknowriad

I noticed that there are still a number of private functions and properties, should we change everything to "protected" or are changing only what we need to extend now?

ntsekouras

Thanks @oandregal! LGTM!

ntsekouras · 2022-02-08T18:46:58Z

lib/compat/wordpress-5.9/class-wp-theme-json-gutenberg.php

@@ -426,7 +426,7 @@ private static function sanitize( $input, $valid_block_names, $valid_element_nam
 			return $output;
 		}

-		$output = array_intersect_key( $input, array_flip( self::VALID_TOP_LEVEL_KEYS ) );
+		$output = array_intersect_key( $input, array_flip( static::VALID_TOP_LEVEL_KEYS ) );


Thank you for making these changes for the patterns PR ❤️

ntsekouras · 2022-02-08T18:48:57Z

I noticed that there are still a number of private functions and properties, should we change everything to "protected" or are changing only what we need to extend now?

I think we can be conservative and change what we need for now, unless there is no specific reason at all to keep them as private.

oandregal · 2022-02-08T18:50:10Z

This only addresses the changes needed for #38323 and #37140.

There's also #37770 and, in general, making sure this is child-friendly. I'm fine with merging as it is and preparing a second PR for these changes or holding off from merging until we have all that we need.

ntsekouras · 2022-02-08T18:53:34Z

I'm fine with merging as it is and preparing a second PR for these changes

I'd love if we do that in order to update the patterns PR tomorrow and verify that these are the only needed changes.

oandregal · 2022-02-08T19:00:00Z

I'd love if we do that in order to update the patterns PR tomorrow and verify that these are the only needed changes.

Yeah, these are the only changes needed for that PR. I have already the modifications to the patterns PR locally for testing. I can push them if that's ok.

oandregal · 2022-02-09T15:59:07Z

Follow up with the rest of the changes at #38671

…and VALID_TOP_LEVEL_KEYS (#38625)

…classes. This change updates methods visibility from `private` to `protected` and adds late static binding. Original PRs from Gutenberg repository: - WordPress/gutenberg#38625 - WordPress/gutenberg#38671 Props oandregal, Mamaduka, kapilpaul. Fixes #55178. See #55179. git-svn-id: https://develop.svn.wordpress.org/trunk@52744 602fd350-edb4-49c9-b593-d223f7449a82

…classes. This change updates methods visibility from `private` to `protected` and adds late static binding. Original PRs from Gutenberg repository: - WordPress/gutenberg#38625 - WordPress/gutenberg#38671 Props oandregal, Mamaduka, kapilpaul. Fixes #55178. See #55179. Built from https://develop.svn.wordpress.org/trunk@52744 git-svn-id: http://core.svn.wordpress.org/trunk@52333 1a063a9b-81f0-0310-95a4-ce76da25c4cd

…classes. This change updates methods visibility from `private` to `protected` and adds late static binding. Original PRs from Gutenberg repository: - WordPress/gutenberg#38625 - WordPress/gutenberg#38671 Props oandregal, Mamaduka, kapilpaul. Fixes #55178. See #55179. Built from https://develop.svn.wordpress.org/trunk@52744 git-svn-id: https://core.svn.wordpress.org/trunk@52333 1a063a9b-81f0-0310-95a4-ce76da25c4cd

…classes. This change updates methods visibility from `private` to `protected` and adds late static binding. Original PRs from Gutenberg repository: - WordPress/gutenberg#38625 - WordPress/gutenberg#38671 Props oandregal, Mamaduka, kapilpaul. Merges [52744] to the 5.9 branch. Fixes #55178. See #55179. git-svn-id: https://develop.svn.wordpress.org/branches/5.9@52746 602fd350-edb4-49c9-b593-d223f7449a82

…classes. This change updates methods visibility from `private` to `protected` and adds late static binding. Original PRs from Gutenberg repository: - WordPress/gutenberg#38625 - WordPress/gutenberg#38671 Props oandregal, Mamaduka, kapilpaul. Merges [52744] to the 5.9 branch. Fixes #55178. See #55179. Built from https://develop.svn.wordpress.org/branches/5.9@52746 git-svn-id: http://core.svn.wordpress.org/branches/5.9@52335 1a063a9b-81f0-0310-95a4-ce76da25c4cd

…classes. This change updates methods visibility from `private` to `protected` and adds late static binding. Original PRs from Gutenberg repository: - WordPress/gutenberg#38625 - WordPress/gutenberg#38671 Props oandregal, Mamaduka, kapilpaul. Merges [52744] to the 5.9 branch. Fixes #55178. See #55179. Built from https://develop.svn.wordpress.org/branches/5.9@52746 git-svn-id: https://core.svn.wordpress.org/branches/5.9@52335 1a063a9b-81f0-0310-95a4-ce76da25c4cd

…classes. This change updates methods visibility from `private` to `protected` and adds late static binding. Original PRs from Gutenberg repository: - WordPress/gutenberg#38625 - WordPress/gutenberg#38671 Props oandregal, Mamaduka, kapilpaul. Merges [52744] to the 5.9 branch. Fixes #55178. See #55179. Built from https://develop.svn.wordpress.org/branches/5.9@52746

…classes. This change updates methods visibility from `private` to `protected` and adds late static binding. Original PRs from Gutenberg repository: - WordPress/gutenberg#38625 - WordPress/gutenberg#38671 Props oandregal, Mamaduka, kapilpaul. Merges [52744] to the 5.9 branch. Fixes #55178. See #55179. Built from https://develop.svn.wordpress.org/branches/5.9@52746 git-svn-id: http://core.svn.wordpress.org/branches/5.9@52335 1a063a9b-81f0-0310-95a4-ce76da25c4cd

Convert to protected so it can be used by children

8669a58

oandregal requested review from aristath and youknowriad February 8, 2022 13:49

oandregal self-assigned this Feb 8, 2022

oandregal requested a review from ntsekouras February 8, 2022 13:50

oandregal mentioned this pull request Feb 8, 2022

Webfonts API #37140

Merged

7 tasks

oandregal marked this pull request as ready for review February 8, 2022 13:51

oandregal requested a review from spacedmonkey as a code owner February 8, 2022 13:51

oandregal mentioned this pull request Feb 8, 2022

[Pattern Directory]: Allow pattern registration from directory with theme.json #38323

Merged

oandregal added the Global Styles Anything related to the broader Global Styles efforts, including Styles Engine and theme.json label Feb 8, 2022

Allow overriding VALID_TOP_LEVEL_KEYS by child classes

bb60d34

youknowriad approved these changes Feb 8, 2022

View reviewed changes

youknowriad reviewed Feb 8, 2022

View reviewed changes

ntsekouras approved these changes Feb 8, 2022

View reviewed changes

youknowriad added the Backport to WP Minor Release Pull request that needs to be backported to a WordPress minor release label Feb 8, 2022

oandregal mentioned this pull request Feb 8, 2022

Borders: Use new border control components in block support #37770

Merged

7 tasks

ramonjd mentioned this pull request Feb 9, 2022

WIP Add/text orientation block support #38319

Closed

10 tasks

oandregal merged commit 70730e6 into trunk Feb 9, 2022

oandregal deleted the update/extend-theme-json branch February 9, 2022 09:41

github-actions bot added this to the Gutenberg 12.6 milestone Feb 9, 2022

oandregal mentioned this pull request Feb 9, 2022

Allow to extend the WP_Theme_JSON_Gutenberg class #38671

Merged

Mamaduka removed the Backport to WP Minor Release Pull request that needs to be backported to a WordPress minor release label Feb 16, 2022

Mamaduka pushed a commit that referenced this pull request Feb 16, 2022

Allow child classes to override the WP_Theme_JSON_Resolver_Gutenberg …

faa2a2b

…and VALID_TOP_LEVEL_KEYS (#38625)

Mamaduka mentioned this pull request Feb 16, 2022

Allow extending WP_Theme_JSON and WP_Theme_JSON_Resolver classes WordPress/wordpress-develop#2322

Closed

oandregal mentioned this pull request Feb 16, 2022

Fix for late static binding in the resolver #38857

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow child classes to use the private methods and constants #38625

Allow child classes to use the private methods and constants #38625

oandregal commented Feb 8, 2022 •

edited

Loading

youknowriad commented Feb 8, 2022

oandregal commented Feb 8, 2022

youknowriad left a comment

youknowriad left a comment

ntsekouras left a comment

ntsekouras Feb 8, 2022

ntsekouras commented Feb 8, 2022

oandregal commented Feb 8, 2022

ntsekouras commented Feb 8, 2022

oandregal commented Feb 8, 2022

oandregal commented Feb 9, 2022

Allow child classes to use the private methods and constants #38625

Allow child classes to use the private methods and constants #38625

Conversation

oandregal commented Feb 8, 2022 • edited Loading

youknowriad commented Feb 8, 2022

oandregal commented Feb 8, 2022

youknowriad left a comment

Choose a reason for hiding this comment

youknowriad left a comment

Choose a reason for hiding this comment

ntsekouras left a comment

Choose a reason for hiding this comment

ntsekouras Feb 8, 2022

Choose a reason for hiding this comment

ntsekouras commented Feb 8, 2022

oandregal commented Feb 8, 2022

ntsekouras commented Feb 8, 2022

oandregal commented Feb 8, 2022

oandregal commented Feb 9, 2022

oandregal commented Feb 8, 2022 •

edited

Loading