Changeset 57339 for trunk/src/wp-includes/l10n/class-wp-translation-controller.php

Timestamp:

01/23/2024 03:13:32 PM (3 years ago)

Author:

swissspidy

Message:

I18N: Improve edge case handling in WP_Translation_Controller.

Prevents PHP warnings for possibly undefined array keys.
Also fixes incorrect @covers annotations.

Follow-up to [57337].
See #59656.

File:

• trunk/src/wp-includes/l10n/class-wp-translation-controller.php (modified) (3 diffs)

trunk/src/wp-includes/l10n/class-wp-translation-controller.php

@@ -152 +152 @@
 
                 if ( null !== $locale ) {
-                        foreach ( $this->loaded_translations[ $locale ][ $textdomain ] as $i => $moe ) {
-                                if ( $file === $moe || $file === $moe->get_file() ) {
-                                        unset( $this->loaded_translations[ $locale ][ $textdomain ][ $i ] );
-                                        unset( $this->loaded_files[ $moe->get_file() ][ $locale ][ $textdomain ] );
-                                        return true;
+                        if ( isset( $this->loaded_translations[ $locale ][ $textdomain ] ) ) {
+                                foreach ( $this->loaded_translations[ $locale ][ $textdomain ] as $i => $moe ) {
+                                        if ( $file === $moe || $file === $moe->get_file() ) {
+                                                unset( $this->loaded_translations[ $locale ][ $textdomain ][ $i ] );
+                                                unset( $this->loaded_files[ $moe->get_file() ][ $locale ][ $textdomain ] );
+                                                return true;
+                                        }
                                 }
                         }
@@ -164 +166 @@
 
                 foreach ( $this->loaded_translations as $l => $domains ) {
+                        if ( ! isset( $domains[ $textdomain ] ) ) {
+                                continue;
+                        }
+
                         foreach ( $domains[ $textdomain ] as $i => $moe ) {
                                 if ( $file === $moe || $file === $moe->get_file() ) {
@@ -186 +192 @@
          */
         public function unload_textdomain( string $textdomain = 'default', string $locale = null ): bool {
+                $unloaded = false;
+
                 if ( null !== $locale ) {
-                        foreach ( $this->loaded_translations[ $locale ][ $textdomain ] as $moe ) {
-                                unset( $this->loaded_files[ $moe->get_file() ][ $locale ][ $textdomain ] );
+                        if ( isset( $this->loaded_translations[ $locale ][ $textdomain ] ) ) {
+                                $unloaded = true;
+                                foreach ( $this->loaded_translations[ $locale ][ $textdomain ] as $moe ) {
+                                        unset( $this->loaded_files[ $moe->get_file() ][ $locale ][ $textdomain ] );
+                                }
                         }
 
                         unset( $this->loaded_translations[ $locale ][ $textdomain ] );
 
-                        return true;
-                }
-
-                $unloaded = false;
+                        return $unloaded;
+                }
 
                 foreach ( $this->loaded_translations as $l => $domains ) {