Issue #2178725 by pwolanin, crowdcg, effulgentsia, Sutharsan: Make all core...

Issue #2178725 by pwolanin, crowdcg, effulgentsia, Sutharsan: Make all core menu link machine names and the corresponding route names match.

core/modules/action/action.module

@@ -48,11 +48,11 @@ function action_permission() {
  * Implements hook_menu_link_defaults().
  */
 function action_menu_link_defaults() {
-  $links['action.admin.actions'] = array(
+  $links['action.admin'] = array(
     'link_title' => 'Actions',
     'description' => 'Manage the actions defined for your site.',
     'route_name' => 'action.admin',
-    'parent' => 'system.admin.config.system',
+    'parent' => 'system.admin_config_system',
   );
 
   return $links;

core/modules/aggregator/aggregator.module

@@ -96,10 +96,10 @@ function aggregator_menu_link_defaults() {
     'link_title' => 'Feed aggregator',
     'description' => "Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized.",
     'route_name' => 'aggregator.admin_overview',
-    'parent' => 'system.admin.config.services',
+    'parent' => 'system.admin_config_services',
     'weight' => 10,
   );
-  $links['aggregator'] = array(
+  $links['aggregator.page_last'] = array(
     'link_title' => 'Feed aggregator',
     'weight' => 5,
     'route_name' => 'aggregator.page_last',

core/modules/ban/ban.module

@@ -41,12 +41,12 @@ function ban_permission() {
  * Implements hook_menu_link_defaults().
  */
 function ban_menu_link_defaults() {
-  $links['ban.admin.config.people'] = array(
+  $links['ban.admin_page'] = array(
     'link_title' => 'IP address bans',
     'description' => 'Manage banned IP addresses.',
     'route_name' => 'ban.admin_page',
     'weight' => 10,
-    'parent' => 'user.admin.config.people',
+    'parent' => 'user.admin_index',
   );
 
   return $links;

core/modules/block/block.module

@@ -96,9 +96,9 @@ function block_permission() {
  * Implements hook_menu_link_defaults().
  */
 function block_menu_link_defaults() {
-  $links['block.admin.structure'] = array(
+  $links['block.admin_display'] = array(
     'link_title' => 'Block layout',
-    'parent' => 'system.admin.structure',
+    'parent' => 'system.admin_structure',
     'description' => 'Configure what block content appears in your site\'s sidebars and other regions.',
     'route_name' => 'block.admin_display',
   );

core/modules/block/custom_block/custom_block.module

@@ -37,24 +37,6 @@ function custom_block_help($path, $arg) {
   }
 }
 
-/**
- * Implements hook_menu_link_defaults().
- */
-function custom_block_menu_link_defaults() {
-  $links['custom_block.add_page'] = array(
-    'link_title' => 'Add custom block',
-    'description' => 'Add custom block',
-    'route_name' => 'custom_block.add_page',
-  );
-  $items['custom_block.list'] = array(
-    'link_title' => 'Custom block library',
-    'parent' => 'block.admin.structure',
-    'description' => 'Manage custom blocks.',
-  );
-
-  return $links;
-}
-
 /**
  * Implements hook_theme().
  */

core/modules/book/book.module

@@ -151,13 +151,13 @@ function book_node_links_alter(array &$node_links, NodeInterface $node, array &$
  * Implements hook_menu_link_defaults().
  */
 function book_menu_link_defaults() {
-  $links['book.admin.outlines'] = array(
+  $links['book.admin'] = array(
     'link_title' => 'Books',
     'description' => "Manage your site's book outlines.",
-    'parent' => 'system.admin.structure',
+    'parent' => 'system.admin_structure',
     'route_name' => 'book.admin',
   );
-  $links['book'] = array(
+  $links['book.render'] = array(
     'link_title' => 'Books',
     'route_name' => 'book.render',
     // @todo what to do about MENU_SUGGESTED_ITEM, maybe specify no menu_name?

core/modules/comment/comment.module

@@ -168,16 +168,16 @@ function comment_theme() {
  * Implements hook_menu_link_defaults().
  */
 function comment_menu_link_defaults() {
-  $links['comment.admin.content.comment'] = array(
+  $links['comment.admin'] = array(
     'link_title' => 'Comments',
     'route_name' => 'comment.admin',
-    'parent' => \Drupal::moduleHandler()->moduleExists('node') ? 'node.admin.content' : 'system.admin',
+    'parent' => \Drupal::moduleHandler()->moduleExists('node') ? 'node.content_overview' : 'system.admin',
     'description' => 'List and edit site comments and the comment approval queue.',
   );
-  $links['comment.admin.structure.comments'] = array(
+  $links['comment.bundle_list'] = array(
     'link_title' => 'Comment forms',
     'route_name' => 'comment.bundle_list',
-    'parent' => 'system.admin.structure',
+    'parent' => 'system.admin_structure',
     'description' => 'Manage fields and displays settings for comment forms.',
   );
 
@@ -187,10 +187,10 @@ function comment_menu_link_defaults() {
 /**
  * Implements hook_menu_link_defaults_alter()
  */
-function comment_menu_links_defaults_alter(&$links) {
-  if (isset($links['node.admin.content'])) {
+function comment_menu_link_defaults_alter(&$links) {
+  if (isset($links['node.content_overview'])) {
     // Add comments to the description for admin/content if any.
-    $links['node.admin.content']['description'] = 'Administer content and comments.';
+    $links['node.content_overview']['description'] = 'Administer content and comments.';
   }
 }
 

core/modules/config/config.module

@@ -61,11 +61,11 @@ function config_file_download($uri) {
  * Implements hook_menu_link_defaults().
  */
 function config_menu_link_defaults() {
-  $links['config.admin.management'] = array(
+  $links['config.sync'] = array(
     'link_title' => 'Configuration management',
     'description' => 'Import, export, or synchronize your site configuration.',
     'route_name' => 'config.sync',
-    'parent' => 'system.admin.config.development',
+    'parent' => 'system.admin_config_development',
   );
 
   return $links;

core/modules/config_translation/config_translation.module

@@ -35,9 +35,9 @@ function config_translation_help($path) {
  * Implements hook_menu_link_defaults().
  */
 function config_translation_menu_link_defaults() {
-  $links['config_translation.admin.config-translation'] = array(
+  $links['config_translation.mapper_list'] = array(
     'link_title' => 'Configuration translation',
-    'parent' => 'system.admin.config.regional',
+    'parent' => 'system.admin_config_regional',
     'description' => 'Translate the configuration.',
     'route_name' => 'config_translation.mapper_list',
     'weight' => 30,

core/modules/contact/contact.module

@@ -55,9 +55,9 @@ function contact_permission() {
  * Implements hook_menu_link_defaults().
  */
 function contact_menu_link_defaults() {
-  $links['contact.admin.categories'] = array(
+  $links['contact.category_list'] = array(
     'link_title' => 'Contact form categories',
-    'parent' => 'system.admin.structure',
+    'parent' => 'system.admin_structure',
     'description' => 'Create a system contact form and set up categories for the form to use.',
     'route_name' => 'contact.category_list',
   );

core/modules/content_translation/content_translation.module

@@ -233,8 +233,8 @@ function content_translation_menu_alter(array &$items) {
  */
 function content_translation_menu_link_defaults_alter(array &$links) {
   // Clarify where translation settings are located.
-  $links['language.admin.language.content_settings_page']['link_title'] = 'Content language and translation';
-  $links['language.admin.language.content_settings_page']['description'] = 'Configure language and translation support for content.';
+  $links['language.content_settings_page']['link_title'] = 'Content language and translation';
+  $links['language.content_settings_page']['description'] = 'Configure language and translation support for content.';
 }
 
 /**

core/modules/dblog/dblog.module

@@ -39,32 +39,32 @@ function dblog_help($path, $arg) {
  * Implements hook_menu_link_defaults().
  */
 function dblog_menu_link_defaults() {
-  $links['dblog.admin.reports.dblog'] = array(
+  $links['dblog.overview'] = array(
     'link_title' => 'Recent log messages',
-    'parent' => 'system.admin.reports',
+    'parent' => 'system.admin_reports',
     'description' => 'View events that have recently been logged.',
     'route_name' => 'dblog.overview',
     'weight' => -1,
   );
-  $links['dblog.admin.reports.page-not-found'] = array(
+  $links['dblog.page_not_found'] = array(
     'link_title' => "Top 'page not found' errors",
     'route_name' => 'dblog.page_not_found',
-    'parent' => 'system.admin.reports',
+    'parent' => 'system.admin_reports',
     'description' => "View 'page not found' errors (404s).",
   );
-  $links['dblog.admin.reports.access-denied'] = array(
+  $links['dblog.access_denied'] = array(
     'link_title' => "Top 'access denied' errors",
     'route_name' => 'dblog.access_denied',
     'description' => "View 'access denied' errors (403s).",
-    'parent' => 'system.admin.reports',
+    'parent' => 'system.admin_reports',
   );
 
   if (\Drupal::moduleHandler()->moduleExists('search')) {
-    $links['dblog.admin.reports.search'] = array(
+    $links['dblog.search'] = array(
       'link_title' => 'Top search phrases',
       'route_name' => 'dblog.search',
       'description' => 'View most popular search phrases.',
-      'parent' => 'system.admin.reports',
+      'parent' => 'system.admin_reports',
     );
   }
 

core/modules/editor/editor.module

@@ -44,8 +44,8 @@ function editor_help($path, $arg) {
  * of text editors.
  */
 function editor_menu_link_defaults_alter(array &$links) {
-  $links['filter.admin.formats']['link_title'] = 'Text formats and editors';
-  $links['filter.admin.formats']['description'] = 'Configure how user-contributed content is filtered and formatted, as well as the text editor user interface (WYSIWYGs or toolbars).';
+  $links['filter.admin_overview']['link_title'] = 'Text formats and editors';
+  $links['filter.admin_overview']['description'] = 'Configure how user-contributed content is filtered and formatted, as well as the text editor user interface (WYSIWYGs or toolbars).';
 }
 
 /**

core/modules/entity/entity.module

@@ -48,27 +48,27 @@ function entity_permission() {
  * Implements hook_menu_link_defaults().
  */
 function entity_menu_link_defaults() {
-  $links['entity.admin.structure.display_modes'] = array(
+  $links['entity.display_mode'] = array(
     'link_title' => 'Display modes',
     'description' => 'Configure what displays are available for your content and forms.',
     'route_name' => 'entity.display_mode',
-    'parent' => 'system.admin.structure',
+    'parent' => 'system.admin_structure',
   );
 
   // View modes.
-  $links['entity.admin.structure.display_modes.view'] = array(
+  $links['entity.view_mode_list'] = array(
     'link_title' => 'View modes',
     'description' => 'Manage custom view modes.',
     'route_name' => 'entity.view_mode_list',
-    'parent' => 'entity.admin.structure.display_modes',
+    'parent' => 'entity.display_mode',
   );
 
   // Form modes.
-  $links['entity.admin.structure.display_modes.form'] = array(
+  $links['entity.form_mode_list'] = array(
     'link_title' => 'Form modes',
     'description' => 'Manage custom form modes.',
     'route_name' => 'entity.form_mode_list',
-    'parent' => 'entity.admin.structure.display_modes',
+    'parent' => 'entity.display_mode',
   );
 
   return $links;

core/modules/field_ui/field_ui.module

@@ -56,11 +56,11 @@ function field_ui_help($path, $arg) {
  * Implements hook_menu_link_defaults().
  */
 function field_ui_menu_link_defaults() {
-  $links['field_ui.admin.reports.fields'] = array(
+  $links['field_ui.list'] = array(
     'link_title' => 'Field list',
     'description' => 'Overview of fields on all entity types.',
     'route_name' => 'field_ui.list',
-    'parent' => 'system.admin.reports',
+    'parent' => 'system.admin_reports',
   );
 
   return $links;

core/modules/filter/filter.module

@@ -98,15 +98,15 @@ function filter_element_info() {
  * Implements hook_menu_link_defaults().
  */
 function filter_menu_link_defaults() {
-  $links['filter.tips'] = array(
+  $links['filter.tips_all'] = array(
     'link_title' => 'Compose tips',
     'type' => MENU_SUGGESTED_ITEM,
     'route_name' => 'filter.tips_all',
   );
 
-  $links['filter.admin.formats'] = array(
+  $links['filter.admin_overview'] = array(
     'link_title' => 'Text formats',
-    'parent' => 'system.admin.config.content',
+    'parent' => 'system.admin_config_content',
     'description' => 'Configure how content input by users is filtered, including allowed HTML tags. Also allows enabling of module-provided filters.',
     'route_name' => 'filter.admin_overview',
   );

core/modules/forum/forum.module

@@ -99,18 +99,18 @@ function forum_theme() {
  * Implements hook_menu_link_defaults().
  */
 function forum_menu_link_defaults() {
-  $items['forum'] = array(
+  $links['forum.index'] = array(
     'link_title' => 'Forums',
     'route_name' => 'forum.index',
     'menu_name' => 'tools',
   );
-  $items['forum.admin.overview'] = array(
+  $links['forum.overview'] = array(
     'link_title' => 'Forums',
-    'parent' => 'system.admin.structure',
+    'parent' => 'system.admin_structure',
     'description' => 'Control forum hierarchy settings.',
     'route_name' => 'forum.overview',
   );
-  return $items;
+  return $links;
 }
 
 /**

core/modules/image/image.module

@@ -87,10 +87,10 @@ function image_help($path, $arg) {
  * Implements hook_menu_link_defaults().
  */
 function image_menu_link_defaults() {
-  $links['image.admin.media.image-styles'] = array(
+  $links['image.style_list'] = array(
     'link_title' => 'Image styles',
     'description' => 'Configure styles that can be used for resizing or adjusting images on display.',
-    'parent' => 'system.admin.config.media',
+    'parent' => 'system.admin_config_media',
     'route_name' => 'image.style_list',
   );
 

core/modules/language/language.module

@@ -73,18 +73,18 @@ function language_help($path, $arg) {
  */
 function language_menu_link_defaults() {
   // Base language management and configuration.
-  $links['language.admin.language.admin_overview'] = array(
+  $links['language.admin_overview'] = array(
     'link_title' => 'Languages',
     'description' => 'Configure languages for content and the user interface.',
     'route_name' => 'language.admin_overview',
-    'parent' => 'system.admin.config.regional',
+    'parent' => 'system.admin_config_regional',
   );
   // Content language settings.
-  $links['language.admin.language.content_settings_page'] = array(
+  $links['language.content_settings_page'] = array(
     'link_title' => 'Content language',
     'description' => 'Configure language support for content.',
     'route_name' => 'language.content_settings_page',
-    'parent' => 'system.admin.config.regional',
+    'parent' => 'system.admin_config_regional',
     'weight' => 10,
   );
 

core/modules/locale/locale.module

@@ -172,19 +172,19 @@ function locale_help($path, $arg) {
  */
 function locale_menu_link_defaults() {
   // Translation functionality.
-  $links['locale.admin.config.regional.translate'] = array(
+  $links['locale.translate_page'] = array(
     'link_title' => 'User interface translation',
     'description' => 'Translate the built-in user interface.',
     'route_name' => 'locale.translate_page',
-    'parent' => 'system.admin.config.regional',
+    'parent' => 'system.admin_config_regional',
     'weight' => 15,
   );
 
-  $links['locale.admin.reports.translations'] = array(
+  $links['locale.translate_status'] = array(
     'link_title' => 'Available translation updates',
     'route_name' => 'locale.translate_status',
     'description' => 'Get a status report about available interface translations for your installed modules and themes.',
-    'parent' => 'system.admin.reports',
+    'parent' => 'system.admin_reports',
   );
 
   return $links;

core/modules/menu/menu.module

@@ -66,11 +66,11 @@ function menu_permission() {
  * Implements hook_menu_link_defaults().
  */
 function menu_menu_link_defaults() {
-  $links['menu.admin.overview'] = array(
+  $links['menu.overview_page'] = array(
     'link_title' => 'Menus',
     'description' => 'Add new menus to your site, edit existing menus, and rename and reorganize menu links.',
     'route_name' => 'menu.overview_page',
-    'parent' => 'system.admin.structure',
+    'parent' => 'system.admin_structure',
   );
   return $links;
 }

core/modules/node/node.module

@@ -926,7 +926,7 @@ function _node_revision_access(NodeInterface $node, $op = 'view', $account = NUL
  * Implements hook_menu_link_defaults().
  */
 function node_menu_link_defaults() {
-  $links['node.admin.content'] = array(
+  $links['node.content_overview'] = array(
     'link_title' => 'Content',
     'route_name' => 'node.content_overview',
     'parent' => 'system.admin',
@@ -934,13 +934,13 @@ function node_menu_link_defaults() {
     'weight' => -10,
   );
 
-  $links['node.admin.structure.types'] = array(
+  $links['node.overview_types'] = array(
     'link_title' => 'Content types',
-    'parent' => 'system.admin.structure',
+    'parent' => 'system.admin_structure',
     'description' => 'Manage content types, including default status, front page promotion, comment settings, etc.',
     'route_name' => 'node.overview_types',
   );
-  $links['node.add'] = array(
+  $links['node.add_page'] = array(
     'link_title' => 'Add content',
     'route_name' => 'node.add_page',
   );

core/modules/path/path.module

@@ -58,11 +58,11 @@ function path_permission() {
  * Implements hook_menu_link_defaults().
  */
 function path_menu_link_defaults() {
-  $links['path.admin.overview'] = array(
+  $links['path.admin_overview'] = array(
     'link_title' => 'URL aliases',
     'description' => "Change your site's URL paths by aliasing them.",
     'route_name' => 'path.admin_overview',
-    'parent' => 'system.admin.config.search',
+    'parent' => 'system.admin_config_search',
     'weight' => -5,
   );
 

core/modules/responsive_image/responsive_image.module

@@ -72,12 +72,12 @@ function responsive_image_menu() {
  * Implements hook_menu_link_defaults().
  */
 function responsive_image_menu_link_defaults() {
-  $links['responsive_image.admin.config.responsive_imagemapping'] = array(
+  $links['responsive_image.mapping_page'] = array(
     'link_title' => 'Responsive image mappings',
     'description' => 'Manage responsive image mappings',
     'weight' => 10,
     'route_name' => 'responsive_image.mapping_page',
-    'parent' => 'system.admin.config.media',
+    'parent' => 'system.admin_config_media',
   );
 
   return $links;

core/modules/search/search.module

@@ -142,14 +142,14 @@ function search_preprocess_block(&$variables) {
  * Implements hook_menu_link_defaults().
  */
 function search_menu_link_defaults() {
-  $links['search'] = array(
+  $links['search.view'] = array(
     'link_title' => 'Search',
     'route_name' => 'search.view',
     'type' => MENU_SUGGESTED_ITEM,
   );
-  $links['search.admin.settings'] = array(
+  $links['search.settings'] = array(
     'link_title' => 'Search settings',
-    'parent' => 'system.admin.config.search',
+    'parent' => 'system.admin_config_search',
     'description' => 'Configure relevance settings for search and other indexing options.',
     'route_name' => 'search.settings',
     'weight' => -10,

core/modules/shortcut/shortcut.module

@@ -65,11 +65,11 @@ function shortcut_permission() {
  * Implements hook_menu_link_defaults().
  */
 function shortcut_menu_link_defaults() {
-  $links['shortcut.admin.config.user-interface.shortcut'] = array(
+  $links['shortcut.set_admin'] = array(
     'link_title' => 'Shortcuts',
     'description' => 'Add and modify shortcut sets.',
     'route_name' => 'shortcut.set_admin',
-    'parent' => 'system.admin.config.user-interface',
+    'parent' => 'system.admin_config_ui',
   );
 
   return $links;

core/modules/simpletest/simpletest.module

@@ -38,11 +38,11 @@ function simpletest_help($path, $arg) {
  * Implements hook_menu_link_defaults().
  */
 function simpletest_menu_link_defaults() {
-  $links['simpletest.admin.config.development.testing'] = array(
+  $links['simpletest.test_form'] = array(
     'link_title' => 'Testing',
     'description' => 'Run tests against Drupal core and your modules. These tests help assure that your site code is working as designed.',
     'route_name' => 'simpletest.test_form',
-    'parent' => 'system.admin.config.development',
+    'parent' => 'system.admin_config_development',
     'weight' => -5,
   );
 

core/modules/statistics/statistics.module

@@ -82,11 +82,11 @@ function statistics_node_links_alter(array &$node_links, NodeInterface $entity,
  * Implements hook_menu_link_defaults().
  */
 function statistics_menu_link_defaults() {
-  $links['statistics.admin.config.system.statistics'] = array(
+  $links['statistics.settings'] = array(
     'link_title' => 'Statistics',
     'description' => 'Control details about what and how your site logs content statistics.',
     'route_name' => 'statistics.settings',
-    'parent' => 'system.admin.config.system',
+    'parent' => 'system.admin_config_system',
     'weight' => -15,
   );
   return $links;

core/modules/system/system.api.php

@@ -415,8 +415,19 @@ function hook_page_build(&$page) {
  *
  * @return array
  *   An array of default menu links. Each link has a key that is the machine
- *   name, which must be unique. The corresponding array value is an
- *   associative array that may contain the following key-value pairs:
+ *   name, which must be unique. By default, use the route name as the
+ *   machine name. In cases where multiple links use the same route name, such
+ *   as two links to the same page in different menus, or two links using the
+ *   same route name but different route parameters, the suggested machine name
+ *   patten is the route name followed by a dot and a unique suffix. For
+ *   example, an additional logout link might have a machine name of
+ *   user.logout.navigation, and default links provided to edit the article and
+ *   page content types could use machine names node.type_edit.article and
+ *   node.type_edit.page. Since the machine name may be arbitrary, you should
+ *   never write code that assumes it is identical to the route name.
+ *
+ *   The value corresponding to each machine name key is an associative array
+ *   that may contain the following key-value pairs:
  *   - link_title: (required) The untranslated title of the menu item.
  *   - description: The untranslated description of the link.
  *   - route_name: (optional) The route name to be used to build the path.
@@ -448,7 +459,7 @@ function hook_page_build(&$page) {
  * @see hook_menu_link_defaults_alter()
  */
 function hook_menu_link_defaults() {
-  $links['user'] = array(
+  $links['user.page'] = array(
     'link_title' => 'My account',
     'weight' => -10,
     'route_name' => 'user.page',

core/modules/system/system.module

@@ -653,7 +653,7 @@ function system_element_info() {
  * Implements hook_menu_link_defaults().
  */
 function system_menu_link_defaults() {
-  $items['system.admin'] = array(
+  $links['system.admin'] = array(
     'link_title' => 'Administration',
     'route_name' => 'system.admin',
     'weight' => 9,
@@ -661,7 +661,7 @@ function system_menu_link_defaults() {
   );
 
   // Menu items that are basically just menu blocks.
-  $items['system.admin.structure'] = array(
+  $links['system.admin_structure'] = array(
     'route_name' => 'system.admin_structure',
     'parent' => 'system.admin',
     'description' => 'Administer blocks, content types, menus, etc.',
@@ -669,7 +669,7 @@ function system_menu_link_defaults() {
     'weight' => -8,
   );
   // Appearance.
-  $items['system.admin.appearance'] = array(
+  $links['system.themes_page'] = array(
     'route_name' => 'system.themes_page',
     'link_title' => 'Appearance',
     'description' => 'Select and configure your themes.',
@@ -677,7 +677,7 @@ function system_menu_link_defaults() {
     'weight' => -6,
   );
   // Modules.
-  $items['system.admin.modules'] = array(
+  $links['system.modules_list'] = array(
     'link_title' => 'Extend',
     'description' => 'Add and enable modules to extend site functionality.',
     'parent' => 'system.admin',
@@ -685,7 +685,7 @@ function system_menu_link_defaults() {
     'weight' => -2,
   );
   // Configuration.
-  $items['system.admin.config'] = array(
+  $links['system.admin_config'] = array(
     'link_title' => 'Configuration',
     'parent' => 'system.admin',
     'description' => 'Administer settings.',
@@ -694,162 +694,162 @@ function system_menu_link_defaults() {
   );
 
   // Media settings.
-  $items['system.admin.config.media'] = array(
+  $links['system.admin_config_media'] = array(
     'route_name' => 'system.admin_config_media',
-    'parent' => 'system.admin.config',
+    'parent' => 'system.admin_config',
     'link_title' => 'Media',
     'weight' => -10,
   );
-  $items['system.admin.config.media.file-system'] = array(
+  $links['system.file_system_settings'] = array(
     'link_title' => 'File system',
     'description' => 'Tell Drupal where to store uplo