Changeset 54682 for branches/6.1/tests/phpunit/tests/l10n/wpLocaleSwitcher.php

Timestamp:

10/24/2022 06:35:30 PM (4 years ago)

Author:

ocean90

Message:

I18N: Change how WP_Textdomain_Registry stores the default languages path.

WP_Textdomain_Registry was introduced in [53874] to store text domains and their language directory paths, addressing issues with just-in-time loading of textdomains when using locale switching and when usingload_*_textdomain() functions.

Said change has inadvertently caused a performance regression exactly when usingload_*_textdomain(), which still often is the case, where the cached information was not further used or even overridden.

This change addresses that issue by storing the default languages paths in a separate way, while at the same time making WP_Textdomain_Registry easier to maintain and adding new tests to catch future regressions.

Props flixos90, spacedmonkey, ocean90, SergeyBiryukov, costdev.
Merges [54669] to the 6.1 branch.
See #39210.

Location:

branches/6.1

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/l10n/wpLocaleSwitcher.php (modified) (4 diffs)

branches/6.1/tests/phpunit/tests/l10n/wpLocaleSwitcher.php

@@ -28 +28 @@
                 global $wp_textdomain_registry;
 
-                $wp_textdomain_registry->reset();
+                $wp_textdomain_registry = new WP_Textdomain_Registry();
         }
 
@@ -37 +37 @@
                 global $wp_textdomain_registry;
 
-                $wp_textdomain_registry->reset();
+                $wp_textdomain_registry = new WP_Textdomain_Registry();
 
                 parent::tear_down();
@@ -479 +479 @@
                 require_once DIR_TESTDATA . '/plugins/custom-internationalized-plugin/custom-internationalized-plugin.php';
 
+                $actual = custom_i18n_plugin_test();
+
+                switch_to_locale( 'es_ES' );
+
                 $registry_value = $wp_textdomain_registry->get( 'custom-internationalized-plugin', determine_locale() );
 
-                $actual = custom_i18n_plugin_test();
-
-                switch_to_locale( 'es_ES' );
                 switch_to_locale( 'de_DE' );
 
@@ -518 +519 @@
                 require_once get_stylesheet_directory() . '/functions.php';
 
+                $actual = custom_i18n_theme_test();
+
+                switch_to_locale( 'es_ES' );
+
                 $registry_value = $wp_textdomain_registry->get( 'custom-internationalized-theme', determine_locale() );
 
-                $actual = custom_i18n_theme_test();
-
-                switch_to_locale( 'es_ES' );
                 switch_to_locale( 'de_DE' );