diff --git a/core/lib/Drupal/Core/Routing/CompiledRoute.php b/core/lib/Drupal/Core/Routing/CompiledRoute.php index cd8c74b..98671a7 100644 --- a/core/lib/Drupal/Core/Routing/CompiledRoute.php +++ b/core/lib/Drupal/Core/Routing/CompiledRoute.php @@ -139,8 +139,8 @@ public function getRoute() { * @return string * The pattern. */ - public function getPattern() { - return $this->route->getPattern(); + public function getPath() { + return $this->route->getPath(); } /** diff --git a/core/lib/Drupal/Core/Routing/MatcherDumper.php b/core/lib/Drupal/Core/Routing/MatcherDumper.php index 33f8801..3cbc1f5 100644 --- a/core/lib/Drupal/Core/Routing/MatcherDumper.php +++ b/core/lib/Drupal/Core/Routing/MatcherDumper.php @@ -107,7 +107,7 @@ public function dump(array $options = array()) { 'name' => $name, 'route_set' => $options['route_set'], 'fit' => $compiled->getFit(), - 'pattern' => $compiled->getPattern(), + 'path' => $compiled->getPath(), 'pattern_outline' => $compiled->getPatternOutline(), 'number_parts' => $compiled->getNumParts(), 'route' => serialize($route), diff --git a/core/lib/Drupal/Core/Routing/RouteCompiler.php b/core/lib/Drupal/Core/Routing/RouteCompiler.php index bd6c7b4..771669a 100644 --- a/core/lib/Drupal/Core/Routing/RouteCompiler.php +++ b/core/lib/Drupal/Core/Routing/RouteCompiler.php @@ -125,7 +125,7 @@ public static function getFit($path) { * The path string, stripped of placeholders that have default values. */ protected static function getPathWithoutDefaults(Route $route) { - $path = $route->getPattern(); + $path = $route->getPath(); $defaults = $route->getDefaults(); // Remove placeholders with default values from the outline, so that they diff --git a/core/modules/action/action.routing.yml b/core/modules/action/action.routing.yml index 19e1703..4f3fee6 100644 --- a/core/modules/action/action.routing.yml +++ b/core/modules/action/action.routing.yml @@ -1,26 +1,26 @@ action_admin: - pattern: '/admin/config/system/actions' + path: '/admin/config/system/actions' defaults: _entity_list: 'action' requirements: _permission: 'administer actions' action_admin_add: - pattern: '/admin/config/system/actions/add/{action_id}' + path: '/admin/config/system/actions/add/{action_id}' defaults: _entity_form: 'action.add' requirements: _permission: 'administer actions' action_admin_configure: - pattern: '/admin/config/system/actions/configure/{action}' + path: '/admin/config/system/actions/configure/{action}' defaults: _entity_form: 'action.edit' requirements: _permission: 'administer actions' action_delete: - pattern: 'admin/config/system/actions/configure/{action}/delete' + path: 'admin/config/system/actions/configure/{action}/delete' defaults: _entity_form: 'action.delete' requirements: diff --git a/core/modules/aggregator/aggregator.routing.yml b/core/modules/aggregator/aggregator.routing.yml index 2c69045..9052c56 100644 --- a/core/modules/aggregator/aggregator.routing.yml +++ b/core/modules/aggregator/aggregator.routing.yml @@ -1,68 +1,68 @@ aggregator_admin_overview: - pattern: 'admin/config/services/aggregator' + path: 'admin/config/services/aggregator' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::adminOverview' requirements: _permission: 'administer news feeds' aggregator_admin_settings: - pattern: 'admin/config/services/aggregator/settings' + path: 'admin/config/services/aggregator/settings' defaults: _form: '\Drupal\aggregator\Form\SettingsForm' requirements: _permission: 'administer news feeds' aggregator_feed_items_delete: - pattern: '/admin/config/services/aggregator/remove/{aggregator_feed}' + path: '/admin/config/services/aggregator/remove/{aggregator_feed}' defaults: _entity_form: 'aggregator_feed.remove_items' requirements: _permission: 'administer news feeds' aggregator_feed_delete: - pattern: '/admin/config/services/aggregator/delete/feed/{aggregator_feed}' + path: '/admin/config/services/aggregator/delete/feed/{aggregator_feed}' defaults: _entity_form: 'aggregator_feed.delete' requirements: _permission: 'administer news feeds' aggregator_feed_add: - pattern: '/admin/config/services/aggregator/add/feed' + path: '/admin/config/services/aggregator/add/feed' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::feedAdd' requirements: _permission: 'administer news feeds' aggregator_feed_refresh: - pattern: '/admin/config/services/aggregator/update/{aggregator_feed}' + path: '/admin/config/services/aggregator/update/{aggregator_feed}' defaults: _controller: '\Drupal\aggregator\Controller\AggregatorController::feedRefresh' requirements: _permission: 'administer news feeds' aggregator_opml_add: - pattern: '/admin/config/services/aggregator/add/opml' + path: '/admin/config/services/aggregator/add/opml' defaults: _form: '\Drupal\aggregator\Form\OpmlFeedAdd' requirements: _permission: 'administer news feeds' aggregator_page_last: - pattern: '/aggregator' + path: '/aggregator' defaults: _controller: '\Drupal\aggregator\Controller\AggregatorController::pageLast' requirements: _permission: 'access news feeds' aggregator_sources: - pattern: '/aggregator/sources' + path: '/aggregator/sources' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::sources' requirements: _permission: 'access news feeds' aggregator_categories: - pattern: '/aggregator/categories' + path: '/aggregator/categories' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::categories' requirements: diff --git a/core/modules/ban/ban.routing.yml b/core/modules/ban/ban.routing.yml index 16c77ec..0716d7a 100644 --- a/core/modules/ban/ban.routing.yml +++ b/core/modules/ban/ban.routing.yml @@ -1,5 +1,5 @@ ban_admin_page: - pattern: '/admin/config/people/ban/{default_ip}' + path: '/admin/config/people/ban/{default_ip}' defaults: _form: '\Drupal\ban\Form\BanAdmin' default_ip: '' @@ -7,7 +7,7 @@ ban_admin_page: _permission: 'ban IP addresses' ban_delete: - pattern: '/admin/config/people/ban/delete/{ban_id}' + path: '/admin/config/people/ban/delete/{ban_id}' defaults: _form: '\Drupal\ban\Form\BanDelete' requirements: diff --git a/core/modules/block/block.routing.yml b/core/modules/block/block.routing.yml index 669e0a2..41330f1 100644 --- a/core/modules/block/block.routing.yml +++ b/core/modules/block/block.routing.yml @@ -1,19 +1,19 @@ block_admin_block_delete: - pattern: '/admin/structure/block/manage/{block}/delete' + path: '/admin/structure/block/manage/{block}/delete' defaults: _entity_form: 'block.delete' requirements: _permission: 'administer blocks' block_admin_edit: - pattern: '/admin/structure/block/manage/{block}' + path: '/admin/structure/block/manage/{block}' defaults: _entity_form: 'block.default' requirements: _entity_access: 'block.update' block_admin_display: - pattern: '/admin/structure/block' + path: '/admin/structure/block' defaults: _content: '\Drupal\block\Controller\BlockListController::listing' entity_type: 'block' @@ -21,7 +21,7 @@ block_admin_display: _permission: 'administer blocks' block_admin_add: - pattern: '/admin/structure/block/add/{plugin_id}/{theme}' + path: '/admin/structure/block/add/{plugin_id}/{theme}' defaults: _content: '\Drupal\block\Controller\BlockAddController::blockAddConfigureForm' requirements: diff --git a/core/modules/block/custom_block/custom_block.routing.yml b/core/modules/block/custom_block/custom_block.routing.yml index 02bad13..95ba4e5 100644 --- a/core/modules/block/custom_block/custom_block.routing.yml +++ b/core/modules/block/custom_block/custom_block.routing.yml @@ -1,33 +1,33 @@ custom_block_type_list: - pattern: '/admin/structure/custom-blocks' + path: '/admin/structure/custom-blocks' defaults: _entity_list: 'custom_block_type' requirements: _permission: 'administer blocks' custom_block_add_page: - pattern: '/block/add' + path: '/block/add' defaults: _content: 'Drupal\custom_block\Controller\CustomBlockController::add' requirements: _permission: 'administer blocks' custom_block_add_form: - pattern: block/add/{custom_block_type} + path: block/add/{custom_block_type} defaults: _content: 'Drupal\custom_block\Controller\CustomBlockController::addForm' requirements: _permission: 'administer blocks' custom_block_type_delete: - pattern: '/admin/structure/custom-blocks/manage/{custom_block_type}/delete' + path: '/admin/structure/custom-blocks/manage/{custom_block_type}/delete' defaults: _entity_form: 'custom_block_type.delete' requirements: _entity_access: 'custom_block_type.delete' custom_block_edit: - pattern: '/block/{custom_block}' + path: '/block/{custom_block}' defaults: _entity_form: 'custom_block.edit' requirements: @@ -35,14 +35,14 @@ custom_block_edit: custom_block: \d+ custom_block_type_add: - pattern: '/admin/structure/custom-blocks/add' + path: '/admin/structure/custom-blocks/add' defaults: _entity_form: 'custom_block_type.add' requirements: _permission: 'administer blocks' custom_block_type_edit: - pattern: '/admin/structure/custom-blocks/manage/{custom_block_type}' + path: '/admin/structure/custom-blocks/manage/{custom_block_type}' defaults: _entity_form: 'custom_block_type.edit' requirements: diff --git a/core/modules/book/book.routing.yml b/core/modules/book/book.routing.yml index 6c8b010..e4a1047 100644 --- a/core/modules/book/book.routing.yml +++ b/core/modules/book/book.routing.yml @@ -1,19 +1,19 @@ book_render: - pattern: '/book' + path: '/book' defaults: _content: '\Drupal\book\Controller\BookController::bookRender' requirements: _permission: 'access content' book_admin: - pattern: '/admin/structure/book' + path: '/admin/structure/book' defaults: _content: '\Drupal\book\Controller\BookController::adminOverview' requirements: _permission: 'administer book outlines' book_settings: - pattern: '/admin/structure/book/settings' + path: '/admin/structure/book/settings' defaults: _form: 'Drupal\book\BookSettingsForm' requirements: diff --git a/core/modules/comment/comment.routing.yml b/core/modules/comment/comment.routing.yml index b62c118..f376bde 100644 --- a/core/modules/comment/comment.routing.yml +++ b/core/modules/comment/comment.routing.yml @@ -1,12 +1,12 @@ comment_edit_page: - pattern: '/comment/{comment}/edit' + path: '/comment/{comment}/edit' defaults: _entity_form: 'comment.default' requirements: _entity_access: 'comment.update' comment_approve: - pattern: '/comment/{comment}/approve' + path: '/comment/{comment}/approve' defaults: _content: '\Drupal\comment\Controller\CommentController::commentApprove' entity_type: 'comment' @@ -14,7 +14,7 @@ comment_approve: _entity_access: 'comment.approve' comment_permalink: - pattern: '/comment/{comment}' + path: '/comment/{comment}' defaults: _controller: '\Drupal\comment\Controller\CommentController::commentPermalink' requirements: diff --git a/core/modules/config/config.routing.yml b/core/modules/config/config.routing.yml index bf3134d..1e6cab2 100644 --- a/core/modules/config/config.routing.yml +++ b/core/modules/config/config.routing.yml @@ -1,29 +1,29 @@ config_diff: - pattern: '/admin/config/development/sync/diff/{config_file}' + path: '/admin/config/development/sync/diff/{config_file}' defaults: _content: '\Drupal\config\Controller\ConfigController::diff' requirements: _permission: 'synchronize configuration' config_export_download: - pattern: '/admin/config/development/export-download' + path: '/admin/config/development/export-download' defaults: _controller: '\Drupal\config\Controller\ConfigController::downloadExport' requirements: _permission: 'export configuration' config_export: - pattern: '/admin/config/development/export' + path: '/admin/config/development/export' defaults: _form: '\Drupal\config\Form\ConfigExportForm' requirements: _permission: 'export configuration' config_import: - pattern: '/admin/config/development/import' + path: '/admin/config/development/import' defaults: _form: '\Drupal\config\Form\ConfigImportForm' requirements: _permission: 'import configuration' config_sync: - pattern: '/admin/config/development/sync' + path: '/admin/config/development/sync' defaults: _form: '\Drupal\config\Form\ConfigSync' requirements: 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 c26a438..da8d704 100644 --- a/core/modules/config/tests/config_test/config_test.routing.yml +++ b/core/modules/config/tests/config_test/config_test.routing.yml @@ -1,19 +1,19 @@ config_test_list_page: - pattern: '/admin/structure/config_test' + path: '/admin/structure/config_test' defaults: _entity_list: 'config_test' requirements: _access: 'TRUE' config_test_entity_add: - pattern: 'admin/structure/config_test/add' + path: 'admin/structure/config_test/add' defaults: _entity_form: 'config_test' requirements: _access: 'TRUE' config_test_entity: - pattern: 'admin/structure/config_test/manage/{config_test}' + path: 'admin/structure/config_test/manage/{config_test}' defaults: _controller: '\Drupal\config_test\ConfigTestController::edit' entity_type: 'config_test' @@ -21,7 +21,7 @@ config_test_entity: _access: 'TRUE' config_test_entity_edit: - pattern: 'admin/structure/config_test/manage/{config_test}/edit' + path: 'admin/structure/config_test/manage/{config_test}/edit' defaults: _controller: '\Drupal\config_test\ConfigTestController::edit' entity_type: 'config_test' @@ -29,7 +29,7 @@ config_test_entity_edit: _access: 'TRUE' config_test_entity_enable: - pattern: 'admin/structure/config_test/manage/{config_test}/enable' + path: 'admin/structure/config_test/manage/{config_test}/enable' defaults: _content: '\Drupal\config_test\ConfigTestController::enable' entity_type: 'config_test' @@ -37,7 +37,7 @@ config_test_entity_enable: _access: 'TRUE' config_test_entity_disable: - pattern: 'admin/structure/config_test/manage/{config_test}/disable' + path: 'admin/structure/config_test/manage/{config_test}/disable' defaults: _content: '\Drupal\config_test\ConfigTestController::disable' entity_type: 'config_test' @@ -45,7 +45,7 @@ config_test_entity_disable: _access: 'TRUE' config_test_entity_delete: - pattern: 'admin/structure/config_test/manage/{config_test}/delete' + path: 'admin/structure/config_test/manage/{config_test}/delete' defaults: _entity_form: 'config_test.delete' entity_type: 'config_test' diff --git a/core/modules/contact/contact.routing.yml b/core/modules/contact/contact.routing.yml index ba47a6a..1e9b811 100644 --- a/core/modules/contact/contact.routing.yml +++ b/core/modules/contact/contact.routing.yml @@ -1,26 +1,26 @@ contact_category_delete: - pattern: 'admin/structure/contact/manage/{contact_category}/delete' + path: 'admin/structure/contact/manage/{contact_category}/delete' defaults: _entity_form: contact_category.delete requirements: _entity_access: contact_category.delete contact_category_list: - pattern: '/admin/structure/contact' + path: '/admin/structure/contact' defaults: _entity_list: 'contact_category' requirements: _permission: 'administer contact forms' contact_category_add: - pattern: '/admin/structure/contact/add' + path: '/admin/structure/contact/add' defaults: _entity_form: contact_category.add requirements: _permission: 'administer contact forms' contact_category_edit: - pattern: '/admin/structure/contact/manage/{contact_category}' + path: '/admin/structure/contact/manage/{contact_category}' defaults: _entity_form: contact_category.edit requirements: diff --git a/core/modules/content_translation/content_translation.routing.yml b/core/modules/content_translation/content_translation.routing.yml index d7d55a1..9703497 100644 --- a/core/modules/content_translation/content_translation.routing.yml +++ b/core/modules/content_translation/content_translation.routing.yml @@ -1,5 +1,5 @@ content_translation_translatable: - pattern: 'admin/config/regional/content_translation/translatable/{field_name}' + path: 'admin/config/regional/content_translation/translatable/{field_name}' defaults: _form: 'Drupal\content_translation\Form\TranslatableForm' requirements: diff --git a/core/modules/contextual/contextual.routing.yml b/core/modules/contextual/contextual.routing.yml index 5dd4457..a444beb 100644 --- a/core/modules/contextual/contextual.routing.yml +++ b/core/modules/contextual/contextual.routing.yml @@ -1,5 +1,5 @@ contextual_render: - pattern: '/contextual/render' + path: '/contextual/render' defaults: _controller: '\Drupal\contextual\ContextualController::render' requirements: diff --git a/core/modules/dblog/dblog.routing.yml b/core/modules/dblog/dblog.routing.yml index 310d798..dd91256 100644 --- a/core/modules/dblog/dblog.routing.yml +++ b/core/modules/dblog/dblog.routing.yml @@ -1,5 +1,5 @@ dblog_overview: - pattern: '/admin/reports/dblog' + path: '/admin/reports/dblog' defaults: _content: '\Drupal\dblog\Controller\DbLogController::overview' requirements: diff --git a/core/modules/edit/edit.routing.yml b/core/modules/edit/edit.routing.yml index b709d0a..682c145 100644 --- a/core/modules/edit/edit.routing.yml +++ b/core/modules/edit/edit.routing.yml @@ -1,19 +1,19 @@ edit_metadata: - pattern: '/edit/metadata' + path: '/edit/metadata' defaults: _controller: '\Drupal\edit\EditController::metadata' requirements: _permission: 'access in-place editing' edit_attachments: - pattern: '/edit/attachments' + path: '/edit/attachments' defaults: _controller: '\Drupal\edit\EditController::attachments' requirements: _permission: 'access in-place editing' edit_field_form: - pattern: '/edit/form/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}' + path: '/edit/form/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}' defaults: _controller: '\Drupal\edit\EditController::fieldForm' requirements: @@ -22,7 +22,7 @@ edit_field_form: edit_entity_save: - pattern: '/edit/entity/{entity_type}/{entity}' + path: '/edit/entity/{entity_type}/{entity}' defaults: _controller: '\Drupal\edit\EditController::entitySave' requirements: diff --git a/core/modules/editor/editor.routing.yml b/core/modules/editor/editor.routing.yml index 26aa16c..a61fcd5 100644 --- a/core/modules/editor/editor.routing.yml +++ b/core/modules/editor/editor.routing.yml @@ -1,18 +1,18 @@ editor_field_untransformed_text: - pattern: '/editor/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}' + path: '/editor/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}' defaults: _controller: '\Drupal\editor\EditorController::getUntransformedText' requirements: _permission: 'access in-place editing' _access_edit_entity_field: 'TRUE' editor_image_dialog: - pattern: '/editor/dialog/image/{filter_format}' + path: '/editor/dialog/image/{filter_format}' defaults: _form: '\Drupal\editor\Form\EditorImageDialog' requirements: _filter_access: 'TRUE' editor_link_dialog: - pattern: '/editor/dialog/link/{filter_format}' + path: '/editor/dialog/link/{filter_format}' defaults: _form: '\Drupal\editor\Form\EditorLinkDialog' requirements: diff --git a/core/modules/entity/entity.routing.yml b/core/modules/entity/entity.routing.yml index 05d7092..d209091 100644 --- a/core/modules/entity/entity.routing.yml +++ b/core/modules/entity/entity.routing.yml @@ -1,68 +1,68 @@ entity_view_mode.list: - pattern: '/admin/structure/display-modes/view' + path: '/admin/structure/display-modes/view' defaults: _entity_list: 'view_mode' requirements: _permission: 'administer display modes' entity_view_mode.add: - pattern: '/admin/structure/display-modes/view/add' + path: '/admin/structure/display-modes/view/add' defaults: _content: '\Drupal\entity\Controller\EntityDisplayModeController::viewModeTypeSelection' requirements: _permission: 'administer display modes' entity_view_mode.add_type: - pattern: '/admin/structure/display-modes/view/add/{entity_type}' + path: '/admin/structure/display-modes/view/add/{entity_type}' defaults: _entity_form: 'view_mode.add' requirements: _permission: 'administer display modes' entity_view_mode.edit: - pattern: '/admin/structure/display-modes/view/manage/{view_mode}' + path: '/admin/structure/display-modes/view/manage/{view_mode}' defaults: _entity_form: 'view_mode.edit' requirements: _entity_access: 'view_mode.update' entity_view_mode.delete: - pattern: '/admin/structure/display-modes/view/manage/{view_mode}/delete' + path: '/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: - pattern: '/admin/structure/display-modes/form' + path: '/admin/structure/display-modes/form' defaults: _entity_list: 'form_mode' requirements: _permission: 'administer display modes' entity_form_mode.add: - pattern: '/admin/structure/display-modes/form/add' + path: '/admin/structure/display-modes/form/add' defaults: _content: '\Drupal\entity\Controller\EntityDisplayModeController::formModeTypeSelection' requirements: _permission: 'administer display modes' entity_form_mode.add_type: - pattern: '/admin/structure/display-modes/form/add/{entity_type}' + path: '/admin/structure/display-modes/form/add/{entity_type}' defaults: _entity_form: 'form_mode.add' requirements: _permission: 'administer display modes' entity_form_mode.edit: - pattern: '/admin/structure/display-modes/form/manage/{form_mode}' + path: '/admin/structure/display-modes/form/manage/{form_mode}' defaults: _entity_form: 'form_mode.edit' requirements: _entity_access: 'form_mode.update' entity_form_mode.delete: - pattern: '/admin/structure/display-modes/form/manage/{form_mode}/delete' + path: '/admin/structure/display-modes/form/manage/{form_mode}/delete' defaults: _entity_form: 'form_mode.delete' requirements: diff --git a/core/modules/entity_reference/entity_reference.routing.yml b/core/modules/entity_reference/entity_reference.routing.yml index e0b23b8..b2f73ff 100644 --- a/core/modules/entity_reference/entity_reference.routing.yml +++ b/core/modules/entity_reference/entity_reference.routing.yml @@ -1,5 +1,5 @@ entity_reference.autocomplete: - pattern: '/entity_reference/autocomplete/{type}/{field_name}/{entity_type}/{bundle_name}/{entity_id}' + path: '/entity_reference/autocomplete/{type}/{field_name}/{entity_type}/{bundle_name}/{entity_id}' defaults: _controller: '\Drupal\entity_reference\EntityReferenceController::handleAutocomplete' entity_id: 'NULL' diff --git a/core/modules/field_ui/field_ui.routing.yml b/core/modules/field_ui/field_ui.routing.yml index 946d60e..55d1cfb 100644 --- a/core/modules/field_ui/field_ui.routing.yml +++ b/core/modules/field_ui/field_ui.routing.yml @@ -1,5 +1,5 @@ field_list: - pattern: 'admin/reports/fields' + path: 'admin/reports/fields' defaults: _entity_list: 'field_entity' requirements: diff --git a/core/modules/file/file.routing.yml b/core/modules/file/file.routing.yml index c2a9efd..bc0711b 100644 --- a/core/modules/file/file.routing.yml +++ b/core/modules/file/file.routing.yml @@ -1,11 +1,11 @@ file.ajax.upload: - pattern: '/file/ajax' + path: '/file/ajax' defaults: _controller: '\Drupal\file\Controller\FileWidgetAjaxController::upload' requirements: _permission: 'access content' file.ajax.progress: - pattern: '/file/progress' + path: '/file/progress' defaults: _controller: '\Drupal\file\Controller\FileWidgetAjaxController::progress' requirements: 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 73fa7ed..8dbc03d 100644 --- a/core/modules/file/tests/file_test/file_test.routing.yml +++ b/core/modules/file/tests/file_test/file_test.routing.yml @@ -1,5 +1,5 @@ file_test: - pattern: '/file-test/upload' + path: '/file-test/upload' defaults: _form: 'Drupal\file_test\Form\FileTestForm' requirements: diff --git a/core/modules/filter/filter.routing.yml b/core/modules/filter/filter.routing.yml index 5442fb0..6e0dfce 100644 --- a/core/modules/filter/filter.routing.yml +++ b/core/modules/filter/filter.routing.yml @@ -1,19 +1,19 @@ filter_tips_all: - pattern: '/filter/tips' + path: '/filter/tips' defaults: _content: '\Drupal\filter\Controller\FilterController::filterTips' requirements: _access: 'TRUE' filter_tips: - pattern: '/filter/tips/{filter_format}' + path: '/filter/tips/{filter_format}' defaults: _content: '\Drupal\filter\Controller\FilterController::filterTips' requirements: _filter_access: 'TRUE' filter_admin_overview: - pattern: '/admin/config/content/formats' + path: '/admin/config/content/formats' defaults: _content: '\Drupal\Core\Entity\Controller\EntityListController::listing' entity_type: 'filter_format' @@ -21,21 +21,21 @@ filter_admin_overview: _permission: 'administer filters' filter_format_add: - pattern: '/admin/config/content/formats/add' + path: '/admin/config/content/formats/add' defaults: _entity_form: filter_format.add requirements: _permission: 'administer filters' filter_format_edit: - pattern: '/admin/config/content/formats/manage/{filter_format}' + path: '/admin/config/content/formats/manage/{filter_format}' defaults: _entity_form: filter_format.edit requirements: _permission: 'administer filters' filter_admin_disable: - pattern: '/admin/config/content/formats/manage/{filter_format}/disable' + path: '/admin/config/content/formats/manage/{filter_format}/disable' defaults: _entity_form: 'filter_format.disable' requirements: diff --git a/core/modules/forum/forum.routing.yml b/core/modules/forum/forum.routing.yml index fe816f0..2928791 100644 --- a/core/modules/forum/forum.routing.yml +++ b/core/modules/forum/forum.routing.yml @@ -1,35 +1,35 @@ forum_delete: - pattern: 'admin/structure/forum/delete/forum/{taxonomy_term}' + path: 'admin/structure/forum/delete/forum/{taxonomy_term}' defaults: _form: 'Drupal\forum\Form\DeleteForm' requirements: _permission: 'administer forums' forum_settings: - pattern: '/admin/structure/forum/settings' + path: '/admin/structure/forum/settings' defaults: _form: '\Drupal\forum\ForumSettingsForm' requirements: _permission: 'administer forums' forum_add_container: - pattern: 'admin/structure/forum/add/container' + path: 'admin/structure/forum/add/container' defaults: _content: 'Drupal\forum\Controller\ForumController::addContainer' requirements: _permission: 'administer forums' forum_add_forum: - pattern: 'admin/structure/forum/add/forum' + path: 'admin/structure/forum/add/forum' defaults: _content: 'Drupal\forum\Controller\ForumController::addForum' requirements: _permission: 'administer forums' forum_edit_container: - pattern: 'admin/structure/forum/edit/container/{taxonomy_term}' + path: 'admin/structure/forum/edit/container/{taxonomy_term}' defaults: _entity_form: 'taxonomy_term.container' requirements: _permission: 'administer forums' forum_edit_forum: - pattern: 'admin/structure/forum/edit/forum/{taxonomy_term}' + path: 'admin/structure/forum/edit/forum/{taxonomy_term}' defaults: _entity_form: 'taxonomy_term.forum' requirements: diff --git a/core/modules/help/help.routing.yml b/core/modules/help/help.routing.yml index 75877c9..974100b 100644 --- a/core/modules/help/help.routing.yml +++ b/core/modules/help/help.routing.yml @@ -1,11 +1,11 @@ help_main: - pattern: 'admin/help' + path: 'admin/help' defaults: _content: '\Drupal\help\Controller\HelpController::helpMain' requirements: _permission: 'access administration pages' help_page: - pattern: 'admin/help/{name}' + path: 'admin/help/{name}' defaults: _content: '\Drupal\help\Controller\HelpController::helpPage' requirements: diff --git a/core/modules/image/image.routing.yml b/core/modules/image/image.routing.yml index c5b83ce..ad4453d 100644 --- a/core/modules/image/image.routing.yml +++ b/core/modules/image/image.routing.yml @@ -1,54 +1,54 @@ image_style_add: - pattern: '/admin/config/media/image-styles/add' + path: '/admin/config/media/image-styles/add' defaults: _entity_form: image_style.add requirements: _permission: 'administer image styles' image_style_edit: - pattern: '/admin/config/media/image-styles/manage/{image_style}' + path: '/admin/config/media/image-styles/manage/{image_style}' defaults: _entity_form: image_style.edit requirements: _permission: 'administer image styles' image_style_delete: - pattern: 'admin/config/media/image-styles/manage/{image_style}/delete' + path: 'admin/config/media/image-styles/manage/{image_style}/delete' defaults: _entity_form: 'image_style.delete' requirements: _permission: 'administer image styles' image_effect_delete: - pattern: 'admin/config/media/image-styles/manage/{image_style}/effects/{image_effect}/delete' + path: '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: - pattern: '/admin/config/media/image-styles' + path: '/admin/config/media/image-styles' defaults: _entity_list: 'image_style' requirements: _permission: 'administer image styles' image_style_private: - pattern: '/system/files/styles/{image_style}/{scheme}' + path: '/system/files/styles/{image_style}/{scheme}' defaults: _controller: '\Drupal\image\Controller\ImageStyleDownloadController::deliver' requirements: _access: 'TRUE' image_effect_add_form: - pattern: '/admin/config/media/image-styles/manage/{image_style}/add/{image_effect}' + path: '/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: - pattern: '/admin/config/media/image-styles/manage/{image_style}/effects/{image_effect}' + path: '/admin/config/media/image-styles/manage/{image_style}/effects/{image_effect}' defaults: _form: '\Drupal\image\Form\ImageEffectEditForm' requirements: diff --git a/core/modules/language/language.routing.yml b/core/modules/language/language.routing.yml index e75e1ce..6675d7c 100644 --- a/core/modules/language/language.routing.yml +++ b/core/modules/language/language.routing.yml @@ -1,26 +1,26 @@ language_negotiation_url: - pattern: '/admin/config/regional/language/detection/url' + path: '/admin/config/regional/language/detection/url' defaults: _form: 'Drupal\language\Form\NegotiationUrlForm' requirements: _permission: 'administer languages' language_negotiation_session: - pattern: '/admin/config/regional/language/detection/session' + path: '/admin/config/regional/language/detection/session' defaults: _form: 'Drupal\language\Form\NegotiationSessionForm' requirements: _permission: 'administer languages' language_negotiation_selected: - pattern: '/admin/config/regional/language/detection/selected' + path: '/admin/config/regional/language/detection/selected' defaults: _form: 'Drupal\language\Form\NegotiationSelectedForm' requirements: _permission: 'administer languages' language_admin_overview: - pattern: '/admin/config/regional/language' + path: '/admin/config/regional/language' defaults: _entity_list: 'language_entity' requirements: 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 4ab68ab..902c9e4 100644 --- a/core/modules/language/tests/language_test/language_test.routing.yml +++ b/core/modules/language/tests/language_test/language_test.routing.yml @@ -1,12 +1,12 @@ language_test_l_active_class: - pattern: '/language_test/type-link-active-class' + path: '/language_test/type-link-active-class' defaults: _content: '\Drupal\language_test\Controller\LanguageTestController::typeLinkActiveClass' requirements: _access: 'TRUE' language_test_subrequest: - pattern: '/language_test/subrequest' + path: '/language_test/subrequest' defaults: _controller: '\Drupal\language_test\Controller\LanguageTestController::testSubRequest' requirements: diff --git a/core/modules/layout/layout.routing.yml b/core/modules/layout/layout.routing.yml index d1cd540..ddbaebd 100644 --- a/core/modules/layout/layout.routing.yml +++ b/core/modules/layout/layout.routing.yml @@ -1,5 +1,5 @@ layout_page_list: - pattern: '/admin/structure/templates' + path: '/admin/structure/templates' defaults: _content: '\Drupal\layout\Controller\LayoutController::layoutPageList' requirements: diff --git a/core/modules/layout/tests/layout_test/layout_test.routing.yml b/core/modules/layout/tests/layout_test/layout_test.routing.yml index 636e13f..cdc5d4a 100644 --- a/core/modules/layout/tests/layout_test/layout_test.routing.yml +++ b/core/modules/layout/tests/layout_test/layout_test.routing.yml @@ -1,5 +1,5 @@ layout_test_page: - pattern: '/layout-test' + path: '/layout-test' defaults: _content: '\Drupal\layout_test\Controller\LayoutTestController::layoutTestPage' requirements: diff --git a/core/modules/locale/locale.routing.yml b/core/modules/locale/locale.routing.yml index 2047229..1ecc28e 100644 --- a/core/modules/locale/locale.routing.yml +++ b/core/modules/locale/locale.routing.yml @@ -1,12 +1,12 @@ locale_settings: - pattern: '/admin/config/regional/translate/settings' + path: '/admin/config/regional/translate/settings' defaults: _form: 'Drupal\locale\Form\LocaleSettingsForm' requirements: _permission: 'translate interface' locale_check_translation: - pattern: '/admin/reports/translations/check' + path: '/admin/reports/translations/check' defaults: _controller: 'Drupal\locale\Controller\LocaleController::checkTranslation' requirements: diff --git a/core/modules/menu/menu.routing.yml b/core/modules/menu/menu.routing.yml index d710470..90db7a7 100644 --- a/core/modules/menu/menu.routing.yml +++ b/core/modules/menu/menu.routing.yml @@ -1,68 +1,68 @@ menu_settings: - pattern: '/admin/structure/menu/settings' + path: '/admin/structure/menu/settings' defaults: _form: 'Drupal\menu\MenuSettingsForm' requirements: _permission: 'administer menu' menu_overview_page: - pattern: '/admin/structure/menu' + path: '/admin/structure/menu' defaults: _entity_list: 'menu' requirements: _permission: 'administer menu' menu_parent_options_js: - pattern: '/admin/structure/menu/parents' + path: '/admin/structure/menu/parents' defaults: _controller: '\Drupal\menu\Controller\MenuController::getParentOptions' requirements: _permission: 'administer menu' menu_link_add: - pattern: '/admin/structure/menu/manage/{menu}/add' + path: '/admin/structure/menu/manage/{menu}/add' defaults: _content: '\Drupal\menu\Controller\MenuController::addLink' requirements: _permission: 'administer menu' menu_link_edit: - pattern: '/admin/structure/menu/item/{menu_link}/edit' + path: '/admin/structure/menu/item/{menu_link}/edit' defaults: _entity_form: 'menu_link' requirements: _permission: 'administer menu' menu_link_reset: - pattern: 'admin/structure/menu/item/{menu_link}/reset' + path: 'admin/structure/menu/item/{menu_link}/reset' defaults: _entity_form: 'menu_link.reset' requirements: _permission: 'administer menu' menu_link_delete: - pattern: 'admin/structure/menu/item/{menu_link}/delete' + path: 'admin/structure/menu/item/{menu_link}/delete' defaults: _entity_form: 'menu_link.delete' requirements: _access_menu_delete_link: 'TRUE' menu_menu_add: - pattern: '/admin/structure/menu/add' + path: '/admin/structure/menu/add' defaults: _entity_form: 'menu.add' requirements: _entity_create_access: 'menu' menu_menu_edit: - pattern: '/admin/structure/menu/manage/{menu}' + path: '/admin/structure/menu/manage/{menu}' defaults: _entity_form: 'menu.edit' requirements: _entity_access: 'menu.update' menu_delete_menu: - pattern: 'admin/structure/menu/manage/{menu}/delete' + path: 'admin/structure/menu/manage/{menu}/delete' defaults: _entity_form: 'menu.delete' requirements: diff --git a/core/modules/node/node.routing.yml b/core/modules/node/node.routing.yml index dfdc0a6..021ea21 100644 --- a/core/modules/node/node.routing.yml +++ b/core/modules/node/node.routing.yml @@ -1,40 +1,40 @@ node_multiple_delete_confirm: - pattern: '/admin/content/node/delete' + path: '/admin/content/node/delete' defaults: _form: '\Drupal\node\Form\DeleteMultiple' requirements: _permission: 'administer nodes' node_page_edit: - pattern: '/node/{node}/edit' + path: '/node/{node}/edit' defaults: _entity_form: 'node.edit' requirements: _entity_access: 'node.update' node_delete_confirm: - pattern: '/node/{node}/delete' + path: '/node/{node}/delete' defaults: _entity_form: 'node.delete' requirements: _entity_access: 'node.delete' node_revision_revert_confirm: - pattern: '/node/{node}/revisions/{node_revision}/revert' + path: '/node/{node}/revisions/{node_revision}/revert' defaults: _form: '\Drupal\node\Form\NodeRevisionRevertForm' requirements: _access_node_revision: 'update' node_revision_delete_confirm: - pattern: '/node/{node}/revisions/{node_revision}/delete' + path: '/node/{node}/revisions/{node_revision}/delete' defaults: _form: '\Drupal\node\Form\NodeRevisionDeleteForm' requirements: _access_node_revision: 'delete' node_overview_types: - pattern: '/admin/structure/types' + path: '/admin/structure/types' defaults: _content: '\Drupal\Core\Entity\Controller\EntityListController::listing' entity_type: 'node_type' @@ -42,35 +42,35 @@ node_overview_types: _permission: 'administer content types' node_type_add: - pattern: '/admin/structure/types/add' + path: '/admin/structure/types/add' defaults: _entity_form: 'node_type.add' requirements: _permission: 'administer content types' node_type_edit: - pattern: '/admin/structure/types/manage/{node_type}' + path: '/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' + path: '/admin/structure/types/manage/{node_type}/edit' defaults: _entity_form: 'node_type.edit' requirements: _permission: 'administer content types' node_type_delete_confirm: - pattern: '/admin/structure/types/manage/{node_type}/delete' + path: '/admin/structure/types/manage/{node_type}/delete' defaults: _entity_form: 'node_type.delete' requirements: _entity_access: 'node_type.delete' node_configure_rebuild_confirm: - pattern: '/admin/reports/status/rebuild' + path: '/admin/reports/status/rebuild' defaults: _form: 'Drupal\node\Form\RebuildPermissionsForm' requirements: diff --git a/core/modules/overlay/overlay.routing.yml b/core/modules/overlay/overlay.routing.yml index 9f22f56..78687e9 100644 --- a/core/modules/overlay/overlay.routing.yml +++ b/core/modules/overlay/overlay.routing.yml @@ -1,5 +1,5 @@ overlay_message: - pattern: '/overlay/dismiss-message' + path: '/overlay/dismiss-message' defaults: _controller: '\Drupal\overlay\Controller\OverlayController::overlayMessage' requirements: diff --git a/core/modules/path/path.routing.yml b/core/modules/path/path.routing.yml index dbc6883..238495c 100644 --- a/core/modules/path/path.routing.yml +++ b/core/modules/path/path.routing.yml @@ -1,5 +1,5 @@ path_delete: - pattern: 'admin/config/search/path/delete/{pid}' + path: 'admin/config/search/path/delete/{pid}' defaults: _form: '\Drupal\path\Form\DeleteForm' requirements: diff --git a/core/modules/picture/picture.routing.yml b/core/modules/picture/picture.routing.yml index e01bb81..71135e4 100644 --- a/core/modules/picture/picture.routing.yml +++ b/core/modules/picture/picture.routing.yml @@ -1,33 +1,33 @@ picture_mapping_page: - pattern: '/admin/config/media/picturemapping' + path: '/admin/config/media/picturemapping' defaults: _entity_list: 'picture_mapping' requirements: _permission: 'administer pictures' picture_mapping_page_add: - pattern: '/admin/config/media/picturemapping/add' + path: '/admin/config/media/picturemapping/add' defaults: _entity_form: 'picture_mapping.add' requirements: _permission: 'administer pictures' picture_mapping_page_edit: - pattern: '/admin/config/media/picturemapping/{picture_mapping}' + path: '/admin/config/media/picturemapping/{picture_mapping}' defaults: _entity_form: 'picture_mapping.edit' requirements: _permission: 'administer pictures' picture_mapping_page_duplicate: - pattern: '/admin/config/media/picturemapping/{picture_mapping}/duplicate' + path: '/admin/config/media/picturemapping/{picture_mapping}/duplicate' defaults: _entity_form: 'picture_mapping.duplicate' requirements: _permission: 'administer pictures' picture_mapping_action_confirm: - pattern: '/admin/config/media/picturemapping/{picture_mapping}/delete' + path: '/admin/config/media/picturemapping/{picture_mapping}/delete' defaults: _entity_form: 'picture_mapping.delete' requirements: diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/ResourceBase.php b/core/modules/rest/lib/Drupal/rest/Plugin/ResourceBase.php index b829c7c..3c1e9f9 100644 --- a/core/modules/rest/lib/Drupal/rest/Plugin/ResourceBase.php +++ b/core/modules/rest/lib/Drupal/rest/Plugin/ResourceBase.php @@ -108,7 +108,7 @@ public function routes() { // HTTP Accept headers. foreach ($this->serializerFormats as $format_name) { // Expose one route per available format. - //$format_route = new Route($route->getPattern(), $route->getDefaults(), $route->getRequirements()); + //$format_route = new Route($route->getPath(), $route->getDefaults(), $route->getRequirements()); $format_route = clone $route; $format_route->addRequirements(array('_format' => $format_name)); $collection->add("$route_name.$method.$format_name", $format_route); diff --git a/core/modules/rest/rest.routing.yml b/core/modules/rest/rest.routing.yml index c7ef69e..843dee9 100644 --- a/core/modules/rest/rest.routing.yml +++ b/core/modules/rest/rest.routing.yml @@ -1,5 +1,5 @@ rest.csrftoken: - pattern: '/rest/session/token' + path: '/rest/session/token' defaults: _controller: '\Drupal\rest\RequestHandler::csrfToken' requirements: diff --git a/core/modules/search/search.routing.yml b/core/modules/search/search.routing.yml index 8acf650..62e23e9 100644 --- a/core/modules/search/search.routing.yml +++ b/core/modules/search/search.routing.yml @@ -1,11 +1,11 @@ search_settings: - pattern: '/admin/config/search/settings' + path: '/admin/config/search/settings' defaults: _form: 'Drupal\search\Form\SearchSettingsForm' requirements: _permission: 'administer search' search_reindex_confirm: - pattern: '/admin/config/search/settings/reindex' + path: '/admin/config/search/settings/reindex' defaults: _form: 'Drupal\search\Form\ReindexConfirm' requirements: diff --git a/core/modules/shortcut/shortcut.routing.yml b/core/modules/shortcut/shortcut.routing.yml index faf495a..d30d4b2 100644 --- a/core/modules/shortcut/shortcut.routing.yml +++ b/core/modules/shortcut/shortcut.routing.yml @@ -1,47 +1,47 @@ shortcut_link_delete: - pattern: '/admin/config/user-interface/shortcut/link/{menu_link}/delete' + path: '/admin/config/user-interface/shortcut/link/{menu_link}/delete' defaults: _form: 'Drupal\shortcut\Form\LinkDelete' requirements: _access_shortcut_link_delete: 'TRUE' shortcut_set_delete: - pattern: '/admin/config/user-interface/shortcut/manage/{shortcut_set}/delete' + path: '/admin/config/user-interface/shortcut/manage/{shortcut_set}/delete' defaults: _entity_form: 'shortcut_set.delete' requirements: _entity_access: 'shortcut_set.delete' shortcut_set_admin: - pattern: '/admin/config/user-interface/shortcut' + path: '/admin/config/user-interface/shortcut' defaults: _entity_list: 'shortcut_set' requirements: _permission: 'administer shortcuts' shortcut_set_add: - pattern: '/admin/config/user-interface/shortcut/add-set' + path: '/admin/config/user-interface/shortcut/add-set' defaults: _entity_form: 'shortcut_set.add' requirements: _entity_create_access: 'shortcut_set' shortcut_set_edit: - pattern: '/admin/config/user-interface/shortcut/manage/{shortcut_set}/edit' + path: '/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: - pattern: '/admin/config/user-interface/shortcut/manage/{shortcut_set}/add-link-inline' + path: '/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: - pattern: '/admin/config/user-interface/shortcut/manage/{shortcut_set}' + path: '/admin/config/user-interface/shortcut/manage/{shortcut_set}' defaults: _entity_form: 'shortcut_set.customize' requirements: diff --git a/core/modules/simpletest/simpletest.routing.yml b/core/modules/simpletest/simpletest.routing.yml index 8436309..7da0200 100644 --- a/core/modules/simpletest/simpletest.routing.yml +++ b/core/modules/simpletest/simpletest.routing.yml @@ -1,19 +1,19 @@ simpletest_settings: - pattern: '/admin/config/development/testing/settings' + path: '/admin/config/development/testing/settings' defaults: _form: 'Drupal\simpletest\Form\SimpletestSettingsForm' requirements: _permission: 'administer unit tests' simpletest_test_form: - pattern: '/admin/config/development/testing' + path: '/admin/config/development/testing' defaults: _form: '\Drupal\simpletest\Form\SimpletestTestForm' requirements: _permission: 'administer unit tests' simpletest_result_form: - pattern: '/admin/config/development/testing/results/{test_id}' + path: '/admin/config/development/testing/results/{test_id}' defaults: _form: 'Drupal\simpletest\Form\SimpletestResultsForm' requirements: diff --git a/core/modules/statistics/statistics.routing.yml b/core/modules/statistics/statistics.routing.yml index 0d0310f..ebe5399 100644 --- a/core/modules/statistics/statistics.routing.yml +++ b/core/modules/statistics/statistics.routing.yml @@ -1,5 +1,5 @@ statistics_settings: - pattern: '/admin/config/system/statistics' + path: '/admin/config/system/statistics' defaults: _form: 'Drupal\statistics\StatisticsSettingsForm' requirements: diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php index 7f6f312..fcdbbfe 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php @@ -72,7 +72,7 @@ function testAddRoutes() { $collection_routes = $collection->all(); foreach ($dumper_routes as $name => $route) { - $this->assertEqual($route->getPattern(), $collection_routes[$name]->getPattern(), 'Routes match'); + $this->assertEqual($route->getPath(), $collection_routes[$name]->getPath(), 'Routes match'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/RouteProviderTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/RouteProviderTest.php index 01f651e..d17dd87 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Routing/RouteProviderTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Routing/RouteProviderTest.php @@ -95,7 +95,7 @@ function testExactPathMatch() { $routes = $provider->getRouteCollectionForRequest($request); foreach ($routes as $route) { - $this->assertEqual($route->getPattern(), $path, 'Found path has correct pattern'); + $this->assertEqual($route->getPath(), $path, 'Found path has correct pattern'); } } @@ -358,7 +358,7 @@ function testSystemPathMatch() { $this->assertEqual(array_keys($routes_by_pattern->all()), array_keys($routes->all()), 'Ensure the expected routes are found.'); foreach ($routes as $route) { - $this->assertEqual($route->getPattern(), '/path/two', 'Found path has correct pattern'); + $this->assertEqual($route->getPath(), '/path/two', 'Found path has correct pattern'); } } @@ -376,10 +376,10 @@ protected function testRouteByName() { $dumper->dump(); $route = $provider->getRouteByName('route_a'); - $this->assertEqual($route->getPattern(), '/path/one', 'The right route pattern was found.'); + $this->assertEqual($route->getPath(), '/path/one', 'The right route pattern was found.'); $this->assertEqual($route->getRequirement('_method'), 'GET', 'The right route method was found.'); $route = $provider->getRouteByName('route_b'); - $this->assertEqual($route->getPattern(), '/path/one', 'The right route pattern was found.'); + $this->assertEqual($route->getPath(), '/path/one', 'The right route pattern was found.'); $this->assertEqual($route->getRequirement('_method'), 'PUT', 'The right route method was found.'); $exception_thrown = FALSE; @@ -393,8 +393,8 @@ protected function testRouteByName() { $routes = $provider->getRoutesByNames(array('route_c', 'route_d', $this->randomName())); $this->assertEqual(count($routes), 2, 'Only two valid routes found.'); - $this->assertEqual($routes['route_c']->getPattern(), '/path/two'); - $this->assertEqual($routes['route_d']->getPattern(), '/path/three'); + $this->assertEqual($routes['route_c']->getPath(), '/path/two'); + $this->assertEqual($routes['route_d']->getPath(), '/path/three'); } } diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml index 017d486..fe1cc82 100644 --- a/core/modules/system/system.routing.yml +++ b/core/modules/system/system.routing.yml @@ -1,178 +1,178 @@ system.ajax: - pattern: '/system/ajax' + path: '/system/ajax' defaults: _controller: '\Drupal\system\Controller\FormAjaxController::content' requirements: _access: 'TRUE' system.cron: - pattern: '/cron/{key}' + path: '/cron/{key}' defaults: _controller: '\Drupal\system\CronController::run' requirements: _access_system_cron: 'TRUE' system.machine_name_transliterate: - pattern: '/machine_name/transliterate' + path: '/machine_name/transliterate' defaults: _controller: '\Drupal\system\MachineNameController::transliterate' requirements: _permission: 'access content' system_site_information_settings: - pattern: '/admin/config/system/site-information' + path: '/admin/config/system/site-information' defaults: _form: 'Drupal\system\Form\SiteInformationForm' requirements: _permission: 'administer site configuration' system_cron_settings: - pattern: '/admin/config/system/cron' + path: '/admin/config/system/cron' defaults: _form: 'Drupal\system\Form\CronForm' requirements: _permission: 'administer site configuration' system_logging_settings: - pattern: '/admin/config/development/logging' + path: '/admin/config/development/logging' defaults: _form: 'Drupal\system\Form\LoggingForm' requirements: _permission: 'administer site configuration' system_performance_settings: - pattern: '/admin/config/development/performance' + path: '/admin/config/development/performance' defaults: _form: 'Drupal\system\Form\PerformanceForm' requirements: _permission: 'administer site configuration' system_file_system_settings: - pattern: '/admin/config/media/file-system' + path: '/admin/config/media/file-system' defaults: _form: 'Drupal\system\Form\FileSystemForm' requirements: _permission: 'administer site configuration' system_rss_feeds_settings: - pattern: '/admin/config/services/rss-publishing' + path: '/admin/config/services/rss-publishing' defaults: _form: 'Drupal\system\Form\RssFeedsForm' requirements: _permission: 'administer site configuration' system_regional_settings: - pattern: '/admin/config/regional/settings' + path: '/admin/config/regional/settings' defaults: _form: 'Drupal\system\Form\RegionalForm' requirements: _permission: 'administer site configuration' system_image_toolkit_settings: - pattern: '/admin/config/media/image-toolkit' + path: '/admin/config/media/image-toolkit' defaults: _form: 'Drupal\system\Form\ImageToolkitForm' requirements: _permission: 'administer administration pages' system_site_maintenance_mode: - pattern: '/admin/config/development/maintenance' + path: '/admin/config/development/maintenance' defaults: _form: 'Drupal\system\Form\SiteMaintenanceModeForm' requirements: _permission: 'administer site configuration' system_run_cron: - pattern: '/admin/reports/status/run-cron' + path: '/admin/reports/status/run-cron' defaults: _controller: '\Drupal\system\CronController::runManually' requirements: _permission: 'administer site configuration' date_format_list: - pattern: '/admin/config/regional/date-time' + path: '/admin/config/regional/date-time' defaults: _entity_list: 'date_format' requirements: _permission: 'administer site configuration' date_format_add: - pattern: '/admin/config/regional/date-time/formats/add' + path: '/admin/config/regional/date-time/formats/add' defaults: _entity_form: 'date_format.add' requirements: _permission: 'administer site configuration' date_format_edit: - pattern: '/admin/config/regional/date-time/formats/manage/{date_format}' + path: '/admin/config/regional/date-time/formats/manage/{date_format}' defaults: _entity_form: 'date_format.edit' requirements: _entity_access: 'date_format.update' date_format_delete: - pattern: 'admin/config/regional/date-time/formats/manage/{date_format}/delete' + path: '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: - pattern: 'admin/config/regional/date-time/locale/{langcode}/reset' + path: 'admin/config/regional/date-time/locale/{langcode}/reset' defaults: _form: '\Drupal\system\Form\DateFormatLocalizeResetForm' requirements: _permission: 'administer site configuration' system_modules_list: - pattern: 'admin/modules' + path: 'admin/modules' defaults: _form: 'Drupal\system\Form\ModulesListForm' requirements: _permission: 'administer modules' system_modules_list_confirm: - pattern: 'admin/modules/list/confirm' + path: 'admin/modules/list/confirm' defaults: _form: 'Drupal\system\Form\ModulesListConfirmForm' requirements: _permission: 'administer modules' system_theme_disable: - pattern: '/admin/appearance/disable' + path: '/admin/appearance/disable' defaults: _controller: 'Drupal\system\Controller\ThemeController::disable' requirements: _permission: 'administer themes' system_theme_enable: - pattern: '/admin/appearance/enable' + path: '/admin/appearance/enable' defaults: _controller: 'Drupal\system\Controller\ThemeController::enable' requirements: _permission: 'administer themes' system_status: - pattern: '/admin/reports/status' + path: '/admin/reports/status' defaults: _controller: 'Drupal\system\Controller\SystemInfoController::status' requirements: _permission: 'administer site configuration' system_php: - pattern: '/admin/reports/status/php' + path: '/admin/reports/status/php' defaults: _controller: 'Drupal\system\Controller\SystemInfoController::php' requirements: _permission: 'administer site configuration' system_admin_index: - pattern: 'admin/index' + path: 'admin/index' defaults: _content: 'Drupal\system\Controller\AdminController::index' requirements: _permission: 'access administration pages' system_files: - pattern: '/system/files/{scheme}' + path: '/system/files/{scheme}' defaults: _controller: 'Drupal\system\FileDownloadController::download' scheme: private @@ -180,35 +180,35 @@ system_files: _access: 'TRUE' system_theme_settings: - pattern: '/admin/appearance/settings' + path: '/admin/appearance/settings' defaults: _form: '\Drupal\system\Form\ThemeSettingsForm' requirements: _permission: 'administer themes' system_theme_settings_global: - pattern: '/admin/appearance/settings/global' + path: '/admin/appearance/settings/global' defaults: _form: '\Drupal\system\Form\ThemeSettingsForm' requirements: _permission: 'administer themes' system_modules_uninstall: - pattern: 'admin/modules/uninstall' + path: 'admin/modules/uninstall' defaults: _form: 'Drupal\system\Form\ModulesUninstallForm' requirements: _permission: 'administer modules' system_modules_uninstall_confirm: - pattern: 'admin/modules/uninstall/confirm' + path: 'admin/modules/uninstall/confirm' defaults: _form: 'Drupal\system\Form\ModulesUninstallConfirmForm' requirements: _permission: 'administer modules' system_timezone: - pattern: '/system/timezone' + path: '/system/timezone' defaults: _controller: '\Drupal\system\Controller\TimezoneController::getTimezone' requirements: 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 04a0f6d..6b5eab9 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,11 +1,11 @@ ajax_test_dialog_contents: - pattern: ajax-test/dialog-contents + path: ajax-test/dialog-contents defaults: _content: '\Drupal\ajax_test\AjaxTestController::dialogContents' requirements: _access: 'TRUE' ajax_test_dialog_form: - pattern: ajax-test/dialog-form + path: ajax-test/dialog-form defaults: _form: '\Drupal\ajax_test\AjaxTestForm' requirements: 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 b3186c3..8e7804a 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,5 +1,5 @@ common_test_l_active_class: - pattern: '/common-test/type-link-active-class' + path: '/common-test/type-link-active-class' defaults: _content: '\Drupal\common_test\Controller\CommonTestController::typeLinkActiveClass' requirements: 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 d242511..a429ce1 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,5 +1,5 @@ condition_test_1: - pattern: '/condition_test' + path: '/condition_test' defaults: _form: '\Drupal\condition_test\FormController' requirements: 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 1262be4..89f28d9 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,5 +1,5 @@ design_test: - pattern: '/design_test/{category}' + path: '/design_test/{category}' defaults: _content: '\Drupal\design_test\Controller\DesignTestController::categoryPage' category: 'FALSE' 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 645fae1..547e45d 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,12 +1,12 @@ entity_test_render: - pattern: '/entity-test-render/{entity_test_render}' + path: '/entity-test-render/{entity_test_render}' defaults: _entity_view: 'entity_test_render.full' requirements: _access: 'TRUE' entity_test_render_options: - pattern: '/entity-test-render-converter/{foo}' + path: '/entity-test-render-converter/{foo}' options: parameters: foo: @@ -17,7 +17,7 @@ entity_test_render_options: _access: 'TRUE' entity_test_render_no_view_mode: - pattern: '/entity-test-render-no-view-mode/{entity_test_render}' + path: '/entity-test-render-no-view-mode/{entity_test_render}' defaults: _entity_view: 'entity_test_render' requirements: diff --git a/core/modules/system/tests/modules/form_test/form_test.routing.yml b/core/modules/system/tests/modules/form_test/form_test.routing.yml index 0091561..152a3b9 100644 --- a/core/modules/system/tests/modules/form_test/form_test.routing.yml +++ b/core/modules/system/tests/modules/form_test/form_test.routing.yml @@ -1,47 +1,47 @@ form_test.route1: - pattern: '/form-test/object-builder' + path: '/form-test/object-builder' defaults: _form: '\Drupal\form_test\FormTestObject' requirements: _access: 'TRUE' form_test.route2: - pattern: '/form-test/object-arguments-builder/{arg}' + path: '/form-test/object-arguments-builder/{arg}' defaults: _form: '\Drupal\form_test\FormTestArgumentsObject' requirements: _access: 'TRUE' form_test.route3: - pattern: '/form-test/object-service-builder' + path: '/form-test/object-service-builder' defaults: _form: 'form_test.form.serviceForm' requirements: _access: 'TRUE' form_test.route4: - pattern: '/form-test/object-controller-builder' + path: '/form-test/object-controller-builder' defaults: _form: '\Drupal\form_test\FormTestControllerObject' requirements: _access: 'TRUE' form_test.route5: - pattern: '/form-test/system-config-form' + path: '/form-test/system-config-form' defaults: _form: '\Drupal\form_test\SystemConfigFormTestForm' requirements: _access: 'TRUE' form_test.route6: - pattern: '/form-test/confirm-form' + path: '/form-test/confirm-form' defaults: _form: '\Drupal\form_test\ConfirmFormTestForm' requirements: _access: 'TRUE' form_test.route7: - pattern: '/form-test/confirm-form-array-path' + path: '/form-test/confirm-form-array-path' defaults: _form: '\Drupal\form_test\ConfirmFormArrayPathTestForm' requirements: 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 2d701dc..2e161ec 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,107 +1,107 @@ menu_login_callback: - pattern: '/menu_login_callback' + path: '/menu_login_callback' defaults: _content: '\Drupal\menu_test\TestControllers::testLogin' requirements: _access: 'TRUE' menu_router_test1: - pattern: '/foo/{bar}' + path: '/foo/{bar}' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' menu_router_test2: - pattern: '/foo/{bar}/b' + path: '/foo/{bar}/b' defaults: _content: '\Drupal\menu_test\TestControllers::test2' requirements: _access: 'TRUE' menu_router_test3: - pattern: '/foo/{bar}/c' + path: '/foo/{bar}/c' defaults: _content: '\Drupal\menu_test\TestControllers::test2' requirements: _access: 'FALSE' menu_test_local_action1: - pattern: '/menu-test-local-action' + path: '/menu-test-local-action' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' menu_test_local_action2: - pattern: '/menu-test-local-action/hook_menu' + path: '/menu-test-local-action/hook_menu' defaults: _content: '\Drupal\menu_test\TestControllers::test2' requirements: _access: 'TRUE' menu_test_local_action3: - pattern: '/menu-test-local-action/routing' + path: '/menu-test-local-action/routing' defaults: _content: '\Drupal\menu_test\TestControllers::test2' requirements: _access: 'TRUE' menu_test_local_action4: - pattern: '/menu-test-local-action/dynamic-title' + path: '/menu-test-local-action/dynamic-title' defaults: _content: '\Drupal\menu_test\TestControllers::test2' requirements: _access: 'TRUE' menu_local_task_test_tasks: - pattern: '/menu-local-task-test/tasks' + path: '/menu-local-task-test/tasks' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' menu_local_task_test_tasks_tasks: - pattern: '/menu-local-task-test/tasks/tasks' + path: '/menu-local-task-test/tasks/tasks' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' menu_local_task_test_tasks_view: - pattern: '/menu-local-task-test/tasks/view' + path: '/menu-local-task-test/tasks/view' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' menu_local_task_test_tasks_edit: - pattern: '/menu-local-task-test/tasks/edit' + path: '/menu-local-task-test/tasks/edit' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' menu_local_task_test_tasks_settings: - pattern: '/menu-local-task-test/tasks/settings' + path: '/menu-local-task-test/tasks/settings' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' menu_local_task_test_tasks_settings_sub1: - pattern: '/menu-local-task-test/tasks/settings/sub1' + path: '/menu-local-task-test/tasks/settings/sub1' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' menu_local_task_test_tasks_settings_sub2: - pattern: '/menu-local-task-test/tasks/settings/sub2' + path: '/menu-local-task-test/tasks/settings/sub2' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' menu_test_optional_placeholder: - pattern: '/menu-test/optional/{placeholder}' + path: '/menu-test/optional/{placeholder}' defaults: _content: '\Drupal\menu_test\TestControllers::testDefaults' placeholder: NULL 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 10efb11..139160c 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,12 +1,12 @@ paramconverter_test_user_node_foo: - pattern: '/paramconverter_test/test_user_node_foo/{user}/{node}/{foo}' + path: '/paramconverter_test/test_user_node_foo/{user}/{node}/{foo}' defaults: _content: '\Drupal\paramconverter_test\TestControllers::testUserNodeFoo' requirements: _access: 'TRUE' paramconverter_test_node_user_user: - pattern: '/paramconverter_test/test_node_user_user/{node}/{foo}/{user}' + path: '/paramconverter_test/test_node_user_user/{node}/{foo}/{user}' defaults: _content: '\Drupal\paramconverter_test\TestControllers::testUserNodeFoo' requirements: @@ -17,7 +17,7 @@ paramconverter_test_node_user_user: type: 'entity:user' paramconverter_test_node_node_foo: - pattern: '/paramconverter_test/test_node_node_foo/{user}/{node}/{foo}' + path: '/paramconverter_test/test_node_node_foo/{user}/{node}/{foo}' defaults: _content: '\Drupal\paramconverter_test\TestControllers::testUserNodeFoo' requirements: @@ -28,7 +28,7 @@ paramconverter_test_node_node_foo: type: 'entity:node' paramconverter_test_node_set_parent: - pattern: '/paramconverter_test/node/{node}/set/parent/{parent}' + path: '/paramconverter_test/node/{node}/set/parent/{parent}' requirements: _access: 'TRUE' defaults: 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 2eda2c8..6eb1848 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,26 +1,26 @@ router_test_1: - pattern: '/router_test/test1' + path: '/router_test/test1' defaults: _controller: '\Drupal\router_test\TestControllers::test1' requirements: _access: 'TRUE' router_test_2: - pattern: '/router_test/test2' + path: '/router_test/test2' defaults: _content: '\Drupal\router_test\TestControllers::test2' requirements: _access: 'TRUE' router_test_3: - pattern: '/router_test/test3/{value}' + path: '/router_test/test3/{value}' defaults: _content: '\Drupal\router_test\TestControllers::test3' requirements: _access: 'TRUE' router_test_4: - pattern: '/router_test/test4/{value}' + path: '/router_test/test4/{value}' defaults: _content: '\Drupal\router_test\TestControllers::test4' value: 'narf' @@ -28,26 +28,26 @@ router_test_4: _access: 'TRUE' router_test_6: - pattern: '/router_test/test6' + path: '/router_test/test6' defaults: _controller: '\Drupal\router_test\TestControllers::test1' requirements: _access: 'TRUE' router_test_7: - pattern: '/router_test/test7' + path: '/router_test/test7' defaults: _controller: '\Drupal\router_test\TestControllers::test7' requirements: _permission: 'access test7' router_test_8: - pattern: '/router_test/test8' + path: '/router_test/test8' defaults: _controller: '\Drupal\router_test\TestControllers::test8' router_test_9: - pattern: '/router_test/test9' + path: '/router_test/test9' defaults: _controller: '\Drupal\router_test\TestControllers::test8' requirements: @@ -55,14 +55,14 @@ router_test_9: _access_router_test: 'TRUE' router_test_10: - pattern: '/router_test/test10' + path: '/router_test/test10' defaults: _content: '\Drupal\router_test\TestContent::test1' requirements: _access: 'TRUE' router_test_11: - pattern: '/router_test/test11' + path: '/router_test/test11' options: _auth: [ 'http_basic' ] requirements: 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 866171e..83aded6 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,5 +1,5 @@ function_template_override: - pattern: '/theme-test/function-template-overridden' + path: '/theme-test/function-template-overridden' defaults: _content: '\Drupal\theme_test\ThemeTestController::functionTemplateOverridden' requirements: diff --git a/core/modules/system/tests/modules/twig_extension_test/twig_extension_test.routing.yml b/core/modules/system/tests/modules/twig_extension_test/twig_extension_test.routing.yml index 8d4bace..cda7369 100644 --- a/core/modules/system/tests/modules/twig_extension_test/twig_extension_test.routing.yml +++ b/core/modules/system/tests/modules/twig_extension_test/twig_extension_test.routing.yml @@ -1,11 +1,11 @@ twig_extension_test.filter: - pattern: '/twig-extension-test/filter' + path: '/twig-extension-test/filter' defaults: _content: '\Drupal\twig_extension_test\TwigExtensionTestController::testFilterRender' requirements: _permission: 'access content' twig_extension_test.function: - pattern: '/twig-extension-test/function' + path: '/twig-extension-test/function' defaults: _content: '\Drupal\twig_extension_test\TwigExtensionTestController::testFunctionRender' requirements: 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 17ac5b0..2cc9502 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,11 +1,11 @@ twig_theme_test_php_variables: - pattern: '/twig-theme-test/php-variables' + path: '/twig-theme-test/php-variables' defaults: _content: '\Drupal\twig_theme_test\TwigThemeTestController::phpVariablesRender' requirements: _permission: 'access content' twig_theme_test_trans: - pattern: '/twig-theme-test/trans' + path: '/twig-theme-test/trans' defaults: _content: '\Drupal\twig_theme_test\TwigThemeTestController::transBlockRender' requirements: diff --git a/core/modules/taxonomy/taxonomy.routing.yml b/core/modules/taxonomy/taxonomy.routing.yml index 09dc6d0..d1be280 100644 --- a/core/modules/taxonomy/taxonomy.routing.yml +++ b/core/modules/taxonomy/taxonomy.routing.yml @@ -1,33 +1,33 @@ taxonomy_vocabulary_list: - pattern: '/admin/structure/taxonomy' + path: '/admin/structure/taxonomy' defaults: _entity_list: 'taxonomy_vocabulary' requirements: _permission: 'administer taxonomy' taxonomy_term_add: - pattern: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/add' + path: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/add' defaults: _content: '\Drupal\taxonomy\Controller\TaxonomyController::addForm' requirements: _access_taxonomy_term_create: 'taxonomy_term' taxonomy_term_delete: - pattern: '/taxonomy/term/{taxonomy_term}/delete' + path: '/taxonomy/term/{taxonomy_term}/delete' defaults: _entity_form: 'taxonomy_term.delete' requirements: _entity_access: 'taxonomy_term.delete' taxonomy_vocabulary_delete: - pattern: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/delete' + path: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/delete' defaults: _entity_form: 'taxonomy_vocabulary.delete' requirements: _entity_access: 'taxonomy_vocabulary.delete' taxonomy_vocabulary_reset: - pattern: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/reset' + path: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/reset' defaults: _entity_form: 'taxonomy_vocabulary.reset' requirements: diff --git a/core/modules/toolbar/toolbar.routing.yml b/core/modules/toolbar/toolbar.routing.yml index 448ea99..503e0ea 100644 --- a/core/modules/toolbar/toolbar.routing.yml +++ b/core/modules/toolbar/toolbar.routing.yml @@ -1,5 +1,5 @@ toolbar_subtrees: - pattern: '/toolbar/subtrees/{hash}' + path: '/toolbar/subtrees/{hash}' defaults: _controller: '\Drupal\toolbar\Routing\ToolbarController::subtreesJsonp' requirements: diff --git a/core/modules/update/update.routing.yml b/core/modules/update/update.routing.yml index 16ac4b4..f54154b 100644 --- a/core/modules/update/update.routing.yml +++ b/core/modules/update/update.routing.yml @@ -1,12 +1,12 @@ update_settings: - pattern: '/admin/reports/updates/settings' + path: '/admin/reports/updates/settings' defaults: _form: '\Drupal\update\UpdateSettingsForm' requirements: _permission: 'administer site configuration' update_status: - pattern: '/admin/reports/updates' + path: '/admin/reports/updates' defaults: _content: '\Drupal\update\Controller\UpdateController::updateStatus' requirements: diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml index 90570ea..f49c9ea 100644 --- a/core/modules/user/user.routing.yml +++ b/core/modules/user/user.routing.yml @@ -1,103 +1,103 @@ user_register: - pattern: '/user/register' + path: '/user/register' defaults: _entity_form: 'user.register' requirements: _access_user_register: 'TRUE' user_logout: - pattern: '/user/logout' + path: '/user/logout' defaults: _controller: '\Drupal\user\Controller\UserController::logout' requirements: _user_is_logged_in: 'TRUE' user_autocomplete: - pattern: '/user/autocomplete' + path: '/user/autocomplete' defaults: _controller: '\Drupal\user\Controller\UserAutocompleteController::autocompleteUser' requirements: _permission: 'access user profiles' user_autocomplete_anonymous: - pattern: '/user/autocomplete/anonymous' + path: '/user/autocomplete/anonymous' defaults: _controller: '\Drupal\user\Controller\UserAutocompleteController::autocompleteUserAnonymous' requirements: _permission: 'access user profiles' user_account_settings: - pattern: '/admin/config/people/accounts' + path: '/admin/config/people/accounts' defaults: _form: '\Drupal\user\AccountSettingsForm' requirements: _permission: 'administer users' user_admin_create: - pattern: '/admin/people/create' + path: '/admin/people/create' defaults: _entity_form: 'user.register' requirements: _permission: 'administer users' user_admin_permissions: - pattern: '/admin/people/permissions' + path: '/admin/people/permissions' defaults: _form: '\Drupal\user\Form\UserPermissionsForm' requirements: _permission: 'administer permissions' user_admin_permission: - pattern: '/admin/people/permissions/{role_id}' + path: '/admin/people/permissions/{role_id}' defaults: _form: '\Drupal\user\Form\UserPermissionsRoleSpecificForm' requirements: _permission: 'administer permissions' user_role_list: - pattern: '/admin/people/roles' + path: '/admin/people/roles' defaults: _entity_list: 'user_role' requirements: _permission: 'administer permissions' user_role_add: - pattern: '/admin/people/roles/add' + path: '/admin/people/roles/add' defaults: _entity_form: user_role.default requirements: _permission: 'administer permissions' user_role_edit: - pattern: '/admin/people/roles/manage/{user_role}' + path: '/admin/people/roles/manage/{user_role}' defaults: _entity_form: user_role.default requirements: _entity_access: user_role.update user_role_delete: - pattern: '/admin/people/roles/manage/{user_role}/delete' + path: '/admin/people/roles/manage/{user_role}/delete' defaults: _entity_form: user_role.delete requirements: _entity_access: user_role.delete user_pass: - pattern: '/user/password' + path: '/user/password' defaults: _form: '\Drupal\user\Form\UserPasswordForm' requirements: _access: 'TRUE' user_page: - pattern: '/user' + path: '/user' defaults: _content: '\Drupal\user\Controller\UserController::userPage' requirements: _access: 'TRUE' user_login: - pattern: '/user/login' + path: '/user/login' defaults: _form: '\Drupal\user\Form\UserLoginForm' requirements: 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 f022c68..06745df 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,5 +1,5 @@ views_test_data_element: - pattern: '/views_test_data_element_form' + path: '/views_test_data_element_form' defaults: _form: '\Drupal\views_test_data\Form\ViewsTestDataElementForm' requirements: diff --git a/core/modules/views/views.routing.yml b/core/modules/views/views.routing.yml index 016b2a5..53c180b 100644 --- a/core/modules/views/views.routing.yml +++ b/core/modules/views/views.routing.yml @@ -1,5 +1,5 @@ views_ajax: - pattern: '/views/ajax' + path: '/views/ajax' defaults: _controller: '\Drupal\views\Controller\ViewAjaxController::ajaxView' requirements: diff --git a/core/modules/views_ui/views_ui.routing.yml b/core/modules/views_ui/views_ui.routing.yml index cc56c8b..77fecf1 100644 --- a/core/modules/views_ui/views_ui.routing.yml +++ b/core/modules/views_ui/views_ui.routing.yml @@ -1,47 +1,47 @@ views_ui.list: - pattern: '/admin/structure/views' + path: '/admin/structure/views' defaults: _entity_list: 'view' requirements: _permission: 'administer views' views_ui.add: - pattern: '/admin/structure/views/add' + path: '/admin/structure/views/add' defaults: _entity_form: 'view.add' requirements: _permission: 'administer views' views_ui.settings.basic: - pattern: '/admin/structure/views/settings' + path: '/admin/structure/views/settings' defaults: _form: '\Drupal\views_ui\Form\BasicSettingsForm' requirements: _permission: 'administer views' views_ui.settings.advanced: - pattern: '/admin/structure/views/settings/advanced' + path: '/admin/structure/views/settings/advanced' defaults: _form: '\Drupal\views_ui\Form\AdvancedSettingsForm' requirements: _permission: 'administer views' views_ui.reports.fields: - pattern: '/admin/reports/fields/views-fields' + path: '/admin/reports/fields/views-fields' defaults: _controller: '\Drupal\views_ui\Controller\ViewsUIController::reportFields' requirements: _permission: 'administer views' views_ui.reports.plugins: - pattern: '/admin/reports/views-plugins' + path: '/admin/reports/views-plugins' defaults: _controller: '\Drupal\views_ui\Controller\ViewsUIController::reportPlugins' requirements: _permission: 'administer views' views_ui.operation: - pattern: '/admin/structure/views/view/{view}/{op}' + path: '/admin/structure/views/view/{view}/{op}' defaults: _controller: '\Drupal\views_ui\Controller\ViewsUIController::ajaxOperation' requirements: @@ -49,28 +49,28 @@ views_ui.operation: op: 'enable|disable' views_ui.clone: - pattern: '/admin/structure/views/view/{view}/clone' + path: '/admin/structure/views/view/{view}/clone' defaults: _entity_form: 'view.clone' requirements: _permission: 'administer views' views_ui.delete: - pattern: '/admin/structure/views/view/{view}/delete' + path: '/admin/structure/views/view/{view}/delete' defaults: _entity_form: 'view.delete' requirements: _permission: 'administer views' views_ui.autocomplete: - pattern: '/admin/views/ajax/autocomplete/tag' + path: '/admin/views/ajax/autocomplete/tag' defaults: _controller: '\Drupal\views_ui\Controller\ViewsUIController::autocompleteTag' requirements: _permission: 'administer views' views_ui.edit: - pattern: '/admin/structure/views/view/{view}' + path: '/admin/structure/views/view/{view}' options: parameters: view: @@ -81,7 +81,7 @@ views_ui.edit: _permission: 'administer views' views_ui.edit.display: - pattern: '/admin/structure/views/view/{view}/edit/{display_id}' + path: '/admin/structure/views/view/{view}/edit/{display_id}' options: parameters: view: @@ -93,7 +93,7 @@ views_ui.edit.display: _permission: 'administer views' views_ui.preview: - pattern: '/admin/structure/views/view/{view}/preview/{display_id}' + path: '/admin/structure/views/view/{view}/preview/{display_id}' options: parameters: view: @@ -105,14 +105,14 @@ views_ui.preview: _permission: 'administer views' views_ui.breakLock: - pattern: '/admin/structure/views/view/{view}/break-lock' + path: '/admin/structure/views/view/{view}/break-lock' defaults: _entity_form: 'view.break_lock' requirements: _permission: 'administer views' views_ui.form.addItem: - pattern: '/admin/structure/views/{js}/add-item/{view}/{display_id}/{type}' + path: '/admin/structure/views/{js}/add-item/{view}/{display_id}/{type}' options: parameters: view: @@ -124,7 +124,7 @@ views_ui.form.addItem: js: 'nojs|ajax' views_ui.form.editDetails: - pattern: '/admin/structure/views/{js}/edit-details/{view}/{display_id}' + path: '/admin/structure/views/{js}/edit-details/{view}/{display_id}' options: parameters: view: @@ -136,7 +136,7 @@ views_ui.form.editDetails: js: 'nojs|ajax' views_ui.form.reorderDisplays: - pattern: '/admin/structure/views/{js}/reorder-displays/{view}/{display_id}' + path: '/admin/structure/views/{js}/reorder-displays/{view}/{display_id}' options: parameters: view: @@ -148,7 +148,7 @@ views_ui.form.reorderDisplays: js: 'nojs|ajax' views_ui.form.analyze: - pattern: '/admin/structure/views/{js}/analyze/{view}/{display_id}' + path: '/admin/structure/views/{js}/analyze/{view}/{display_id}' options: parameters: view: @@ -160,7 +160,7 @@ views_ui.form.analyze: js: 'nojs|ajax' views_ui.form.rearrange: - pattern: '/admin/structure/views/{js}/rearrange/{view}/{display_id}/{type}' + path: '/admin/structure/views/{js}/rearrange/{view}/{display_id}/{type}' options: parameters: view: @@ -172,7 +172,7 @@ views_ui.form.rearrange: js: 'nojs|ajax' views_ui.form.rearrangeFilter: - pattern: '/admin/structure/views/{js}/rearrange-filter/{view}/{display_id}' + path: '/admin/structure/views/{js}/rearrange-filter/{view}/{display_id}' options: parameters: view: @@ -184,7 +184,7 @@ views_ui.form.rearrangeFilter: js: 'nojs|ajax' views_ui.form.display: - pattern: '/admin/structure/views/{js}/display/{view}/{display_id}/{type}' + path: '/admin/structure/views/{js}/display/{view}/{display_id}/{type}' options: parameters: view: @@ -196,7 +196,7 @@ views_ui.form.display: js: 'nojs|ajax' views_ui.form.configItem: - pattern: '/admin/structure/views/{js}/config-item/{view}/{display_id}/{type}/{id}' + path: '/admin/structure/views/{js}/config-item/{view}/{display_id}/{type}/{id}' options: parameters: view: @@ -208,7 +208,7 @@ views_ui.form.configItem: js: 'nojs|ajax' views_ui.form.configItemExtra: - pattern: '/admin/structure/views/{js}/config-item-extra/{view}/{display_id}/{type}/{id}' + path: '/admin/structure/views/{js}/config-item-extra/{view}/{display_id}/{type}/{id}' options: parameters: view: @@ -220,7 +220,7 @@ views_ui.form.configItemExtra: js: 'nojs|ajax' views_ui.form.configItemGroup: - pattern: '/admin/structure/views/{js}/config-item-group/{view}/{display_id}/{type}/{id}' + path: '/admin/structure/views/{js}/config-item-group/{view}/{display_id}/{type}/{id}' options: parameters: view: