diff --git a/core/lib/Drupal/Core/Menu/MenuTreeStorage.php b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php index 3be4556..fc81bd0 100644 --- a/core/lib/Drupal/Core/Menu/MenuTreeStorage.php +++ b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php @@ -177,7 +177,6 @@ public function rebuild(array $definitions) { // Handle any children we didn't find starting from top-level links. foreach ($children as $orphan_links) { foreach ($orphan_links as $id) { - // Force it to the top level. $this->saveRecursive($id, $children, $links); } } diff --git a/core/modules/system/src/Tests/Menu/MenuParentChildRelationshipTest.php b/core/modules/system/src/Tests/Menu/MenuParentChildRelationshipTest.php index 6220cd4..1ca5dfa 100644 --- a/core/modules/system/src/Tests/Menu/MenuParentChildRelationshipTest.php +++ b/core/modules/system/src/Tests/Menu/MenuParentChildRelationshipTest.php @@ -22,7 +22,7 @@ class MenuParentChildRelationshipTest extends WebTestBase { * * @var array */ - public static $modules = array('node', 'menu_link_content'); + public static $modules = ['node', 'menu_link_content']; /** * The menu link plugin manager. @@ -39,39 +39,40 @@ protected function setUp() { $this->menuLinkManager = \Drupal::service('plugin.manager.menu.link'); - entity_create('menu', array( + entity_create('menu', [ 'id' => 'menu_test', 'label' => 'Test menu', 'description' => 'Description text', - ))->save(); + ])->save(); } /** - * Tests creating links with the path created using views and test relationship on rebuild. + * Tests creating links with the path created using views and test + * relationship on rebuild. */ public function testParentChildRelationshipOnMenuRebuild() { $this->menuLinkManager->deleteLinksInMenu('menu_test'); - $base_options = array( + $base_options = [ 'title' => 'Menu link test', 'provider' => 'menu_test', 'menu_name' => 'menu_test', - ); + ]; - $node = entity_create('node', array('type' => 'page', 'title' => 'Test Title')); + $node = entity_create('node', ['type' => 'page', 'title' => 'Test Title']); $node->save(); - $parent = $base_options + array( + $parent = $base_options + [ 'link' => [['uri' => 'entity:node/' . $node->id()]], - ); + ]; $link = entity_create('menu_link_content', $parent); $link->save(); $links['parent'] = $link->getPluginId(); - $child = $base_options + array( + $child = $base_options + [ 'link' => [['uri' => 'internal:/admin/content/files']], 'parent' => $links['parent'], - ); + ]; $link = entity_create('menu_link_content', $child); $link->save(); $links['child'] = $link->getPluginId(); @@ -79,7 +80,7 @@ public function testParentChildRelationshipOnMenuRebuild() { \Drupal::service('plugin.manager.menu.link')->rebuild(); $child_menu = $this->menuLinkManager->createInstance($links['child']); - $this->assertEqual($child_menu->getParent(), $links['parent'], SafeMarkup::format('Menu link %id has parent %parent, expected %expected_parent.', array('%id' => $links['child'], '%parent' => $child_menu->getParent(), '%expected_parent' => $links['parent']))); + $this->assertEqual($child_menu->getParent(), $links['parent'], SafeMarkup::format('Menu link %id has parent %parent, expected %expected_parent.', ['%id' => $links['child'], '%parent' => $child_menu->getParent(), '%expected_parent' => $links['parent']])); } }