diff --git a/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc index 3288d38..2234d83 100644 --- a/core/modules/menu/menu.admin.inc +++ b/core/modules/menu/menu.admin.inc @@ -52,7 +52,7 @@ function menu_menu_edit(Menu $menu) { * Shows for one menu the menu links accessible to the current user and * relevant operations. */ -function menu_overview_form($form, &$form_state, $menu) { +function menu_overview_form($form, &$form_state, Menu $menu) { global $menu_admin; $form['#attached']['css'] = array(drupal_get_path('module', 'menu') . '/menu.admin.css'); $links = array(); @@ -282,7 +282,7 @@ function theme_menu_overview_form($variables) { /** * Menu callback; check access and get a confirm form for deletion of a custom menu. */ -function menu_delete_menu_page($menu) { +function menu_delete_menu_page(Menu $menu) { // System-defined menus may not be deleted. $system_menus = menu_list_system_menus(); if (isset($system_menus[$menu->id()])) { @@ -297,7 +297,8 @@ function menu_delete_menu_page($menu) { function menu_delete_menu_confirm($form, &$form_state, Menu $menu) { $form['#menu'] = $menu; $caption = ''; - $num_links = entity_get_controller('menu_link')->countMenuLinks($menu->id()); + $num_links = drupal_container()->get('plugin.manager.entity') + ->getStorageController('menu_link')->countMenuLinks($menu->id()); if ($num_links) { $caption .= '

' . format_plural($num_links, 'Warning: There is currently 1 menu link in %title. It will be deleted (system-defined items will be reset).', 'Warning: There are currently @count menu links in %title. They will be deleted (system-defined links will be reset).', array('%title' => $menu->label())) . '

'; } @@ -388,17 +389,17 @@ function menu_edit_menu_submit($form, &$form_state) { /** * Menu callback: Provides the menu link submission form. * - * @param array $menu - * An array representing a custom menu. + * @param \Drupal\system\Plugin\Core\Entity\Menu $menu + * An entity representing a custom menu. * * @return * Returns the menu link submission form. */ -function menu_link_add(array $menu) { +function menu_link_add(Menu $menu) { $menu_link = entity_create('menu_link', array( 'mlid' => 0, 'plid' => 0, - 'menu_name' => $menu['menu_name'], + 'menu_name' => $menu->id(), )); drupal_set_title(t('Add menu link')); return entity_get_form($menu_link); diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php index fb8aa06..6b3eaa4 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php @@ -110,7 +110,8 @@ public function form(array $form, array &$form_state, EntityInterface $menu_link ); // Get number of items in menu so the weight selector is sized appropriately. - $delta = entity_get_controller('menu_link')->countMenuLinks($menu_link->menu_name); + $delta = drupal_container()->get('plugin.manager.entity') + ->getStorageController('menu_link')->countMenuLinks($menu_link->menu_name); if ($delta < 50) { // Old hardcoded value. $delta = 50; diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php index cb5a5a9..d2e7c06 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php @@ -253,7 +253,8 @@ public static function buildFromRouterItem(array $item) { 'link_path' => $item['path'], 'options' => empty($item['description']) ? array() : array('attributes' => array('title' => $item['description'])), ); - return entity_get_controller('menu_link')->create($item); + return drupal_container()->get('plugin.manager.entity') + ->getStorageController('menu_link')->create($item); } /** diff --git a/core/modules/menu_link/menu_link.module b/core/modules/menu_link/menu_link.module index 9332219..bf56799 100644 --- a/core/modules/menu_link/menu_link.module +++ b/core/modules/menu_link/menu_link.module @@ -86,7 +86,8 @@ function menu_link_delete_multiple(array $mlids, $force = FALSE, $prevent_repare return; } - $controller = entity_get_controller('menu_link'); + $controller = drupal_container()->get('plugin.manager.entity') + ->getStorageController('menu_link'); if (!$force) { $entity_query = entity_query('menu_link'); $group = $entity_query->orConditionGroup() @@ -164,7 +165,8 @@ function menu_link_clone($links, $menu_name = NULL) { * The insert op returns the mlid of the new item. Others op return NULL. */ function menu_link_maintain($module, $op, $link_path, $link_title = NULL) { - $menu_link_controller = entity_get_controller('menu_link'); + $menu_link_controller = drupal_container()->get('plugin.manager.entity') + ->getStorageController('menu_link'); switch ($op) { case 'insert': $menu_link = entity_create('menu_link', array(