Issue #2085243 by dawehner: Rename Menu module into Menu UI module.

core/includes/menu.inc

@@ -422,8 +422,8 @@ function menu_secondary_menu() {
  *   Returns menu name, if exist
  */
 function _menu_get_links_source($name, $default) {
-  $config = \Drupal::config('menu.settings');
-  return \Drupal::moduleHandler()->moduleExists('menu') ? $config->get($name) : $default;
+  $config = \Drupal::config('menu_ui.settings');
+  return \Drupal::moduleHandler()->moduleExists('menu_ui') ? $config->get($name) : $default;
 }
 
 /**

core/modules/block/lib/Drupal/block/Tests/BlockLanguageCacheTest.php

@@ -21,7 +21,7 @@ class BlockLanguageCacheTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'language', 'menu');
+  public static $modules = array('block', 'language', 'menu_ui');
 
   /**
    * List of langcodes.

core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationListUiTest.php

@@ -30,7 +30,7 @@ class ConfigTranslationListUiTest extends WebTestBase {
     'custom_block',
     'field',
     'field_ui',
-    'menu',
+    'menu_ui',
     'node',
     'shortcut',
     'taxonomy',

core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php

@@ -20,7 +20,7 @@ class ForumTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('taxonomy', 'comment', 'forum', 'node', 'block', 'menu', 'help');
+  public static $modules = array('taxonomy', 'comment', 'forum', 'node', 'block', 'menu_ui', 'help');
 
   /**
    * A user with various administrative privileges.

core/modules/menu/menu.local_tasks.yml

-menu.menu_edit:
-  title: 'Edit menu'
-  route_name: menu.menu_edit
-  base_route: menu.menu_edit
-
-menu.overview_page:
-  title: 'List'
-  route_name: menu.overview_page
-  base_route: menu.overview_page
-
-menu.settings:
-  title: 'Settings'
-  route_name: menu.settings
-  base_route: menu.overview_page
-  weight: 100

core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php

@@ -111,7 +111,7 @@ class MenuLink extends Entity implements \ArrayAccess, MenuLinkInterface {
    *
    * @var string
    */
-  public $module = 'menu';
+  public $module = 'menu_ui';
 
   /**
    * A flag for whether the link should be rendered in menus.

core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php

@@ -31,7 +31,7 @@ protected function checkAccess(EntityInterface $entity, $operation, $langcode, A
 
         case 'delete':
           // Only items created by the menu module can be deleted.
-          return $entity->module == 'menu' || $entity->updated == 1;
+          return $entity->module == 'menu_ui' || $entity->updated == 1;
 
       }
     }

core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php

@@ -98,7 +98,7 @@ public function form(array $form, array &$form_state) {
     if (isset($menu_link->options['fragment'])) {
       $path .= '#' . $menu_link->options['fragment'];
     }
-    if ($menu_link->module == 'menu') {
+    if ($menu_link->module == 'menu_ui') {
       $form['link_path'] = array(
         '#type' => 'textfield',
         '#title' => t('Path'),
@@ -137,7 +137,7 @@ public function form(array $form, array &$form_state) {
     );
 
     // Generate a list of possible parents (not including this link or descendants).
-    $options = menu_parent_options(menu_get_menus(), $menu_link);
+    $options = menu_ui_parent_options(menu_ui_get_menus(), $menu_link);
     $default = $menu_link->menu_name . ':' . $menu_link->plid;
     if (!isset($options[$default])) {
       $default = 'tools:0';
@@ -298,7 +298,7 @@ public function save(array $form, array &$form_state) {
     if ($saved) {
       drupal_set_message(t('The menu link has been saved.'));
       $form_state['redirect_route'] = array(
-        'route_name' => 'menu.menu_edit',
+        'route_name' => 'menu_ui.menu_edit',
         'route_parameters' => array(
           'menu' => $menu_link->menu_name,
         ),

core/modules/menu_link/menu_link.module

@@ -15,7 +15,7 @@ function menu_link_help($path, $arg) {
     case 'admin/help#menu_link':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Menu Link module allows users to create menu links. It is required by the Menu module, which provides an interface for managing menus. See the <a href="!menu-help">Menu module help page</a> for more information.', array('!menu-help' => \Drupal::url('help.page', array('name' => 'menu')))) . '</p>';
+      $output .= '<p>' . t('The Menu Link module allows users to create menu links. It is required by the Menu module, which provides an interface for managing menus. See the <a href="!menu-help">Menu module help page</a> for more information.', array('!menu-help' => \Drupal::url('help.page', array('name' => 'menu_ui')))) . '</p>';
       return $output;
   }
 }
@@ -203,12 +203,12 @@ function menu_link_maintain($module, $op, $link_path, $link_title = NULL) {
 function menu_link_system_breadcrumb_alter(array &$breadcrumb, array $attributes, array $context) {
   // Custom breadcrumb behavior for editing menu links, we append a link to
   // the menu in which the link is found.
-  if (!empty($attributes[RouteObjectInterface::ROUTE_NAME]) && $attributes[RouteObjectInterface::ROUTE_NAME] == 'menu.link_edit' && !empty($attributes['menu_link'])) {
+  if (!empty($attributes[RouteObjectInterface::ROUTE_NAME]) && $attributes[RouteObjectInterface::ROUTE_NAME] == 'menu_ui.link_edit' && !empty($attributes['menu_link'])) {
     $menu_link = $attributes['menu_link'];
     if (($menu_link instanceof MenuLinkInterface) && !$menu_link->isNew()) {
       // Add a link to the menu admin screen.
       $menu = entity_load('menu', $menu_link->menu_name);
-      $breadcrumb[] = Drupal::l($menu->label(), 'menu.menu_edit', array('menu' => $menu->id));
+      $breadcrumb[] = Drupal::l($menu->label(), 'menu_ui.menu_edit', array('menu' => $menu->id));
     }
   }
 }

core/modules/menu/config/schema/menu.schema.yml → core/modules/menu_ui/config/schema/menu_ui.schema.yml

 # Schema for configuration files of the Menu module.
 
-menu.settings:
+menu_ui.settings:
   type: mapping
   label: 'Menu settings'
   mapping:

core/modules/menu/lib/Drupal/menu/Controller/MenuController.php → core/modules/menu_ui/lib/Drupal/menu_ui/Controller/MenuController.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\menu\Controller\MenuController.
+ * Contains \Drupal\menu_ui\Controller\MenuController.
  */
 
-namespace Drupal\menu\Controller;
+namespace Drupal\menu_ui\Controller;
 
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
@@ -34,7 +34,7 @@ public function getParentOptions(Request $request) {
         $available_menus[$menu] = $menu;
       }
     }
