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.

Sign up for GitHub

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

Jump to bottom

Try: bundle the WP_Theme_JSON_Resolver class instead of inheriting per WordPress version #46750

Merged
merged 30 commits into from
Dec 22, 2022
Merged

Try: bundle the WP_Theme_JSON_Resolver class instead of inheriting per WordPress version #46750

merged 30 commits into from
Dec 22, 2022
+702 −601

Commits on Dec 22, 2022

  1. Backport WP_Theme_JSON_Resolver from core as it is

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    96c0239 View commit details
    Browse the repository at this point in the history

  2. Substitute WP_Theme_JSON by WP_Theme_JSON_Gutenberg

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    13185e2 View commit details
    Browse the repository at this point in the history

  3. Substitute WP_Theme_JSON_Data by WP_Theme_JSON_Data_Gutenberg

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    1f5ad2d View commit details
    Browse the repository at this point in the history

  4. Rename WP_Theme_JSON_Resolver to WP_Theme_JSON_Resolver_Base 

    The goal is to use it as base to inherit from, until we are able
to remove all the children.
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    fa996f4 View commit details
    Browse the repository at this point in the history

  5. Make WP_Theme_JSON_Resolver_6_1 inherit from WP_Theme_JSON_Resolver_Base

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    a6e00ce View commit details
    Browse the repository at this point in the history

  6. 6.1: remove field already defined in base class

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    bd03602 View commit details
    Browse the repository at this point in the history

  7. 6.1: remove translate, it is equal to base method

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    3d13fa9 View commit details
    Browse the repository at this point in the history

  8. 6.1: remove get_core_data, it does not have base changes

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    e2d54a4 View commit details
    Browse the repository at this point in the history

  9. 6.1: remove get_user_data 

    Missed core changes and does not do anything differently from core.
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    1f0ca1d View commit details
    Browse the repository at this point in the history

  10. 6.1: remove get_user_data_from_wp_global_styles 

    It misses core changes and does not do anything differently.
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    7f48e7d View commit details
    Browse the repository at this point in the history

  11. 6.2: inherit from WP_Theme_JSON_Resolver_Base instead of 6.1 

    This makes the WP_Theme_JSON_Resover_6_1 class unused.
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    6858a77 View commit details
    Browse the repository at this point in the history

  12. 6.1: remove class no longer in use

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    811fc7d View commit details
    Browse the repository at this point in the history

  13. 6.2: deprecate theme_has_support 

    #45380
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    f4c6c01 View commit details
    Browse the repository at this point in the history

  14. 6.2: substitute WP_Theme_JSON_Resolver::theme_has_support 

    by wp_theme_has_theme_json()

#45168
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    fc639bc View commit details
    Browse the repository at this point in the history

  15. 6.2: port changes to get_user_data_from_wp_global_styles 

    #46043
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    fe37493 View commit details
    Browse the repository at this point in the history

  16. 6.2: update get_merged_data 

    #45969
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    a5bdc76 View commit details
    Browse the repository at this point in the history

  17. 6.2: remove get_user_data 

    Same code as core. There's a check for detecting whether the class
is an instance of WP_Theme_JSON_Gutenberg that was not ported.
This check was introduced to make sure the cache of the core class
didn't interfere with the cache of the Gutenberg class,
so it's no longer necessary.

See #42756
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    897c355 View commit details
    Browse the repository at this point in the history

  18. experimental: make it inherit from WP_Theme_JSON_Resolver_Base

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    edf3fb0 View commit details
    Browse the repository at this point in the history

  19. 6.2: remove class no longer in use

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    afb4aa0 View commit details
    Browse the repository at this point in the history

  20. experimental: delete remove_json_comments 

    It's already part of the base class.
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    486162d View commit details
    Browse the repository at this point in the history

  21. experimental: remove get_block_data 

    It's already part of the base class and it didn't have
the changes from core.
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    6551ec8 View commit details
    Browse the repository at this point in the history

  22. experimental: appearanceTools 

    Port changes to the base class that were meant to be part of 6.1.
See #43337
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    31e4b00 View commit details
    Browse the repository at this point in the history

  23. experimental: port webfonts (experimental API) 

    see #37140
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    26bf599 View commit details
    Browse the repository at this point in the history

  24. experimental: use gutenberg_get_legacy_theme_supports_for_theme_json 

    #46112
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    78c51b3 View commit details
    Browse the repository at this point in the history

  25. experimental: get_theme_data, all code is in the base class

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    f18b7b8 View commit details
    Browse the repository at this point in the history

  26. experimental: remove empty class

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    9335dbc View commit details
    Browse the repository at this point in the history

  27. Rename WP_Theme_JSON_Resolver_Base to WP_Theme_JSON_Resolver_Gutenberg

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    9e1336a View commit details
    Browse the repository at this point in the history

  28. Fix lint issue: rename class-wp-theme-json-resolver.php to class-wp-t… 

    …heme-json-resolver-gutenberg.php
    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    1b16af4 View commit details
    Browse the repository at this point in the history

  29. Move theme.json to unversioned lib/

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    9938731 View commit details
    Browse the repository at this point in the history

  30. Move theme-i18n.json to unversioned lib/

    @oandregal
    oandregal committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    703ccaf View commit details
    Browse the repository at this point in the history