Changeset 57290

Timestamp:

01/16/2024 12:10:47 PM (3 years ago)

Author:

swissspidy

Message:

I18N: Do not use trailingslashit in WP_Textdomain_Registry.

This usage of trailingslashit(), introduced in [57287], is not only redundant, but also discouraged in order to avoid formatting.php dependency (which might not always be loaded).

Props SergeyBiryukov.
See #58919.

Location:

trunk

Files:

• src/wp-includes/class-wp-textdomain-registry.php (modified) (2 diffs)
• tests/phpunit/tests/l10n/wpTextdomainRegistry.php (modified) (5 diffs)

trunk/src/wp-includes/class-wp-textdomain-registry.php

@@ -162 +162 @@
          */
         public function get_language_files_from_path( $path ) {
-                $path = trailingslashit( $path );
+                $path = rtrim( $path, '/' ) . '/';
 
                 /**
@@ -238 +238 @@
                         switch ( $type ) {
                                 case 'plugin':
-                                        wp_cache_delete( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) . '/plugins/' ), 'translations' );
+                                        wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/plugins' ), 'translations' );
                                         break;
                                 case 'theme':
-                                        wp_cache_delete( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) . '/themes/' ), 'translations' );
+                                        wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/themes' ), 'translations' );
                                         break;
                                 default:
-                                        wp_cache_delete( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) ), 'translations' );
+                                        wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR ), 'translations' );
                                         break;
                         }

trunk/tests/phpunit/tests/l10n/wpTextdomainRegistry.php

@@ -20 +20 @@
 
         public function tear_down() {
-                wp_cache_delete( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) . '/foobar/' ), 'translations' );
-                wp_cache_delete( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) . '/plugins/' ), 'translations' );
-                wp_cache_delete( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) . '/themes/' ), 'translations' );
-                wp_cache_delete( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) ), 'translations' );
+                wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/foobar' ), 'translations' );
+                wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/plugins' ), 'translations' );
+                wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/themes' ), 'translations' );
+                wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR ), 'translations' );
 
                 parent::tear_down();
@@ -85 +85 @@
          */
         public function test_get_language_files_from_path_caches_results() {
-                $this->instance->get_language_files_from_path( trailingslashit( WP_LANG_DIR ) . '/foobar/' );
-                $this->instance->get_language_files_from_path( trailingslashit( WP_LANG_DIR ) . '/plugins/' );
-                $this->instance->get_language_files_from_path( trailingslashit( WP_LANG_DIR ) . '/themes/' );
+                $this->instance->get_language_files_from_path( trailingslashit( WP_LANG_DIR ) . 'foobar/' );
+                $this->instance->get_language_files_from_path( trailingslashit( WP_LANG_DIR ) . 'plugins/' );
+                $this->instance->get_language_files_from_path( trailingslashit( WP_LANG_DIR ) . 'themes/' );
                 $this->instance->get_language_files_from_path( trailingslashit( WP_LANG_DIR ) );
 
-                $this->assertNotFalse( wp_cache_get( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) . '/plugins/' ), 'translations' ) );
-                $this->assertNotFalse( wp_cache_get( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) . '/themes/' ), 'translations' ) );
-                $this->assertNotFalse( wp_cache_get( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) . '/foobar/' ), 'translations' ) );
+                $this->assertNotFalse( wp_cache_get( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) . 'plugins/' ), 'translations' ) );
+                $this->assertNotFalse( wp_cache_get( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) . 'themes/' ), 'translations' ) );
+                $this->assertNotFalse( wp_cache_get( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) . 'foobar/' ), 'translations' ) );
                 $this->assertNotFalse( wp_cache_get( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) ), 'translations' ) );
         }
@@ -101 +101 @@
         public function test_get_language_files_from_path_short_circuit() {
                 add_filter( 'pre_get_language_files_from_path', '__return_empty_array' );
-                $result = $this->instance->get_language_files_from_path( trailingslashit( WP_LANG_DIR ) . '/plugins/' );
+                $result = $this->instance->get_language_files_from_path( WP_LANG_DIR . '/plugins' );
                 remove_filter( 'pre_get_language_files_from_path', '__return_empty_array' );
 
-                $cache = wp_cache_get( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) . '/plugins/' ), 'translations' );
+                $cache = wp_cache_get( 'cached_mo_files_' . md5( WP_LANG_DIR . 'plugins' ), 'translations' );
 
                 $this->assertEmpty( $result );
@@ -114 +114 @@
          */
         public function test_invalidate_mo_files_cache() {
-                $this->instance->get_language_files_from_path( trailingslashit( WP_LANG_DIR ) . '/plugins/' );
-                $this->instance->get_language_files_from_path( trailingslashit( WP_LANG_DIR ) . '/themes/' );
-                $this->instance->get_language_files_from_path( trailingslashit( WP_LANG_DIR ) );
+                $this->instance->get_language_files_from_path( WP_LANG_DIR . '/plugins' );
+                $this->instance->get_language_files_from_path( WP_LANG_DIR . '/themes' );
+                $this->instance->get_language_files_from_path( WP_LANG_DIR );
 
                 $this->instance->invalidate_mo_files_cache(
@@ -145 +145 @@
                 );
 
-                $this->assertFalse( wp_cache_get( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) . '/plugins/' ), 'translations' ) );
-                $this->assertFalse( wp_cache_get( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) . '/themes/' ), 'translations' ) );
-                $this->assertFalse( wp_cache_get( 'cached_mo_files_' . md5( trailingslashit( WP_LANG_DIR ) ), 'translations' ) );
+                $this->assertFalse( wp_cache_get( 'cached_mo_files_' . md5( WP_LANG_DIR . '/plugins' ), 'translations' ) );
+                $this->assertFalse( wp_cache_get( 'cached_mo_files_' . md5( WP_LANG_DIR . '/themes' ), 'translations' ) );
+                $this->assertFalse( wp_cache_get( 'cached_mo_files_' . md5( WP_LANG_DIR ), 'translations' ) );
         }