-    $options = _menu_get_options(menu_get_menus(), $available_menus, array('mlid' => 0));
+    $options = _menu_ui_get_options(menu_ui_get_menus(), $available_menus, array('mlid' => 0));
 
     return new JsonResponse($options);
   }

core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php → core/modules/menu_ui/lib/Drupal/menu_ui/Form/MenuDeleteForm.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\menu\Form\MenuDeleteForm.
+ * Contains \Drupal\menu_ui\Form\MenuDeleteForm.
  */
 
-namespace Drupal\menu\Form;
+namespace Drupal\menu_ui\Form;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Entity\EntityConfirmFormBase;
@@ -66,7 +66,7 @@ public function getQuestion() {
    */
   public function getCancelRoute() {
     return array(
-      'route_name' => 'menu.menu_edit',
+      'route_name' => 'menu_ui.menu_edit',
       'route_parameters' => array(
         'menu' => $this->entity->id(),
       ),
@@ -97,7 +97,7 @@ public function getConfirmText() {
    * {@inheritdoc}
    */
   public function submit(array $form, array &$form_state) {
-    $form_state['redirect_route']['route_name'] = 'menu.overview_page';
+    $form_state['redirect_route']['route_name'] = 'menu_ui.overview_page';
 
     // Locked menus may not be deleted.
     if ($this->entity->isLocked()) {

core/modules/menu/lib/Drupal/menu/Form/MenuLinkDeleteForm.php → core/modules/menu_ui/lib/Drupal/menu_ui/Form/MenuLinkDeleteForm.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\menu\Form\MenuLinkDeleteForm.
+ * Contains \Drupal\menu_ui\Form\MenuLinkDeleteForm.
  */
 
-namespace Drupal\menu\Form;
+namespace Drupal\menu_ui\Form;
 
 use Drupal\Core\Entity\EntityConfirmFormBase;
 
@@ -26,7 +26,7 @@ public function getQuestion() {
    */
   public function getCancelRoute() {
     return array(
-      'route_name' => 'menu.menu_edit',
+      'route_name' => 'menu_ui.menu_edit',
       'route_parameters' => array(
         'menu' => $this->entity->menu_name,
       ),
@@ -42,7 +42,7 @@ public function submit(array $form, array &$form_state) {
     drupal_set_message(t('The menu link %title has been deleted.', $t_args));
     watchdog('menu', 'Deleted menu link %title.', $t_args, WATCHDOG_NOTICE);
     $form_state['redirect_route'] = array(
-      'route_name' => 'menu.menu_edit',
+      'route_name' => 'menu_ui.menu_edit',
       'route_parameters' => array(
         'menu' => $this->entity->menu_name,
       ),

core/modules/menu/lib/Drupal/menu/Form/MenuLinkResetForm.php → core/modules/menu_ui/lib/Drupal/menu_ui/Form/MenuLinkResetForm.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\menu\Form\MenuLinkResetForm.
+ * Contains \Drupal\menu_ui\Form\MenuLinkResetForm.
  */
 
-namespace Drupal\menu\Form;
+namespace Drupal\menu_ui\Form;
 
 use Drupal\Core\Entity\EntityConfirmFormBase;
 
@@ -26,7 +26,7 @@ public function getQuestion() {
    */
   public function getCancelRoute() {
     return array(
-      'route_name' => 'menu.menu_edit',
+      'route_name' => 'menu_ui.menu_edit',
       'route_parameters' => array(
         'menu' => $this->entity->menu_name,
       ),
@@ -54,7 +54,7 @@ public function submit(array $form, array &$form_state) {
     $new_menu_link = $this->entity->reset();
     drupal_set_message(t('The menu link was reset to its default settings.'));
     $form_state['redirect_route'] = array(
-      'route_name' => 'menu.menu_edit',
+      'route_name' => 'menu_ui.menu_edit',
       'route_parameters' => array(
         'menu' => $new_menu_link->menu_name,
       ),

core/modules/menu/lib/Drupal/menu/MenuFormController.php → core/modules/menu_ui/lib/Drupal/menu_ui/MenuFormController.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\menu\MenuFormController.
+ * Contains \Drupal\menu_ui\MenuFormController.
  */
 
-namespace Drupal\menu;
+namespace Drupal\menu_ui;
 
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Entity\EntityFormController;
@@ -240,7 +240,7 @@ public function save(array $form, array &$form_state) {
    *
    * This form constructor can be integrated as a section into another form. It
    * relies on the following keys in $form_state:
-   * - menu: A loaded menu definition, as returned by menu_load().
+   * - menu: A loaded menu definition, as returned by menu_ui_load().
    * - menu_overview_form_parents: An array containing the parent keys to this
    *   form.
    * Forms integrating this section should call menu_overview_form_submit() from

core/modules/menu/lib/Drupal/menu/MenuListBuilder.php → core/modules/menu_ui/lib/Drupal/menu_ui/MenuListBuilder.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\menu\MenuListBuilder.
+ * Contains \Drupal\menu_ui\MenuListBuilder.
  */
 
-namespace Drupal\menu;
+namespace Drupal\menu_ui;
 
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Config\Entity\ConfigEntityListBuilder;

core/modules/menu/lib/Drupal/menu/MenuSettingsForm.php → core/modules/menu_ui/lib/Drupal/menu_ui/MenuSettingsForm.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\menu\MenuSettingsForm.
+ * Contains \Drupal\menu_ui\MenuSettingsForm.
  */
 
-namespace Drupal\menu;
+namespace Drupal\menu_ui;
 
 use Drupal\Core\Form\ConfigFormBase;
 
@@ -25,13 +25,13 @@ public function getFormId() {
    * Implements \Drupal\Core\Form\FormInterface::buildForm().
    */
   public function buildForm(array $form, array &$form_state) {
-    $config = $this->configFactory->get('menu.settings');
+    $config = $this->configFactory->get('menu_ui.settings');
     $form['intro'] = array(
       '#type' => 'item',
       '#markup' => t('The menu module allows on-the-fly creation of menu links in the content authoring forms. To configure these settings for a particular content type, visit the <a href="@content-types">Content types</a> page, click the <em>edit</em> link for the content type, and go to the <em>Menu settings</em> section.', array('@content-types' => url('admin/structure/types'))),
     );
 
-    $menu_options = menu_get_menus();
+    $menu_options = menu_ui_get_menus();
 
     $main = $config->get('main_links');
     $form['menu_main_links_source'] = array(
@@ -61,7 +61,7 @@ public function buildForm(array $form, array &$form_state) {
    * Implements \Drupal\Core\Form\FormInterface::submitForm().
    */
   public function submitForm(array &$form, array &$form_state) {
-    $this->configFactory->get('menu.settings')
+    $this->configFactory->get('menu_ui.settings')
       ->set('main_links', $form_state['values']['menu_main_links_source'])
       ->set('secondary_links', $form_state['values']['menu_secondary_links_source'])
       ->save();