diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php index 0703c067bc3..f29523294f3 100644 --- a/core/lib/Drupal.php +++ b/core/lib/Drupal.php @@ -455,7 +455,7 @@ class Drupal { * However, for links enclosed in translatable text you should use t() and * embed the HTML anchor tag directly in the translated string. For example: * @code - * t('Visit the content types page', array('@url' => Drupal::url('node_overview_types'))); + * t('Visit the content types page', array('@url' => Drupal::url('node.overview_types'))); * @endcode * This keeps the context of the link title ('settings' in the example) for * translators. diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php index fc45202dcbf..98b486404a3 100644 --- a/core/lib/Drupal/Core/Entity/EntityManager.php +++ b/core/lib/Drupal/Core/Entity/EntityManager.php @@ -434,7 +434,7 @@ class EntityManager extends PluginManagerBase { $bundle = str_replace($entity_info['bundle_prefix'], '', $bundle); } return array( - 'route_name' => 'field_ui.overview.' . $entity_type, + 'route_name' => "field_ui.overview_$entity_type", 'route_parameters' => array( 'bundle' => $bundle, ) diff --git a/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php b/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php index dba34cd58cc..a85262fc5ec 100644 --- a/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php +++ b/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php @@ -22,7 +22,7 @@ interface LinkGeneratorInterface { * However, for links enclosed in translatable text you should use t() and * embed the HTML anchor tag directly in the translated string. For example: * @code - * t('Visit the content types page', array('@url' => Drupal::url('node_overview_types'))); + * t('Visit the content types page', array('@url' => Drupal::url('node.overview_types'))); * @endcode * This keeps the context of the link title ('settings' in the example) for * translators. diff --git a/core/modules/action/action.module b/core/modules/action/action.module index b7e018d36b1..5c0e3500bb3 100644 --- a/core/modules/action/action.module +++ b/core/modules/action/action.module @@ -51,7 +51,7 @@ function action_menu() { $items['admin/config/system/actions'] = array( 'title' => 'Actions', 'description' => 'Manage the actions defined for your site.', - 'route_name' => 'action_admin', + 'route_name' => 'action.admin', ); $items['admin/config/system/actions/manage'] = array( 'title' => 'Manage actions', @@ -61,17 +61,17 @@ function action_menu() { $items['admin/config/system/actions/add'] = array( 'title' => 'Create an advanced action', 'type' => MENU_VISIBLE_IN_BREADCRUMB, - 'route_name' => 'action_admin_add', + 'route_name' => 'action.admin_add', ); $items['admin/config/system/actions/configure'] = array( 'title' => 'Configure an advanced action', 'type' => MENU_VISIBLE_IN_BREADCRUMB, - 'route_name' => 'action_admin_configure', + 'route_name' => 'action.admin_configure', ); $items['admin/config/system/actions/configure/%/delete'] = array( 'title' => 'Delete action', 'description' => 'Delete an action.', - 'route_name' => 'action_delete', + 'route_name' => 'action.delete', ); return $items; } diff --git a/core/modules/action/action.routing.yml b/core/modules/action/action.routing.yml index 19e1703fd89..1be59204ebe 100644 --- a/core/modules/action/action.routing.yml +++ b/core/modules/action/action.routing.yml @@ -1,25 +1,25 @@ -action_admin: +action.admin: pattern: '/admin/config/system/actions' defaults: _entity_list: 'action' requirements: _permission: 'administer actions' -action_admin_add: +action.admin_add: pattern: '/admin/config/system/actions/add/{action_id}' defaults: _entity_form: 'action.add' requirements: _permission: 'administer actions' -action_admin_configure: +action.admin_configure: pattern: '/admin/config/system/actions/configure/{action}' defaults: _entity_form: 'action.edit' requirements: _permission: 'administer actions' -action_delete: +action.delete: pattern: 'admin/config/system/actions/configure/{action}/delete' defaults: _entity_form: 'action.delete' diff --git a/core/modules/action/lib/Drupal/action/Form/ActionDeleteForm.php b/core/modules/action/lib/Drupal/action/Form/ActionDeleteForm.php index 23e8894cd14..a49a9011bff 100644 --- a/core/modules/action/lib/Drupal/action/Form/ActionDeleteForm.php +++ b/core/modules/action/lib/Drupal/action/Form/ActionDeleteForm.php @@ -33,7 +33,7 @@ class ActionDeleteForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'action_admin', + 'route_name' => 'action.admin', ); } diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module index 041a0f85b70..0edf9968750 100644 --- a/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -92,31 +92,31 @@ function aggregator_menu() { $items['admin/config/services/aggregator'] = array( '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', + 'route_name' => 'aggregator.admin_overview', 'weight' => 10, ); $items['admin/config/services/aggregator/add/feed'] = array( 'title' => 'Add feed', - 'route_name' => 'aggregator_feed_add', + 'route_name' => 'aggregator.feed_add', 'type' => MENU_LOCAL_ACTION, ); $items['admin/config/services/aggregator/add/category'] = array( 'title' => 'Add category', 'type' => MENU_LOCAL_ACTION, - 'route_name' => 'aggregator_category_add', + 'route_name' => 'aggregator.category_add', ); $items['admin/config/services/aggregator/add/opml'] = array( 'title' => 'Import OPML', 'type' => MENU_LOCAL_ACTION, - 'route_name' => 'aggregator_opml_add', + 'route_name' => 'aggregator.opml_add', ); $items['admin/config/services/aggregator/remove/%aggregator_feed'] = array( 'title' => 'Remove items', - 'route_name' => 'aggregator_feed_items_delete', + 'route_name' => 'aggregator.feed_items_delete', ); $items['admin/config/services/aggregator/update/%aggregator_feed'] = array( 'title' => 'Update items', - 'route_name' => 'aggregator_feed_refresh', + 'route_name' => 'aggregator.feed_refresh', ); $items['admin/config/services/aggregator/list'] = array( 'title' => 'List', @@ -125,22 +125,22 @@ function aggregator_menu() { $items['admin/config/services/aggregator/settings'] = array( 'title' => 'Settings', 'description' => 'Configure the behavior of the feed aggregator, including when to discard feed items and how to present feed items and categories.', - 'route_name' => 'aggregator_admin_settings', + 'route_name' => 'aggregator.admin_settings', 'type' => MENU_LOCAL_TASK, 'weight' => 100, ); $items['aggregator'] = array( 'title' => 'Feed aggregator', 'weight' => 5, - 'route_name' => 'aggregator_page_last', + 'route_name' => 'aggregator.page_last', ); $items['aggregator/sources'] = array( 'title' => 'Sources', - 'route_name' => 'aggregator_sources', + 'route_name' => 'aggregator.sources', ); $items['aggregator/categories'] = array( 'title' => 'Categories', - 'route_name' => 'aggregator_categories', + 'route_name' => 'aggregator.categories', ); $items['aggregator/opml'] = array( 'title' => 'OPML feed', @@ -152,7 +152,7 @@ function aggregator_menu() { $items['aggregator/categories/%aggregator_category'] = array( 'title callback' => '_aggregator_category_title', 'title arguments' => array(2), - 'route_name' => 'aggregator_category_view', + 'route_name' => 'aggregator.category_view', ); $items['aggregator/categories/%aggregator_category/view'] = array( 'title' => 'View', @@ -161,18 +161,18 @@ function aggregator_menu() { $items['aggregator/categories/%aggregator_category/categorize'] = array( 'title' => 'Categorize', 'type' => MENU_LOCAL_TASK, - 'route_name' => 'aggregator_categorize_category_form', + 'route_name' => 'aggregator.categorize_category_form', ); $items['aggregator/categories/%aggregator_category/configure'] = array( 'title' => 'Configure', 'type' => MENU_LOCAL_TASK, 'weight' => 10, - 'route_name' => 'aggregator_category_edit', + 'route_name' => 'aggregator.category_edit', ); $items['aggregator/sources/%aggregator_feed'] = array( 'title callback' => 'entity_page_label', 'title arguments' => array(2), - 'route_name' => 'aggregator_feed_view', + 'route_name' => 'aggregator.feed_view', ); $items['aggregator/sources/%aggregator_feed/view'] = array( 'title' => 'View', @@ -180,30 +180,30 @@ function aggregator_menu() { ); $items['aggregator/sources/%aggregator_feed/categorize'] = array( 'title' => 'Categorize', - 'route_name' => 'aggregator_categorize_feed_form', + 'route_name' => 'aggregator.categorize_feed_form', 'type' => MENU_LOCAL_TASK, ); $items['aggregator/sources/%aggregator_feed/configure'] = array( 'title' => 'Configure', - 'route_name' => 'aggregator_feed_configure', + 'route_name' => 'aggregator.feed_configure', 'type' => MENU_LOCAL_TASK, 'weight' => 10, ); $items['admin/config/services/aggregator/edit/feed/%aggregator_feed'] = array( 'title' => 'Edit feed', - 'route_name' => 'aggregator_feed_edit', + 'route_name' => 'aggregator.feed_edit', ); $items['admin/config/services/aggregator/delete/feed/%aggregator_feed'] = array( 'title' => 'Delete feed', - 'route_name' => 'aggregator_feed_delete', + 'route_name' => 'aggregator.feed_delete', ); $items['admin/config/services/aggregator/edit/category/%aggregator_category'] = array( 'title' => 'Edit category', - 'route_name' => 'aggregator_category_admin_edit', + 'route_name' => 'aggregator.category_admin_edit', ); $items['admin/config/services/aggregator/delete/category/%aggregator_category'] = array( 'title' => 'Delete category', - 'route_name' => 'aggregator_category_delete', + 'route_name' => 'aggregator.category_delete', ); return $items; diff --git a/core/modules/aggregator/aggregator.routing.yml b/core/modules/aggregator/aggregator.routing.yml index 1e314c2d247..799c3ea3205 100644 --- a/core/modules/aggregator/aggregator.routing.yml +++ b/core/modules/aggregator/aggregator.routing.yml @@ -1,137 +1,137 @@ -aggregator_admin_overview: +aggregator.admin_overview: pattern: '/admin/config/services/aggregator' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::adminOverview' requirements: _permission: 'administer news feeds' -aggregator_admin_settings: +aggregator.admin_settings: pattern: '/admin/config/services/aggregator/settings' defaults: _form: '\Drupal\aggregator\Form\SettingsForm' requirements: _permission: 'administer news feeds' -aggregator_feed_items_delete: +aggregator.feed_items_delete: pattern: '/admin/config/services/aggregator/remove/{aggregator_feed}' defaults: _entity_form: 'aggregator_feed.remove_items' requirements: _permission: 'administer news feeds' -aggregator_feed_delete: +aggregator.feed_delete: pattern: '/admin/config/services/aggregator/delete/feed/{aggregator_feed}' defaults: _entity_form: 'aggregator_feed.delete' requirements: _permission: 'administer news feeds' -aggregator_feed_add: +aggregator.feed_add: pattern: '/admin/config/services/aggregator/add/feed' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::feedAdd' requirements: _permission: 'administer news feeds' -aggregator_feed_configure: +aggregator.feed_configure: pattern: '/aggregator/sources/{aggregator_feed}/configure' defaults: _entity_form: 'aggregator_feed.default' requirements: _permission: 'administer news feeds' -aggregator_feed_edit: +aggregator.feed_edit: pattern: '/admin/config/services/aggregator/edit/feed/{aggregator_feed}' defaults: _entity_form: 'aggregator_feed.default' requirements: _permission: 'administer news feeds' -aggregator_feed_refresh: +aggregator.feed_refresh: pattern: '/admin/config/services/aggregator/update/{aggregator_feed}' defaults: _controller: '\Drupal\aggregator\Controller\AggregatorController::feedRefresh' requirements: _permission: 'administer news feeds' -aggregator_opml_add: +aggregator.opml_add: pattern: '/admin/config/services/aggregator/add/opml' defaults: _form: '\Drupal\aggregator\Form\OpmlFeedAdd' requirements: _permission: 'administer news feeds' -aggregator_feed_view: +aggregator.feed_view: pattern: '/aggregator/sources/{aggregator_feed}' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::viewFeed' requirements: _permission: 'access news feeds' -aggregator_page_last: +aggregator.page_last: pattern: '/aggregator' defaults: _controller: '\Drupal\aggregator\Controller\AggregatorController::pageLast' requirements: _permission: 'access news feeds' -aggregator_sources: +aggregator.sources: pattern: '/aggregator/sources' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::sources' requirements: _permission: 'access news feeds' -aggregator_categories: +aggregator.categories: pattern: '/aggregator/categories' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::categories' requirements: _access_aggregator_categories: 'TRUE' -aggregator_category_view: +aggregator.category_view: pattern: '/aggregator/categories/{cid}' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::viewCategory' requirements: _permission: 'access news feeds' -aggregator_category_edit: +aggregator.category_edit: pattern: '/aggregator/categories/{cid}/configure' defaults: _form: '\Drupal\aggregator\Form\CategoryAdminForm' requirements: _permission: 'administer news feeds' -aggregator_category_admin_edit: +aggregator.category_admin_edit: pattern: '/admin/config/services/aggregator/edit/category/{cid}' defaults: _form: '\Drupal\aggregator\Form\CategoryAdminForm' requirements: _permission: 'administer news feeds' -aggregator_category_delete: +aggregator.category_delete: pattern: '/admin/config/services/aggregator/delete/category/{cid}' defaults: _form: '\Drupal\aggregator\Form\CategoryDeleteForm' requirements: _permission: 'administer news feeds' -aggregator_category_add: +aggregator.category_add: pattern: '/admin/config/services/aggregator/add/category' defaults: _form: '\Drupal\aggregator\Form\CategoryAdminForm' requirements: _permission: 'administer news feeds' -aggregator_categorize_category_form: +aggregator.categorize_category_form: pattern: '/aggregator/categories/{cid}/categorize' defaults: _form: '\Drupal\aggregator\Form\CategorizeCategoryForm' requirements: _permission: 'administer news feeds' -aggregator_categorize_feed_form: +aggregator.categorize_feed_form: pattern: '/aggregator/sources/{aggregator_feed}/categorize' defaults: _form: '\Drupal\aggregator\Form\CategorizeFeedForm' diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php index 63e9ddac509..238693a543d 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php @@ -164,7 +164,7 @@ class AggregatorController extends ControllerBase implements ContainerInjectionI // @todo after https://drupal.org/node/1972246 find a new place for it. aggregator_refresh($aggregator_feed); - return $this->redirect('aggregator_admin_overview'); + return $this->redirect('aggregator.admin_overview'); } /** @@ -331,7 +331,7 @@ class AggregatorController extends ControllerBase implements ContainerInjectionI ->viewMultiple($items, 'summary'); } } - $feed->url = $this->urlGenerator()->generateFromRoute('aggregator_feed_view', array('aggregator_feed' => $feed->id())); + $feed->url = $this->urlGenerator()->generateFromRoute('aggregator.feed_view', array('aggregator_feed' => $feed->id())); $build[$feed->id()] = array( '#theme' => 'aggregator_summary_items', '#summary_items' => $summary_items, diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php b/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php index c27dd657ecc..01f1e9ba9ca 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php @@ -87,7 +87,7 @@ class CategoryDeleteForm extends ConfirmFormBase implements ContainerInjectionIn */ public function getCancelRoute() { return array( - 'route_name' => 'aggregator_admin_overview', + 'route_name' => 'aggregator.admin_overview', ); } diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/FeedDeleteForm.php b/core/modules/aggregator/lib/Drupal/aggregator/Form/FeedDeleteForm.php index 1ea3f5a8e71..6916d025e17 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Form/FeedDeleteForm.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Form/FeedDeleteForm.php @@ -26,7 +26,7 @@ class FeedDeleteForm extends EntityNGConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'aggregator_admin_overview', + 'route_name' => 'aggregator.admin_overview', ); } diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/FeedItemsRemoveForm.php b/core/modules/aggregator/lib/Drupal/aggregator/Form/FeedItemsRemoveForm.php index 6ef34d60bb1..388604811c2 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Form/FeedItemsRemoveForm.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Form/FeedItemsRemoveForm.php @@ -26,7 +26,7 @@ class FeedItemsRemoveForm extends EntityNGConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'aggregator_admin_overview', + 'route_name' => 'aggregator.admin_overview', ); } diff --git a/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.routing.yml b/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.routing.yml index dff02c627bb..1c377e0efd3 100644 --- a/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.routing.yml +++ b/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.routing.yml @@ -1,4 +1,4 @@ -aggregator_test_feed: +aggregator_test.feed: pattern: '/aggregator/test-feed/{use_last_modified}/{use_etag}' defaults: _controller: '\Drupal\aggregator_test\Controller\AggregatorTestRssController::testFeed' @@ -8,7 +8,7 @@ aggregator_test_feed: requirements: _permission: 'access content' -aggregator_redirect: +aggregator_test.redirect: pattern: '/aggregator/redirect' defaults: _controller: '\Drupal\aggregator_test\Controller\AggregatorTestRssController::testRedirect' diff --git a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Controller/AggregatorTestRssController.php b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Controller/AggregatorTestRssController.php index 6c2b1cd5300..28d024bfb34 100644 --- a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Controller/AggregatorTestRssController.php +++ b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Controller/AggregatorTestRssController.php @@ -74,7 +74,7 @@ class AggregatorTestRssController extends ControllerBase { * A response that redirects users to the test feed. */ public function testRedirect() { - return $this->redirect('aggregator_test_feed', array(), 301); + return $this->redirect('aggregator_test.feed', array(), 301); } } diff --git a/core/modules/ban/ban.module b/core/modules/ban/ban.module index a703a75f052..ffb443806fa 100644 --- a/core/modules/ban/ban.module +++ b/core/modules/ban/ban.module @@ -44,12 +44,12 @@ function ban_menu() { $items['admin/config/people/ban'] = array( 'title' => 'IP address bans', 'description' => 'Manage banned IP addresses.', - 'route_name' => 'ban_admin_page', + 'route_name' => 'ban.admin_page', 'weight' => 10, ); $items['admin/config/people/ban/delete/%'] = array( 'title' => 'Delete IP address', - 'route_name' => 'ban_delete', + 'route_name' => 'ban.delete', ); return $items; } diff --git a/core/modules/ban/ban.routing.yml b/core/modules/ban/ban.routing.yml index 16c77ec47a5..43194788aa1 100644 --- a/core/modules/ban/ban.routing.yml +++ b/core/modules/ban/ban.routing.yml @@ -1,4 +1,4 @@ -ban_admin_page: +ban.admin_page: pattern: '/admin/config/people/ban/{default_ip}' defaults: _form: '\Drupal\ban\Form\BanAdmin' @@ -6,7 +6,7 @@ ban_admin_page: requirements: _permission: 'ban IP addresses' -ban_delete: +ban.delete: pattern: '/admin/config/people/ban/delete/{ban_id}' defaults: _form: '\Drupal\ban\Form\BanDelete' diff --git a/core/modules/ban/lib/Drupal/ban/Form/BanDelete.php b/core/modules/ban/lib/Drupal/ban/Form/BanDelete.php index c23feb554ee..95c8d9b25f7 100644 --- a/core/modules/ban/lib/Drupal/ban/Form/BanDelete.php +++ b/core/modules/ban/lib/Drupal/ban/Form/BanDelete.php @@ -69,7 +69,7 @@ class BanDelete extends ConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'ban_admin_page', + 'route_name' => 'ban.admin_page', ); } diff --git a/core/modules/block/block.module b/core/modules/block/block.module index 8fa59ea7016..843a7a728fe 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -102,7 +102,7 @@ function block_menu() { $items['admin/structure/block'] = array( 'title' => 'Block layout', 'description' => 'Configure what block content appears in your site\'s sidebars and other regions.', - 'route_name' => 'block_admin_display', + 'route_name' => 'block.admin_display', ); $items['admin/structure/block/list'] = array( 'title' => 'Block layout', @@ -110,7 +110,7 @@ function block_menu() { ); $items['admin/structure/block/manage/%block'] = array( 'title' => 'Configure block', - 'route_name' => 'block_admin_edit', + 'route_name' => 'block.admin_edit', ); $items['admin/structure/block/manage/%block/configure'] = array( 'title' => 'Configure block', @@ -121,12 +121,12 @@ function block_menu() { 'title' => 'Delete block', 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_NONE, - 'route_name' => 'block_admin_block_delete', + 'route_name' => 'block.admin_block_delete', ); $items['admin/structure/block/add/%/%'] = array( 'title' => 'Place block', 'type' => MENU_VISIBLE_IN_BREADCRUMB, - 'route_name' => 'block_admin_add', + 'route_name' => 'block.admin_add', ); // Block administration is tied to the theme and plugin definition so // that the plugin can appropriately attach to this URL structure. @@ -138,7 +138,7 @@ function block_menu() { $items["admin/structure/block/list/$key"] = array( 'title' => check_plain($theme->info['name']), 'type' => $key == $default_theme ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK, - 'route_name' => "block_admin_display.$key", + 'route_name' => "block.admin_display_$key", ); $items["admin/structure/block/demo/$key"] = array( 'title' => check_plain($theme->info['name']), diff --git a/core/modules/block/block.routing.yml b/core/modules/block/block.routing.yml index 9e9d4e42681..93f5e472043 100644 --- a/core/modules/block/block.routing.yml +++ b/core/modules/block/block.routing.yml @@ -1,18 +1,18 @@ -block_admin_block_delete: +block.admin_block_delete: pattern: '/admin/structure/block/manage/{block}/delete' defaults: _entity_form: 'block.delete' requirements: _permission: 'administer blocks' -block_admin_edit: +block.admin_edit: pattern: '/admin/structure/block/manage/{block}' defaults: _entity_form: 'block.default' requirements: _entity_access: 'block.update' -block_admin_display: +block.admin_display: pattern: '/admin/structure/block' defaults: _content: '\Drupal\block\Controller\BlockListController::listing' @@ -20,7 +20,7 @@ block_admin_display: requirements: _permission: 'administer blocks' -block_admin_add: +block.admin_add: pattern: '/admin/structure/block/add/{plugin_id}/{theme}' defaults: _content: '\Drupal\block\Controller\BlockAddController::blockAddConfigureForm' diff --git a/core/modules/block/custom_block/custom_block.local_actions.yml b/core/modules/block/custom_block/custom_block.local_actions.yml index 83314450803..531668eed0a 100644 --- a/core/modules/block/custom_block/custom_block.local_actions.yml +++ b/core/modules/block/custom_block/custom_block.local_actions.yml @@ -1,11 +1,11 @@ custom_block_type_add: - route_name: custom_block_type_add + route_name: custom_block.type_add title: 'Add custom block type' appears_on: - - custom_block_type_list + - custom_block.type_list custom_block_add_action: - route_name: custom_block_add_page + route_name: custom_block.add_page title: 'Add custom block' appears_on: - - block_admin_display + - block.admin_display diff --git a/core/modules/block/custom_block/custom_block.module b/core/modules/block/custom_block/custom_block.module index 4ebc5cb48c8..e938f88b464 100644 --- a/core/modules/block/custom_block/custom_block.module +++ b/core/modules/block/custom_block/custom_block.module @@ -31,7 +31,7 @@ function custom_block_help($path, $arg) { * Implements hook_menu_local_tasks(). */ function custom_block_menu_local_tasks(&$data, $router_item, $root_path) { - if ($router_item['route_name'] == 'custom_block_list') { + if ($router_item['route_name'] == 'custom_block.list') { // @todo Move to a LocalAction plugin when https://drupal.org/node/2045267 // allows local actions to work with query strings. $item = menu_get_item('block/add'); @@ -46,7 +46,7 @@ function custom_block_menu_local_tasks(&$data, $router_item, $root_path) { } $routes = array_map(function ($theme) { - return "block_admin_display.$theme"; + return "block.admin_display_$theme"; }, array_keys(list_themes())); if (in_array($router_item['route_name'], $routes)) { // @todo Move to a LocalAction plugin when https://drupal.org/node/2045267 @@ -70,7 +70,7 @@ function custom_block_menu() { $items['admin/structure/block/custom-blocks'] = array( 'title' => 'Custom block library', 'description' => 'Manage custom blocks.', - 'route_name' => 'custom_block_list', + 'route_name' => 'custom_block.list', 'type' => MENU_LOCAL_TASK | MENU_NORMAL_ITEM, ); $items['admin/structure/block/custom-blocks/list'] = array( @@ -79,11 +79,11 @@ function custom_block_menu() { ); $items['admin/structure/block/custom-blocks/types'] = array( 'title' => 'Types', - 'route_name' => 'custom_block_type_list', + 'route_name' => 'custom_block.type_list', 'type' => MENU_LOCAL_TASK, ); $items['admin/structure/block/custom-blocks/types/add'] = array( - 'route_name' => 'custom_block_type_add', + 'route_name' => 'custom_block.type_add', 'type' => MENU_SIBLING_LOCAL_TASK, 'weight' => 1, ); @@ -91,7 +91,7 @@ function custom_block_menu() { 'title' => 'Edit custom block type', 'title callback' => 'entity_page_label', 'title arguments' => array(5), - 'route_name' => 'custom_block_type_edit', + 'route_name' => 'custom_block.type_edit', ); $items['admin/structure/block/custom-blocks/manage/%custom_block_type/edit'] = array( 'title' => 'Edit', @@ -102,21 +102,21 @@ function custom_block_menu() { 'title' => 'Delete', 'type' => MENU_LOCAL_TASK, 'weight' => 10, - 'route_name' => 'custom_block_type_delete', + 'route_name' => 'custom_block.type_delete', ); $items['block/add'] = array( 'title' => 'Add custom block', - 'route_name' => 'custom_block_add_page', + 'route_name' => 'custom_block.add_page', ); $items['block/add/%custom_block_type'] = array( 'title' => 'Add custom block', 'description' => 'Add custom block', - 'route_name' => 'custom_block_add_form' + 'route_name' => 'custom_block.add_form' ); // There has to be a base-item in order for contextual links to work. $items['block/%custom_block'] = array( 'title' => 'Edit', - 'route_name' => 'custom_block_edit', + 'route_name' => 'custom_block.edit', ); $items['block/%custom_block/edit'] = array( 'title' => 'Edit', @@ -129,7 +129,7 @@ function custom_block_menu() { 'weight' => 1, 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_INLINE, - 'route_name' => 'custom_block_delete', + 'route_name' => 'custom_block.delete', ); return $items; } diff --git a/core/modules/block/custom_block/custom_block.pages.inc b/core/modules/block/custom_block/custom_block.pages.inc index a1a3cac1b51..b6d080c4904 100644 --- a/core/modules/block/custom_block/custom_block.pages.inc +++ b/core/modules/block/custom_block/custom_block.pages.inc @@ -25,7 +25,7 @@ function template_preprocess_custom_block_add_list(&$variables) { $query = Drupal::request()->query->all(); foreach ($variables['content'] as $type) { $variables['types'][$type->id()] = array( - 'link' => Drupal::l($type->label(), 'custom_block_add_form', array('custom_block_type' => $type->id()), array('query' => $query)), + 'link' => Drupal::l($type->label(), 'custom_block.add_form', array('custom_block_type' => $type->id()), array('query' => $query)), 'description' => filter_xss_admin($type->description), 'title' => $type->label(), 'localized_options' => array( diff --git a/core/modules/block/custom_block/custom_block.routing.yml b/core/modules/block/custom_block/custom_block.routing.yml index 018110150ac..1e87bac00aa 100644 --- a/core/modules/block/custom_block/custom_block.routing.yml +++ b/core/modules/block/custom_block/custom_block.routing.yml @@ -1,32 +1,32 @@ -custom_block_type_list: +custom_block.type_list: pattern: '/admin/structure/block/custom-blocks/types' defaults: _entity_list: 'custom_block_type' requirements: _permission: 'administer blocks' -custom_block_add_page: +custom_block.add_page: pattern: '/block/add' defaults: _content: 'Drupal\custom_block\Controller\CustomBlockController::add' requirements: _permission: 'administer blocks' -custom_block_add_form: +custom_block.add_form: pattern: block/add/{custom_block_type} defaults: _content: 'Drupal\custom_block\Controller\CustomBlockController::addForm' requirements: _permission: 'administer blocks' -custom_block_type_delete: +custom_block.type_delete: pattern: '/admin/structure/block/custom-blocks/manage/{custom_block_type}/delete' defaults: _entity_form: 'custom_block_type.delete' requirements: _entity_access: 'custom_block_type.delete' -custom_block_edit: +custom_block.edit: pattern: '/block/{custom_block}' defaults: _entity_form: 'custom_block.edit' @@ -34,28 +34,28 @@ custom_block_edit: _entity_access: 'custom_block.update' custom_block: \d+ -custom_block_delete: +custom_block.delete: pattern: '/block/{custom_block}/delete' defaults: _entity_form: 'custom_block.delete' requirements: _entity_access: 'custom_block.delete' -custom_block_type_add: +custom_block.type_add: pattern: '/admin/structure/block/custom-blocks/types/add' defaults: _entity_form: 'custom_block_type.add' requirements: _permission: 'administer blocks' -custom_block_type_edit: +custom_block.type_edit: pattern: '/admin/structure/block/custom-blocks/manage/{custom_block_type}' defaults: _entity_form: 'custom_block_type.edit' requirements: _entity_access: 'custom_block_type.update' -custom_block_list: +custom_block.list: pattern: '/admin/structure/block/custom-blocks' defaults: _title: 'Custom block library' diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php index b3a491d9be8..16d22b48a17 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php @@ -27,7 +27,7 @@ class CustomBlockDeleteForm extends EntityNGConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'block_admin_display', + 'route_name' => 'block.admin_display', ); } diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockTypeDeleteForm.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockTypeDeleteForm.php index 67f8bf651f3..01433ae659c 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockTypeDeleteForm.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockTypeDeleteForm.php @@ -54,7 +54,7 @@ class CustomBlockTypeDeleteForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'custom_block_type_list', + 'route_name' => 'custom_block.type_list', ); } diff --git a/core/modules/block/lib/Drupal/block/Form/BlockDeleteForm.php b/core/modules/block/lib/Drupal/block/Form/BlockDeleteForm.php index e6ccfb20262..ce381cc3da2 100644 --- a/core/modules/block/lib/Drupal/block/Form/BlockDeleteForm.php +++ b/core/modules/block/lib/Drupal/block/Form/BlockDeleteForm.php @@ -26,7 +26,7 @@ class BlockDeleteForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'block_admin_display', + 'route_name' => 'block.admin_display', ); } diff --git a/core/modules/block/lib/Drupal/block/Routing/RouteSubscriber.php b/core/modules/block/lib/Drupal/block/Routing/RouteSubscriber.php index 576ea8071dd..27113660695 100644 --- a/core/modules/block/lib/Drupal/block/Routing/RouteSubscriber.php +++ b/core/modules/block/lib/Drupal/block/Routing/RouteSubscriber.php @@ -49,7 +49,7 @@ class RouteSubscriber implements EventSubscriberInterface { '_block_themes_access' => 'TRUE', ) ); - $collection->add("block_admin_display.$key", $route); + $collection->add("block.admin_display_$key", $route); } } diff --git a/core/modules/book/book.module b/core/modules/book/book.module index 6f56b970289..8ed85c4d3f2 100644 --- a/core/modules/book/book.module +++ b/core/modules/book/book.module @@ -169,7 +169,7 @@ function book_menu() { $items['admin/structure/book'] = array( 'title' => 'Books', 'description' => "Manage your site's book outlines.", - 'route_name' => 'book_admin', + 'route_name' => 'book.admin', ); $items['admin/structure/book/list'] = array( 'title' => 'List', @@ -177,19 +177,19 @@ function book_menu() { ); $items['admin/structure/book/settings'] = array( 'title' => 'Settings', - 'route_name' => 'book_settings', + 'route_name' => 'book.settings', 'access arguments' => array('administer site configuration'), 'type' => MENU_LOCAL_TASK, 'weight' => 100, ); $items['book'] = array( 'title' => 'Books', - 'route_name' => 'book_render', + 'route_name' => 'book.render', 'type' => MENU_SUGGESTED_ITEM, ); $items['node/%node/outline'] = array( 'title' => 'Outline', - 'route_name' => 'book_outline', + 'route_name' => 'book.outline', 'type' => MENU_LOCAL_TASK, 'weight' => 2, ); diff --git a/core/modules/book/book.routing.yml b/core/modules/book/book.routing.yml index 04939e080fc..733ae8cafbc 100644 --- a/core/modules/book/book.routing.yml +++ b/core/modules/book/book.routing.yml @@ -1,25 +1,25 @@ -book_render: +book.render: pattern: '/book' defaults: _content: '\Drupal\book\Controller\BookController::bookRender' requirements: _permission: 'access content' -book_admin: +book.admin: pattern: '/admin/structure/book' defaults: _content: '\Drupal\book\Controller\BookController::adminOverview' requirements: _permission: 'administer book outlines' -book_settings: +book.settings: pattern: '/admin/structure/book/settings' defaults: _form: '\Drupal\book\Form\BookSettingsForm' requirements: _permission: 'administer site configuration' -book_export: +book.export: pattern: '/book/export/{type}/{node}' defaults: _controller: '\Drupal\book\Controller\BookController::bookExport' @@ -29,7 +29,7 @@ book_export: _permission: 'access printer-friendly version' _entity_access: 'node.view' -book_outline: +book.outline: pattern: '/node/{node}/outline' defaults: _entity_form: 'node.book_outline' @@ -39,7 +39,7 @@ book_outline: _permission: 'administer book outlines' _entity_access: 'node.view' -book_admin_edit: +book.admin_edit: pattern: '/admin/structure/book/{node}' defaults: _form: 'Drupal\book\Form\BookAdminEditForm' diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index 808ac546777..45af84a90bc 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -204,7 +204,7 @@ function comment_menu() { ); $items['comment/%comment'] = array( 'title' => 'Comment permalink', - 'route_name' => 'comment_permalink', + 'route_name' => 'comment.permalink', ); $items['comment/%comment/view'] = array( 'title' => 'View comment', @@ -215,17 +215,17 @@ function comment_menu() { $items['comment/%comment/edit'] = array( 'title' => 'Edit', 'type' => MENU_LOCAL_TASK, - 'route_name' => 'comment_edit_page', + 'route_name' => 'comment.edit_page', ); $items['comment/%comment/approve'] = array( 'title' => 'Approve', 'weight' => 10, - 'route_name' => 'comment_approve', + 'route_name' => 'comment.approve', ); $items['comment/%comment/delete'] = array( 'title' => 'Delete', 'type' => MENU_LOCAL_TASK, - 'route_name' => 'comment_confirm_delete', + 'route_name' => 'comment.confirm_delete', 'weight' => 20, ); diff --git a/core/modules/comment/comment.routing.yml b/core/modules/comment/comment.routing.yml index 77edd367ee7..7cbff291633 100644 --- a/core/modules/comment/comment.routing.yml +++ b/core/modules/comment/comment.routing.yml @@ -1,11 +1,11 @@ -comment_edit_page: +comment.edit_page: pattern: '/comment/{comment}/edit' defaults: _entity_form: 'comment.default' requirements: _entity_access: 'comment.update' -comment_approve: +comment.approve: pattern: '/comment/{comment}/approve' defaults: _content: '\Drupal\comment\Controller\CommentController::commentApprove' @@ -13,21 +13,21 @@ comment_approve: requirements: _entity_access: 'comment.approve' -comment_permalink: +comment.permalink: pattern: '/comment/{comment}' defaults: _controller: '\Drupal\comment\Controller\CommentController::commentPermalink' requirements: _entity_access: 'comment.view' -comment_confirm_delete: +comment.confirm_delete: pattern: '/comment/{comment}/delete' defaults: _entity_form: 'comment.delete' requirements: _entity_access: 'comment.delete' -comment_reply: +comment.reply: pattern: 'comment/reply/{node}/{pid}' defaults: _content: '\Drupal\comment\Controller\CommentController::getReplyForm' @@ -35,7 +35,7 @@ comment_reply: requirements: _entity_access: 'node.view' -comment_new_comments_node_links: +comment.new_comments_node_links: pattern: '/comments/render_new_comments_node_links' defaults: _controller: '\Drupal\comment\Controller\CommentController::renderNewCommentsNodeLinks' diff --git a/core/modules/comment/lib/Drupal/comment/CommentBreadcrumbBuilder.php b/core/modules/comment/lib/Drupal/comment/CommentBreadcrumbBuilder.php index 38dd91fcc8e..66cdec474a2 100644 --- a/core/modules/comment/lib/Drupal/comment/CommentBreadcrumbBuilder.php +++ b/core/modules/comment/lib/Drupal/comment/CommentBreadcrumbBuilder.php @@ -37,7 +37,7 @@ class CommentBreadcrumbBuilder implements BreadcrumbBuilderInterface { * {@inheritdoc} */ public function build(array $attributes) { - if (isset($attributes[RouteObjectInterface::ROUTE_NAME]) && $attributes[RouteObjectInterface::ROUTE_NAME] == 'comment_reply' && isset($attributes['node'])) { + if (isset($attributes[RouteObjectInterface::ROUTE_NAME]) && $attributes[RouteObjectInterface::ROUTE_NAME] == 'comment.reply' && isset($attributes['node'])) { $node = $attributes['node']; $uri = $node->uri(); $breadcrumb[] = l($this->t('Home'), NULL); diff --git a/core/modules/comment/lib/Drupal/comment/CommentFormController.php b/core/modules/comment/lib/Drupal/comment/CommentFormController.php index 985f9008b1c..8256889d086 100644 --- a/core/modules/comment/lib/Drupal/comment/CommentFormController.php +++ b/core/modules/comment/lib/Drupal/comment/CommentFormController.php @@ -92,7 +92,7 @@ class CommentFormController extends EntityFormControllerNG { if ($is_admin) { $form['author']['name']['#title'] = t('Authored by'); $form['author']['name']['#description'] = t('Leave blank for %anonymous.', array('%anonymous' => \Drupal::config('user.settings')->get('anonymous'))); - $form['author']['name']['#autocomplete_route_name'] = 'user_autocomplete'; + $form['author']['name']['#autocomplete_route_name'] = 'user.autocomplete'; } elseif ($user->isAuthenticated()) { $form['author']['name']['#type'] = 'item'; diff --git a/core/modules/config/config.module b/core/modules/config/config.module index e972b23601d..450f210e5f2 100644 --- a/core/modules/config/config.module +++ b/core/modules/config/config.module @@ -64,22 +64,22 @@ function config_menu() { $items['admin/config/development/sync'] = array( 'title' => 'Synchronize configuration', 'description' => 'Synchronize configuration changes.', - 'route_name' => 'config_sync', + 'route_name' => 'config.sync', ); $items['admin/config/development/export'] = array( 'title' => 'Configuration export', 'description' => 'Export your site configuration', - 'route_name' => 'config_export', + 'route_name' => 'config.export', ); $items['admin/config/development/import'] = array( 'title' => 'Configuration import', 'description' => 'Import configuration for your site', - 'route_name' => 'config_import', + 'route_name' => 'config.import', ); $items['admin/config/development/sync/diff/%'] = array( 'title' => 'Configuration file diff', 'description' => 'Diff between active and staged configuration.', - 'route_name' => 'config_diff', + 'route_name' => 'config.diff', ); $items['admin/config/development/sync/import'] = array( 'title' => 'Import', diff --git a/core/modules/config/config.routing.yml b/core/modules/config/config.routing.yml index bf3134d9bc8..f4c60df515f 100644 --- a/core/modules/config/config.routing.yml +++ b/core/modules/config/config.routing.yml @@ -1,28 +1,32 @@ -config_diff: +config.diff: pattern: '/admin/config/development/sync/diff/{config_file}' defaults: _content: '\Drupal\config\Controller\ConfigController::diff' requirements: _permission: 'synchronize configuration' -config_export_download: + +config.export_download: pattern: '/admin/config/development/export-download' defaults: _controller: '\Drupal\config\Controller\ConfigController::downloadExport' requirements: _permission: 'export configuration' -config_export: + +config.export: pattern: '/admin/config/development/export' defaults: _form: '\Drupal\config\Form\ConfigExportForm' requirements: _permission: 'export configuration' -config_import: + +config.import: pattern: '/admin/config/development/import' defaults: _form: '\Drupal\config\Form\ConfigImportForm' requirements: _permission: 'import configuration' -config_sync: + +config.sync: pattern: '/admin/config/development/sync' defaults: _form: '\Drupal\config\Form\ConfigSync' diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php b/core/modules/config/lib/Drupal/config/Form/ConfigSync.php index 8f6f87bad78..61160b88ff3 100644 --- a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php +++ b/core/modules/config/lib/Drupal/config/Form/ConfigSync.php @@ -178,7 +178,7 @@ class ConfigSync extends FormBase { foreach ($config_files as $config_file) { $links['view_diff'] = array( 'title' => $this->t('View differences'), - 'href' => $this->urlGenerator->getPathFromRoute('config_diff', array('config_file' => $config_file)), + 'href' => $this->urlGenerator->getPathFromRoute('config.diff', array('config_file' => $config_file)), 'attributes' => array( 'class' => array('use-ajax'), 'data-accepts' => 'application/vnd.drupal-modal', diff --git a/core/modules/config/tests/config_test/config_test.module b/core/modules/config/tests/config_test/config_test.module index a985921b50a..c0cab7a3322 100644 --- a/core/modules/config/tests/config_test/config_test.module +++ b/core/modules/config/tests/config_test/config_test.module @@ -28,15 +28,15 @@ function config_test_uri(ConfigTest $config_test) { function config_test_menu() { $items['admin/structure/config_test'] = array( 'title' => 'Test configuration', - 'route_name' => 'config_test_list_page', + 'route_name' => 'config_test.list_page', ); $items['admin/structure/config_test/add'] = array( 'title' => 'Add test configuration', - 'route_name' => 'config_test_entity_add', + 'route_name' => 'config_test.entity_add', 'type' => MENU_SIBLING_LOCAL_TASK, ); $items['admin/structure/config_test/manage/%config_test'] = array( - 'route_name' => 'config_test_entity_edit', + 'route_name' => 'config_test.entity', ); $items['admin/structure/config_test/manage/%config_test/edit'] = array( 'title' => 'Edit', @@ -44,15 +44,15 @@ function config_test_menu() { ); $items['admin/structure/config_test/manage/%config_test/delete'] = array( 'title' => 'Delete', - 'route_name' => 'config_test_entity_delete', + 'route_name' => 'config_test.entity_delete', ); $items['admin/structure/config_test/manage/%config_test/enable'] = array( 'title' => 'Enable', - 'route_name' => 'config_test_entity_enable', + 'route_name' => 'config_test.entity_enable', ); $items['admin/structure/config_test/manage/%config_test/disable'] = array( 'title' => 'Disable', - 'route_name' => 'config_test_entity_disable', + 'route_name' => 'config_test.entity_disable', ); return $items; } diff --git a/core/modules/config/tests/config_test/config_test.routing.yml b/core/modules/config/tests/config_test/config_test.routing.yml index c26a438ede0..bd2c5498363 100644 --- a/core/modules/config/tests/config_test/config_test.routing.yml +++ b/core/modules/config/tests/config_test/config_test.routing.yml @@ -1,18 +1,18 @@ -config_test_list_page: +config_test.list_page: pattern: '/admin/structure/config_test' defaults: _entity_list: 'config_test' requirements: _access: 'TRUE' -config_test_entity_add: +config_test.entity_add: pattern: 'admin/structure/config_test/add' defaults: _entity_form: 'config_test' requirements: _access: 'TRUE' -config_test_entity: +config_test.entity: pattern: 'admin/structure/config_test/manage/{config_test}' defaults: _controller: '\Drupal\config_test\ConfigTestController::edit' @@ -20,15 +20,7 @@ config_test_entity: requirements: _access: 'TRUE' -config_test_entity_edit: - pattern: 'admin/structure/config_test/manage/{config_test}/edit' - defaults: - _controller: '\Drupal\config_test\ConfigTestController::edit' - entity_type: 'config_test' - requirements: - _access: 'TRUE' - -config_test_entity_enable: +config_test.entity_enable: pattern: 'admin/structure/config_test/manage/{config_test}/enable' defaults: _content: '\Drupal\config_test\ConfigTestController::enable' @@ -36,7 +28,7 @@ config_test_entity_enable: requirements: _access: 'TRUE' -config_test_entity_disable: +config_test.entity_disable: pattern: 'admin/structure/config_test/manage/{config_test}/disable' defaults: _content: '\Drupal\config_test\ConfigTestController::disable' @@ -44,7 +36,7 @@ config_test_entity_disable: requirements: _access: 'TRUE' -config_test_entity_delete: +config_test.entity_delete: pattern: 'admin/structure/config_test/manage/{config_test}/delete' defaults: _entity_form: 'config_test.delete' diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Form/ConfigTestDeleteForm.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/Form/ConfigTestDeleteForm.php index 6f90d2abaaf..c41396d482d 100644 --- a/core/modules/config/tests/config_test/lib/Drupal/config_test/Form/ConfigTestDeleteForm.php +++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/Form/ConfigTestDeleteForm.php @@ -33,7 +33,7 @@ class ConfigTestDeleteForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'config_test_list_page', + 'route_name' => 'config_test.list_page', ); } diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Menu/LocalAction/AddConfigTestEntityLocalAction.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Menu/LocalAction/AddConfigTestEntityLocalAction.php index 9a55b79d6c7..1f31d46008c 100644 --- a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Menu/LocalAction/AddConfigTestEntityLocalAction.php +++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Menu/LocalAction/AddConfigTestEntityLocalAction.php @@ -14,9 +14,9 @@ use Drupal\Core\Annotation\Menu\LocalAction; /** * @LocalAction( * id = "config_test_entity_add_local_action", - * route_name = "config_test_entity_add", + * route_name = "config_test.entity_add", * title = @Translation("Add test configuration"), - * appears_on = {"config_test_list_page"} + * appears_on = {"config_test.list_page"} * ) */ class AddConfigTestEntityLocalAction extends LocalActionBase { diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module index 2b1d8bffc3d..673a50067aa 100644 --- a/core/modules/contact/contact.module +++ b/core/modules/contact/contact.module @@ -61,17 +61,17 @@ function contact_menu() { $items['admin/structure/contact'] = array( 'title' => 'Contact form categories', 'description' => 'Create a system contact form and set up categories for the form to use.', - 'route_name' => 'contact_category_list', + 'route_name' => 'contact.category_list', ); $items['admin/structure/contact/add'] = array( 'title' => 'Add category', - 'route_name' => 'contact_category_add', + 'route_name' => 'contact.category_add', 'type' => MENU_LOCAL_ACTION, 'weight' => 1, ); $items['admin/structure/contact/manage/%contact_category'] = array( 'title' => 'Edit contact category', - 'route_name' => 'contact_category_edit', + 'route_name' => 'contact.category_edit', ); $items['admin/structure/contact/manage/%contact_category/edit'] = array( 'title' => 'Edit', @@ -79,7 +79,7 @@ function contact_menu() { ); $items['admin/structure/contact/manage/%contact_category/delete'] = array( 'title' => 'Delete', - 'route_name' => 'contact_category_delete', + 'route_name' => 'contact.category_delete', 'type' => MENU_LOCAL_TASK, 'weight' => 10, ); diff --git a/core/modules/contact/contact.routing.yml b/core/modules/contact/contact.routing.yml index ba47a6aca97..eb029b8754d 100644 --- a/core/modules/contact/contact.routing.yml +++ b/core/modules/contact/contact.routing.yml @@ -1,25 +1,25 @@ -contact_category_delete: +contact.category_delete: pattern: 'admin/structure/contact/manage/{contact_category}/delete' defaults: _entity_form: contact_category.delete requirements: _entity_access: contact_category.delete -contact_category_list: +contact.category_list: pattern: '/admin/structure/contact' defaults: _entity_list: 'contact_category' requirements: _permission: 'administer contact forms' -contact_category_add: +contact.category_add: pattern: '/admin/structure/contact/add' defaults: _entity_form: contact_category.add requirements: _permission: 'administer contact forms' -contact_category_edit: +contact.category_edit: pattern: '/admin/structure/contact/manage/{contact_category}' defaults: _entity_form: contact_category.edit diff --git a/core/modules/contact/lib/Drupal/contact/Form/CategoryDeleteForm.php b/core/modules/contact/lib/Drupal/contact/Form/CategoryDeleteForm.php index 3cbdd7a06dd..9b74947e2be 100644 --- a/core/modules/contact/lib/Drupal/contact/Form/CategoryDeleteForm.php +++ b/core/modules/contact/lib/Drupal/contact/Form/CategoryDeleteForm.php @@ -26,7 +26,7 @@ class CategoryDeleteForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'contact_category_list', + 'route_name' => 'contact.category_list', ); } diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index 3ced1885d04..49a3adc2d14 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -203,7 +203,7 @@ function content_translation_menu() { $items['admin/config/regional/content_translation/translatable/%/%'] = array( 'title' => 'Confirm change in translatability.', 'description' => 'Confirm page for changing field translatability.', - 'route_name' => 'content_translation_translatable', + 'route_name' => 'content_translation.translatable', ); return $items; diff --git a/core/modules/content_translation/content_translation.routing.yml b/core/modules/content_translation/content_translation.routing.yml index 64f210c0291..4a0ec4eee40 100644 --- a/core/modules/content_translation/content_translation.routing.yml +++ b/core/modules/content_translation/content_translation.routing.yml @@ -1,4 +1,4 @@ -content_translation_translatable: +content_translation.translatable: pattern: 'admin/config/regional/content_translation/translatable/{entity_type}/{field_name}' defaults: _form: 'Drupal\content_translation\Form\TranslatableForm' diff --git a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php index 7e0b20e0cb8..b4d397553b1 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php @@ -276,7 +276,7 @@ class ContentTranslationController implements ContentTranslationControllerInterf '#type' => 'textfield', '#title' => t('Authored by'), '#maxlength' => 60, - '#autocomplete_route_name' => 'user_autocomplete', + '#autocomplete_route_name' => 'user.autocomplete', '#default_value' => $name, '#description' => t('Leave blank for %anonymous.', array('%anonymous' => variable_get('anonymous', t('Anonymous')))), ); diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module index 527cc2b71a6..70ed7ff5868 100644 --- a/core/modules/contextual/contextual.module +++ b/core/modules/contextual/contextual.module @@ -12,7 +12,7 @@ function contextual_menu() { // @todo Remove this menu item in http://drupal.org/node/1954892 when theme // callbacks are replaced with something else. $items['contextual/render'] = array( - 'route_name' => 'contextual_render', + 'route_name' => 'contextual.render', 'theme callback' => 'ajax_base_page_theme', 'type' => MENU_CALLBACK, ); diff --git a/core/modules/contextual/contextual.routing.yml b/core/modules/contextual/contextual.routing.yml index 5dd44577ba8..73ee8e1fd2b 100644 --- a/core/modules/contextual/contextual.routing.yml +++ b/core/modules/contextual/contextual.routing.yml @@ -1,4 +1,4 @@ -contextual_render: +contextual.render: pattern: '/contextual/render' defaults: _controller: '\Drupal\contextual\ContextualController::render' diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module index 165d3cbfc3e..7c431555bde 100644 --- a/core/modules/dblog/dblog.module +++ b/core/modules/dblog/dblog.module @@ -43,7 +43,7 @@ function dblog_menu() { $items['admin/reports/dblog'] = array( 'title' => 'Recent log messages', 'description' => 'View events that have recently been logged.', - 'route_name' => 'dblog_overview', + 'route_name' => 'dblog.overview', 'weight' => -1, ); $items['admin/reports/page-not-found'] = array( @@ -64,7 +64,7 @@ function dblog_menu() { ); $items['admin/reports/event/%'] = array( 'title' => 'Details', - 'route_name' => 'dblog_event', + 'route_name' => 'dblog.event', ); if (module_exists('search')) { diff --git a/core/modules/dblog/dblog.routing.yml b/core/modules/dblog/dblog.routing.yml index 388348d1acc..067109bf7f9 100644 --- a/core/modules/dblog/dblog.routing.yml +++ b/core/modules/dblog/dblog.routing.yml @@ -1,11 +1,11 @@ -dblog_overview: +dblog.overview: pattern: '/admin/reports/dblog' defaults: _content: '\Drupal\dblog\Controller\DbLogController::overview' requirements: _permission: 'access site reports' -dblog_event: +dblog.event: pattern: 'admin/reports/event/{event_id}' defaults: _content: '\Drupal\dblog\Controller\DbLogController::eventDetails' diff --git a/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php b/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php index 5ae1ad31b2e..9dc63f0493d 100644 --- a/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php +++ b/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php @@ -177,7 +177,7 @@ class DbLogController extends ControllerBase implements ContainerInjectionInterf if (isset($dblog->wid)) { // Truncate link_text to 56 chars of message. $log_text = Unicode::truncate(filter_xss($message, array()), 56, TRUE, TRUE); - $message = $this->l($log_text, 'dblog_event', array('event_id' => $dblog->wid), array('html' => TRUE)); + $message = $this->l($log_text, 'dblog.event', array('event_id' => $dblog->wid), array('html' => TRUE)); } } $username = array( diff --git a/core/modules/edit/edit.module b/core/modules/edit/edit.module index ae02deb82bd..d23f650393a 100644 --- a/core/modules/edit/edit.module +++ b/core/modules/edit/edit.module @@ -24,12 +24,12 @@ function edit_menu() { // @todo Remove these menu items in http://drupal.org/node/1954892 when theme // callbacks are replaced with something else. $items['edit/metadata'] = array( - 'route_name' => 'edit_metadata', + 'route_name' => 'edit.metadata', 'theme callback' => 'ajax_base_page_theme', 'type' => MENU_CALLBACK, ); $items['edit/form/%/%/%/%/%'] = array( - 'route_name' => 'edit_field_form', + 'route_name' => 'edit.field_form', 'theme callback' => 'ajax_base_page_theme', 'type' => MENU_CALLBACK, ); diff --git a/core/modules/edit/edit.routing.yml b/core/modules/edit/edit.routing.yml index adef7f180c5..983a55ef1e8 100644 --- a/core/modules/edit/edit.routing.yml +++ b/core/modules/edit/edit.routing.yml @@ -1,18 +1,18 @@ -edit_metadata: +edit.metadata: pattern: '/edit/metadata' defaults: _controller: '\Drupal\edit\EditController::metadata' requirements: _permission: 'access in-place editing' -edit_attachments: +edit.attachments: pattern: '/edit/attachments' defaults: _controller: '\Drupal\edit\EditController::attachments' requirements: _permission: 'access in-place editing' -edit_field_form: +edit.field_form: pattern: '/edit/form/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}' defaults: _controller: '\Drupal\edit\EditController::fieldForm' @@ -22,7 +22,7 @@ edit_field_form: _permission: 'access in-place editing' _access_edit_entity_field: 'TRUE' -edit_entity_save: +edit.entity_save: pattern: '/edit/entity/{entity_type}/{entity}' defaults: _controller: '\Drupal\edit\EditController::entitySave' diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module index 75632ca49d5..00445df5b80 100644 --- a/core/modules/editor/editor.module +++ b/core/modules/editor/editor.module @@ -146,7 +146,7 @@ function editor_menu() { // @todo Remove this menu item in http://drupal.org/node/1954892 when theme // callbacks are replaced with something else. $items['editor/%/%/%/%/%'] = array( - 'route_name' => 'editor_field_untransformed_text', + 'route_name' => 'editor.field_untransformed_text', 'theme callback' => 'ajax_base_page_theme', 'type' => MENU_CALLBACK, ); diff --git a/core/modules/editor/editor.routing.yml b/core/modules/editor/editor.routing.yml index 9e5fcd1569f..600486843cd 100644 --- a/core/modules/editor/editor.routing.yml +++ b/core/modules/editor/editor.routing.yml @@ -1,4 +1,4 @@ -editor_field_untransformed_text: +editor.field_untransformed_text: pattern: '/editor/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}' defaults: _controller: '\Drupal\editor\EditorController::getUntransformedText' @@ -8,14 +8,14 @@ editor_field_untransformed_text: _permission: 'access in-place editing' _access_edit_entity_field: 'TRUE' -editor_image_dialog: +editor.image_dialog: pattern: '/editor/dialog/image/{filter_format}' defaults: _form: '\Drupal\editor\Form\EditorImageDialog' requirements: _entity_access: 'filter_format.view' -editor_link_dialog: +editor.link_dialog: pattern: '/editor/dialog/link/{filter_format}' defaults: _form: '\Drupal\editor\Form\EditorLinkDialog' diff --git a/core/modules/entity/entity.module b/core/modules/entity/entity.module index 8b70c47def6..9225fa90c58 100644 --- a/core/modules/entity/entity.module +++ b/core/modules/entity/entity.module @@ -30,14 +30,14 @@ function entity_menu() { $items['admin/structure/display-modes'] = array( 'title' => 'Display modes', 'description' => 'Configure what displays are available for your content and forms.', - 'route_name' => 'entity_display_mode', + 'route_name' => 'entity.display_mode', ); // View modes. $items['admin/structure/display-modes/view'] = array( 'title' => 'View modes', 'description' => 'Manage custom view modes.', - 'route_name' => 'entity_view_mode.list', + 'route_name' => 'entity.view_mode_list', ); $items['admin/structure/display-modes/view/list'] = array( 'title' => 'List', @@ -45,25 +45,25 @@ function entity_menu() { ); $items['admin/structure/display-modes/view/add'] = array( 'title' => 'Add view mode', - 'route_name' => 'entity_view_mode.add', + 'route_name' => 'entity.view_mode_add', 'type' => MENU_SIBLING_LOCAL_TASK, ); $items['admin/structure/display-modes/view/add/%'] = array( - 'route_name' => 'entity_view_mode.add_type', + 'route_name' => 'entity.view_mode_add_type', ); $items['admin/structure/display-modes/view/manage/%'] = array( 'title' => 'Edit view mode', - 'route_name' => 'entity_view_mode.edit', + 'route_name' => 'entity.view_mode_edit', ); $items['admin/structure/display-modes/view/manage/%/delete'] = array( - 'route_name' => 'entity_view_mode.delete', + 'route_name' => 'entity.view_mode_delete', ); // Form modes. $items['admin/structure/display-modes/form'] = array( 'title' => 'Form modes', 'description' => 'Manage custom form modes.', - 'route_name' => 'entity_form_mode.list', + 'route_name' => 'entity.form_mode_list', ); $items['admin/structure/display-modes/form/list'] = array( 'title' => 'List', @@ -71,18 +71,18 @@ function entity_menu() { ); $items['admin/structure/display-modes/form/add'] = array( 'title' => 'Add form mode', - 'route_name' => 'entity_form_mode.add', + 'route_name' => 'entity.form_mode_add', 'type' => MENU_SIBLING_LOCAL_TASK, ); $items['admin/structure/display-modes/form/add/%'] = array( - 'route_name' => 'entity_form_mode.add_type', + 'route_name' => 'entity.form_mode_add_type', ); $items['admin/structure/display-modes/form/manage/%'] = array( 'title' => 'Edit form mode', - 'route_name' => 'entity_form_mode.edit', + 'route_name' => 'entity.form_mode_edit', ); $items['admin/structure/display-modes/form/manage/%/delete'] = array( - 'route_name' => 'entity_form_mode.delete', + 'route_name' => 'entity.form_mode_delete', ); return $items; @@ -94,10 +94,10 @@ function entity_menu() { function entity_local_actions() { return array( array( - 'route_name' => 'entity_view_mode.add', + 'route_name' => 'entity.view_mode_add', 'title' => t('Add view mode'), 'appears_on' => array( - 'entity_view_mode.list', + 'entity.view_mode_list', ), ), ); diff --git a/core/modules/entity/entity.routing.yml b/core/modules/entity/entity.routing.yml index 6ef9fd9bd5b..e7ace5f9052 100644 --- a/core/modules/entity/entity.routing.yml +++ b/core/modules/entity/entity.routing.yml @@ -1,74 +1,74 @@ -entity_display_mode: +entity.display_mode: pattern: '/admin/structure/display-modes' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'administer display modes' -entity_view_mode.list: +entity.view_mode_list: pattern: '/admin/structure/display-modes/view' defaults: _entity_list: 'view_mode' requirements: _permission: 'administer display modes' -entity_view_mode.add: +entity.view_mode_add: pattern: '/admin/structure/display-modes/view/add' defaults: _content: '\Drupal\entity\Controller\EntityDisplayModeController::viewModeTypeSelection' requirements: _permission: 'administer display modes' -entity_view_mode.add_type: +entity.view_mode_add_type: pattern: '/admin/structure/display-modes/view/add/{entity_type}' defaults: _entity_form: 'view_mode.add' requirements: _permission: 'administer display modes' -entity_view_mode.edit: +entity.view_mode_edit: pattern: '/admin/structure/display-modes/view/manage/{view_mode}' defaults: _entity_form: 'view_mode.edit' requirements: _entity_access: 'view_mode.update' -entity_view_mode.delete: +entity.view_mode_delete: pattern: '/admin/structure/display-modes/view/manage/{view_mode}/delete' defaults: _entity_form: 'view_mode.delete' requirements: _entity_access: 'view_mode.delete' -entity_form_mode.list: +entity.form_mode_list: pattern: '/admin/structure/display-modes/form' defaults: _entity_list: 'form_mode' requirements: _permission: 'administer display modes' -entity_form_mode.add: +entity.form_mode_add: pattern: '/admin/structure/display-modes/form/add' defaults: _content: '\Drupal\entity\Controller\EntityDisplayModeController::formModeTypeSelection' requirements: _permission: 'administer display modes' -entity_form_mode.add_type: +entity.form_mode_add_type: pattern: '/admin/structure/display-modes/form/add/{entity_type}' defaults: _entity_form: 'form_mode.add' requirements: _permission: 'administer display modes' -entity_form_mode.edit: +entity.form_mode_edit: pattern: '/admin/structure/display-modes/form/manage/{form_mode}' defaults: _entity_form: 'form_mode.edit' requirements: _entity_access: 'form_mode.update' -entity_form_mode.delete: +entity.form_mode_delete: pattern: '/admin/structure/display-modes/form/manage/{form_mode}/delete' defaults: _entity_form: 'form_mode.delete' diff --git a/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeDeleteForm.php b/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeDeleteForm.php index ec12e685f09..aa26aeef86e 100644 --- a/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeDeleteForm.php +++ b/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeDeleteForm.php @@ -19,7 +19,7 @@ class EntityDisplayModeDeleteForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'entity_' . $this->entity->entityType() . '.list', + 'route_name' => 'entity.' . $this->entity->entityType() . '_list', ); } diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module index 18a631e02b1..9d49073e324 100644 --- a/core/modules/field_ui/field_ui.module +++ b/core/modules/field_ui/field_ui.module @@ -57,7 +57,7 @@ function field_ui_menu() { $items['admin/reports/fields'] = array( 'title' => 'Field list', 'description' => 'Overview of fields on all entity types.', - 'route_name' => 'field_list', + 'route_name' => 'field_ui.list', 'type' => MENU_NORMAL_ITEM, ); $items['admin/reports/fields/list'] = array( @@ -78,13 +78,13 @@ function field_ui_menu() { $items["$path/fields"] = array( 'title' => 'Manage fields', 'type' => MENU_LOCAL_TASK, - 'route_name' => "field_ui.overview.$entity_type", + 'route_name' => "field_ui.overview_$entity_type", 'weight' => 1, ); $items["$path/fields/%"] = array( 'title callback' => 'entity_page_label', 'title arguments' => array($field_position), - 'route_name' => "field_ui.instance_edit.$entity_type", + 'route_name' => "field_ui.instance_edit_$entity_type", ); $items["$default_path/fields/%/edit"] = array( 'title' => 'Edit', @@ -93,12 +93,12 @@ function field_ui_menu() { $items["$path/fields/%/field"] = array( 'title' => 'Field settings', 'type' => MENU_LOCAL_TASK, - 'route_name' => "field_ui.field_edit.$entity_type", + 'route_name' => "field_ui.field_edit_$entity_type", ); $items["$path/fields/%/delete"] = array( 'title' => 'Delete', 'type' => MENU_VISIBLE_IN_BREADCRUMB, - 'route_name' => "field_ui.delete.$entity_type", + 'route_name' => "field_ui.delete_$entity_type", 'weight' => 10, ); @@ -106,7 +106,7 @@ function field_ui_menu() { $items["$path/form-display"] = array( 'title' => 'Manage form display', 'type' => MENU_LOCAL_TASK, - 'route_name' => "field_ui.form_display_overview.$entity_type", + 'route_name' => "field_ui.form_display_overview_$entity_type", 'weight' => 2, ); @@ -114,7 +114,7 @@ function field_ui_menu() { $items["$path/display"] = array( 'title' => 'Manage display', 'type' => MENU_LOCAL_TASK, - 'route_name' => "field_ui.display_overview.$entity_type", + 'route_name' => "field_ui.display_overview_$entity_type", 'weight' => 3, ); @@ -139,7 +139,7 @@ function field_ui_menu() { 'title' => $form_mode_info['label'], 'type' => MENU_LOCAL_TASK, 'weight' => $weight++, - 'route_name' => "field_ui.form_display_overview.$entity_type.$form_mode", + 'route_name' => "field_ui.form_display_overview_$entity_type" . '_' . $form_mode, ); } $weight = 0; @@ -148,7 +148,7 @@ function field_ui_menu() { 'title' => $view_mode_info['label'], 'type' => MENU_LOCAL_TASK, 'weight' => $weight++, - 'route_name' => "field_ui.display_overview.$entity_type.$view_mode", + 'route_name' => "field_ui.display_overview_$entity_type" . '_' . $view_mode, ); } } diff --git a/core/modules/field_ui/field_ui.routing.yml b/core/modules/field_ui/field_ui.routing.yml index 946d60efd06..0520a440cec 100644 --- a/core/modules/field_ui/field_ui.routing.yml +++ b/core/modules/field_ui/field_ui.routing.yml @@ -1,4 +1,4 @@ -field_list: +field_ui.list: pattern: 'admin/reports/fields' defaults: _entity_list: 'field_entity' diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php b/core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php index e994202ec1b..490a0d0cd66 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php @@ -58,21 +58,21 @@ class RouteSubscriber implements EventSubscriberInterface { array('_form' => '\Drupal\field_ui\Form\FieldInstanceEditForm'), array('_permission' => 'administer ' . $entity_type . ' fields') ); - $collection->add("field_ui.instance_edit.$entity_type", $route); + $collection->add("field_ui.instance_edit_$entity_type", $route); $route = new Route( "$path/fields/{field_instance}/field", array('_form' => '\Drupal\field_ui\Form\FieldEditForm'), array('_permission' => 'administer ' . $entity_type . ' fields') ); - $collection->add("field_ui.field_edit.$entity_type", $route); + $collection->add("field_ui.field_edit_$entity_type", $route); $route = new Route( "$path/fields/{field_instance}/delete", array('_entity_form' => 'field_instance.delete'), array('_permission' => 'administer ' . $entity_type . ' fields') ); - $collection->add("field_ui.delete.$entity_type", $route); + $collection->add("field_ui.delete_$entity_type", $route); // If the entity type has no bundles, use the entity type. $defaults['entity_type'] = $entity_type; @@ -84,14 +84,14 @@ class RouteSubscriber implements EventSubscriberInterface { array('_form' => '\Drupal\field_ui\FieldOverview') + $defaults, array('_permission' => 'administer ' . $entity_type . ' fields') ); - $collection->add("field_ui.overview.$entity_type", $route); + $collection->add("field_ui.overview_$entity_type", $route); $route = new Route( "$path/form-display", array('_form' => '\Drupal\field_ui\FormDisplayOverview') + $defaults, array('_permission' => 'administer ' . $entity_type . ' form display') ); - $collection->add("field_ui.form_display_overview.$entity_type", $route); + $collection->add("field_ui.form_display_overview_$entity_type", $route); foreach (entity_get_form_modes($entity_type) as $form_mode => $form_mode_info) { $route = new Route( @@ -101,7 +101,7 @@ class RouteSubscriber implements EventSubscriberInterface { 'mode' => $form_mode, ) + $defaults, array('_field_ui_form_mode_access' => 'administer ' . $entity_type . ' form display')); - $collection->add("field_ui.form_display_overview.$entity_type.$form_mode", $route); + $collection->add("field_ui.form_display_overview_$entity_type" . '_'. $form_mode, $route); } $route = new Route( @@ -109,7 +109,7 @@ class RouteSubscriber implements EventSubscriberInterface { array('_form' => '\Drupal\field_ui\DisplayOverview') + $defaults, array('_permission' => 'administer ' . $entity_type . ' display') ); - $collection->add("field_ui.display_overview.$entity_type", $route); + $collection->add("field_ui.display_overview_$entity_type", $route); foreach (entity_get_view_modes($entity_type) as $view_mode => $view_mode_info) { $route = new Route( @@ -119,7 +119,7 @@ class RouteSubscriber implements EventSubscriberInterface { 'mode' => $view_mode, ) + $defaults, array('_field_ui_view_mode_access' => 'administer ' . $entity_type . ' display')); - $collection->add("field_ui.display_overview.$entity_type.$view_mode", $route); + $collection->add("field_ui.display_overview_$entity_type" . '_' . $view_mode, $route); } } } diff --git a/core/modules/file/file.module b/core/modules/file/file.module index 345c6ecc2a9..3316ece42d8 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -43,7 +43,7 @@ function file_menu() { $items = array(); $items['file/ajax'] = array( - 'route_name' => 'file.ajax.upload', + 'route_name' => 'file.ajax_upload', 'theme callback' => 'ajax_base_page_theme', 'type' => MENU_CALLBACK, ); diff --git a/core/modules/file/file.routing.yml b/core/modules/file/file.routing.yml index c2a9efd33d7..a972dc6cd7f 100644 --- a/core/modules/file/file.routing.yml +++ b/core/modules/file/file.routing.yml @@ -1,10 +1,11 @@ -file.ajax.upload: +file.ajax_upload: pattern: '/file/ajax' defaults: _controller: '\Drupal\file\Controller\FileWidgetAjaxController::upload' requirements: _permission: 'access content' -file.ajax.progress: + +file.ajax_progress: pattern: '/file/progress' defaults: _controller: '\Drupal\file\Controller\FileWidgetAjaxController::progress' diff --git a/core/modules/file/tests/file_test/file_test.routing.yml b/core/modules/file/tests/file_test/file_test.routing.yml index 73fa7ed9b15..81fd186d243 100644 --- a/core/modules/file/tests/file_test/file_test.routing.yml +++ b/core/modules/file/tests/file_test/file_test.routing.yml @@ -1,4 +1,4 @@ -file_test: +file.test: pattern: '/file-test/upload' defaults: _form: 'Drupal\file_test\Form\FileTestForm' diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index 732acf44aca..4c9990940a0 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -125,33 +125,33 @@ function filter_menu() { $items['filter/tips'] = array( 'title' => 'Compose tips', 'type' => MENU_SUGGESTED_ITEM, - 'route_name' => 'filter_tips_all', + 'route_name' => 'filter.tips_all', ); $items['filter/tips/%'] = array( 'title' => 'Compose tips', - 'route_name' => 'filter_tips', + 'route_name' => 'filter.tips', ); $items['admin/config/content/formats'] = array( 'title' => 'Text formats', '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', + 'route_name' => 'filter.admin_overview', ); $items['admin/config/content/formats/list'] = array( 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['admin/config/content/formats/add'] = array( - 'route_name' => 'filter_format_add', + 'route_name' => 'filter.format_add', 'type' => MENU_SIBLING_LOCAL_TASK, ); $items['admin/config/content/formats/manage/%'] = array( 'title callback' => 'entity_page_label', 'title arguments' => array(5), - 'route_name' => 'filter_format_edit', + 'route_name' => 'filter.format_edit', ); $items['admin/config/content/formats/manage/%/disable'] = array( 'title' => 'Disable text format', - 'route_name' => 'filter_admin_disable', + 'route_name' => 'filter.admin_disable', ); return $items; } diff --git a/core/modules/filter/filter.routing.yml b/core/modules/filter/filter.routing.yml index 226017789e8..448be94397e 100644 --- a/core/modules/filter/filter.routing.yml +++ b/core/modules/filter/filter.routing.yml @@ -1,18 +1,18 @@ -filter_tips_all: +filter.tips_all: pattern: '/filter/tips' defaults: _content: '\Drupal\filter\Controller\FilterController::filterTips' requirements: _access: 'TRUE' -filter_tips: +filter.tips: pattern: '/filter/tips/{filter_format}' defaults: _content: '\Drupal\filter\Controller\FilterController::filterTips' requirements: _entity_access: 'filter_format.view' -filter_admin_overview: +filter.admin_overview: pattern: '/admin/config/content/formats' defaults: _content: '\Drupal\Core\Entity\Controller\EntityListController::listing' @@ -20,21 +20,21 @@ filter_admin_overview: requirements: _permission: 'administer filters' -filter_format_add: +filter.format_add: pattern: '/admin/config/content/formats/add' defaults: _entity_form: filter_format.add requirements: _permission: 'administer filters' -filter_format_edit: +filter.format_edit: pattern: '/admin/config/content/formats/manage/{filter_format}' defaults: _entity_form: filter_format.edit requirements: _permission: 'administer filters' -filter_admin_disable: +filter.admin_disable: pattern: '/admin/config/content/formats/manage/{filter_format}/disable' defaults: _entity_form: 'filter_format.disable' diff --git a/core/modules/filter/lib/Drupal/filter/Form/FilterDisableForm.php b/core/modules/filter/lib/Drupal/filter/Form/FilterDisableForm.php index 01dc651e3b8..8cf93d2a388 100644 --- a/core/modules/filter/lib/Drupal/filter/Form/FilterDisableForm.php +++ b/core/modules/filter/lib/Drupal/filter/Form/FilterDisableForm.php @@ -26,7 +26,7 @@ class FilterDisableForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'filter_admin_overview', + 'route_name' => 'filter.admin_overview', ); } diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Menu/LocalAction/AddFilterFormatLocalAction.php b/core/modules/filter/lib/Drupal/filter/Plugin/Menu/LocalAction/AddFilterFormatLocalAction.php index f42bb88f420..b75c10217c4 100644 --- a/core/modules/filter/lib/Drupal/filter/Plugin/Menu/LocalAction/AddFilterFormatLocalAction.php +++ b/core/modules/filter/lib/Drupal/filter/Plugin/Menu/LocalAction/AddFilterFormatLocalAction.php @@ -14,9 +14,9 @@ use Drupal\Core\Annotation\Menu\LocalAction; /** * @LocalAction( * id = "filter_format_add_local_action", - * route_name = "filter_format_add", + * route_name = "filter.format_add", * title = @Translation("Add text format"), - * appears_on = {"filter_admin_overview"} + * appears_on = {"filter.admin_overview"} * ) */ class AddFilterFormatLocalAction extends LocalActionBase { diff --git a/core/modules/forum/forum.local_actions.yml b/core/modules/forum/forum.local_actions.yml index 9f571aa63db..512b9d572d3 100644 --- a/core/modules/forum/forum.local_actions.yml +++ b/core/modules/forum/forum.local_actions.yml @@ -1,11 +1,11 @@ forum_add_forum_local_action: - route_name: forum_add_forum + route_name: forum.add_forum title: 'Add forum' appears_on: - - forum_overview + - forum.overview forum_add_container_local_action: - route_name: forum_add_container + route_name: forum.add_container title: 'Add container' appears_on: - - forum_overview + - forum.overview diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index 49fdd3553c7..0a1739b84fa 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -104,18 +104,18 @@ function forum_theme() { function forum_menu() { $items['forum'] = array( 'title' => 'Forums', - 'route_name' => 'forum_index', + 'route_name' => 'forum.index', ); $items['forum/%forum'] = array( 'title' => 'Forums', 'title callback' => 'entity_page_label', 'title arguments' => array(1), - 'route_name' => 'forum_page', + 'route_name' => 'forum.page', ); $items['admin/structure/forum'] = array( 'title' => 'Forums', 'description' => 'Control forum hierarchy settings.', - 'route_name' => 'forum_overview', + 'route_name' => 'forum.overview', ); $items['admin/structure/forum/list'] = array( 'title' => 'List', @@ -126,19 +126,19 @@ function forum_menu() { 'weight' => 100, 'type' => MENU_LOCAL_TASK, 'parent' => 'admin/structure/forum', - 'route_name' => 'forum_settings', + 'route_name' => 'forum.settings', ); $items['admin/structure/forum/edit/container/%taxonomy_term'] = array( 'title' => 'Edit container', - 'route_name' => 'forum_edit_container', + 'route_name' => 'forum.edit_container', ); $items['admin/structure/forum/edit/forum/%taxonomy_term'] = array( 'title' => 'Edit forum', - 'route_name' => 'forum_edit_forum', + 'route_name' => 'forum.edit_forum', ); $items['admin/structure/forum/delete/forum/%taxonomy_term'] = array( 'title' => 'Delete forum', - 'route_name' => 'forum_delete', + 'route_name' => 'forum.delete', ); return $items; } diff --git a/core/modules/forum/forum.routing.yml b/core/modules/forum/forum.routing.yml index 4268919b0c7..75bd0db128b 100644 --- a/core/modules/forum/forum.routing.yml +++ b/core/modules/forum/forum.routing.yml @@ -1,60 +1,60 @@ -forum_delete: +forum.delete: pattern: '/admin/structure/forum/delete/forum/{taxonomy_term}' defaults: _form: '\Drupal\forum\Form\DeleteForm' requirements: _permission: 'administer forums' -forum_settings: +forum.settings: pattern: '/admin/structure/forum/settings' defaults: _form: '\Drupal\forum\ForumSettingsForm' requirements: _permission: 'administer forums' -forum_index: +forum.index: pattern: '/forum' defaults: _content: '\Drupal\forum\Controller\ForumController::forumIndex' requirements: _permission: 'access content' -forum_page: +forum.page: pattern: '/forum/{taxonomy_term}' defaults: _content: '\Drupal\forum\Controller\ForumController::forumPage' requirements: _permission: 'access content' -forum_add_container: +forum.add_container: pattern: '/admin/structure/forum/add/container' defaults: _content: '\Drupal\forum\Controller\ForumController::addContainer' requirements: _permission: 'administer forums' -forum_add_forum: +forum.add_forum: pattern: '/admin/structure/forum/add/forum' defaults: _content: '\Drupal\forum\Controller\ForumController::addForum' requirements: _permission: 'administer forums' -forum_edit_container: +forum.edit_container: pattern: '/admin/structure/forum/edit/container/{taxonomy_term}' defaults: _entity_form: 'taxonomy_term.container' requirements: _permission: 'administer forums' -forum_edit_forum: +forum.edit_forum: pattern: '/admin/structure/forum/edit/forum/{taxonomy_term}' defaults: _entity_form: 'taxonomy_term.forum' requirements: _permission: 'administer forums' -forum_overview: +forum.overview: pattern: '/admin/structure/forum' defaults: _form: '\Drupal\forum\Form\Overview' diff --git a/core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php b/core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php index 724baaf2216..d28dc338112 100644 --- a/core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php +++ b/core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php @@ -70,7 +70,7 @@ class ForumBreadcrumbBuilder implements BreadcrumbBuilderInterface { } } - if (!empty($attributes[RouteObjectInterface::ROUTE_NAME]) && $attributes[RouteObjectInterface::ROUTE_NAME] == 'forum_page' && isset($attributes['taxonomy_term'])) { + if (!empty($attributes[RouteObjectInterface::ROUTE_NAME]) && $attributes[RouteObjectInterface::ROUTE_NAME] == 'forum.page' && isset($attributes['taxonomy_term'])) { $breadcrumb = $this->forumTermBreadcrumb($attributes['taxonomy_term']); } diff --git a/core/modules/help/help.module b/core/modules/help/help.module index 9c86f459237..3b239c6a8e8 100644 --- a/core/modules/help/help.module +++ b/core/modules/help/help.module @@ -12,12 +12,12 @@ function help_menu() { $items['admin/help'] = array( 'title' => 'Help', 'description' => 'Reference for usage, configuration, and modules.', - 'route_name' => 'help_main', + 'route_name' => 'help.main', 'weight' => 9, ); $items['admin/help/%'] = array( - 'route_name' => 'help_page', + 'route_name' => 'help.page', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); diff --git a/core/modules/help/help.routing.yml b/core/modules/help/help.routing.yml index 75877c94f0e..bc575bc36a7 100644 --- a/core/modules/help/help.routing.yml +++ b/core/modules/help/help.routing.yml @@ -1,10 +1,11 @@ -help_main: +help.main: pattern: 'admin/help' defaults: _content: '\Drupal\help\Controller\HelpController::helpMain' requirements: _permission: 'access administration pages' -help_page: + +help.page: pattern: 'admin/help/{name}' defaults: _content: '\Drupal\help\Controller\HelpController::helpPage' diff --git a/core/modules/history/history.routing.yml b/core/modules/history/history.routing.yml index 4069c30af27..7ffd2892b9a 100644 --- a/core/modules/history/history.routing.yml +++ b/core/modules/history/history.routing.yml @@ -1,11 +1,11 @@ -history_get_last_node_view: +history.get_last_node_view: pattern: '/history/get_node_read_timestamps' defaults: _controller: '\Drupal\history\Controller\HistoryController::getNodeReadTimestamps' requirements: _permission: 'access content' -history_read_node: +history.read_node: pattern: '/history/{node}/read' defaults: _controller: '\Drupal\history\Controller\HistoryController::readNode' diff --git a/core/modules/image/image.module b/core/modules/image/image.module index fa03dcd9a37..ee59456fee9 100644 --- a/core/modules/image/image.module +++ b/core/modules/image/image.module @@ -95,7 +95,7 @@ function image_menu() { $items['admin/config/media/image-styles'] = array( 'title' => 'Image styles', 'description' => 'Configure styles that can be used for resizing or adjusting images on display.', - 'route_name' => 'image_style_list', + 'route_name' => 'image.style_list', ); $items['admin/config/media/image-styles/list'] = array( 'title' => 'List', @@ -103,14 +103,14 @@ function image_menu() { 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['admin/config/media/image-styles/add'] = array( - 'route_name' => 'image_style_add', + 'route_name' => 'image.style_add', 'type' => MENU_SIBLING_LOCAL_TASK, 'weight' => 1, ); $items['admin/config/media/image-styles/manage/%image_style'] = array( 'title' => 'Edit style', 'description' => 'Configure an image style.', - 'route_name' => 'image_style_edit', + 'route_name' => 'image.style_edit', ); $items['admin/config/media/image-styles/manage/%image_style/edit'] = array( 'title' => 'Edit', @@ -121,22 +121,22 @@ function image_menu() { 'description' => 'Delete an image style.', 'type' => MENU_LOCAL_TASK, 'weight' => 10, - 'route_name' => 'image_style_delete', + 'route_name' => 'image.style_delete', ); $items['admin/config/media/image-styles/manage/%/effects/%'] = array( 'title' => 'Edit image effect', 'description' => 'Edit an existing effect within a style.', - 'route_name' => 'image_effect_edit_form', + 'route_name' => 'image.effect_edit_form', ); $items['admin/config/media/image-styles/manage/%image_style/effects/%/delete'] = array( 'title' => 'Delete image effect', 'description' => 'Delete an existing effect from a style.', - 'route_name' => 'image_effect_delete', + 'route_name' => 'image.effect_delete', ); $items['admin/config/media/image-styles/manage/%/add/%'] = array( 'title' => 'Add image effect', 'description' => 'Add a new effect to a style.', - 'route_name' => 'image_effect_add_form', + 'route_name' => 'image.effect_add_form', ); return $items; diff --git a/core/modules/image/image.routing.yml b/core/modules/image/image.routing.yml index c5b83ce1a26..c28a48d849b 100644 --- a/core/modules/image/image.routing.yml +++ b/core/modules/image/image.routing.yml @@ -1,53 +1,53 @@ -image_style_add: +image.style_add: pattern: '/admin/config/media/image-styles/add' defaults: _entity_form: image_style.add requirements: _permission: 'administer image styles' -image_style_edit: +image.style_edit: pattern: '/admin/config/media/image-styles/manage/{image_style}' defaults: _entity_form: image_style.edit requirements: _permission: 'administer image styles' -image_style_delete: +image.style_delete: pattern: 'admin/config/media/image-styles/manage/{image_style}/delete' defaults: _entity_form: 'image_style.delete' requirements: _permission: 'administer image styles' -image_effect_delete: +image.effect_delete: pattern: 'admin/config/media/image-styles/manage/{image_style}/effects/{image_effect}/delete' defaults: _form: '\Drupal\image\Form\ImageEffectDeleteForm' requirements: _permission: 'administer image styles' -image_style_list: +image.style_list: pattern: '/admin/config/media/image-styles' defaults: _entity_list: 'image_style' requirements: _permission: 'administer image styles' -image_style_private: +image.style_private: pattern: '/system/files/styles/{image_style}/{scheme}' defaults: _controller: '\Drupal\image\Controller\ImageStyleDownloadController::deliver' requirements: _access: 'TRUE' -image_effect_add_form: +image.effect_add_form: pattern: '/admin/config/media/image-styles/manage/{image_style}/add/{image_effect}' defaults: _form: '\Drupal\image\Form\ImageEffectAddForm' requirements: _permission: 'administer image styles' -image_effect_edit_form: +image.effect_edit_form: pattern: '/admin/config/media/image-styles/manage/{image_style}/effects/{image_effect}' defaults: _form: '\Drupal\image\Form\ImageEffectEditForm' diff --git a/core/modules/image/lib/Drupal/image/EventSubscriber/RouteSubscriber.php b/core/modules/image/lib/Drupal/image/EventSubscriber/RouteSubscriber.php index 69f84f4d811..252452224c4 100644 --- a/core/modules/image/lib/Drupal/image/EventSubscriber/RouteSubscriber.php +++ b/core/modules/image/lib/Drupal/image/EventSubscriber/RouteSubscriber.php @@ -49,7 +49,7 @@ class RouteSubscriber implements EventSubscriberInterface { '_access' => 'TRUE', ) ); - $collection->add('image_style_public', $route); + $collection->add('image.style_public', $route); } } diff --git a/core/modules/image/lib/Drupal/image/Form/ImageEffectDeleteForm.php b/core/modules/image/lib/Drupal/image/Form/ImageEffectDeleteForm.php index 32d07d9d4b2..3297e8378bb 100644 --- a/core/modules/image/lib/Drupal/image/Form/ImageEffectDeleteForm.php +++ b/core/modules/image/lib/Drupal/image/Form/ImageEffectDeleteForm.php @@ -48,7 +48,7 @@ class ImageEffectDeleteForm extends ConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'image_style_edit', + 'route_name' => 'image.style_edit', 'route_parameters' => array( 'image_style' => $this->imageStyle->id(), ), diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleDeleteForm.php b/core/modules/image/lib/Drupal/image/Form/ImageStyleDeleteForm.php index 5f962710e0d..6cfe35497b7 100644 --- a/core/modules/image/lib/Drupal/image/Form/ImageStyleDeleteForm.php +++ b/core/modules/image/lib/Drupal/image/Form/ImageStyleDeleteForm.php @@ -33,7 +33,7 @@ class ImageStyleDeleteForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'image_style_list', + 'route_name' => 'image.style_list', ); } diff --git a/core/modules/image/lib/Drupal/image/Plugin/Menu/LocalAction/ImageStyleAddLocalAction.php b/core/modules/image/lib/Drupal/image/Plugin/Menu/LocalAction/ImageStyleAddLocalAction.php index 0af82bf46b5..eb1381395f8 100644 --- a/core/modules/image/lib/Drupal/image/Plugin/Menu/LocalAction/ImageStyleAddLocalAction.php +++ b/core/modules/image/lib/Drupal/image/Plugin/Menu/LocalAction/ImageStyleAddLocalAction.php @@ -14,9 +14,9 @@ use Drupal\Core\Annotation\Menu\LocalAction; /** * @LocalAction( * id = "image_style_add_action", - * route_name = "image_style_add", + * route_name = "image.style_add", * title = @Translation("Add image style"), - * appears_on = {"image_style_list"} + * appears_on = {"image.style_list"} * ) */ class ImageStyleAddLocalAction extends LocalActionBase { diff --git a/core/modules/language/language.local_actions.yml b/core/modules/language/language.local_actions.yml index 32c143d97e0..ad09aa11d6a 100644 --- a/core/modules/language/language.local_actions.yml +++ b/core/modules/language/language.local_actions.yml @@ -1,5 +1,5 @@ language_add_local_action: - route_name: language_add + route_name: language.add title: 'Add language' appears_on: - - language_admin_overview + - language.admin_overview diff --git a/core/modules/language/language.module b/core/modules/language/language.module index 83f61e95157..216211b1c79 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -70,7 +70,7 @@ function language_menu() { $items['admin/config/regional/language'] = array( 'title' => 'Languages', 'description' => 'Configure languages for content and the user interface.', - 'route_name' => 'language_admin_overview', + 'route_name' => 'language.admin_overview', 'weight' => -10, ); $items['admin/config/regional/language/list'] = array( @@ -78,15 +78,15 @@ function language_menu() { 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['admin/config/regional/language/add'] = array( - 'route_name' => 'language_add', + 'route_name' => 'language.add', 'type' => MENU_SIBLING_LOCAL_TASK, ); $items['admin/config/regional/language/edit/%language'] = array( 'title' => 'Edit language', - 'route_name' => 'language_edit', + 'route_name' => 'language.edit', ); $items['admin/config/regional/language/delete/%language'] = array( - 'route_name' => 'language_delete', + 'route_name' => 'language.delete', ); // Language negotiation. @@ -101,22 +101,22 @@ function language_menu() { ); $items['admin/config/regional/language/detection/url'] = array( 'title' => 'URL language detection configuration', - 'route_name' => 'language_negotiation_url', + 'route_name' => 'language.negotiation_url', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); $items['admin/config/regional/language/detection/session'] = array( 'title' => 'Session language detection configuration', - 'route_name' => 'language_negotiation_session', + 'route_name' => 'language.negotiation_session', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); $items['admin/config/regional/language/detection/browser'] = array( 'title' => 'Browser language detection configuration', - 'route_name' => 'language_negotiation_browser', + 'route_name' => 'language.negotiation_browser', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); $items['admin/config/regional/language/detection/selected'] = array( 'title' => 'Selected language detection configuration', - 'route_name' => 'language_negotiation_selected', + 'route_name' => 'language.negotiation_selected', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); diff --git a/core/modules/language/language.routing.yml b/core/modules/language/language.routing.yml index c7e8f12ace9..f79da8d1947 100644 --- a/core/modules/language/language.routing.yml +++ b/core/modules/language/language.routing.yml @@ -1,53 +1,53 @@ -language_negotiation_url: +language.negotiation_url: pattern: '/admin/config/regional/language/detection/url' defaults: _form: 'Drupal\language\Form\NegotiationUrlForm' requirements: _permission: 'administer languages' -language_negotiation_session: +language.negotiation_session: pattern: '/admin/config/regional/language/detection/session' defaults: _form: 'Drupal\language\Form\NegotiationSessionForm' requirements: _permission: 'administer languages' -language_negotiation_selected: +language.negotiation_selected: pattern: '/admin/config/regional/language/detection/selected' defaults: _form: 'Drupal\language\Form\NegotiationSelectedForm' requirements: _permission: 'administer languages' -language_add: +language.add: pattern: '/admin/config/regional/language/add' defaults: _entity_form: 'language_entity.add' requirements: _entity_create_access: 'language_entity' -language_edit: +language.edit: pattern: '/admin/config/regional/language/edit/{language_entity}' defaults: _entity_form: 'language_entity.edit' requirements: _entity_access: 'language_entity.update' -language_admin_overview: +language.admin_overview: pattern: '/admin/config/regional/language' defaults: _entity_list: 'language_entity' requirements: _permission: 'administer languages' -language_delete: +language.delete: pattern: '/admin/config/regional/language/delete/{language_entity}' defaults: _entity_form: 'language_entity.delete' requirements: _entity_access: 'language_entity.delete' -language_negotiation_browser: +language.negotiation_browser: pattern: '/admin/config/regional/language/detection/browser' defaults: _form: '\Drupal\language\Form\NegotiationBrowserForm' @@ -55,7 +55,7 @@ language_negotiation_browser: requirements: _permission: 'administer languages' -language_negotiation_browser_delete: +language.negotiation_browser_delete: pattern: 'admin/config/regional/language/detection/browser/delete/{browser_langcode}' defaults: _form: '\Drupal\language\Form\NegotiationBrowserDeleteForm' diff --git a/core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php b/core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php index 164f27105f5..337bb923ea8 100644 --- a/core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php +++ b/core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php @@ -57,7 +57,7 @@ class LanguageDeleteForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'language_admin_overview', + 'route_name' => 'language.admin_overview', ); } diff --git a/core/modules/language/tests/language_test/language_test.routing.yml b/core/modules/language/tests/language_test/language_test.routing.yml index 4ab68ab0024..6ed2138a42b 100644 --- a/core/modules/language/tests/language_test/language_test.routing.yml +++ b/core/modules/language/tests/language_test/language_test.routing.yml @@ -1,11 +1,11 @@ -language_test_l_active_class: +language_test.l_active_class: pattern: '/language_test/type-link-active-class' defaults: _content: '\Drupal\language_test\Controller\LanguageTestController::typeLinkActiveClass' requirements: _access: 'TRUE' -language_test_subrequest: +language_test.subrequest: pattern: '/language_test/subrequest' defaults: _controller: '\Drupal\language_test\Controller\LanguageTestController::testSubRequest' diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module index 1b3440652a8..d8b4f4096b3 100644 --- a/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module @@ -173,7 +173,7 @@ function locale_menu() { $items['admin/config/regional/translate'] = array( 'title' => 'User interface translation', 'description' => 'Translate the built-in user interface.', - 'route_name' => 'locale_translate_page', + 'route_name' => 'locale.translate_page', 'weight' => -5, ); $items['admin/config/regional/translate/translate'] = array( @@ -200,7 +200,7 @@ function locale_menu() { ); $items['admin/config/regional/translate/settings'] = array( 'title' => 'Settings', - 'route_name' => 'locale_settings', + 'route_name' => 'locale.settings', 'weight' => 100, 'type' => MENU_LOCAL_TASK, ); diff --git a/core/modules/locale/locale.routing.yml b/core/modules/locale/locale.routing.yml index 4b7d50e71bf..cbbfc00e021 100644 --- a/core/modules/locale/locale.routing.yml +++ b/core/modules/locale/locale.routing.yml @@ -1,18 +1,18 @@ -locale_settings: +locale.settings: pattern: '/admin/config/regional/translate/settings' defaults: _form: 'Drupal\locale\Form\LocaleSettingsForm' requirements: _permission: 'translate interface' -locale_check_translation: +locale.check_translation: pattern: '/admin/reports/translations/check' defaults: _controller: 'Drupal\locale\Controller\LocaleController::checkTranslation' requirements: _permission: 'translate interface' -locale_translate_page: +locale.translate_page: pattern: '/admin/config/regional/translate' defaults: _content: 'Drupal\locale\Controller\LocaleController::translatePage' diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php b/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php index 5b7c20bb3ed..ac1e7fbfabb 100644 --- a/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php +++ b/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php @@ -66,7 +66,7 @@ class MenuDeleteForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'menu_menu_edit', + 'route_name' => 'menu.menu_edit', 'route_parameters' => array( 'menu' => $this->entity->id(), ), diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuLinkDeleteForm.php b/core/modules/menu/lib/Drupal/menu/Form/MenuLinkDeleteForm.php index cb2a81984e7..2815a919d5c 100644 --- a/core/modules/menu/lib/Drupal/menu/Form/MenuLinkDeleteForm.php +++ b/core/modules/menu/lib/Drupal/menu/Form/MenuLinkDeleteForm.php @@ -26,7 +26,7 @@ class MenuLinkDeleteForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'menu_menu_edit', + 'route_name' => 'menu.menu_edit', 'route_parameters' => array( 'menu' => $this->entity->menu_name, ), diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuLinkResetForm.php b/core/modules/menu/lib/Drupal/menu/Form/MenuLinkResetForm.php index f0b6ec3a022..5b79ef48c99 100644 --- a/core/modules/menu/lib/Drupal/menu/Form/MenuLinkResetForm.php +++ b/core/modules/menu/lib/Drupal/menu/Form/MenuLinkResetForm.php @@ -26,7 +26,7 @@ class MenuLinkResetForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'menu_menu_edit', + 'route_name' => 'menu.menu_edit', 'route_parameters' => array( 'menu' => $this->entity->menu_name, ), diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module index 57f39b6aa65..038177a038e 100644 --- a/core/modules/menu/menu.module +++ b/core/modules/menu/menu.module @@ -68,7 +68,7 @@ function menu_menu() { $items['admin/structure/menu'] = array( 'title' => 'Menus', 'description' => 'Add new menus to your site, edit existing menus, and rename and reorganize menu links.', - 'route_name' => 'menu_overview_page', + 'route_name' => 'menu.overview_page', ); $items['admin/structure/menu/list'] = array( 'title' => 'List menus', @@ -76,24 +76,24 @@ function menu_menu() { ); $items['admin/structure/menu/add'] = array( 'title' => 'Add menu', - 'route_name' => 'menu_menu_add', + 'route_name' => 'menu.menu_add', 'type' => MENU_LOCAL_ACTION, ); $items['admin/structure/menu/settings'] = array( 'title' => 'Settings', - 'route_name' => 'menu_settings', + 'route_name' => 'menu.settings', 'type' => MENU_LOCAL_TASK, 'weight' => 100, ); $items['admin/structure/menu/manage/%menu'] = array( 'title' => 'Edit menu', - 'route_name' => 'menu_menu_edit', + 'route_name' => 'menu.menu_edit', 'title callback' => 'entity_page_label', 'title arguments' => array(4), ); $items['admin/structure/menu/manage/%menu/add'] = array( 'title' => 'Add link', - 'route_name' => 'menu_link_add', + 'route_name' => 'menu.link_add', 'type' => MENU_LOCAL_ACTION, ); $items['admin/structure/menu/manage/%menu/edit'] = array( @@ -103,19 +103,19 @@ function menu_menu() { ); $items['admin/structure/menu/manage/%menu/delete'] = array( 'title' => 'Delete menu', - 'route_name' => 'menu_delete_menu', + 'route_name' => 'menu.delete_menu', ); $items['admin/structure/menu/item/%menu_link/edit'] = array( 'title' => 'Edit menu link', - 'route_name' => 'menu_link_edit', + 'route_name' => 'menu.link_edit', ); $items['admin/structure/menu/item/%menu_link/reset'] = array( 'title' => 'Reset menu link', - 'route_name' => 'menu_link_reset', + 'route_name' => 'menu.link_reset', ); $items['admin/structure/menu/item/%menu_link/delete'] = array( 'title' => 'Delete menu link', - 'route_name' => 'menu_link_delete', + 'route_name' => 'menu.link_delete', ); return $items; } diff --git a/core/modules/menu/menu.routing.yml b/core/modules/menu/menu.routing.yml index c5a0d107cba..7d0ac81286e 100644 --- a/core/modules/menu/menu.routing.yml +++ b/core/modules/menu/menu.routing.yml @@ -1,67 +1,67 @@ -menu_settings: +menu.settings: pattern: '/admin/structure/menu/settings' defaults: _form: 'Drupal\menu\MenuSettingsForm' requirements: _permission: 'administer menu' -menu_overview_page: +menu.overview_page: pattern: '/admin/structure/menu' defaults: _entity_list: 'menu' requirements: _permission: 'administer menu' -menu_parent_options_js: +menu.parent_options_js: pattern: '/admin/structure/menu/parents' defaults: _controller: '\Drupal\menu\Controller\MenuController::getParentOptions' requirements: _permission: 'administer menu' -menu_link_add: +menu.link_add: pattern: '/admin/structure/menu/manage/{menu}/add' defaults: _content: '\Drupal\menu\Controller\MenuController::addLink' requirements: _entity_create_access: 'menu_link' -menu_link_edit: +menu.link_edit: pattern: '/admin/structure/menu/item/{menu_link}/edit' defaults: _entity_form: 'menu_link' requirements: _entity_access: 'menu_link.update' -menu_link_reset: +menu.link_reset: pattern: 'admin/structure/menu/item/{menu_link}/reset' defaults: _entity_form: 'menu_link.reset' requirements: _entity_access: 'menu_link.reset' -menu_link_delete: +menu.link_delete: pattern: 'admin/structure/menu/item/{menu_link}/delete' defaults: _entity_form: 'menu_link.delete' requirements: _entity_access: 'menu_link.delete' -menu_menu_add: +menu.menu_add: pattern: '/admin/structure/menu/add' defaults: _entity_form: 'menu.add' requirements: _entity_create_access: 'menu' -menu_menu_edit: +menu.menu_edit: pattern: '/admin/structure/menu/manage/{menu}' defaults: _entity_form: 'menu.edit' requirements: _entity_access: 'menu.update' -menu_delete_menu: +menu.delete_menu: pattern: 'admin/structure/menu/manage/{menu}/delete' defaults: _entity_form: 'menu.delete' diff --git a/core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php b/core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php index 60a929c294c..14244c5e026 100644 --- a/core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php +++ b/core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php @@ -79,7 +79,7 @@ class NodeRevisionDeleteForm extends ConfirmFormBase implements ContainerInjecti * {@inheritdoc} */ public function getFormID() { - return 'node_revision_delete_confirm'; + return 'node.revision_delete_confirm'; } /** diff --git a/core/modules/node/lib/Drupal/node/Form/NodeTypeDeleteConfirm.php b/core/modules/node/lib/Drupal/node/Form/NodeTypeDeleteConfirm.php index 3793c718952..04a52c0800c 100644 --- a/core/modules/node/lib/Drupal/node/Form/NodeTypeDeleteConfirm.php +++ b/core/modules/node/lib/Drupal/node/Form/NodeTypeDeleteConfirm.php @@ -54,7 +54,7 @@ class NodeTypeDeleteConfirm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'node_overview_types', + 'route_name' => 'node.overview_types', ); } diff --git a/core/modules/node/lib/Drupal/node/Form/RebuildPermissionsForm.php b/core/modules/node/lib/Drupal/node/Form/RebuildPermissionsForm.php index a7430649936..17fe56bfcc9 100644 --- a/core/modules/node/lib/Drupal/node/Form/RebuildPermissionsForm.php +++ b/core/modules/node/lib/Drupal/node/Form/RebuildPermissionsForm.php @@ -30,7 +30,7 @@ class RebuildPermissionsForm extends ConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'system_status', + 'route_name' => 'system.status', ); } diff --git a/core/modules/node/lib/Drupal/node/NodeFormController.php b/core/modules/node/lib/Drupal/node/NodeFormController.php index 0609e9c0374..f0c0ae85ded 100644 --- a/core/modules/node/lib/Drupal/node/NodeFormController.php +++ b/core/modules/node/lib/Drupal/node/NodeFormController.php @@ -190,7 +190,7 @@ class NodeFormController extends EntityFormControllerNG { '#type' => 'textfield', '#title' => t('Authored by'), '#maxlength' => 60, - '#autocomplete_route_name' => 'user_autocomplete', + '#autocomplete_route_name' => 'user.autocomplete', '#default_value' => $node->getAuthorId()? $node->getAuthor()->getUsername() : '', '#weight' => -1, '#description' => t('Leave blank for %anonymous.', array('%anonymous' => $user_config->get('anonymous'))), diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/AssignOwnerNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/AssignOwnerNode.php index dc3a0bd387d..ced712e6275 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/Action/AssignOwnerNode.php +++ b/core/modules/node/lib/Drupal/node/Plugin/Action/AssignOwnerNode.php @@ -107,7 +107,7 @@ class AssignOwnerNode extends ConfigurableActionBase implements ContainerFactory '#type' => 'textfield', '#title' => t('Username'), '#default_value' => $owner_name, - '#autocomplete_route_name' => 'user_autocomplete', + '#autocomplete_route_name' => 'user.autocomplete', '#size' => '6', '#maxlength' => '60', '#description' => $description, diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php index e17158d2445..9d79e70c701 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php @@ -304,7 +304,7 @@ class Node extends WizardPluginBase { $form['displays']['show']['tagged_with'] = array( '#type' => 'textfield', '#title' => t('tagged with'), - '#autocomplete_route_name' => 'taxonomy_autocomplete', + '#autocomplete_route_name' => 'taxonomy.autocomplete', '#autocomplete_route_parameters' => array( 'entity_type' => $this->entity_type, 'field_name' => $tag_field_name, diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 80b2fed6b77..8c6eddb43e8 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -978,7 +978,7 @@ function node_menu() { $items['admin/structure/types'] = array( 'title' => 'Content types', 'description' => 'Manage content types, including default status, front page promotion, comment settings, etc.', - 'route_name' => 'node_overview_types', + 'route_name' => 'node.overview_types', ); $items['admin/structure/types/list'] = array( 'title' => 'List', @@ -986,14 +986,14 @@ function node_menu() { ); $items['admin/structure/types/add'] = array( 'title' => 'Add content type', - 'route_name' => 'node_type_add', + 'route_name' => 'node.type_add', 'type' => MENU_LOCAL_ACTION, ); $items['admin/structure/types/manage/%node_type'] = array( 'title' => 'Edit content type', 'title callback' => 'entity_page_label', 'title arguments' => array(4), - 'route_name' => 'node_type_edit', + 'route_name' => 'node.type_edit', ); $items['admin/structure/types/manage/%node_type/edit'] = array( 'title' => 'Edit', @@ -1001,7 +1001,7 @@ function node_menu() { ); $items['admin/structure/types/manage/%node_type/delete'] = array( 'title' => 'Delete', - 'route_name' => 'node_type_delete_confirm', + 'route_name' => 'node.type_delete_confirm', ); $items['node/add'] = array( 'title' => 'Add content', @@ -1036,13 +1036,13 @@ function node_menu() { ); $items['node/%node/edit'] = array( 'title' => 'Edit', - 'route_name' => 'node_page_edit', + 'route_name' => 'node.page_edit', 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE, ); $items['node/%node/delete'] = array( 'title' => 'Delete', - 'route_name' => 'node_delete_confirm', + 'route_name' => 'node.delete_confirm', 'weight' => 10, 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_INLINE, @@ -1066,11 +1066,11 @@ function node_menu() { ); $items['node/%node/revisions/%node_revision/revert'] = array( 'title' => 'Revert to earlier revision', - 'route_name' => 'node_revision_revert_confirm', + 'route_name' => 'node.revision_revert_confirm', ); $items['node/%node/revisions/%node_revision/delete'] = array( 'title' => 'Delete earlier revision', - 'route_name' => 'node_revision_delete_confirm', + 'route_name' => 'node.revision_delete_confirm', ); return $items; } diff --git a/core/modules/node/node.routing.yml b/core/modules/node/node.routing.yml index dfdc0a6037f..10141ec1dac 100644 --- a/core/modules/node/node.routing.yml +++ b/core/modules/node/node.routing.yml @@ -1,39 +1,39 @@ -node_multiple_delete_confirm: +node.multiple_delete_confirm: pattern: '/admin/content/node/delete' defaults: _form: '\Drupal\node\Form\DeleteMultiple' requirements: _permission: 'administer nodes' -node_page_edit: +node.page_edit: pattern: '/node/{node}/edit' defaults: _entity_form: 'node.edit' requirements: _entity_access: 'node.update' -node_delete_confirm: +node.delete_confirm: pattern: '/node/{node}/delete' defaults: _entity_form: 'node.delete' requirements: _entity_access: 'node.delete' -node_revision_revert_confirm: +node.revision_revert_confirm: pattern: '/node/{node}/revisions/{node_revision}/revert' defaults: _form: '\Drupal\node\Form\NodeRevisionRevertForm' requirements: _access_node_revision: 'update' -node_revision_delete_confirm: +node.revision_delete_confirm: pattern: '/node/{node}/revisions/{node_revision}/delete' defaults: _form: '\Drupal\node\Form\NodeRevisionDeleteForm' requirements: _access_node_revision: 'delete' -node_overview_types: +node.overview_types: pattern: '/admin/structure/types' defaults: _content: '\Drupal\Core\Entity\Controller\EntityListController::listing' @@ -41,35 +41,28 @@ node_overview_types: requirements: _permission: 'administer content types' -node_type_add: +node.type_add: pattern: '/admin/structure/types/add' defaults: _entity_form: 'node_type.add' requirements: _permission: 'administer content types' -node_type_edit: +node.type_edit: pattern: '/admin/structure/types/manage/{node_type}' defaults: _entity_form: 'node_type.edit' requirements: _permission: 'administer content types' -node_type_edit_default: - pattern: '/admin/structure/types/manage/{node_type}/edit' - defaults: - _entity_form: 'node_type.edit' - requirements: - _permission: 'administer content types' - -node_type_delete_confirm: +node.type_delete_confirm: pattern: '/admin/structure/types/manage/{node_type}/delete' defaults: _entity_form: 'node_type.delete' requirements: _entity_access: 'node_type.delete' -node_configure_rebuild_confirm: +node.configure_rebuild_confirm: pattern: '/admin/reports/status/rebuild' defaults: _form: 'Drupal\node\Form\RebuildPermissionsForm' diff --git a/core/modules/overlay/overlay.routing.yml b/core/modules/overlay/overlay.routing.yml index 50bc1209516..e75e078dbe7 100644 --- a/core/modules/overlay/overlay.routing.yml +++ b/core/modules/overlay/overlay.routing.yml @@ -1,11 +1,11 @@ -overlay_message: +overlay.message: pattern: '/overlay/dismiss-message' defaults: _controller: '\Drupal\overlay\Controller\OverlayController::overlayMessage' requirements: _access_overlay_dismiss_message: 'TRUE' -overlay_ajax: +overlay.ajax: pattern: '/overlay-ajax/{region}' defaults: _controller: '\Drupal\overlay\Controller\OverlayController::regionRender' diff --git a/core/modules/path/path.module b/core/modules/path/path.module index a6d7fbda93a..aeec0918152 100644 --- a/core/modules/path/path.module +++ b/core/modules/path/path.module @@ -76,7 +76,7 @@ function path_menu() { ); $items['admin/config/search/path/delete/%path'] = array( 'title' => 'Delete alias', - 'route_name' => 'path_delete', + 'route_name' => 'path.delete', ); $items['admin/config/search/path/add'] = array( 'title' => 'Add alias', diff --git a/core/modules/path/path.routing.yml b/core/modules/path/path.routing.yml index dbc6883df37..44f1fdf75c0 100644 --- a/core/modules/path/path.routing.yml +++ b/core/modules/path/path.routing.yml @@ -1,4 +1,4 @@ -path_delete: +path.delete: pattern: 'admin/config/search/path/delete/{pid}' defaults: _form: '\Drupal\path\Form\DeleteForm' diff --git a/core/modules/picture/lib/Drupal/picture/Form/PictureMappingDeleteForm.php b/core/modules/picture/lib/Drupal/picture/Form/PictureMappingDeleteForm.php index 1ed16e1fa9c..26983be5f2c 100644 --- a/core/modules/picture/lib/Drupal/picture/Form/PictureMappingDeleteForm.php +++ b/core/modules/picture/lib/Drupal/picture/Form/PictureMappingDeleteForm.php @@ -23,7 +23,7 @@ class PictureMappingDeleteForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'picture_mapping_page', + 'route_name' => 'picture.mapping_page', ); } diff --git a/core/modules/picture/picture.module b/core/modules/picture/picture.module index d2474d11d01..4926c08e469 100644 --- a/core/modules/picture/picture.module +++ b/core/modules/picture/picture.module @@ -57,24 +57,24 @@ function picture_menu() { 'title' => 'Picture Mappings', 'description' => 'Manage picture mappings', 'weight' => 10, - 'route_name' => 'picture_mapping_page', + 'route_name' => 'picture.mapping_page', ); $items['admin/config/media/picturemapping/add'] = array( 'title' => 'Add picture mapping', - 'route_name' => 'picture_mapping_page_add', + 'route_name' => 'picture.mapping_page_add', 'type' => MENU_LOCAL_ACTION, ); $items['admin/config/media/picturemapping/%picture_mapping'] = array( 'title' => 'Edit picture mapping', - 'route_name' => 'picture_mapping_page_edit', + 'route_name' => 'picture.mapping_page_edit', ); $items['admin/config/media/picturemapping/%picture_mapping/duplicate'] = array( 'title' => 'Duplicate picture mapping', - 'route_name' => 'picture_mapping_page_duplicate', + 'route_name' => 'picture.mapping_page_duplicate', ); $items['admin/config/media/picturemapping/%picture_mapping/delete'] = array( 'title' => 'Delete', - 'route_name' => 'picture_mapping_action_confirm', + 'route_name' => 'picture.mapping_action_confirm', ); return $items; diff --git a/core/modules/picture/picture.routing.yml b/core/modules/picture/picture.routing.yml index e01bb81049a..730f429b47d 100644 --- a/core/modules/picture/picture.routing.yml +++ b/core/modules/picture/picture.routing.yml @@ -1,32 +1,32 @@ -picture_mapping_page: +picture.mapping_page: pattern: '/admin/config/media/picturemapping' defaults: _entity_list: 'picture_mapping' requirements: _permission: 'administer pictures' -picture_mapping_page_add: +picture.mapping_page_add: pattern: '/admin/config/media/picturemapping/add' defaults: _entity_form: 'picture_mapping.add' requirements: _permission: 'administer pictures' -picture_mapping_page_edit: +picture.mapping_page_edit: pattern: '/admin/config/media/picturemapping/{picture_mapping}' defaults: _entity_form: 'picture_mapping.edit' requirements: _permission: 'administer pictures' -picture_mapping_page_duplicate: +picture.mapping_page_duplicate: pattern: '/admin/config/media/picturemapping/{picture_mapping}/duplicate' defaults: _entity_form: 'picture_mapping.duplicate' requirements: _permission: 'administer pictures' -picture_mapping_action_confirm: +picture.mapping_action_confirm: pattern: '/admin/config/media/picturemapping/{picture_mapping}/delete' defaults: _entity_form: 'picture_mapping.delete' diff --git a/core/modules/search/lib/Drupal/search/Form/ReindexConfirm.php b/core/modules/search/lib/Drupal/search/Form/ReindexConfirm.php index 80c24174476..20a484bff63 100644 --- a/core/modules/search/lib/Drupal/search/Form/ReindexConfirm.php +++ b/core/modules/search/lib/Drupal/search/Form/ReindexConfirm.php @@ -54,7 +54,7 @@ class ReindexConfirm extends ConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'search_settings', + 'route_name' => 'search.settings', ); } diff --git a/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php b/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php index d07e346c2b1..3433e6b3a8a 100644 --- a/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php +++ b/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php @@ -148,7 +148,7 @@ class SearchSettingsForm extends SystemConfigFormBase { '#title' => t('Number of items to index per cron run'), '#default_value' => $this->searchSettings->get('index.cron_limit'), '#options' => $items, - '#description' => t('The maximum number of items indexed in each pass of a cron maintenance task. If necessary, reduce the number of items to prevent timeouts and memory errors while indexing.', array('@cron' => $this->url('system_status'))) + '#description' => t('The maximum number of items indexed in each pass of a cron maintenance task. If necessary, reduce the number of items to prevent timeouts and memory errors while indexing.', array('@cron' => $this->url('system.status'))) ); // Indexing settings: $form['indexing_settings'] = array( diff --git a/core/modules/search/search.module b/core/modules/search/search.module index a4830ad8daf..a13fd991168 100644 --- a/core/modules/search/search.module +++ b/core/modules/search/search.module @@ -161,12 +161,12 @@ function search_menu() { $items['admin/config/search/settings'] = array( 'title' => 'Search settings', 'description' => 'Configure relevance settings for search and other indexing options.', - 'route_name' => 'search_settings', + 'route_name' => 'search.settings', 'weight' => -10, ); $items['admin/config/search/settings/reindex'] = array( 'title' => 'Clear index', - 'route_name' => 'search_reindex_confirm', + 'route_name' => 'search.reindex_confirm', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); diff --git a/core/modules/search/search.routing.yml b/core/modules/search/search.routing.yml index 8acf6506585..4a2789f55a7 100644 --- a/core/modules/search/search.routing.yml +++ b/core/modules/search/search.routing.yml @@ -1,10 +1,11 @@ -search_settings: +search.settings: pattern: '/admin/config/search/settings' defaults: _form: 'Drupal\search\Form\SearchSettingsForm' requirements: _permission: 'administer search' -search_reindex_confirm: + +search.reindex_confirm: pattern: '/admin/config/search/settings/reindex' defaults: _form: 'Drupal\search\Form\ReindexConfirm' diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php b/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php index de8a8dc77f0..a0012dc1bee 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php @@ -41,7 +41,7 @@ class LinkDelete extends ConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'shortcut_set_customize', + 'route_name' => 'shortcut.set_customize', 'route_parameters' => array( 'shortcut_set' => str_replace('shortcut-', '', $this->menuLink->menu_name), ), diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php b/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php index bab133fd884..d7cdd9ae6d8 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php @@ -61,7 +61,7 @@ class ShortcutSetDeleteForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'shortcut_set_customize', + 'route_name' => 'shortcut.set_customize', 'route_parameters' => array( 'shortcut_set' => $this->entity->id(), ), diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Menu/LocalAction/AddShortcutSetLocalAction.php b/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Menu/LocalAction/AddShortcutSetLocalAction.php index 65abdf032c6..8a01f7bac9e 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Menu/LocalAction/AddShortcutSetLocalAction.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Menu/LocalAction/AddShortcutSetLocalAction.php @@ -14,9 +14,9 @@ use Drupal\Core\Menu\LocalActionBase; /** * @LocalAction( * id = "shortcut_set_add_local_action", - * route_name = "shortcut_set_add", + * route_name = "shortcut.set_add", * title = @Translation("Add shortcut set"), - * appears_on = {"shortcut_set_admin"} + * appears_on = {"shortcut.set_admin"} * ) */ class AddShortcutSetLocalAction extends LocalActionBase { diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module index 1d1a5050dd7..27f11d7cae3 100644 --- a/core/modules/shortcut/shortcut.module +++ b/core/modules/shortcut/shortcut.module @@ -88,16 +88,16 @@ function shortcut_menu() { $items['admin/config/user-interface/shortcut'] = array( 'title' => 'Shortcuts', 'description' => 'Add and modify shortcut sets.', - 'route_name' => 'shortcut_set_admin', + 'route_name' => 'shortcut.set_admin', ); $items['admin/config/user-interface/shortcut/add-set'] = array( 'title' => 'Add shortcut set', - 'route_name' => 'shortcut_set_add', + 'route_name' => 'shortcut.set_add', 'type' => MENU_SIBLING_LOCAL_TASK, ); $items['admin/config/user-interface/shortcut/manage/%shortcut_set'] = array( 'title' => 'Edit shortcuts', - 'route_name' => 'shortcut_set_customize', + 'route_name' => 'shortcut.set_customize', 'title callback' => 'entity_page_label', 'title arguments' => array(5), ); @@ -107,13 +107,13 @@ function shortcut_menu() { ); $items['admin/config/user-interface/shortcut/manage/%shortcut_set/edit'] = array( 'title' => 'Edit set name', - 'route_name' => 'shortcut_set_edit', + 'route_name' => 'shortcut.set_edit', 'type' => MENU_LOCAL_TASK, 'weight' => 10, ); $items['admin/config/user-interface/shortcut/manage/%shortcut_set/delete'] = array( 'title' => 'Delete shortcut set', - 'route_name' => 'shortcut_set_delete', + 'route_name' => 'shortcut.set_delete', ); $items['admin/config/user-interface/shortcut/manage/%shortcut_set/add-link'] = array( 'title' => 'Add shortcut', @@ -134,7 +134,7 @@ function shortcut_menu() { ); $items['admin/config/user-interface/shortcut/link/%menu_link/delete'] = array( 'title' => 'Delete shortcut', - 'route_name' => 'shortcut_link_delete', + 'route_name' => 'shortcut.link_delete', ); $items['user/%user/shortcuts'] = array( 'title' => 'Shortcuts', diff --git a/core/modules/shortcut/shortcut.routing.yml b/core/modules/shortcut/shortcut.routing.yml index faf495a2846..0745206d23f 100644 --- a/core/modules/shortcut/shortcut.routing.yml +++ b/core/modules/shortcut/shortcut.routing.yml @@ -1,46 +1,46 @@ -shortcut_link_delete: +shortcut.link_delete: pattern: '/admin/config/user-interface/shortcut/link/{menu_link}/delete' defaults: _form: 'Drupal\shortcut\Form\LinkDelete' requirements: _access_shortcut_link_delete: 'TRUE' -shortcut_set_delete: +shortcut.set_delete: pattern: '/admin/config/user-interface/shortcut/manage/{shortcut_set}/delete' defaults: _entity_form: 'shortcut_set.delete' requirements: _entity_access: 'shortcut_set.delete' -shortcut_set_admin: +shortcut.set_admin: pattern: '/admin/config/user-interface/shortcut' defaults: _entity_list: 'shortcut_set' requirements: _permission: 'administer shortcuts' -shortcut_set_add: +shortcut.set_add: pattern: '/admin/config/user-interface/shortcut/add-set' defaults: _entity_form: 'shortcut_set.add' requirements: _entity_create_access: 'shortcut_set' -shortcut_set_edit: +shortcut.set_edit: pattern: '/admin/config/user-interface/shortcut/manage/{shortcut_set}/edit' defaults: _entity_form: 'shortcut_set.edit' requirements: _entity_access: 'shortcut_set.update' -shortcut_link_add_inline: +shortcut.link_add_inline: pattern: '/admin/config/user-interface/shortcut/manage/{shortcut_set}/add-link-inline' defaults: _controller: 'Drupal\shortcut\Controller\ShortcutSetController::addShortcutLinkInline' requirements: _entity_access: 'shortcut_set.update' -shortcut_set_customize: +shortcut.set_customize: pattern: '/admin/config/user-interface/shortcut/manage/{shortcut_set}' defaults: _entity_form: 'shortcut_set.customize' diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index 8d441f42547..2dcb725b110 100644 --- a/core/modules/simpletest/simpletest.module +++ b/core/modules/simpletest/simpletest.module @@ -35,7 +35,7 @@ function simpletest_menu() { $items['admin/config/development/testing'] = array( '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', + 'route_name' => 'simpletest.test_form', 'weight' => -5, ); $items['admin/config/development/testing/list'] = array( @@ -44,7 +44,7 @@ function simpletest_menu() { ); $items['admin/config/development/testing/settings'] = array( 'title' => 'Settings', - 'route_name' => 'simpletest_settings', + 'route_name' => 'simpletest.settings', 'access arguments' => array('administer unit tests'), 'type' => MENU_LOCAL_TASK, 'weight' => 100, @@ -52,7 +52,7 @@ function simpletest_menu() { $items['admin/config/development/testing/results/%'] = array( 'title' => 'Test result', 'description' => 'View result of tests.', - 'route_name' => 'simpletest_result_form', + 'route_name' => 'simpletest.result_form', ); return $items; } diff --git a/core/modules/simpletest/simpletest.routing.yml b/core/modules/simpletest/simpletest.routing.yml index 8436309a631..9bf932258a4 100644 --- a/core/modules/simpletest/simpletest.routing.yml +++ b/core/modules/simpletest/simpletest.routing.yml @@ -1,18 +1,18 @@ -simpletest_settings: +simpletest.settings: pattern: '/admin/config/development/testing/settings' defaults: _form: 'Drupal\simpletest\Form\SimpletestSettingsForm' requirements: _permission: 'administer unit tests' -simpletest_test_form: +simpletest.test_form: pattern: '/admin/config/development/testing' defaults: _form: '\Drupal\simpletest\Form\SimpletestTestForm' requirements: _permission: 'administer unit tests' -simpletest_result_form: +simpletest.result_form: pattern: '/admin/config/development/testing/results/{test_id}' defaults: _form: 'Drupal\simpletest\Form\SimpletestResultsForm' diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module index 853d13939dd..8ef3136fb80 100644 --- a/core/modules/statistics/statistics.module +++ b/core/modules/statistics/statistics.module @@ -79,7 +79,7 @@ function statistics_menu() { $items['admin/config/system/statistics'] = array( 'title' => 'Statistics', 'description' => 'Control details about what and how your site logs content statistics.', - 'route_name' => 'statistics_settings', + 'route_name' => 'statistics.settings', 'access arguments' => array('administer statistics'), 'weight' => -15, ); diff --git a/core/modules/statistics/statistics.routing.yml b/core/modules/statistics/statistics.routing.yml index 0d0310f0a7b..86499f5081a 100644 --- a/core/modules/statistics/statistics.routing.yml +++ b/core/modules/statistics/statistics.routing.yml @@ -1,4 +1,4 @@ -statistics_settings: +statistics.settings: pattern: '/admin/config/system/statistics' defaults: _form: 'Drupal\statistics\StatisticsSettingsForm' diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php b/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php index 733c8702efe..619a9203c9a 100644 --- a/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php +++ b/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php @@ -64,7 +64,7 @@ class DateFormatDeleteForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'date_format_list', + 'route_name' => 'system.date_format_list', ); } diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php b/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php index 832afd0d49d..bb313c502aa 100644 --- a/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php +++ b/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php @@ -78,7 +78,7 @@ class DateFormatLocalizeResetForm extends ConfirmFormBase implements ContainerIn */ public function getCancelRoute() { return array( - 'route_name' => 'date_format_language_overview', + 'route_name' => 'system.date_format_language_overview', ); } diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php index 58be6a976be..2cc788e0fd2 100644 --- a/core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php +++ b/core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php @@ -75,7 +75,7 @@ class ModulesListConfirmForm extends ConfirmFormBase implements ContainerInjecti */ public function getCancelRoute() { return array( - 'route_name' => 'system_modules_list', + 'route_name' => 'system.modules_list', ); } @@ -109,7 +109,7 @@ class ModulesListConfirmForm extends ConfirmFormBase implements ContainerInjecti // Redirect to the modules list page if the key value store is empty. if (!$this->modules) { - return new RedirectResponse($this->urlGenerator()->generate('system_modules_list', array(), TRUE)); + return new RedirectResponse($this->urlGenerator()->generate('system.modules_list', array(), TRUE)); } $items = array(); diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php index c12566c9192..c4e0d16babf 100644 --- a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php +++ b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php @@ -82,7 +82,7 @@ class ModulesUninstallConfirmForm extends ConfirmFormBase implements ContainerIn */ public function getCancelRoute() { return array( - 'route_name' => 'system_modules_uninstall', + 'route_name' => 'system.modules_uninstall', ); } diff --git a/core/modules/system/lib/Drupal/system/Form/PerformanceForm.php b/core/modules/system/lib/Drupal/system/Form/PerformanceForm.php index 92404b740f1..3d30c10b1f2 100644 --- a/core/modules/system/lib/Drupal/system/Form/PerformanceForm.php +++ b/core/modules/system/lib/Drupal/system/Form/PerformanceForm.php @@ -55,7 +55,7 @@ class PerformanceForm extends SystemConfigFormBase { * {@inheritdoc} */ public function getFormID() { - return 'system_performance_settings'; + return 'system.performance_settings'; } /** diff --git a/core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php b/core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php index e83b93ff3ae..bcb0f8f652c 100644 --- a/core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php +++ b/core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php @@ -55,7 +55,7 @@ class SiteMaintenanceModeForm extends SystemConfigFormBase { * {@inheritdoc} */ public function getFormID() { - return 'system_site_maintenance_mode'; + return 'system.site_maintenance_mode'; } /** diff --git a/core/modules/system/lib/Drupal/system/Routing/RouteSubscriber.php b/core/modules/system/lib/Drupal/system/Routing/RouteSubscriber.php index 616955c90ab..600e6af49e3 100644 --- a/core/modules/system/lib/Drupal/system/Routing/RouteSubscriber.php +++ b/core/modules/system/lib/Drupal/system/Routing/RouteSubscriber.php @@ -39,7 +39,7 @@ class RouteSubscriber implements EventSubscriberInterface { '_form' => '\Drupal\system\Form\ThemeSettingsForm', 'theme_name' => $theme->name), array( '_permission' => 'administer themes', )); - $collection->add('system_theme_settings_' . $theme->name, $route); + $collection->add('system.theme_settings_' . $theme->name, $route); } } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/DialogTest.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/DialogTest.php index 346b9329fdf..88106497307 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Ajax/DialogTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/DialogTest.php @@ -83,7 +83,7 @@ class DialogTest extends AjaxTestBase { ); $no_target_expected_response = array( 'command' => 'openDialog', - 'selector' => '#drupal-dialog-ajax-test-dialog-contents', + 'selector' => '#drupal-dialog-ajax-testdialog-contents', 'settings' => NULL, 'data' => $dialog_contents, 'dialogOptions' => array( diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php index 5df96295255..bcf7c9629bd 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php @@ -246,18 +246,18 @@ class LinksTest extends WebTestBase { 'link_path' => 'router_test/test1', )); $menu_link->save(); - $this->assertEqual($menu_link->route_name, 'router_test_1'); + $this->assertEqual($menu_link->route_name, 'router_test.1'); $this->assertEqual($menu_link->route_parameters, array()); $menu_link = entity_create('menu_link', array( 'link_path' => 'router_test/test3/test', )); $menu_link->save(); - $this->assertEqual($menu_link->route_name, 'router_test_3'); + $this->assertEqual($menu_link->route_name, 'router_test.3'); $this->assertEqual($menu_link->route_parameters, array('value' => 'test')); $menu_link = entity_load('menu_link', $menu_link->id()); - $this->assertEqual($menu_link->route_name, 'router_test_3'); + $this->assertEqual($menu_link->route_name, 'router_test.3'); $this->assertEqual($menu_link->route_parameters, array('value' => 'test')); } diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/RouterPermissionTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/RouterPermissionTest.php index 5541b9f3e8e..060303a5250 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Routing/RouterPermissionTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Routing/RouterPermissionTest.php @@ -39,7 +39,7 @@ class RouterPermissionTest extends WebTestBase { $this->assertResponse(403, "Access denied for a route where we don't have a permission"); // An invalid path should throw an exception. $map = array(); - $route = \Drupal::service('router.route_provider')->getRouteByName('router_test_7'); + $route = \Drupal::service('router.route_provider')->getRouteByName('router_test.7'); try { menu_item_route_access($route, $path . 'invalid', $map); $exception = FALSE; diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 2ea070765ac..d31cd3c2198 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -620,7 +620,7 @@ function system_menu() { ); $items['admin'] = array( 'title' => 'Administration', - 'route_name' => 'system_admin', + 'route_name' => 'system.admin', 'weight' => 9, 'menu_name' => 'admin', ); @@ -631,7 +631,7 @@ function system_menu() { ); $items['admin/index'] = array( 'title' => 'Index', - 'route_name' => 'system_admin_index', + 'route_name' => 'system.admin_index', 'type' => MENU_LOCAL_TASK, 'weight' => -18, ); @@ -642,7 +642,7 @@ function system_menu() { 'description' => 'Administer blocks, content types, menus, etc.', 'position' => 'right', 'weight' => -8, - 'route_name' => 'system_admin_structure', + 'route_name' => 'system.admin_structure', ); // Appearance. $items['admin/appearance'] = array( @@ -670,7 +670,7 @@ function system_menu() { $items['admin/appearance/settings'] = array( 'title' => 'Settings', 'description' => 'Configure default and theme specific settings.', - 'route_name' => 'system_theme_settings', + 'route_name' => 'system.theme_settings', 'type' => MENU_LOCAL_TASK, 'weight' => 100, ); @@ -684,7 +684,7 @@ function system_menu() { if (!empty($theme->status)) { $items['admin/appearance/settings/' . $theme->name] = array( 'title' => $theme->info['name'], - 'route_name' => 'system_theme_settings_' . $theme->name, + 'route_name' => 'system.theme_settings_' . $theme->name, 'type' => MENU_LOCAL_TASK, ); } @@ -694,7 +694,7 @@ function system_menu() { $items['admin/modules'] = array( 'title' => 'Extend', 'description' => 'Add and enable modules to extend site functionality.', - 'route_name' => 'system_modules_list', + 'route_name' => 'system.modules_list', 'weight' => -2, ); $items['admin/modules/list'] = array( @@ -703,18 +703,18 @@ function system_menu() { ); $items['admin/modules/list/confirm'] = array( 'title' => 'List', - 'route_name' => 'system_modules_list_confirm', + 'route_name' => 'system.modules_list_confirm', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); $items['admin/modules/uninstall'] = array( 'title' => 'Uninstall', - 'route_name' => 'system_modules_uninstall', + 'route_name' => 'system.modules_uninstall', 'type' => MENU_LOCAL_TASK, 'weight' => 20, ); $items['admin/modules/uninstall/confirm'] = array( 'title' => 'Uninstall', - 'route_name' => 'system_modules_uninstall_confirm', + 'route_name' => 'system.modules_uninstall_confirm', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); @@ -722,7 +722,7 @@ function system_menu() { $items['admin/config'] = array( 'title' => 'Configuration', 'description' => 'Administer settings.', - 'route_name' => 'system_admin_config', + 'route_name' => 'system.admin_config', ); // Media settings. @@ -731,18 +731,18 @@ function system_menu() { 'description' => 'Media tools.', 'position' => 'left', 'weight' => -10, - 'route_name' => 'system_admin_config_media', + 'route_name' => 'system.admin_config_media', ); $items['admin/config/media/file-system'] = array( 'title' => 'File system', 'description' => 'Tell Drupal where to store uploaded files and how they are accessed.', - 'route_name' => 'system_file_system_settings', + 'route_name' => 'system.file_system_settings', 'weight' => -10, ); $items['admin/config/media/image-toolkit'] = array( 'title' => 'Image toolkit', 'description' => 'Choose which image toolkit to use if you have installed optional toolkits.', - 'route_name' => 'system_image_toolkit_settings', + 'route_name' => 'system.image_toolkit_settings', 'weight' => 20, ); @@ -752,12 +752,12 @@ function system_menu() { 'description' => 'Tools related to web services.', 'position' => 'right', 'weight' => 0, - 'route_name' => 'system_admin_config_services', + 'route_name' => 'system.admin_config_services', ); $items['admin/config/services/rss-publishing'] = array( 'title' => 'RSS publishing', 'description' => 'Configure the site description, the number of items per feed and whether feeds should be titles/teasers/full-text.', - 'route_name' => 'system_rss_feeds_settings', + 'route_name' => 'system.rss_feeds_settings', ); // Development settings. @@ -766,24 +766,24 @@ function system_menu() { 'description' => 'Development tools.', 'position' => 'right', 'weight' => -10, - 'route_name' => 'system_admin_config_development', + 'route_name' => 'system.admin_config_development', ); $items['admin/config/development/maintenance'] = array( 'title' => 'Maintenance mode', 'description' => 'Take the site offline for maintenance or bring it back online.', - 'route_name' => 'system_site_maintenance_mode', + 'route_name' => 'system.site_maintenance_mode', 'weight' => -10, ); $items['admin/config/development/performance'] = array( 'title' => 'Performance', 'description' => 'Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.', - 'route_name' => 'system_performance_settings', + 'route_name' => 'system.performance_settings', 'weight' => -20, ); $items['admin/config/development/logging'] = array( 'title' => 'Logging and errors', 'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destinations, such as syslog, database, email, etc.", - 'route_name' => 'system_logging_settings', + 'route_name' => 'system.logging_settings', 'weight' => -15, ); @@ -793,36 +793,36 @@ function system_menu() { 'description' => 'Regional settings, localization and translation.', 'position' => 'left', 'weight' => -5, - 'route_name' => 'system_admin_config_regional', + 'route_name' => 'system.admin_config_regional', ); $items['admin/config/regional/settings'] = array( 'title' => 'Regional settings', 'description' => "Settings for the site's default time zone and country.", - 'route_name' => 'system_regional_settings', + 'route_name' => 'system.regional_settings', 'weight' => -20, ); $items['admin/config/regional/date-time'] = array( 'title' => 'Date and time formats', 'description' => 'Configure display format strings for date and time.', - 'route_name' => 'date_format_list', + 'route_name' => 'system.date_format_list', 'weight' => -9, ); $items['admin/config/regional/date-time/formats/add'] = array( 'title' => 'Add format', 'description' => 'Allow users to add additional date formats.', 'type' => MENU_LOCAL_ACTION, - 'route_name' => 'date_format_add', + 'route_name' => 'system.date_format_add', 'weight' => -10, ); $items['admin/config/regional/date-time/formats/manage/%'] = array( 'title' => 'Edit date format', 'description' => 'Allow users to edit a configured date format.', - 'route_name' => 'date_format_edit', + 'route_name' => 'system.date_format_edit', ); $items['admin/config/regional/date-time/formats/manage/%/delete'] = array( 'title' => 'Delete date format', 'description' => 'Allow users to delete a configured date format.', - 'route_name' => 'date_format_delete', + 'route_name' => 'system.date_format_delete', ); // Search settings. @@ -831,7 +831,7 @@ function system_menu() { 'description' => 'Local site search, metadata and SEO.', 'position' => 'left', 'weight' => -10, - 'route_name' => 'system_admin_config_search', + 'route_name' => 'system.admin_config_search', ); // System settings. @@ -840,18 +840,18 @@ function system_menu() { 'description' => 'General system related configuration.', 'position' => 'right', 'weight' => -20, - 'route_name' => 'system_admin_config_system', + 'route_name' => 'system.admin_config_system', ); $items['admin/config/system/site-information'] = array( 'title' => 'Site information', 'description' => 'Change site name, e-mail address, slogan, default front page, and number of posts per page, error pages.', - 'route_name' => 'system_site_information_settings', + 'route_name' => 'system.site_information_settings', 'weight' => -20, ); $items['admin/config/system/cron'] = array( 'title' => 'Cron', 'description' => 'Manage automatic site maintenance tasks.', - 'route_name' => 'system_cron_settings', + 'route_name' => 'system.cron_settings', 'weight' => 20, ); // Additional categories @@ -859,7 +859,7 @@ function system_menu() { 'title' => 'User interface', 'description' => 'Tools that enhance the user interface.', 'position' => 'right', - 'route_name' => 'system_admin_config_ui', + 'route_name' => 'system.admin_config_ui', 'weight' => -15, ); $items['admin/config/workflow'] = array( @@ -867,33 +867,33 @@ function system_menu() { 'description' => 'Content workflow, editorial workflow tools.', 'position' => 'right', 'weight' => 5, - 'route_name' => 'system_admin_config_workflow', + 'route_name' => 'system.admin_config_workflow', ); $items['admin/config/content'] = array( 'title' => 'Content authoring', 'description' => 'Settings related to formatting and authoring content.', 'position' => 'left', 'weight' => -15, - 'route_name' => 'system_admin_config_content', + 'route_name' => 'system.admin_config_content', ); // Reports. $items['admin/reports'] = array( 'title' => 'Reports', 'description' => 'View reports, updates, and errors.', - 'route_name' => 'system_admin_reports', + 'route_name' => 'system.admin_reports', 'weight' => 5, 'position' => 'left', ); $items['admin/reports/status'] = array( 'title' => 'Status report', 'description' => "Get a status report about your site's operation and any detected problems.", - 'route_name' => 'system_status', + 'route_name' => 'system.status', ); // Default page for batch operations. $items['batch'] = array( - 'route_name' => 'system_batch_page', + 'route_name' => 'system.batch_page', 'theme callback' => '_system_batch_theme', 'type' => MENU_CALLBACK, ); @@ -905,7 +905,7 @@ function system_menu() { 'description' => 'Configure date formats for each locale', 'type' => MENU_LOCAL_TASK, 'weight' => -8, - 'route_name' => 'date_format_language_overview', + 'route_name' => 'system.date_format_language_overview', ); $items['admin/config/regional/date-time/locale/%/edit'] = array( 'title' => 'Localize date formats', @@ -918,7 +918,7 @@ function system_menu() { $items['admin/config/regional/date-time/locale/%/reset'] = array( 'title' => 'Reset date formats', 'description' => 'Reset localized date formats to global defaults', - 'route_name' => 'date_format_localize_reset', + 'route_name' => 'system.date_format_localize_reset', ); } diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml index b014b09f06e..f8eed28b2da 100644 --- a/core/modules/system/system.routing.yml +++ b/core/modules/system/system.routing.yml @@ -5,84 +5,84 @@ system.ajax: requirements: _access: 'TRUE' -system_admin: +system.admin: pattern: '/admin' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' -system_admin_structure: +system.admin_structure: pattern: '/admin/structure' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' -system_admin_reports: +system.admin_reports: pattern: '/admin/reports' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access site reports' -system_admin_config_media: +system.admin_config_media: pattern: '/admin/config/media' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' -system_admin_config_services: +system.admin_config_services: pattern: '/admin/config/services' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' -system_admin_config_development: +system.admin_config_development: pattern: '/admin/config/development' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' -system_admin_config_regional: +system.admin_config_regional: pattern: '/admin/config/regional' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' -system_admin_config_search: +system.admin_config_search: pattern: '/admin/config/search' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' -system_admin_config_system: +system.admin_config_system: pattern: '/admin/config/system' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' -system_admin_config_ui: +system.admin_config_ui: pattern: '/admin/config/user-interface' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' -system_admin_config_workflow: +system.admin_config_workflow: pattern: '/admin/config/workflow' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' -system_admin_config_content: +system.admin_config_content: pattern: '/admin/config/content' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' @@ -96,7 +96,7 @@ system.cron: requirements: _access_system_cron: 'TRUE' -system_admin_compact_page: +system.admin_compact_page: pattern: '/admin/compact/{mode}' defaults: _controller: 'Drupal\system\Controller\SystemController::compactPage' @@ -111,168 +111,168 @@ system.machine_name_transliterate: requirements: _permission: 'access content' -system_site_information_settings: +system.site_information_settings: pattern: '/admin/config/system/site-information' defaults: _form: 'Drupal\system\Form\SiteInformationForm' requirements: _permission: 'administer site configuration' -system_cron_settings: +system.cron_settings: pattern: '/admin/config/system/cron' defaults: _form: 'Drupal\system\Form\CronForm' requirements: _permission: 'administer site configuration' -system_logging_settings: +system.logging_settings: pattern: '/admin/config/development/logging' defaults: _form: 'Drupal\system\Form\LoggingForm' requirements: _permission: 'administer site configuration' -system_performance_settings: +system.performance_settings: pattern: '/admin/config/development/performance' defaults: _form: 'Drupal\system\Form\PerformanceForm' requirements: _permission: 'administer site configuration' -system_file_system_settings: +system.file_system_settings: pattern: '/admin/config/media/file-system' defaults: _form: 'Drupal\system\Form\FileSystemForm' requirements: _permission: 'administer site configuration' -system_rss_feeds_settings: +system.rss_feeds_settings: pattern: '/admin/config/services/rss-publishing' defaults: _form: 'Drupal\system\Form\RssFeedsForm' requirements: _permission: 'administer site configuration' -system_regional_settings: +system.regional_settings: pattern: '/admin/config/regional/settings' defaults: _form: 'Drupal\system\Form\RegionalForm' requirements: _permission: 'administer site configuration' -system_image_toolkit_settings: +system.image_toolkit_settings: pattern: '/admin/config/media/image-toolkit' defaults: _form: 'Drupal\system\Form\ImageToolkitForm' requirements: _permission: 'administer administration pages' -system_site_maintenance_mode: +system.site_maintenance_mode: pattern: '/admin/config/development/maintenance' defaults: _form: 'Drupal\system\Form\SiteMaintenanceModeForm' requirements: _permission: 'administer site configuration' -system_run_cron: +system.run_cron: pattern: '/admin/reports/status/run-cron' defaults: _controller: '\Drupal\system\CronController::runManually' requirements: _permission: 'administer site configuration' -date_format_list: +system.date_format_list: pattern: '/admin/config/regional/date-time' defaults: _entity_list: 'date_format' requirements: _permission: 'administer site configuration' -date_format_add: +system.date_format_add: pattern: '/admin/config/regional/date-time/formats/add' defaults: _entity_form: 'date_format.add' requirements: _permission: 'administer site configuration' -date_format_edit: +system.date_format_edit: pattern: '/admin/config/regional/date-time/formats/manage/{date_format}' defaults: _entity_form: 'date_format.edit' requirements: _entity_access: 'date_format.update' -date_format_language_overview: +system.date_format_language_overview: pattern: '/admin/config/regional/date-time/locale' defaults: _controller: '\Drupal\system\Controller\DateFormatLanguageController::overviewPage' requirements: _permission: 'administer site configuration' -date_format_delete: +system.date_format_delete: pattern: 'admin/config/regional/date-time/formats/manage/{date_format}/delete' defaults: _entity_form: 'date_format.delete' requirements: _entity_access: 'date_format.delete' -date_format_localize_reset: +system.date_format_localize_reset: pattern: 'admin/config/regional/date-time/locale/{langcode}/reset' defaults: _form: '\Drupal\system\Form\DateFormatLocalizeResetForm' requirements: _permission: 'administer site configuration' -system_modules_list: +system.modules_list: pattern: 'admin/modules' defaults: _form: 'Drupal\system\Form\ModulesListForm' requirements: _permission: 'administer modules' -system_modules_list_confirm: +system.modules_list_confirm: pattern: 'admin/modules/list/confirm' defaults: _form: 'Drupal\system\Form\ModulesListConfirmForm' requirements: _permission: 'administer modules' -system_theme_disable: +system.theme_disable: pattern: '/admin/appearance/disable' defaults: _controller: 'Drupal\system\Controller\ThemeController::disable' requirements: _permission: 'administer themes' -system_theme_enable: +system.theme_enable: pattern: '/admin/appearance/enable' defaults: _controller: 'Drupal\system\Controller\ThemeController::enable' requirements: _permission: 'administer themes' -system_status: +system.status: pattern: '/admin/reports/status' defaults: _controller: 'Drupal\system\Controller\SystemInfoController::status' requirements: _permission: 'administer site configuration' -system_php: +system.php: pattern: '/admin/reports/status/php' defaults: _controller: 'Drupal\system\Controller\SystemInfoController::php' requirements: _permission: 'administer site configuration' -system_admin_index: +system.admin_index: pattern: 'admin/index' defaults: _content: 'Drupal\system\Controller\AdminController::index' requirements: _permission: 'access administration pages' -system_files: +system.files: pattern: '/system/files/{scheme}' defaults: _controller: 'Drupal\system\FileDownloadController::download' @@ -280,54 +280,47 @@ system_files: requirements: _access: 'TRUE' -system_theme_settings: +system.theme_settings: pattern: '/admin/appearance/settings' defaults: _form: '\Drupal\system\Form\ThemeSettingsForm' requirements: _permission: 'administer themes' -system_theme_settings_global: - pattern: '/admin/appearance/settings/global' - defaults: - _form: '\Drupal\system\Form\ThemeSettingsForm' - requirements: - _permission: 'administer themes' - '': pattern: '/' requirements: _access: 'TRUE' -system_modules_uninstall: +system.modules_uninstall: pattern: 'admin/modules/uninstall' defaults: _form: 'Drupal\system\Form\ModulesUninstallForm' requirements: _permission: 'administer modules' -system_modules_uninstall_confirm: +system.modules_uninstall_confirm: pattern: 'admin/modules/uninstall/confirm' defaults: _form: 'Drupal\system\Form\ModulesUninstallConfirmForm' requirements: _permission: 'administer modules' -system_timezone: +system.timezone: pattern: '/system/timezone' defaults: _controller: '\Drupal\system\Controller\TimezoneController::getTimezone' requirements: _access: 'TRUE' -system_admin_config: +system.admin_config: pattern: '/admin/config' defaults: _content: '\Drupal\system\Controller\SystemController::overview' requirements: _permission: 'access administration pages' -system_batch_page: +system.batch_page: pattern: '/batch' defaults: _controller: '\Drupal\system\Controller\BatchController::batchPage' diff --git a/core/modules/system/tests/modules/ajax_test/ajax_test.routing.yml b/core/modules/system/tests/modules/ajax_test/ajax_test.routing.yml index 04a0f6d6ab9..7536e1a720a 100644 --- a/core/modules/system/tests/modules/ajax_test/ajax_test.routing.yml +++ b/core/modules/system/tests/modules/ajax_test/ajax_test.routing.yml @@ -1,10 +1,11 @@ -ajax_test_dialog_contents: +ajax_test.dialog_contents: pattern: ajax-test/dialog-contents defaults: _content: '\Drupal\ajax_test\AjaxTestController::dialogContents' requirements: _access: 'TRUE' -ajax_test_dialog_form: + +ajax_test.dialog_form: pattern: ajax-test/dialog-form defaults: _form: '\Drupal\ajax_test\AjaxTestForm' diff --git a/core/modules/system/tests/modules/batch_test/batch_test.module b/core/modules/system/tests/modules/batch_test/batch_test.module index cc1c715a6d0..f2b54409cd2 100644 --- a/core/modules/system/tests/modules/batch_test/batch_test.module +++ b/core/modules/system/tests/modules/batch_test/batch_test.module @@ -44,31 +44,31 @@ function batch_test_menu() { // Programmatic form: the page submits the 'Chained' form through // drupal_form_submit(). $items['batch-test/programmatic'] = array( - 'route_name' => 'batch_test_programmatic', + 'route_name' => 'batch_test.programmatic', 'type' => MENU_LOCAL_TASK, 'weight' => 3, ); // No form: fire a batch simply by accessing a page. $items['batch-test/no-form'] = array( - 'route_name' => 'batch_test_no_form', + 'route_name' => 'batch_test.no_form', 'type' => MENU_LOCAL_TASK, 'weight' => 4, ); // No form: fire a batch; return > 100% complete $items['batch-test/large-percentage'] = array( - 'route_name' => 'batch_test_large_percentage', + 'route_name' => 'batch_test.large_percentage', 'type' => MENU_LOCAL_TASK, 'weight' => 5, ); // Tests programmatic form submission within a batch operation. $items['batch-test/nested-programmatic'] = array( - 'route_name' => 'batch_test_nested_programmatic', + 'route_name' => 'batch_test.nested_programmatic', 'type' => MENU_LOCAL_TASK, 'weight' => 6, ); // Landing page to test redirects. $items['batch-test/redirect'] = array( - 'route_name' => 'batch_test_redirect', + 'route_name' => 'batch_test.redirect', 'type' => MENU_LOCAL_TASK, 'weight' => 7, ); diff --git a/core/modules/system/tests/modules/batch_test/batch_test.routing.yml b/core/modules/system/tests/modules/batch_test/batch_test.routing.yml index da1418c24bf..b19952515b7 100644 --- a/core/modules/system/tests/modules/batch_test/batch_test.routing.yml +++ b/core/modules/system/tests/modules/batch_test/batch_test.routing.yml @@ -1,4 +1,4 @@ -batch_test_redirect: +batch_test.redirect: pattern: '/batch-test/redirect' defaults: _content: '\Drupal\batch_test\Controller\BatchTestController::testRedirect' @@ -6,7 +6,7 @@ batch_test_redirect: requirements: _access: 'TRUE' -batch_test_large_percentage: +batch_test.large_percentage: pattern: '/batch-test/large-percentage' defaults: _content: '\Drupal\batch_test\Controller\BatchTestController::testLargePercentage' @@ -14,7 +14,7 @@ batch_test_large_percentage: requirements: _access: 'TRUE' -batch_test_nested_programmatic: +batch_test.nested_programmatic: pattern: '/batch-test/nested-programmatic/{value}' defaults: _content: '\Drupal\batch_test\Controller\BatchTestController::testNestedDrupalFormSubmit' @@ -23,7 +23,7 @@ batch_test_nested_programmatic: requirements: _access: 'TRUE' -batch_test_no_form: +batch_test.no_form: pattern: '/batch-test/no-form' defaults: _content: '\Drupal\batch_test\Controller\BatchTestController::testNoForm' @@ -31,7 +31,7 @@ batch_test_no_form: requirements: _access: 'TRUE' -batch_test_programmatic: +batch_test.programmatic: pattern: '/batch-test/programmatic/{value}' defaults: _content: '\Drupal\batch_test\Controller\BatchTestController::testProgrammatic' @@ -40,7 +40,7 @@ batch_test_programmatic: requirements: _access: 'TRUE' -batch_test_test_theme: +batch_test.test_theme: pattern: '/admin/batch-test/test-theme' defaults: _content: '\Drupal\batch_test\Controller\BatchTestController::testThemeBatch' diff --git a/core/modules/system/tests/modules/common_test/common_test.routing.yml b/core/modules/system/tests/modules/common_test/common_test.routing.yml index 6c7d6d34691..f96c586e966 100644 --- a/core/modules/system/tests/modules/common_test/common_test.routing.yml +++ b/core/modules/system/tests/modules/common_test/common_test.routing.yml @@ -1,23 +1,26 @@ -common_test_l_active_class: +common_test.l_active_class: pattern: '/common-test/type-link-active-class' defaults: _content: '\Drupal\common_test\Controller\CommonTestController::typeLinkActiveClass' requirements: _access: 'TRUE' -common_test_destination: + +common_test.destination: pattern: '/common-test/destination' defaults: _controller: '\Drupal\common_test\Controller\CommonTestController::destination' requirements: _permission: 'access content' -common_test_drupal_render_invalid_keys: + +common_test.drupal_render_invalid_keys: pattern: 'common-test/drupal-render-invalid-keys' defaults: _title: 'Drupal Render' _content: '\Drupal\common_test\Controller\CommonTestController::drupalRenderInvalidKeys' requirements: _permission: 'access content' -common_test_js_and_css_querystring: + +common_test.js_and_css_querystring: pattern: '/common-test/query-string' defaults: _title: 'Test querystring' diff --git a/core/modules/system/tests/modules/condition_test/condition_test.routing.yml b/core/modules/system/tests/modules/condition_test/condition_test.routing.yml index d2425116774..bf497e0cf69 100644 --- a/core/modules/system/tests/modules/condition_test/condition_test.routing.yml +++ b/core/modules/system/tests/modules/condition_test/condition_test.routing.yml @@ -1,4 +1,4 @@ -condition_test_1: +condition_test.1: pattern: '/condition_test' defaults: _form: '\Drupal\condition_test\FormController' 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 334ea31fb70..24079c4fd35 100644 --- a/core/modules/system/tests/modules/design_test/design_test.module +++ b/core/modules/system/tests/modules/design_test/design_test.module @@ -68,7 +68,7 @@ function design_test_menu() { $items['design_test'] = array( 'title' => 'Design test', - 'route_name' => 'design_test', + 'route_name' => 'design.test', ); $items['design_test/list'] = array( @@ -80,7 +80,7 @@ function design_test_menu() { foreach ($categories as $category) { $items["design_test/{$category}"] = array( 'title' => drupal_ucfirst($category), - 'route_name' => 'design_test', + 'route_name' => 'design.test', 'type' => MENU_LOCAL_TASK | MENU_VISIBLE_IN_TREE, ); } diff --git a/core/modules/system/tests/modules/design_test/design_test.routing.yml b/core/modules/system/tests/modules/design_test/design_test.routing.yml index 1262be42add..3b1c73e16ff 100644 --- a/core/modules/system/tests/modules/design_test/design_test.routing.yml +++ b/core/modules/system/tests/modules/design_test/design_test.routing.yml @@ -1,4 +1,4 @@ -design_test: +design.test: pattern: '/design_test/{category}' defaults: _content: '\Drupal\design_test\Controller\DesignTestController::categoryPage' diff --git a/core/modules/system/tests/modules/entity_test/entity_test.routing.yml b/core/modules/system/tests/modules/entity_test/entity_test.routing.yml index 645fae15e51..4553e61020d 100644 --- a/core/modules/system/tests/modules/entity_test/entity_test.routing.yml +++ b/core/modules/system/tests/modules/entity_test/entity_test.routing.yml @@ -1,11 +1,11 @@ -entity_test_render: +entity_test.render: pattern: '/entity-test-render/{entity_test_render}' defaults: _entity_view: 'entity_test_render.full' requirements: _access: 'TRUE' -entity_test_render_options: +entity_test.render_options: pattern: '/entity-test-render-converter/{foo}' options: parameters: @@ -16,7 +16,7 @@ entity_test_render_options: requirements: _access: 'TRUE' -entity_test_render_no_view_mode: +entity_test.render_no_view_mode: pattern: '/entity-test-render-no-view-mode/{entity_test_render}' defaults: _entity_view: 'entity_test_render' diff --git a/core/modules/system/tests/modules/error_test/error_test.routing.yml b/core/modules/system/tests/modules/error_test/error_test.routing.yml index 37663213fa2..4c9ecdc7597 100644 --- a/core/modules/system/tests/modules/error_test/error_test.routing.yml +++ b/core/modules/system/tests/modules/error_test/error_test.routing.yml @@ -1,11 +1,11 @@ -error_test_generate_warnings: +error_test.generate_warnings: pattern: '/error-test/generate-warnings' defaults: _content: '\Drupal\error_test\Controller\ErrorTestController::generateWarnings' requirements: _access: 'TRUE' -error_test_generate_warnings_with_report: +error_test.generate_warnings_with_report: pattern: '/error-test/generate-warnings-with-report' defaults: _content: '\Drupal\error_test\Controller\ErrorTestController::generateWarnings' @@ -13,14 +13,14 @@ error_test_generate_warnings_with_report: requirements: _access: 'TRUE' -error_test_trigger_exception: +error_test.trigger_exception: pattern: '/error-test/trigger-exception' defaults: _content: '\Drupal\error_test\Controller\ErrorTestController::triggerException' requirements: _access: 'TRUE' -error_test_trigger_pdo_exception: +error_test.trigger_pdo_exception: pattern: '/error-test/trigger-pdo-exception' defaults: _content: '\Drupal\error_test\Controller\ErrorTestController::triggerPDOException' diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormArrayPathTestForm.php b/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormArrayPathTestForm.php index 3a3e02c7b98..7c28d98e38d 100644 --- a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormArrayPathTestForm.php +++ b/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormArrayPathTestForm.php @@ -24,7 +24,7 @@ class ConfirmFormArrayPathTestForm extends ConfirmFormTestForm { */ public function getCancelRoute() { return array( - 'route_name' => 'system_admin', + 'route_name' => 'system.admin', 'options' => array( 'query' => array( 'destination' => 'admin/config', diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormTestForm.php b/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormTestForm.php index e7f40fd749a..b278d22b3ff 100644 --- a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormTestForm.php +++ b/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormTestForm.php @@ -33,7 +33,7 @@ class ConfirmFormTestForm extends ConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'system_admin', + 'route_name' => 'system.admin', ); } diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalAction/MenuTestLocalAction.php b/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalAction/MenuTestLocalAction.php index d09a8fbf716..fb33b7e3af1 100644 --- a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalAction/MenuTestLocalAction.php +++ b/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalAction/MenuTestLocalAction.php @@ -14,9 +14,9 @@ use Drupal\Core\Annotation\Menu\LocalAction; /** * @LocalAction( * id = "menu_test_local_action3", - * route_name = "menu_test_local_action3", + * route_name = "menu_test.local_action3", * title = @Translation("My routing action"), - * appears_on = {"menu_test_local_action1"} + * appears_on = {"menu_test.local_action1"} * ) */ class MenuTestLocalAction extends LocalActionBase { diff --git a/core/modules/system/tests/modules/menu_test/menu_test.local_actions.yml b/core/modules/system/tests/modules/menu_test/menu_test.local_actions.yml index 04e9b0aa327..4f5bf55f6c6 100644 --- a/core/modules/system/tests/modules/menu_test/menu_test.local_actions.yml +++ b/core/modules/system/tests/modules/menu_test/menu_test.local_actions.yml @@ -1,5 +1,5 @@ menu_test_local_action4: - route_name: menu_test_local_action3 - title: 'My YAML discovery action' - appears_on: - - menu_test_local_action1 + route_name: menu_test.local_action3 + title: 'My YAML discovery action' + appears_on: + - menu_test.local_action1 diff --git a/core/modules/system/tests/modules/menu_test/menu_test.local_tasks.yml b/core/modules/system/tests/modules/menu_test/menu_test.local_tasks.yml index e0e3bce0e00..08eeaf1bc13 100644 --- a/core/modules/system/tests/modules/menu_test/menu_test.local_tasks.yml +++ b/core/modules/system/tests/modules/menu_test/menu_test.local_tasks.yml @@ -1,29 +1,29 @@ menu_local_task_test_tasks_view: - route_name: menu_local_task_test_tasks_view + route_name: menu_test.local_task_test_tasks_view title: View tab_root_id: menu_local_task_test_tasks_view menu_local_task_test_tasks_edit: - route_name: menu_local_task_test_tasks_edit + route_name: menu_test.local_task_test_tasks_edit title: Edit tab_root_id: menu_local_task_test_tasks_view menu_local_task_test_tasks_settings: - route_name: menu_local_task_test_tasks_settings + route_name: menu_test.local_task_test_tasks_settings title: Settings tab_root_id: menu_local_task_test_tasks_view menu_local_task_test_tasks_settings_sub1: - route_name: menu_local_task_test_tasks_settings_sub1 + route_name: menu_test.local_task_test_tasks_settings_sub1 title: sub1 tab_root_id: menu_local_task_test_tasks_view tab_parent_id: menu_local_task_test_tasks_settings class: Drupal\menu_test\Plugin\Menu\LocalTask\TestTasksSettingsSub1 weight: -10 menu_local_task_test_tasks_settings_sub2: - route_name: menu_local_task_test_tasks_settings_sub2 + route_name: menu_test.local_task_test_tasks_settings_sub2 title: sub2 tab_root_id: menu_local_task_test_tasks_view tab_parent_id: menu_local_task_test_tasks_settings menu_local_task_test_tasks_settings_sub3: - route_name: menu_local_task_test_tasks_settings_sub3 + route_name: menu_test.local_task_test_tasks_settings_sub3 title: sub3 tab_root_id: menu_local_task_test_tasks_view tab_parent_id: menu_local_task_test_tasks_settings 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 5315f0060fa..36eef0023dc 100644 --- a/core/modules/system/tests/modules/menu_test/menu_test.module +++ b/core/modules/system/tests/modules/menu_test/menu_test.module @@ -29,7 +29,7 @@ function menu_test_menu() { $items['menu_callback_description'] = array( 'title' => 'Menu item title', 'description' => 'Menu item description parent', - 'route_name' => 'menu_callback_description', + 'route_name' => 'menu_test.callback_description', ); // This item tests the description key. $items['menu_callback_description/description-plain'] = array( @@ -377,7 +377,7 @@ function menu_test_menu() { // Parent page for controller-based local tasks. $items['foo/%'] = array( 'title' => 'Controller-based local tasks', - 'route_name' => 'menu_router_test1', + 'route_name' => 'menu_test.router_test1', ); // Controller-based local task. $items['foo/%/a'] = array( @@ -387,23 +387,23 @@ function menu_test_menu() { // Controller-based local task. $items['foo/%/b'] = array( 'title' => 'Local task B', - 'route_name' => 'menu_router_test2', + 'route_name' => 'menu_test.router_test2', 'type' => MENU_LOCAL_TASK, ); $items['foo/%/c'] = array( 'title' => 'Local task C', - 'route_name' => 'menu_router_test3', + 'route_name' => 'menu_test.router_test3', 'type' => MENU_LOCAL_TASK, ); $items['menu-test-local-action'] = array( 'title' => 'Local action parent', - 'route_name' => 'menu_test_local_action1', + 'route_name' => 'menu_test.local_action1', ); $items['menu-test-local-action/hook_menu'] = array( 'title' => 'My hook_menu action', - 'route_name' => 'menu_test_local_action2', + 'route_name' => 'menu_test.local_action2', 'weight' => -10, 'type' => MENU_LOCAL_ACTION, ); @@ -412,18 +412,18 @@ function menu_test_menu() { 'title' => 'My dynamic title action', 'title callback' => 'menu_test_local_action_dynamic_title', 'title arguments' => array(1), - 'route_name' => 'menu_test_local_action4', + 'route_name' => 'menu_test.local_action4', 'weight' => -10, 'type' => MENU_LOCAL_ACTION, ); $items['menu-local-task-test/tasks'] = array( 'title' => 'Local tasks', - 'route_name' => 'menu_local_task_test_tasks', + 'route_name' => 'menu_test.local_task_test_tasks', ); $items['menu-test/optional'] = array( 'title' => 'Test optional placeholder', - 'route_name' => 'menu_test_optional_placeholder', + 'route_name' => 'menu_test.optional_placeholder', 'type' => MENU_LOCAL_TASK, ); 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 99cb83d917c..0168e3d9544 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,121 +1,123 @@ -menu_login_callback: +menu_test.login_callback: pattern: '/menu_login_callback' defaults: _content: '\Drupal\menu_test\TestControllers::testLogin' requirements: _access: 'TRUE' -menu_callback_description: +menu_test.callback_description: pattern: 'menu_callback_description' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access content' -menu_router_test1: +menu_test.router_test1: pattern: '/foo/{bar}' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' -menu_router_test2: + +menu_test.router_test2: pattern: '/foo/{bar}/b' defaults: _content: '\Drupal\menu_test\TestControllers::test2' requirements: _access: 'TRUE' -menu_router_test3: + +menu_test.router_test3: pattern: '/foo/{bar}/c' defaults: _content: '\Drupal\menu_test\TestControllers::test2' requirements: _access: 'FALSE' -menu_test_local_action1: +menu_test.local_action1: pattern: '/menu-test-local-action' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' -menu_test_local_action2: +menu_test.local_action2: pattern: '/menu-test-local-action/hook_menu' defaults: _content: '\Drupal\menu_test\TestControllers::test2' requirements: _access: 'TRUE' -menu_test_local_action3: +menu_test.local_action3: pattern: '/menu-test-local-action/routing' defaults: _content: '\Drupal\menu_test\TestControllers::test2' requirements: _access: 'TRUE' -menu_test_local_action4: +menu_test.local_action4: pattern: '/menu-test-local-action/dynamic-title' defaults: _content: '\Drupal\menu_test\TestControllers::test2' requirements: _access: 'TRUE' -menu_local_task_test_tasks: +menu_test.local_task_test_tasks: pattern: '/menu-local-task-test/tasks' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' -menu_local_task_test_tasks_tasks: +menu_test.local_task_test_tasks_tasks: pattern: '/menu-local-task-test/tasks/tasks' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' -menu_local_task_test_tasks_view: +menu_test.local_task_test_tasks_view: pattern: '/menu-local-task-test/tasks/view' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' -menu_local_task_test_tasks_edit: +menu_test.local_task_test_tasks_edit: pattern: '/menu-local-task-test/tasks/edit' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' -menu_local_task_test_tasks_settings: +menu_test.local_task_test_tasks_settings: pattern: '/menu-local-task-test/tasks/settings' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' -menu_local_task_test_tasks_settings_sub1: +menu_test.local_task_test_tasks_settings_sub1: pattern: '/menu-local-task-test/tasks/settings/sub1' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' -menu_local_task_test_tasks_settings_sub2: +menu_test.local_task_test_tasks_settings_sub2: pattern: '/menu-local-task-test/tasks/settings/sub2' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' -menu_local_task_test_tasks_settings_sub3: +menu_test.local_task_test_tasks_settings_sub3: pattern: '/menu-local-task-test/tasks/settings/sub3' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' -menu_test_optional_placeholder: +menu_test.optional_placeholder: pattern: '/menu-test/optional/{placeholder}' defaults: _content: '\Drupal\menu_test\TestControllers::testDefaults' diff --git a/core/modules/system/tests/modules/paramconverter_test/paramconverter_test.routing.yml b/core/modules/system/tests/modules/paramconverter_test/paramconverter_test.routing.yml index 10efb113753..31078f65151 100644 --- a/core/modules/system/tests/modules/paramconverter_test/paramconverter_test.routing.yml +++ b/core/modules/system/tests/modules/paramconverter_test/paramconverter_test.routing.yml @@ -1,11 +1,11 @@ -paramconverter_test_user_node_foo: +paramconverter_test.user_node_foo: pattern: '/paramconverter_test/test_user_node_foo/{user}/{node}/{foo}' defaults: _content: '\Drupal\paramconverter_test\TestControllers::testUserNodeFoo' requirements: _access: 'TRUE' -paramconverter_test_node_user_user: +paramconverter_test.node_user_user: pattern: '/paramconverter_test/test_node_user_user/{node}/{foo}/{user}' defaults: _content: '\Drupal\paramconverter_test\TestControllers::testUserNodeFoo' @@ -16,7 +16,7 @@ paramconverter_test_node_user_user: foo: type: 'entity:user' -paramconverter_test_node_node_foo: +paramconverter_test.node_node_foo: pattern: '/paramconverter_test/test_node_node_foo/{user}/{node}/{foo}' defaults: _content: '\Drupal\paramconverter_test\TestControllers::testUserNodeFoo' @@ -27,7 +27,7 @@ paramconverter_test_node_node_foo: user: type: 'entity:node' -paramconverter_test_node_set_parent: +paramconverter_test.node_set_parent: pattern: '/paramconverter_test/node/{node}/set/parent/{parent}' requirements: _access: 'TRUE' diff --git a/core/modules/system/tests/modules/plugin_test/plugin_test.module b/core/modules/system/tests/modules/plugin_test/plugin_test.module index 036cd97e10e..6a33894d5a0 100644 --- a/core/modules/system/tests/modules/plugin_test/plugin_test.module +++ b/core/modules/system/tests/modules/plugin_test/plugin_test.module @@ -21,7 +21,7 @@ function plugin_test_plugin_test_alter(&$definitions) { function plugin_test_menu() { $items = array(); $items['plugin_definition_test'] = array( - 'route_name' => 'plugin_test_definitions', + 'route_name' => 'plugin_test.definition', ); return $items; } diff --git a/core/modules/system/tests/modules/plugin_test/plugin_test.routing.yml b/core/modules/system/tests/modules/plugin_test/plugin_test.routing.yml index 16f05a9d0cc..86398b5f32b 100644 --- a/core/modules/system/tests/modules/plugin_test/plugin_test.routing.yml +++ b/core/modules/system/tests/modules/plugin_test/plugin_test.routing.yml @@ -1,4 +1,4 @@ -plugin_definition_test: +plugin_test.definition: pattern: '/plugin_definition_test' defaults: _content: '\Drupal\plugin_test\Controller\PluginTest::testDefinitions' diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouteTestSubscriber.php b/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouteTestSubscriber.php index 4243f81beaf..cc63d39d6ef 100644 --- a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouteTestSubscriber.php +++ b/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouteTestSubscriber.php @@ -38,7 +38,7 @@ class RouteTestSubscriber implements EventSubscriberInterface { ), array( '_access' => 'TRUE' )); - $collection->add('router_test_5', $route); + $collection->add('router_test.5', $route); } /** @@ -53,7 +53,7 @@ class RouteTestSubscriber implements EventSubscriberInterface { public function alterRoutes(RouteBuildEvent $event) { if ($event->getModule() == 'router_test') { $collection = $event->getRouteCollection(); - $route = $collection->get('router_test_6'); + $route = $collection->get('router_test.6'); // Change controller method from test1 to test5. $route->setDefault('_controller', '\Drupal\router_test\TestControllers::test5'); } diff --git a/core/modules/system/tests/modules/router_test/router_test.routing.yml b/core/modules/system/tests/modules/router_test/router_test.routing.yml index dc6c5a7aa02..a6f55a70384 100644 --- a/core/modules/system/tests/modules/router_test/router_test.routing.yml +++ b/core/modules/system/tests/modules/router_test/router_test.routing.yml @@ -1,25 +1,25 @@ -router_test_1: +router_test.1: pattern: '/router_test/test1' defaults: _controller: '\Drupal\router_test\TestControllers::test1' requirements: _access: 'TRUE' -router_test_2: +router_test.2: pattern: '/router_test/test2' defaults: _content: '\Drupal\router_test\TestControllers::test2' requirements: _access: 'TRUE' -router_test_3: +router_test.3: pattern: '/router_test/test3/{value}' defaults: _content: '\Drupal\router_test\TestControllers::test3' requirements: _access: 'TRUE' -router_test_4: +router_test.4: pattern: '/router_test/test4/{value}' defaults: _content: '\Drupal\router_test\TestControllers::test4' @@ -27,26 +27,26 @@ router_test_4: requirements: _access: 'TRUE' -router_test_6: +router_test.6: pattern: '/router_test/test6' defaults: _controller: '\Drupal\router_test\TestControllers::test1' requirements: _access: 'TRUE' -router_test_7: +router_test.7: pattern: '/router_test/test7' defaults: _controller: '\Drupal\router_test\TestControllers::test7' requirements: _permission: 'access test7' -router_test_8: +router_test.8: pattern: '/router_test/test8' defaults: _controller: '\Drupal\router_test\TestControllers::test8' -router_test_9: +router_test.9: pattern: '/router_test/test9' defaults: _controller: '\Drupal\router_test\TestControllers::test8' @@ -54,14 +54,14 @@ router_test_9: _permission: 'access test7' _access_router_test: 'TRUE' -router_test_10: +router_test.10: pattern: '/router_test/test10' defaults: _content: '\Drupal\router_test\TestContent::test1' requirements: _access: 'TRUE' -router_test_11: +router_test.11: pattern: '/router_test/test11' options: _auth: [ 'http_basic' ] @@ -70,14 +70,14 @@ router_test_11: defaults: _content: '\Drupal\router_test\TestContent::test11' -router_test_12: +router_test.12: pattern: '/router_test/test12/{user}' requirements: _access: 'TRUE' defaults: _content: '\Drupal\router_test\TestContent::subrequestTest' -router_test_13: +router_test.13: pattern: '/router_test/test13/{user}' requirements: _access: 'TRUE' diff --git a/core/modules/system/tests/modules/session_test/session_test.routing.yml b/core/modules/system/tests/modules/session_test/session_test.routing.yml index d9177b4478f..9f190025627 100644 --- a/core/modules/system/tests/modules/session_test/session_test.routing.yml +++ b/core/modules/system/tests/modules/session_test/session_test.routing.yml @@ -1,4 +1,4 @@ -session_test_get: +session_test.get: pattern: '/session-test/get' defaults: _title: 'Session value' @@ -6,7 +6,7 @@ session_test_get: requirements: _permission: 'access content' -session_test_id: +session_test.id: pattern: '/session-test/id' defaults: _title: 'Session ID' @@ -14,7 +14,7 @@ session_test_id: requirements: _permission: 'access content' -session_test_id_from_cookie: +session_test.id_from_cookie: pattern: '/session-test/id-from-cookie' defaults: _title: 'Session ID from cookie' @@ -22,7 +22,7 @@ session_test_id_from_cookie: requirements: _permission: 'access content' -session_test_set: +session_test.set: pattern: '/session-test/set/{test_value}' defaults: _title: 'Set session value' @@ -33,7 +33,7 @@ session_test_set: requirements: _permission: 'access content' -session_test_no_set: +session_test.no_set: pattern: '/session-test/no-set/{test_value}' defaults: _title: 'Set session value but do not save session' @@ -44,7 +44,7 @@ session_test_no_set: requirements: _permission: 'access content' -session_test_set_message: +session_test.set_message: pattern: '/session-test/set-message' defaults: _title: 'Set message' @@ -52,7 +52,7 @@ session_test_set_message: requirements: _permission: 'access content' -session_test_set_message_but_dont_save: +session_test.set_message_but_dont_save: pattern: '/session-test/set-message-but-dont-save' defaults: _title: 'Set message but do not save session' @@ -60,7 +60,7 @@ session_test_set_message_but_dont_save: requirements: _permission: 'access content' -session_test_set_not_started: +session_test.set_not_started: pattern: '/session-test/set-not-started' defaults: _title: 'Set message when session is not started' @@ -68,7 +68,7 @@ session_test_set_not_started: requirements: _permission: 'access content' -session_test_is_logged_in: +session_test.is_logged_in: pattern: '/session-test/is-logged-in' defaults: _title: 'Check if user is logged in' diff --git a/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml b/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml index 3a0338920fb..e0ff3749470 100644 --- a/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml +++ b/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml @@ -1,11 +1,11 @@ -test_page_render_title: +test_page_test.render_title: pattern: "/test-render-title" defaults: _content: 'Drupal\test_page_test\Controller\Test::renderTitle' requirements: _access: 'TRUE' -test_page_static_title: +test_page_test.static_title: pattern: "/test-page-static-title" defaults: _content: 'Drupal\test_page_test\Controller\Test::staticTitle' @@ -13,17 +13,16 @@ test_page_static_title: requirements: _access: 'TRUE' -admin_test_page_render_title: +test_page_test.admin_render_title: pattern: "/admin/test-render-title" defaults: _content: 'Drupal\test_page_test\Controller\Test::renderTitle' requirements: _access: 'TRUE' -test_page_render_title_controller: +test_page_test.render_title_controller: pattern: "/test-render-title-controller" defaults: _controller: 'Drupal\test_page_test\Controller\Test::renderTitle' requirements: _access: 'TRUE' - diff --git a/core/modules/system/tests/modules/theme_test/theme_test.module b/core/modules/system/tests/modules/theme_test/theme_test.module index 42555e43606..08e9c012869 100644 --- a/core/modules/system/tests/modules/theme_test/theme_test.module +++ b/core/modules/system/tests/modules/theme_test/theme_test.module @@ -46,18 +46,18 @@ function theme_test_system_theme_info() { */ function theme_test_menu() { $items['theme-test/suggestion'] = array( - 'route_name' => 'theme_test_suggestion', + 'route_name' => 'theme_test.suggestion', 'theme callback' => '_theme_custom_theme', 'type' => MENU_CALLBACK, ); $items['theme-test/alter'] = array( 'theme callback' => '_theme_custom_theme', - 'route_name' => 'theme_test_alter', + 'route_name' => 'theme_test.alter', 'type' => MENU_CALLBACK, ); $items['theme-test/function-template-overridden'] = array( 'theme callback' => '_theme_custom_theme', - 'route_name' => 'function_template_override', + 'route_name' => 'theme_test.function_template_override', ); return $items; } diff --git a/core/modules/system/tests/modules/theme_test/theme_test.routing.yml b/core/modules/system/tests/modules/theme_test/theme_test.routing.yml index 35a0ff10889..eebff8320d4 100644 --- a/core/modules/system/tests/modules/theme_test/theme_test.routing.yml +++ b/core/modules/system/tests/modules/theme_test/theme_test.routing.yml @@ -1,25 +1,25 @@ -function_template_override: +theme_test.function_template_override: pattern: '/theme-test/function-template-overridden' defaults: _content: '\Drupal\theme_test\ThemeTestController::functionTemplateOverridden' requirements: _permission: 'access content' -theme_test_info_stylesheets: +theme_test.info_stylesheets: pattern: '/theme-test/info/stylesheets' defaults: _content: '\Drupal\theme_test\ThemeTestController::testInfoStylesheets' requirements: _access: 'TRUE' -theme_test_template_test: +theme_test.template_test: pattern: '/theme-test/template-test' defaults: _content: '\Drupal\theme_test\ThemeTestController::testTemplate' requirements: _access: 'TRUE' -theme_test_suggestion: +theme_test.suggestion: pattern: '/theme-test/suggestion' defaults: _content: '\Drupal\theme_test\ThemeTestController::testSuggestion' @@ -27,7 +27,7 @@ theme_test_suggestion: requirements: _access: 'TRUE' -theme_test_alter: +theme_test.alter: pattern: '/theme-test/alter' defaults: _content: '\Drupal\theme_test\ThemeTestController::testAlter' @@ -35,7 +35,7 @@ theme_test_alter: requirements: _access: 'TRUE' -theme_test_request_listener: +theme_test.request_listener: pattern: '/theme-test/request-listener' defaults: _content: '\Drupal\theme_test\ThemeTestController::testRequestListener' diff --git a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml index 17ac5b06f9b..60312bac6a0 100644 --- a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml +++ b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml @@ -1,10 +1,11 @@ -twig_theme_test_php_variables: +twig_theme_test.php_variables: pattern: '/twig-theme-test/php-variables' defaults: _content: '\Drupal\twig_theme_test\TwigThemeTestController::phpVariablesRender' requirements: _permission: 'access content' -twig_theme_test_trans: + +twig_theme_test.trans: pattern: '/twig-theme-test/trans' defaults: _content: '\Drupal\twig_theme_test\TwigThemeTestController::transBlockRender' diff --git a/core/modules/system/tests/modules/url_alter_test/url_alter_test.routing.yml b/core/modules/system/tests/modules/url_alter_test/url_alter_test.routing.yml index da07ab8ae24..810ae236153 100644 --- a/core/modules/system/tests/modules/url_alter_test/url_alter_test.routing.yml +++ b/core/modules/system/tests/modules/url_alter_test/url_alter_test.routing.yml @@ -1,4 +1,4 @@ -url_alter_test_foo: +url_alter_test.foo: pattern: 'url-alter-test/foo' defaults: _content: '\Drupal\url_alter_test\Controller\URLAlterTestController::foo' diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php index b3a7c9f8e4a..c8a12379aac 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php @@ -62,7 +62,7 @@ class TermDeleteForm extends EntityNGConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'taxonomy_vocabulary_list', + 'route_name' => 'taxonomy.vocabulary_list', ); } diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyDeleteForm.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyDeleteForm.php index b598358d071..2546d72ea87 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyDeleteForm.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyDeleteForm.php @@ -34,7 +34,7 @@ class VocabularyDeleteForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'taxonomy_vocabulary_list', + 'route_name' => 'taxonomy.vocabulary_list', ); } diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php index a44aeab21b5..dda83d037b4 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php @@ -58,7 +58,7 @@ class VocabularyResetForm extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'taxonomy_overview_terms', + 'route_name' => 'taxonomy.overview_terms', 'route_parameters' => array( 'taxonomy_vocabulary' => $this->entity->id(), ), diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php index 21a3a2c76a1..eecbc5f958b 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php @@ -23,7 +23,7 @@ use Drupal\field\Plugin\Type\Widget\WidgetBase; * }, * settings = { * "size" = "60", - * "autocomplete_route_name" = "taxonomy_autocomplete", + * "autocomplete_route_name" = "taxonomy.autocomplete", * "placeholder" = "" * }, * multiple_values = TRUE diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php index 72a66c7577c..486ae5fa282 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php @@ -127,7 +127,7 @@ class TaxonomyIndexTid extends ManyToOne { ); if ($this->options['limit']) { - $form['value']['#autocomplete_route_name'] = 'taxonomy_autocomplete_vid'; + $form['value']['#autocomplete_route_name'] = 'taxonomy.autocomplete_vid'; $form['value']['#autocomplete_route_parameters'] = array('taxonomy_vocabulary' => $vocabulary->id()); } } diff --git a/core/modules/taxonomy/taxonomy.local_actions.yml b/core/modules/taxonomy/taxonomy.local_actions.yml index a04a0ba3a09..4e865396b2f 100644 --- a/core/modules/taxonomy/taxonomy.local_actions.yml +++ b/core/modules/taxonomy/taxonomy.local_actions.yml @@ -1,5 +1,5 @@ taxonomy_add_vocabulary_local_action: - route_name: taxonomy_vocabulary_add + route_name: taxonomy.vocabulary_add title: 'Add vocabulary' appears_on: - - taxonomy_vocabulary_list + - taxonomy.vocabulary_list diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index 0827befae3b..e14ed580ff8 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -235,14 +235,14 @@ function taxonomy_menu() { $items['admin/structure/taxonomy'] = array( 'title' => 'Taxonomy', 'description' => 'Manage tagging, categorization, and classification of your content.', - 'route_name' => 'taxonomy_vocabulary_list', + 'route_name' => 'taxonomy.vocabulary_list', ); $items['admin/structure/taxonomy/list'] = array( 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['admin/structure/taxonomy/add'] = array( - 'route_name' => 'taxonomy_vocabulary_add', + 'route_name' => 'taxonomy.vocabulary_add', 'type' => MENU_SIBLING_LOCAL_TASK, ); @@ -264,7 +264,7 @@ function taxonomy_menu() { 'title' => 'Edit', 'title callback' => 'entity_page_label', 'title arguments' => array(2), - 'route_name' => 'taxonomy_term_edit', + 'route_name' => 'taxonomy.term_edit', 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE, 'weight' => 10, @@ -274,7 +274,7 @@ function taxonomy_menu() { 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_INLINE, 'weight' => 20, - 'route_name' => 'taxonomy_term_delete', + 'route_name' => 'taxonomy.term_delete', ); $items['taxonomy/term/%taxonomy_term/feed'] = array( 'title' => 'Taxonomy term', @@ -289,7 +289,7 @@ function taxonomy_menu() { ); $items['admin/structure/taxonomy/manage/%taxonomy_vocabulary'] = array( - 'route_name' => 'taxonomy_overview_terms', + 'route_name' => 'taxonomy.overview_terms', 'title callback' => 'entity_page_label', 'title arguments' => array(4), ); @@ -299,7 +299,7 @@ function taxonomy_menu() { ); $items['admin/structure/taxonomy/manage/%taxonomy_vocabulary/edit'] = array( 'title' => 'Edit', - 'route_name' => 'taxonomy_vocabulary_edit', + 'route_name' => 'taxonomy.vocabulary_edit', 'type' => MENU_LOCAL_TASK, ); $items['admin/structure/taxonomy/%taxonomy_vocabulary/delete'] = array( @@ -307,12 +307,12 @@ function taxonomy_menu() { 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_INLINE, 'weight' => 20, - 'route_name' => 'taxonomy_vocabulary_delete', + 'route_name' => 'taxonomy.vocabulary_delete', ); $items['admin/structure/taxonomy/manage/%taxonomy_vocabulary/add'] = array( 'title' => 'Add term', - 'route_name' => 'taxonomy_term_add', + 'route_name' => 'taxonomy.term_add', 'type' => MENU_LOCAL_ACTION, ); diff --git a/core/modules/taxonomy/taxonomy.routing.yml b/core/modules/taxonomy/taxonomy.routing.yml index cb8f46fc2e8..053f4ba1fc3 100644 --- a/core/modules/taxonomy/taxonomy.routing.yml +++ b/core/modules/taxonomy/taxonomy.routing.yml @@ -1,74 +1,74 @@ -taxonomy_vocabulary_list: +taxonomy.vocabulary_list: pattern: '/admin/structure/taxonomy' defaults: _entity_list: 'taxonomy_vocabulary' requirements: _permission: 'administer taxonomy' -taxonomy_term_add: +taxonomy.term_add: pattern: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/add' defaults: _content: '\Drupal\taxonomy\Controller\TaxonomyController::addForm' requirements: _entity_create_access: 'taxonomy_term:{taxonomy_vocabulary}' -taxonomy_term_edit: +taxonomy.term_edit: pattern: '/taxonomy/term/{taxonomy_term}/edit' defaults: _entity_form: 'taxonomy_term.default' requirements: _entity_access: 'taxonomy_term.update' -taxonomy_term_delete: +taxonomy.term_delete: pattern: '/taxonomy/term/{taxonomy_term}/delete' defaults: _entity_form: 'taxonomy_term.delete' requirements: _entity_access: 'taxonomy_term.delete' -taxonomy_vocabulary_add: +taxonomy.vocabulary_add: pattern: '/admin/structure/taxonomy/add' defaults: _entity_form: 'taxonomy_vocabulary' requirements: _entity_create_access: 'taxonomy_vocabulary' -taxonomy_vocabulary_edit: +taxonomy.vocabulary_edit: pattern: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/edit' defaults: _entity_form: 'taxonomy_vocabulary.default' requirements: _entity_access: 'taxonomy_vocabulary.update' -taxonomy_vocabulary_delete: +taxonomy.vocabulary_delete: pattern: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/delete' defaults: _entity_form: 'taxonomy_vocabulary.delete' requirements: _entity_access: 'taxonomy_vocabulary.delete' -taxonomy_vocabulary_reset: +taxonomy.vocabulary_reset: pattern: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/reset' defaults: _entity_form: 'taxonomy_vocabulary.reset' requirements: _permission: 'administer taxonomy' -taxonomy_autocomplete: +taxonomy.autocomplete: pattern: '/taxonomy/autocomplete/{entity_type}/{field_name}' defaults: _controller: '\Drupal\taxonomy\Controller\TermAutocompleteController::autocomplete' requirements: _permission: 'access content' -taxonomy_autocomplete_vid: +taxonomy.autocomplete_vid: pattern: '/taxonomy/autocomplete_vid/{taxonomy_vocabulary}' defaults: _controller: '\Drupal\taxonomy\Controller\TermAutocompleteController::autocompletePerVid' requirements: _permission: 'access content' -taxonomy_overview_terms: +taxonomy.overview_terms: pattern: 'admin/structure/taxonomy/manage/{taxonomy_vocabulary}' defaults: _form: 'Drupal\taxonomy\Form\OverviewTerms' diff --git a/core/modules/toolbar/toolbar.routing.yml b/core/modules/toolbar/toolbar.routing.yml index 448ea99a4d5..aa776c8fdd7 100644 --- a/core/modules/toolbar/toolbar.routing.yml +++ b/core/modules/toolbar/toolbar.routing.yml @@ -1,4 +1,4 @@ -toolbar_subtrees: +toolbar.subtrees: pattern: '/toolbar/subtrees/{hash}' defaults: _controller: '\Drupal\toolbar\Routing\ToolbarController::subtreesJsonp' diff --git a/core/modules/tour/tests/tour_test/tour_test.local_actions.yml b/core/modules/tour/tests/tour_test/tour_test.local_actions.yml index b39fb2ab381..db52cb58061 100644 --- a/core/modules/tour/tests/tour_test/tour_test.local_actions.yml +++ b/core/modules/tour/tests/tour_test/tour_test.local_actions.yml @@ -1,5 +1,5 @@ tour_test_action: - route_name: tour_test_1_action + route_name: tour_test.1_action title: 'Tour test action' appears_on: - - tour_test_1 + - tour_test.1 diff --git a/core/modules/tour/tests/tour_test/tour_test.module b/core/modules/tour/tests/tour_test/tour_test.module index c6a6a6704ae..0df3e57d5d1 100644 --- a/core/modules/tour/tests/tour_test/tour_test.module +++ b/core/modules/tour/tests/tour_test/tour_test.module @@ -22,11 +22,11 @@ function tour_test_admin_paths() { */ function tour_test_menu() { $items['tour-test-1'] = array( - 'route_name' => 'tour_test_1', + 'route_name' => 'tour_test.1', 'title' => 'Tour test 1' ); $items['tour-test-2/subpath'] = array( - 'route_name' => 'tour_test_2', + 'route_name' => 'tour_test.2', 'title' => 'Tour test 2' ); return $items; diff --git a/core/modules/tour/tests/tour_test/tour_test.routing.yml b/core/modules/tour/tests/tour_test/tour_test.routing.yml index e1a68b6bf53..58394ad8853 100644 --- a/core/modules/tour/tests/tour_test/tour_test.routing.yml +++ b/core/modules/tour/tests/tour_test/tour_test.routing.yml @@ -1,18 +1,18 @@ -tour_test_1: +tour_test.1: pattern : 'tour-test-1' defaults: _content: '\Drupal\tour_test\Controller\TourTestController::tourTest1' requirements: _access: 'TRUE' -tour_test_1_action: +tour_test.1_action: pattern : 'tour-test-1/action' defaults: _content: '\Drupal\tour_test\Controller\TourTestController::tourTest1' requirements: _access: 'TRUE' -tour_test_2: +tour_test.2: pattern : 'tour-test-2/subpath' defaults: _content: '\Drupal\tour_test\Controller\TourTestController::tourTest2' diff --git a/core/modules/update/tests/modules/update_test/update_test.routing.yml b/core/modules/update/tests/modules/update_test/update_test.routing.yml index b60d14361df..6e40c942991 100644 --- a/core/modules/update/tests/modules/update_test/update_test.routing.yml +++ b/core/modules/update/tests/modules/update_test/update_test.routing.yml @@ -1,4 +1,4 @@ -update_test_503: +update_test.503: pattern: '/503-error' defaults: _controller: 'Drupal\update_test\Controller\UpdateTestController::updateError' diff --git a/core/modules/update/update.module b/core/modules/update/update.module index 0ab4d9d665a..295476d4c53 100644 --- a/core/modules/update/update.module +++ b/core/modules/update/update.module @@ -158,7 +158,7 @@ function update_menu() { $items['admin/reports/updates'] = array( 'title' => 'Available updates', 'description' => 'Get a status report about available updates for your installed modules and themes.', - 'route_name' => 'update_status', + 'route_name' => 'update.status', 'weight' => -50, ); $items['admin/reports/updates/list'] = array( @@ -168,7 +168,7 @@ function update_menu() { ); $items['admin/reports/updates/settings'] = array( 'title' => 'Settings', - 'route_name' => 'update_settings', + 'route_name' => 'update.settings', 'access arguments' => array('administer site configuration'), 'type' => MENU_LOCAL_TASK, 'weight' => 50, diff --git a/core/modules/update/update.routing.yml b/core/modules/update/update.routing.yml index 16ac4b4d805..4219734819d 100644 --- a/core/modules/update/update.routing.yml +++ b/core/modules/update/update.routing.yml @@ -1,11 +1,11 @@ -update_settings: +update.settings: pattern: '/admin/reports/updates/settings' defaults: _form: '\Drupal\update\UpdateSettingsForm' requirements: _permission: 'administer site configuration' -update_status: +update.status: pattern: '/admin/reports/updates' defaults: _content: '\Drupal\update\Controller\UpdateController::updateStatus' diff --git a/core/modules/user/lib/Drupal/user/Form/UserRoleDelete.php b/core/modules/user/lib/Drupal/user/Form/UserRoleDelete.php index 2e8f07ace5a..5aca6c72a80 100644 --- a/core/modules/user/lib/Drupal/user/Form/UserRoleDelete.php +++ b/core/modules/user/lib/Drupal/user/Form/UserRoleDelete.php @@ -26,7 +26,7 @@ class UserRoleDelete extends EntityConfirmFormBase { */ public function getCancelRoute() { return array( - 'route_name' => 'user_role_list', + 'route_name' => 'user.role_list', ); } diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php index 770079c2452..736bb525442 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php @@ -42,7 +42,7 @@ class Name extends InOperator { '#title' => t('Usernames'), '#description' => t('Enter a comma separated list of user names.'), '#default_value' => $default_value, - '#autocomplete_route_name' => 'user_autocomplete_anonymous', + '#autocomplete_route_name' => 'user.autocomplete_anonymous', ); if (!empty($form_state['exposed']) && !isset($form_state['input'][$this->options['expose']['identifier']])) { diff --git a/core/modules/user/tests/modules/user_form_test/user_form_test.module b/core/modules/user/tests/modules/user_form_test/user_form_test.module index fddedbf7342..134804f4594 100644 --- a/core/modules/user/tests/modules/user_form_test/user_form_test.module +++ b/core/modules/user/tests/modules/user_form_test/user_form_test.module @@ -14,7 +14,7 @@ function user_form_test_menu() { $items = array(); $items['user_form_test_current_password/%user'] = array( 'title' => 'User form test for current password validation', - 'route_name' => 'user_form_test_current_password', + 'route_name' => 'user_form_test.current_password', 'type' => MENU_SUGGESTED_ITEM, ); return $items; diff --git a/core/modules/user/tests/modules/user_form_test/user_form_test.routing.yml b/core/modules/user/tests/modules/user_form_test/user_form_test.routing.yml index 0d294e27609..8e651e02b17 100644 --- a/core/modules/user/tests/modules/user_form_test/user_form_test.routing.yml +++ b/core/modules/user/tests/modules/user_form_test/user_form_test.routing.yml @@ -1,4 +1,4 @@ -user_form_test_current_password: +user_form_test.current_password: pattern: '/user_form_test_current_password/{user}' defaults: _form: '\Drupal\user_form_test\Form\TestCurrentPassword' diff --git a/core/modules/user/user.module b/core/modules/user/user.module index fe32089bb31..7037793762a 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -734,7 +734,7 @@ function user_menu() { 'title' => 'User account', 'title callback' => 'user_menu_title', 'weight' => -10, - 'route_name' => 'user_page', + 'route_name' => 'user.page', 'menu_name' => 'account', ); @@ -751,12 +751,12 @@ function user_menu() { $items['user/register'] = array( 'title' => 'Create new account', 'type' => MENU_LOCAL_TASK, - 'route_name' => 'user_register', + 'route_name' => 'user.register', ); $items['user/password'] = array( 'title' => 'Request new password', - 'route_name' => 'user_pass', + 'route_name' => 'user.pass', 'type' => MENU_LOCAL_TASK, ); $items['user/reset/%/%/%'] = array( @@ -770,7 +770,7 @@ function user_menu() { $items['user/logout'] = array( 'title' => 'Log out', - 'route_name' => 'user_logout', + 'route_name' => 'user.logout', 'weight' => 10, 'menu_name' => 'account', ); @@ -789,24 +789,24 @@ function user_menu() { $items['admin/people/permissions'] = array( 'title' => 'Permissions', 'description' => 'Determine access to features by selecting permissions for roles.', - 'route_name' => 'user_admin_permissions', + 'route_name' => 'user.admin_permissions', 'type' => MENU_LOCAL_TASK, ); $items['admin/people/roles'] = array( 'title' => 'Roles', 'description' => 'List, edit, or add user roles.', - 'route_name' => 'user_role_list', + 'route_name' => 'user.role_list', 'type' => MENU_LOCAL_TASK, ); $items['admin/people/roles/add'] = array( 'title' => 'Add role', - 'route_name' => 'user_role_add', + 'route_name' => 'user.role_add', 'type' => MENU_LOCAL_ACTION, ); $items['admin/people/roles/manage/%user_role'] = array( 'title' => 'Edit role', - 'route_name' => 'user_role_edit', + 'route_name' => 'user.role_edit', ); $items['admin/people/roles/manage/%user_role/edit'] = array( 'title' => 'Edit', @@ -814,14 +814,14 @@ function user_menu() { ); $items['admin/people/roles/manage/%user_role/delete'] = array( 'title' => 'Delete role', - 'route_name' => 'user_role_delete', + 'route_name' => 'user.role_delete', 'weight' => 10, 'context' => MENU_CONTEXT_INLINE, ); $items['admin/people/create'] = array( 'title' => 'Add user', - 'route_name' => 'user_admin_create', + 'route_name' => 'user.admin_create', 'type' => MENU_LOCAL_ACTION, ); @@ -831,14 +831,14 @@ function user_menu() { 'description' => 'Configure user accounts.', 'position' => 'left', 'weight' => -20, - 'route_name' => 'user_admin_index', + 'route_name' => 'user.admin_index', ); $items['admin/config/people/accounts'] = array( 'title' => 'Account settings', 'description' => 'Configure default behavior of users, including registration requirements, e-mails, and fields.', 'weight' => -10, - 'route_name' => 'user_account_settings', + 'route_name' => 'user.account_settings', ); $items['admin/config/people/accounts/settings'] = array( 'title' => 'Settings', @@ -859,7 +859,7 @@ function user_menu() { 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['user/%user/cancel'] = array( - 'route_name' => 'user_cancel_confirm', + 'route_name' => 'user.cancel_confirm', ); $items['user/%user/cancel/confirm/%/%'] = array( 'title' => 'Confirm account cancellation', @@ -871,7 +871,7 @@ function user_menu() { ); $items['user/%user/edit'] = array( 'title' => 'Edit', - 'route_name' => 'user_edit', + 'route_name' => 'user.edit', 'type' => MENU_LOCAL_TASK, ); return $items; diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml index 9e101a47876..ea4ce370d83 100644 --- a/core/modules/user/user.routing.yml +++ b/core/modules/user/user.routing.yml @@ -1,67 +1,67 @@ -user_register: +user.register: pattern: '/user/register' defaults: _entity_form: 'user.register' requirements: _access_user_register: 'TRUE' -user_logout: +user.logout: pattern: '/user/logout' defaults: _controller: '\Drupal\user\Controller\UserController::logout' requirements: _user_is_logged_in: 'TRUE' -user_autocomplete: +user.autocomplete: pattern: '/user/autocomplete' defaults: _controller: '\Drupal\user\Controller\UserAutocompleteController::autocompleteUser' requirements: _permission: 'access user profiles' -user_autocomplete_anonymous: +user.autocomplete_anonymous: pattern: '/user/autocomplete/anonymous' defaults: _controller: '\Drupal\user\Controller\UserAutocompleteController::autocompleteUserAnonymous' requirements: _permission: 'access user profiles' -user_admin_index: +user.admin_index: pattern: '/admin/config/people' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' -user_account_settings: +user.account_settings: pattern: '/admin/config/people/accounts' defaults: _form: '\Drupal\user\AccountSettingsForm' requirements: _permission: 'administer account settings' -user_admin_create: +user.admin_create: pattern: '/admin/people/create' defaults: _entity_form: 'user.register' requirements: _permission: 'administer users' -user_admin_permissions: +user.admin_permissions: pattern: '/admin/people/permissions' defaults: _form: '\Drupal\user\Form\UserPermissionsForm' requirements: _permission: 'administer permissions' -user_admin_permission: +user.admin_permission: pattern: '/admin/people/permissions/{role_id}' defaults: _form: '\Drupal\user\Form\UserPermissionsRoleSpecificForm' requirements: _permission: 'administer permissions' -user_multiple_cancel_confirm: +user.multiple_cancel_confirm: pattern: '/admin/people/cancel' defaults: _form: '\Drupal\user\Form\UserMultipleCancelConfirm' @@ -69,63 +69,63 @@ user_multiple_cancel_confirm: requirements: _permission: 'administer users' -user_role_list: +user.role_list: pattern: '/admin/people/roles' defaults: _entity_list: 'user_role' requirements: _permission: 'administer permissions' -user_role_add: +user.role_add: pattern: '/admin/people/roles/add' defaults: _entity_form: user_role.default requirements: _permission: 'administer permissions' -user_role_edit: +user.role_edit: pattern: '/admin/people/roles/manage/{user_role}' defaults: _entity_form: user_role.default requirements: _entity_access: user_role.update -user_role_delete: +user.role_delete: pattern: '/admin/people/roles/manage/{user_role}/delete' defaults: _entity_form: user_role.delete requirements: _entity_access: user_role.delete -user_pass: +user.pass: pattern: '/user/password' defaults: _form: '\Drupal\user\Form\UserPasswordForm' requirements: _access: 'TRUE' -user_page: +user.page: pattern: '/user' defaults: _content: '\Drupal\user\Controller\UserController::userPage' requirements: _access: 'TRUE' -user_login: +user.login: pattern: '/user/login' defaults: _form: '\Drupal\user\Form\UserLoginForm' requirements: _access: 'TRUE' -user_edit: +user.edit: pattern: '/user/{user}/edit' defaults: _entity_form: 'user.default' requirements: _entity_access: 'user.update' -user_cancel_confirm: +user.cancel_confirm: pattern: '/user/{user}/cancel' defaults: _title: 'Cancel account' diff --git a/core/modules/views/tests/modules/views_test_data/views_test_data.routing.yml b/core/modules/views/tests/modules/views_test_data/views_test_data.routing.yml index f022c6844f5..ce61bb332d9 100644 --- a/core/modules/views/tests/modules/views_test_data/views_test_data.routing.yml +++ b/core/modules/views/tests/modules/views_test_data/views_test_data.routing.yml @@ -1,4 +1,4 @@ -views_test_data_element: +views_test_data.element: pattern: '/views_test_data_element_form' defaults: _form: '\Drupal\views_test_data\Form\ViewsTestDataElementForm' diff --git a/core/modules/views/views.module b/core/modules/views/views.module index 5bc91b26ebd..603ddf3f130 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -319,7 +319,7 @@ function views_menu() { $items['views/ajax'] = array( 'title' => 'Views', 'theme callback' => 'ajax_base_page_theme', - 'route_name' => 'views_ajax', + 'route_name' => 'views.ajax', 'type' => MENU_CALLBACK, ); return $items; diff --git a/core/modules/views/views.routing.yml b/core/modules/views/views.routing.yml index 016b2a5315c..8d9358d5479 100644 --- a/core/modules/views/views.routing.yml +++ b/core/modules/views/views.routing.yml @@ -1,4 +1,4 @@ -views_ajax: +views.ajax: pattern: '/views/ajax' defaults: _controller: '\Drupal\views\Controller\ViewAjaxController::ajaxView' diff --git a/core/modules/views_ui/views_ui.local_tasks.yml b/core/modules/views_ui/views_ui.local_tasks.yml index 7475569b69f..383ef10f42e 100644 --- a/core/modules/views_ui/views_ui.local_tasks.yml +++ b/core/modules/views_ui/views_ui.local_tasks.yml @@ -1,16 +1,16 @@ views_ui_settings_tab: - route_name: views_ui.settings.basic + route_name: views_ui.settings_basic title: Settings tab_root_id: views_ui_list_tab views_ui_settings_basic_tab: - route_name: views_ui.settings.basic + route_name: views_ui.settings_basic title: Basic tab_root_id: views_ui_list_tab tab_parent_id: views_ui_settings_tab views_ui_settings_advanced_tab: - route_name: views_ui.settings.advanced + route_name: views_ui.settings_advanced title: Advanced tab_root_id: views_ui_list_tab tab_parent_id: views_ui_settings_tab diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module index 9e61cfde696..e684432b67d 100644 --- a/core/modules/views_ui/views_ui.module +++ b/core/modules/views_ui/views_ui.module @@ -34,13 +34,13 @@ function views_ui_menu() { // when there is a route-aware breadcrumb builder. $items['admin/structure/views/settings'] = array( 'title' => 'Settings', - 'route_name' => 'views_ui.settings.basic', + 'route_name' => 'views_ui.settings_basic', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); $items['admin/structure/views/settings/advanced'] = array( 'title' => 'Advanced', - 'route_name' => 'views_ui.settings.advanced', + 'route_name' => 'views_ui.settings_advanced', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); @@ -64,7 +64,7 @@ function views_ui_menu() { $items['admin/structure/views/view/%/break-lock'] = array( 'title' => 'Break lock', - 'route_name' => 'views_ui.breakLock', + 'route_name' => 'views_ui.break_lock', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); @@ -77,7 +77,7 @@ function views_ui_menu() { $items['admin/reports/fields/views-fields'] = array( 'title' => 'Used in views', 'description' => 'Overview of fields used in all views.', - 'route_name' => 'views_ui.reports.fields', + 'route_name' => 'views_ui.reports_fields', 'type' => MENU_LOCAL_TASK, ); @@ -85,7 +85,7 @@ function views_ui_menu() { $items['admin/reports/views-plugins'] = array( 'title' => 'Views plugins', 'description' => 'Overview of plugins used in all views.', - 'route_name' => 'views_ui.reports.plugins', + 'route_name' => 'views_ui.reports_plugins', ); return $items; diff --git a/core/modules/views_ui/views_ui.routing.yml b/core/modules/views_ui/views_ui.routing.yml index fca076bdba5..4d57bc76dd7 100644 --- a/core/modules/views_ui/views_ui.routing.yml +++ b/core/modules/views_ui/views_ui.routing.yml @@ -12,28 +12,28 @@ views_ui.add: requirements: _permission: 'administer views' -views_ui.settings.basic: +views_ui.settings_basic: pattern: '/admin/structure/views/settings' defaults: _form: '\Drupal\views_ui\Form\BasicSettingsForm' requirements: _permission: 'administer views' -views_ui.settings.advanced: +views_ui.settings_advanced: pattern: '/admin/structure/views/settings/advanced' defaults: _form: '\Drupal\views_ui\Form\AdvancedSettingsForm' requirements: _permission: 'administer views' -views_ui.reports.fields: +views_ui.reports_fields: pattern: '/admin/reports/fields/views-fields' defaults: _content: '\Drupal\views_ui\Controller\ViewsUIController::reportFields' requirements: _permission: 'administer views' -views_ui.reports.plugins: +views_ui.reports_plugins: pattern: '/admin/reports/views-plugins' defaults: _content: '\Drupal\views_ui\Controller\ViewsUIController::reportPlugins' @@ -80,7 +80,7 @@ views_ui.edit: requirements: _permission: 'administer views' -views_ui.edit.display: +views_ui.edit_display: pattern: '/admin/structure/views/view/{view}/edit/{display_id}' options: parameters: @@ -104,14 +104,14 @@ views_ui.preview: requirements: _permission: 'administer views' -views_ui.breakLock: +views_ui.break_lock: pattern: '/admin/structure/views/view/{view}/break-lock' defaults: _entity_form: 'view.break_lock' requirements: _permission: 'administer views' -views_ui.form.addItem: +views_ui.form_add_item: pattern: '/admin/structure/views/{js}/add-item/{view}/{display_id}/{type}' options: parameters: @@ -123,7 +123,7 @@ views_ui.form.addItem: _permission: 'administer views' js: 'nojs|ajax' -views_ui.form.editDetails: +views_ui.form_edit_details: pattern: '/admin/structure/views/{js}/edit-details/{view}/{display_id}' options: parameters: @@ -135,7 +135,7 @@ views_ui.form.editDetails: _permission: 'administer views' js: 'nojs|ajax' -views_ui.form.reorderDisplays: +views_ui.form_reorder_displays: pattern: '/admin/structure/views/{js}/reorder-displays/{view}/{display_id}' options: parameters: @@ -147,7 +147,7 @@ views_ui.form.reorderDisplays: _permission: 'administer views' js: 'nojs|ajax' -views_ui.form.analyze: +views_ui.form_analyze: pattern: '/admin/structure/views/{js}/analyze/{view}/{display_id}' options: parameters: @@ -159,7 +159,7 @@ views_ui.form.analyze: _permission: 'administer views' js: 'nojs|ajax' -views_ui.form.rearrange: +views_ui.form_rearrange: pattern: '/admin/structure/views/{js}/rearrange/{view}/{display_id}/{type}' options: parameters: @@ -171,7 +171,7 @@ views_ui.form.rearrange: _permission: 'administer views' js: 'nojs|ajax' -views_ui.form.rearrangeFilter: +views_ui.form_rearrange_filter: pattern: '/admin/structure/views/{js}/rearrange-filter/{view}/{display_id}' options: parameters: @@ -183,7 +183,7 @@ views_ui.form.rearrangeFilter: _permission: 'administer views' js: 'nojs|ajax' -views_ui.form.display: +views_ui.form_display: pattern: '/admin/structure/views/{js}/display/{view}/{display_id}/{type}' options: parameters: @@ -195,7 +195,7 @@ views_ui.form.display: _permission: 'administer views' js: 'nojs|ajax' -views_ui.form.configItem: +views_ui.form_config_item: pattern: '/admin/structure/views/{js}/config-item/{view}/{display_id}/{type}/{id}' options: parameters: @@ -207,7 +207,7 @@ views_ui.form.configItem: _permission: 'administer views' js: 'nojs|ajax' -views_ui.form.configItemExtra: +views_ui.form_config_item_extra: pattern: '/admin/structure/views/{js}/config-item-extra/{view}/{display_id}/{type}/{id}' options: parameters: @@ -219,7 +219,7 @@ views_ui.form.configItemExtra: _permission: 'administer views' js: 'nojs|ajax' -views_ui.form.configItemGroup: +views_ui.form_config_item_group: pattern: '/admin/structure/views/{js}/config-item-group/{view}/{display_id}/{type}/{id}' options: parameters: diff --git a/core/profiles/standard/config/entity.form_display.node.article.default.yml b/core/profiles/standard/config/entity.form_display.node.article.default.yml index cfc95e04f9d..ce4efbc8628 100644 --- a/core/profiles/standard/config/entity.form_display.node.article.default.yml +++ b/core/profiles/standard/config/entity.form_display.node.article.default.yml @@ -15,7 +15,7 @@ content: weight: '-4' settings: size: '60' - autocomplete_route_name: taxonomy_autocomplete + autocomplete_route_name: taxonomy.autocomplete placeholder: '' field_image: type: image_image diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme index cb0cd84056a..bfc87e22ba1 100644 --- a/core/themes/seven/seven.theme +++ b/core/themes/seven/seven.theme @@ -99,7 +99,7 @@ function seven_custom_block_add_list($variables) { $content .= '
' . filter_xss_admin($type['description']) . '
'; $options = $type['localized_options']; $options['html'] = TRUE; - $output .= Drupal::l($content, 'custom_block_add_form', array('custom_block_type' => $id), $options); + $output .= Drupal::l($content, 'custom_block.add_form', array('custom_block_type' => $id), $options); $output .= ''; } $output .= '';