diff --git a/core/modules/menu_link_content/menu_link_content.module b/core/modules/menu_link_content/menu_link_content.module index 1b8b332..f94a139 100644 --- a/core/modules/menu_link_content/menu_link_content.module +++ b/core/modules/menu_link_content/menu_link_content.module @@ -84,13 +84,13 @@ function menu_link_content_path_delete($path) { } /** - * Implements hook_entity_predelete() for node entities. + * Implements hook_entity_predelete(). */ function menu_link_content_entity_predelete(EntityInterface $entity) { /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */ $menu_link_manager = \Drupal::service('plugin.manager.menu.link'); foreach ($entity->uriRelationships() as $rel) { - $url = $entity->urlInfo($rel); + $url = $entity->toUrl($rel); // Delete all MenuLinkContent links that point to this entity route. $result = $menu_link_manager->loadLinksByRoute($url->getRouteName(), $url->getRouteParameters()); diff --git a/core/modules/menu_link_content/tests/src/Functional/LinksTest.php b/core/modules/menu_link_content/tests/src/Functional/LinksTest.php index 6f8886f..a714c27 100644 --- a/core/modules/menu_link_content/tests/src/Functional/LinksTest.php +++ b/core/modules/menu_link_content/tests/src/Functional/LinksTest.php @@ -149,13 +149,13 @@ public function testCreateLink() { public function testMenuLinkOnEntityDelete() { $user = User::create(['name' => 'username']); $user->save(); - $menu_link_content = MenuLinkContent::create(['menu_name' => 'menu_test', 'route_name' => 'entity.user.canonical', 'route_parameters' => ['user' => $user->id()], 'bundle' => 'menu_test']); + $menu_link_content = MenuLinkContent::create(['menu_name' => 'menu_test', 'link' => [['uri' => 'entity:user/' . $user->id()]], 'bundle' => 'menu_test']); $menu_link_content->save(); $menu_tree_condition = (new MenuTreeParameters())->addCondition('route_name', 'entity.user.canonical'); - $this->assertEqual(count(\Drupal::menuTree()->load('menu_test', $menu_tree_condition)), 1); + $this->assertCount(1, \Drupal::menuTree()->load('menu_test', $menu_tree_condition)); $user->delete(); - $this->assertEqual(count(\Drupal::menuTree()->load('menu_test', $menu_tree_condition)), 0); + $this->assertCount(0, \Drupal::menuTree()->load('menu_test', $menu_tree_condition)); } /**