vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-01 15:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes the error handling for when `WP_Classic_To_Block_Menu_Converter::convert()` returns an instance of `WP_Error`. `WP_Navigation_Fallback::create_classic_menu_fallback()` now checks 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_Block_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_get_nav_menu_items()`. The return type is clearly documented as a `string`.

Follow-up to [56052].

Props dlh, get_dave, antonvlasenko, hellofromTonya.
Fixes #58823.

git-svn-id: https://develop.svn.wordpress.org/trunk@56422 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Tonya Mork
2023-08-21 17:49:09 +00:00
parent f0d53f8100
commit 17e9e69bb6
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/phpunit/tests/editor/classic-to-block-menu-converter.php
View File

@@ -205,16 +205,14 @@ class WP_Classic_To_Block_Menu_Converter_Test extends WP_UnitTestCase {
* @ticket 58557
* @covers WP_Classic_To_Block_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' );
$classic_nav_menu = wp_get_nav_menu_object( $menu_id );
$blocks = WP_Classic_To_Block_Menu_Converter::convert( $classic_nav_menu );
$this->assertEmpty( $blocks, 'Result should be empty.' );
$this->assertIsArray( $blocks, 'Result should be empty array.' );
$this->assertSame( '', $blocks, 'Result should be empty string.' );
wp_delete_nav_menu( $menu_id );
}