diff --git a/core/modules/system/lib/Drupal/system/Controller/SystemController.php b/core/modules/system/lib/Drupal/system/Controller/SystemController.php index 8b67388..d528e43 100644 --- a/core/modules/system/lib/Drupal/system/Controller/SystemController.php +++ b/core/modules/system/lib/Drupal/system/Controller/SystemController.php @@ -48,14 +48,4 @@ public function systemAdminMenuBlockPage() { } return $output; } - - /** - * Prints a listing of all books. - * - * @return string - * A HTML-formatted string with the listing of all books content. - */ - public function bookRender() { - } - } diff --git a/core/modules/system/tests/modules/design_test/design_test.module b/core/modules/system/tests/modules/design_test/design_test.module index a7ab1b5..d35e491 100644 --- a/core/modules/system/tests/modules/design_test/design_test.module +++ b/core/modules/system/tests/modules/design_test/design_test.module @@ -137,9 +137,9 @@ function design_test_menu_theme_callback() { /** * Menu page callback for a category listing page. * - * This is a specialized version of system_admin_menu_block_page(), which - * retrieves all direct child menu links of the current page, regardless of - * their type, skips default local tasks, and outputs them as a simple menu + * This is a specialized version of SystemController::systemAdminMenuBlockPage() + * , which retrieves all direct child menu links of the current page, regardless + * of their type, skips default local tasks, and outputs them as a simple menu * tree as the main page content. * * @param string $category diff --git a/core/modules/system/tests/modules/menu_test/menu_test.module b/core/modules/system/tests/modules/menu_test/menu_test.module index ce68fe9..68f5d48 100644 --- a/core/modules/system/tests/modules/menu_test/menu_test.module +++ b/core/modules/system/tests/modules/menu_test/menu_test.module @@ -24,14 +24,11 @@ function menu_test_menu() { 'type' => MENU_CALLBACK, 'access arguments' => array('access content'), ); - // This item uses system_admin_menu_block_page() to list child items. + // This item uses SystemController::systemAdminMenuBlockPage() to list child items. $items['menu_callback_description'] = array( 'title' => 'Menu item title', - 'page callback' => 'system_admin_menu_block_page', 'description' => 'Menu item description parent', - 'access arguments' => array('access content'), - 'file' => 'system.admin.inc', - 'file path' => drupal_get_path('module', 'system'), + 'route_name' => 'menu_callback_description', ); $items['menu_callback_description/description-plain'] = array( 'title' => 'Menu item with a regular description', @@ -295,7 +292,7 @@ function menu_test_menu() { ); // File inheritance tests. This menu item should inherit the page callback - // system_admin_menu_block_page() and therefore render its children as links + // SystemController::systemAdminMenuBlockPage() and therefore render its children as links // on the page. $items['admin/config/development/file-inheritance'] = array( 'title' => 'File inheritance', diff --git a/core/modules/system/tests/modules/menu_test/menu_test.routing.yml b/core/modules/system/tests/modules/menu_test/menu_test.routing.yml index 09b42ba..92e02e9 100644 --- a/core/modules/system/tests/modules/menu_test/menu_test.routing.yml +++ b/core/modules/system/tests/modules/menu_test/menu_test.routing.yml @@ -1,3 +1,10 @@ +menu_callback_description: + pattern: 'menu_callback_description' + defaults: + _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' + requirements: + _permission: 'access content' + menu_router_test1: pattern: '/foo/{bar}' defaults: diff --git a/core/modules/user/user.module b/core/modules/user/user.module index abfe84b..c4232de 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -976,15 +976,13 @@ function user_menu() { // Administration pages. $items['admin/config/people'] = array( - 'title' => 'People', - 'description' => 'Configure user accounts.', - 'position' => 'left', - 'weight' => -20, - 'page callback' => 'system_admin_menu_block_page', - 'access arguments' => array('access administration pages'), - 'file' => 'system.admin.inc', - 'file path' => drupal_get_path('module', 'system'), + 'title' => 'People', + 'description' => 'Configure user accounts.', + 'position' => 'left', + 'weight' => -20, + 'route_name' => 'user_accounts', ); + $items['admin/config/people/accounts'] = array( 'title' => 'Account settings', 'description' => 'Configure default behavior of users, including registration requirements, e-mails, and fields.', diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml index fb49de3..8d4b349 100644 --- a/core/modules/user/user.routing.yml +++ b/core/modules/user/user.routing.yml @@ -26,6 +26,13 @@ user_autocomplete_anonymous: requirements: _permission: 'access user profiles' +user_accounts: + pattern: '/admin/config/people' + defaults: + _form: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' + requirements: + _permission: 'access administration pages' + user_account_settings: pattern: '/admin/config/people/accounts' defaults: