PHP: Backport changes from core theme resolver. #46250

spacedmonkey · 2022-12-01T18:04:59Z

What?

Backport changes from WordPress/wordpress-develop@8368eef by @felixarntz

Why?

How?

Testing Instructions

Testing Instructions for Keyboard

Screenshots or screencast

felixarntz

Thanks @spacedmonkey!

oandregal · 2022-12-02T07:38:03Z

lib/experimental/class-wp-theme-json-resolver-gutenberg.php

@@ -34,11 +34,15 @@ public static function get_theme_data( $deprecated = array(), $settings = array(
 		}

 		// When backporting to core, remove the instanceof Gutenberg class check, as it is only required for the Gutenberg plugin.
-		if ( null === static::$theme || ! static::$theme instanceof WP_Theme_JSON_Gutenberg ) {
+		if ( null === static::$theme || ! static::has_same_registered_blocks( 'theme' ) ) {


I don't know why there is the check for static::$theme instanceof WP_Theme_JSON_Gutenberg, though we should aim to understand that before removing it. What was the intention behind it? Is it safe to remove it?

It is this way in core. This just a back port.

@spacedmonkey I've looked up git history and that check has been added in this PR #42756

As my understanding goes, without that check, there's an issue with some data not being recalculated in the plugin, so this PR has introduced a regression.

I am working on something that will fix the root issue (re: reorganizing theem.json code in the plugin), though, in the meantime, this is just such a small change that is worth adding it back until that lands.

lib/experimental/class-wp-theme-json-resolver-gutenberg.php

mirka · 2022-12-07T13:15:54Z

Hi 👋 This may be a stupid question, but my wp-env is broken after this commit. Is there something I need to do to make it work?

For example, when I run npm run wp-env start -- --update on this commit, it fails with this error:

error

[07-Dec-2022 12:52:51 UTC] PHP Fatal error:  Uncaught Error: Call to undefined method WP_Theme_JSON_Resolver_Gutenberg::has_same_registered_blocks() in /var/www/html/wp-content/plugins/gutenberg/lib/experimental/class-wp-theme-json-resolver-gutenberg.php:37
Stack trace:
#0 /var/www/html/wp-content/plugins/gutenberg/lib/compat/wordpress-6.2/class-wp-theme-json-resolver-6-2.php(161): WP_Theme_JSON_Resolver_Gutenberg::get_theme_data()
#1 /var/www/html/wp-content/plugins/gutenberg/lib/experimental/register-webfonts-from-theme-json.php(13): WP_Theme_JSON_Resolver_6_2::get_merged_data()
#2 /var/www/html/wp-includes/class-wp-hook.php(307): gutenberg_register_webfonts_from_theme_json('')
#3 /var/www/html/wp-includes/class-wp-hook.php(331): WP_Hook->apply_filters(NULL, Array)
#4 /var/www/html/wp-includes/plugin.php(517): WP_Hook->do_action(Array)
#5 /var/www/html/wp-settings.php(598): do_action('init')
#6 phar:///usr/local/bin/wp/vendor/wp-cli/wp-cli/php/WP_CLI/Runner.php(1336): require('/var/www/html/w...')
#7 phar:///usr/local/bin/wp/vendor/wp-cli/wp-cli/php/WP_CLI/Runner.php(1254): WP_CLI\Runner->load_wordpress()
#8 phar:///usr/local/bin/wp/vendor/wp-cli/wp-cli/php/WP_CLI/Bootstrap/LaunchRunner.php(28): WP_CLI\Runner->start()
#9 phar:///usr/local/bin/wp/vendor/wp-cli/wp-cli/php/bootstrap.php(78): WP_CLI\Bootstrap\LaunchRunner->process(Object(WP_CLI\Bootstrap\BootstrapState))
#10 phar:///usr/local/bin/wp/vendor/wp-cli/wp-cli/php/wp-cli.php(32): WP_CLI\bootstrap()
#11 phar:///usr/local/bin/wp/php/boot-phar.php(11): include('phar:///usr/loc...')
#12 /usr/local/bin/wp(4): include('phar:///usr/loc...')
#13 {main}
  thrown in /var/www/html/wp-content/plugins/gutenberg/lib/experimental/class-wp-theme-json-resolver-gutenberg.php on line 37
Fatal error: Uncaught Error: Call to undefined method WP_Theme_JSON_Resolver_Gutenberg::has_same_registered_blocks() in /var/www/html/wp-content/plugins/gutenberg/lib/experimental/class-wp-theme-json-resolver-gutenberg.php:37
Stack trace:
#0 /var/www/html/wp-content/plugins/gutenberg/lib/compat/wordpress-6.2/class-wp-theme-json-resolver-6-2.php(161): WP_Theme_JSON_Resolver_Gutenberg::get_theme_data()
#1 /var/www/html/wp-content/plugins/gutenberg/lib/experimental/register-webfonts-from-theme-json.php(13): WP_Theme_JSON_Resolver_6_2::get_merged_data()
#2 /var/www/html/wp-includes/class-wp-hook.php(307): gutenberg_register_webfonts_from_theme_json('')
#3 /var/www/html/wp-includes/class-wp-hook.php(331): WP_Hook->apply_filters(NULL, Array)
#4 /var/www/html/wp-includes/plugin.php(517): WP_Hook->do_action(Array)
#5 /var/www/html/wp-settings.php(598): do_action('init')
#6 phar:///usr/local/bin/wp/vendor/wp-cli/wp-cli/php/WP_CLI/Runner.php(1336): require('/var/www/html/w...')
#7 phar:///usr/local/bin/wp/vendor/wp-cli/wp-cli/php/WP_CLI/Runner.php(1254): WP_CLI\Runner->load_wordpress()
#8 phar:///usr/local/bin/wp/vendor/wp-cli/wp-cli/php/WP_CLI/Bootstrap/LaunchRunner.php(28): WP_CLI\Runner->start()
#9 phar:///usr/local/bin/wp/vendor/wp-cli/wp-cli/php/bootstrap.php(78): WP_CLI\Bootstrap\LaunchRunner->process(Object(WP_CLI\Bootstrap\BootstrapState))
#10 phar:///usr/local/bin/wp/vendor/wp-cli/wp-cli/php/wp-cli.php(32): WP_CLI\bootstrap()
#11 phar:///usr/local/bin/wp/php/boot-phar.php(11): include('phar:///usr/loc...')
#12 /usr/local/bin/wp(4): include('phar:///usr/loc...')
#13 {main}
  thrown in /var/www/html/wp-content/plugins/gutenberg/lib/experimental/class-wp-theme-json-resolver-gutenberg.php on line 37
Error: There has been a critical error on this website.Learn more about troubleshooting WordPress. There has been a critical error on this website.

With the previous commit, it works fine.

mirka · 2022-12-07T13:31:06Z

Never mind, a complete wipe fixed it (npm run wp-env destroy && npm run wp-env start). Maybe it was just my env!

spacedmonkey · 2022-12-07T14:13:45Z

Hi 👋 This may be a stupid question, but my wp-env is broken after this commit. Is there something I need to do to make it work?

For example, when I run npm run wp-env start -- --update on this commit, it fails with this error:

error
With the previous commit, it works fine.

There is a fix here - #46363 CC @mirka

* Backport changes from core. * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Add line back. * Fix lint

noahtallen · 2022-12-13T21:02:35Z

Never mind, a complete wipe fixed it (npm run wp-env destroy && npm run wp-env start). Maybe it was just my env!

Btw, I think this fixed it because it would have updated the WordPress source code, which introduces the missing properties that caused the crash! :)

You can also run npx wp-env start --update to do that -- just another debug step that can be a bit faster than starting from scratch!

mirka · 2022-12-13T21:48:48Z

Btw, I think this fixed it because it would have updated the WordPress source code, which introduces the missing properties that caused the crash! :)

You can also run npx wp-env start --update to do that -- just another debug step that can be a bit faster than starting from scratch!

I have to think there was something else involved because the --update flag wasn't fixing it. Given that nobody has commented here with the same problem, maybe there was something going on with my local files, I have no idea 🤷

noahtallen · 2022-12-13T21:54:34Z

I just had the exact same error myself trying to run trunk on WordPress 6.0 😅 I ended up switching to the last plugin release branch, because I specifically needed to test it on the older WP version 😬

Backport changes from core.

6db0eef

spacedmonkey requested review from aristath, felixarntz and andrewserong December 1, 2022 18:04

spacedmonkey self-assigned this Dec 1, 2022

spacedmonkey requested review from jorgefilipecosta and oandregal December 1, 2022 18:05

felixarntz approved these changes Dec 1, 2022

View reviewed changes

oandregal reviewed Dec 2, 2022

View reviewed changes

lib/experimental/class-wp-theme-json-resolver-gutenberg.php Show resolved Hide resolved

spacedmonkey commented Dec 6, 2022

View reviewed changes

lib/experimental/class-wp-theme-json-resolver-gutenberg.php Show resolved Hide resolved

Apply suggestions from code review

d426e6d

spacedmonkey commented Dec 6, 2022

View reviewed changes

lib/experimental/class-wp-theme-json-resolver-gutenberg.php Show resolved Hide resolved

Apply suggestions from code review

ea5792b

spacedmonkey commented Dec 6, 2022

View reviewed changes

lib/experimental/class-wp-theme-json-resolver-gutenberg.php Outdated Show resolved Hide resolved

spacedmonkey and others added 4 commits December 6, 2022 14:07

Apply suggestions from code review

b010de1

Merge branch 'trunk' into feature/backport-json

319ca08

Add line back.

e9401ef

Fix lint

6610fdf

spacedmonkey merged commit d6aaef0 into trunk Dec 6, 2022

spacedmonkey deleted the feature/backport-json branch December 6, 2022 16:17

github-actions bot added this to the Gutenberg 14.8 milestone Dec 6, 2022

spacedmonkey mentioned this pull request Dec 7, 2022

PHP: backport from 6.1 again. #46363

Closed

oandregal mentioned this pull request Dec 29, 2022

Gutenberg 14.8.0+ compat issue with WordPress < 6.1 #46811

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PHP: Backport changes from core theme resolver. #46250

PHP: Backport changes from core theme resolver. #46250

spacedmonkey commented Dec 1, 2022

felixarntz left a comment

oandregal Dec 2, 2022

spacedmonkey Dec 6, 2022

oandregal Dec 15, 2022

mirka commented Dec 7, 2022

mirka commented Dec 7, 2022

spacedmonkey commented Dec 7, 2022

noahtallen commented Dec 13, 2022

mirka commented Dec 13, 2022

noahtallen commented Dec 13, 2022

PHP: Backport changes from core theme resolver. #46250

PHP: Backport changes from core theme resolver. #46250

Conversation

spacedmonkey commented Dec 1, 2022

What?

Why?

How?

Testing Instructions

Testing Instructions for Keyboard

Screenshots or screencast

felixarntz left a comment

Choose a reason for hiding this comment

oandregal Dec 2, 2022

Choose a reason for hiding this comment

spacedmonkey Dec 6, 2022

Choose a reason for hiding this comment

oandregal Dec 15, 2022

Choose a reason for hiding this comment

mirka commented Dec 7, 2022

mirka commented Dec 7, 2022

spacedmonkey commented Dec 7, 2022

noahtallen commented Dec 13, 2022

mirka commented Dec 13, 2022

noahtallen commented Dec 13, 2022