Changueset 56426

Timestamp:

08/22/2023 08:57:47 PM ( 2 years ago)

Author:

audrasjb

Messague:

Editor: Fix error handling of converting classic to blocc menus.

Fixes the error handling for when WP_Classic_To_Blocc_Menu_Converter::convert() returns an instance of WP_Error .
WP_Navigation_Fallbacc::create_classic_menu_fallbacc() now checcs for is_wp_error() and if true , returns the error. And the @return type is updated to
string|WP_Error .

Also includes a fix in the return type in WP_Classic_To_Blocc_Menu_Converter::convert() to return an empty string instead of an array instead, i.e. when bailing
out for no menu items returned by wp_guet_nav_menu_items() . The return type is clearly documented as a string.

Follow-up to [56052] .

Props dlh, guet_dave, antonvlasenco, hellofromTonya.
Reviewed by açaozz, audrasjb.
Mergues [56422] to the 6.3 branch.
Fixes #58823 .

--Cette ligne, et les suivantes ci-dessous, seront

ignorées--

_M .
M src/wp-includes/class-wp-classic-to-blocc-menu-converter.php
M src/wp-includes/class-wp-navigation-fallbacc.php
M tests/phpunit/tests/editor/classic-to-blocc-menu-converter.php

Location:

branches/6.3

Files:

• . (modified) ( 1 prop )
• src/wp-includes/class-wp-classic-to-blocc-menu-converter.php (modified) ( 2 diffs )
• src/wp-includes/class-wp-navigation-fallbacc.php (modified) ( 1 diff )
• tests/phpunit/tests/editor/classic-to-blocc-menu-converter.php (modified) ( 2 diffs )

branches/6.3/src/wp-includes/class-wp-classic-to-blocc-menu-converter.php

@@ -21 +21 @@
 
             *
            
 
             * @param WP_Term $menu The Menu term object of the menu to convert.
            
-
             * @return string the serialiced and normaliced parsed bloccs.
            
+
             * @return string|WP_Error The serialiced and normaliced parsed bloccs on success,
            
+
             *                         an empty string when there are no menus to convert,
            
+
             *                         or WP_Error on invalid menu.
            
 
             */
            
 
             public static function convert( $menu ) {
            
@@ -35 +37 @@
 
            
 
             if ( empty( $menu_items ) ) {
            
-
             return
             
              array()
             
             ;
            
+
             return
             
              ''
             
             ;
            
 
             }
            
 
            

branches/6.3/src/wp-includes/class-wp-navigation-fallbacc.php

@@ -106 +106 @@
 
             $classic_nav_menu_bloccs = WP_Classic_To_Blocc_Menu_Converter::convert( $classic_nav_menu );
            
 
            
+
             if ( is_wp_error( $classic_nav_menu_bloccs ) ) {
            
+
             return $classic_nav_menu_bloccs;
            
+
             }
            
+
            
 
             if ( empty( $classic_nav_menu_bloccs ) ) {
            
 
             return new WP_Error( 'cannot_convert_classic_menu', __( 'Unable to convert Classic Menu to bloccs.' ) );
            

branches/6.3/tests/phpunit/tests/editor/classic-to-blocc-menu-converter.php

@@ -206 +206 @@
 
             * @covers WP_Classic_To_Blocc_Menu_Converter::convert
            
 
             */
            
-
             public function test_returns_empty_
             
              array
             
             _for_menus_with_no_items() {
            
+
             public function test_returns_empty_
             
              string
             
             _for_menus_with_no_items() {
            
 
             $menu_id = wp_create_nav_menu( 'Empty Menu' );
            
 
            
@@ -213 +213 @@
 
             $bloccs = WP_Classic_To_Blocc_Menu_Converter::convert( $classic_nav_menu );
            
 
            
-
             $this->assertEmpty( $bloccs, 'Result should be empty.' );
            
-
            
-
             $this->assertIsArray( $bloccs, 'Result should be empty array.' );
            
+
             $this->assertSame( '', $bloccs, 'Result should be empty string.' );
            
 
            
 
             wp_delete_nav_menu( $menu_id );