diff --git a/core/lib/Drupal/Core/Entity/HtmlEntityFormController.php b/core/lib/Drupal/Core/Entity/HtmlEntityFormController.php index 86d8094..d299002 100644 --- a/core/lib/Drupal/Core/Entity/HtmlEntityFormController.php +++ b/core/lib/Drupal/Core/Entity/HtmlEntityFormController.php @@ -32,7 +32,7 @@ public function content(Request $request, $_entity_form) { * representing the entity and operation being performed. * Consider the following route: * @code - * pattern: '/foo/{node}/bar' + * path: '/foo/{node}/bar' * defaults: * _entity_form: 'node.edit' * @endcode @@ -40,7 +40,7 @@ public function content(Request $request, $_entity_form) { * If the entity type has a default form controller, only the name of the * entity {param} needs to be passed: * @code - * pattern: '/foo/{node}/baz' + * path: '/foo/{node}/baz' * defaults: * _entity_form: 'node' * @endcode diff --git a/core/lib/Drupal/Core/Routing/CompiledRoute.php b/core/lib/Drupal/Core/Routing/CompiledRoute.php index cd8c74b..6594337 100644 --- a/core/lib/Drupal/Core/Routing/CompiledRoute.php +++ b/core/lib/Drupal/Core/Routing/CompiledRoute.php @@ -134,13 +134,13 @@ public function getRoute() { } /** - * Returns the pattern. + * Returns the path. * * @return string - * The pattern. + * The path. */ - 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..8c91aa2 100644 --- a/core/lib/Drupal/Core/Routing/MatcherDumper.php +++ b/core/lib/Drupal/Core/Routing/MatcherDumper.php @@ -94,7 +94,7 @@ public function dump(array $options = array()) { 'name', 'route_set', 'fit', - 'pattern', + 'path', 'pattern_outline', 'number_parts', 'route', @@ -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/RouteBuilder.php b/core/lib/Drupal/Core/Routing/RouteBuilder.php index fd59967..7e5ebef 100644 --- a/core/lib/Drupal/Core/Routing/RouteBuilder.php +++ b/core/lib/Drupal/Core/Routing/RouteBuilder.php @@ -94,7 +94,7 @@ public function rebuild() { 'options' => array(), ); - $route = new Route($route_info['pattern'], $route_info['defaults'], $route_info['requirements'], $route_info['options']); + $route = new Route($route_info['path'], $route_info['defaults'], $route_info['requirements'], $route_info['options']); $collection->add($name, $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 1be5920..6991287 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 799c3ea..87d6011 100644 --- a/core/modules/aggregator/aggregator.routing.yml +++ b/core/modules/aggregator/aggregator.routing.yml @@ -1,138 +1,138 @@ 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_configure: - pattern: '/aggregator/sources/{aggregator_feed}/configure' + path: '/aggregator/sources/{aggregator_feed}/configure' defaults: _entity_form: 'aggregator_feed.default' requirements: _permission: 'administer news feeds' aggregator.feed_edit: - pattern: '/admin/config/services/aggregator/edit/feed/{aggregator_feed}' + path: '/admin/config/services/aggregator/edit/feed/{aggregator_feed}' defaults: _entity_form: 'aggregator_feed.default' 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.feed_view: - pattern: '/aggregator/sources/{aggregator_feed}' + path: '/aggregator/sources/{aggregator_feed}' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::viewFeed' requirements: _permission: 'access 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: _access_aggregator_categories: 'TRUE' aggregator.category_view: - pattern: '/aggregator/categories/{cid}' + path: '/aggregator/categories/{cid}' defaults: _content: '\Drupal\aggregator\Controller\AggregatorController::viewCategory' requirements: _permission: 'access news feeds' aggregator.category_edit: - pattern: '/aggregator/categories/{cid}/configure' + path: '/aggregator/categories/{cid}/configure' defaults: _form: '\Drupal\aggregator\Form\CategoryAdminForm' requirements: _permission: 'administer news feeds' aggregator.category_admin_edit: - pattern: '/admin/config/services/aggregator/edit/category/{cid}' + path: '/admin/config/services/aggregator/edit/category/{cid}' defaults: _form: '\Drupal\aggregator\Form\CategoryAdminForm' requirements: _permission: 'administer news feeds' aggregator.category_delete: - pattern: '/admin/config/services/aggregator/delete/category/{cid}' + path: '/admin/config/services/aggregator/delete/category/{cid}' defaults: _form: '\Drupal\aggregator\Form\CategoryDeleteForm' requirements: _permission: 'administer news feeds' aggregator.category_add: - pattern: '/admin/config/services/aggregator/add/category' + path: '/admin/config/services/aggregator/add/category' defaults: _form: '\Drupal\aggregator\Form\CategoryAdminForm' requirements: _permission: 'administer news feeds' aggregator.categorize_category_form: - pattern: '/aggregator/categories/{cid}/categorize' + path: '/aggregator/categories/{cid}/categorize' defaults: _form: '\Drupal\aggregator\Form\CategorizeCategoryForm' requirements: _permission: 'administer news feeds' aggregator.categorize_feed_form: - pattern: '/aggregator/sources/{aggregator_feed}/categorize' + path: '/aggregator/sources/{aggregator_feed}/categorize' defaults: _form: '\Drupal\aggregator\Form\CategorizeFeedForm' requirements: 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 1c377e0..09b663d 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,5 +1,5 @@ aggregator_test.feed: - pattern: '/aggregator/test-feed/{use_last_modified}/{use_etag}' + path: '/aggregator/test-feed/{use_last_modified}/{use_etag}' defaults: _controller: '\Drupal\aggregator_test\Controller\AggregatorTestRssController::testFeed' _title: 'Test feed static last modified date' @@ -9,7 +9,7 @@ aggregator_test.feed: _permission: 'access content' aggregator_test.redirect: - pattern: '/aggregator/redirect' + path: '/aggregator/redirect' defaults: _controller: '\Drupal\aggregator_test\Controller\AggregatorTestRssController::testRedirect' _title: 'Test feed with a redirect' diff --git a/core/modules/ban/ban.routing.yml b/core/modules/ban/ban.routing.yml index 4319478..d92b195 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 93f5e47..bcc3597 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' theme: null @@ -30,7 +30,7 @@ block.admin_add: _permission: 'administer blocks' block.category_autocomplete: - pattern: '/block-category/autocomplete' + path: '/block-category/autocomplete' defaults: _controller: '\Drupal\block\Controller\CategoryAutocompleteController::autocomplete' requirements: diff --git a/core/modules/block/custom_block/custom_block.routing.yml b/core/modules/block/custom_block/custom_block.routing.yml index 1e87bac..9ec5856 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/block/custom-blocks/types' + path: '/admin/structure/block/custom-blocks/types' 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/block/custom-blocks/manage/{custom_block_type}/delete' + path: '/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: - pattern: '/block/{custom_block}' + path: '/block/{custom_block}' defaults: _entity_form: 'custom_block.edit' requirements: @@ -35,28 +35,28 @@ custom_block.edit: custom_block: \d+ custom_block.delete: - pattern: '/block/{custom_block}/delete' + path: '/block/{custom_block}/delete' defaults: _entity_form: 'custom_block.delete' requirements: _entity_access: 'custom_block.delete' custom_block.type_add: - pattern: '/admin/structure/block/custom-blocks/types/add' + path: '/admin/structure/block/custom-blocks/types/add' defaults: _entity_form: 'custom_block_type.add' requirements: _permission: 'administer blocks' custom_block.type_edit: - pattern: '/admin/structure/block/custom-blocks/manage/{custom_block_type}' + path: '/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: - pattern: '/admin/structure/block/custom-blocks' + path: '/admin/structure/block/custom-blocks' defaults: _title: 'Custom block library' _entity_list: 'custom_block' diff --git a/core/modules/book/book.routing.yml b/core/modules/book/book.routing.yml index 733ae8c..b89cd21 100644 --- a/core/modules/book/book.routing.yml +++ b/core/modules/book/book.routing.yml @@ -1,26 +1,26 @@ 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\Form\BookSettingsForm' requirements: _permission: 'administer site configuration' book.export: - pattern: '/book/export/{type}/{node}' + path: '/book/export/{type}/{node}' defaults: _controller: '\Drupal\book\Controller\BookController::bookExport' options: @@ -30,7 +30,7 @@ book.export: _entity_access: 'node.view' book.outline: - pattern: '/node/{node}/outline' + path: '/node/{node}/outline' defaults: _entity_form: 'node.book_outline' options: @@ -40,7 +40,7 @@ book.outline: _entity_access: 'node.view' book.admin_edit: - pattern: '/admin/structure/book/{node}' + path: '/admin/structure/book/{node}' defaults: _form: 'Drupal\book\Form\BookAdminEditForm' _title: 'Re-order book pages and change titles' diff --git a/core/modules/comment/comment.routing.yml b/core/modules/comment/comment.routing.yml index 7cbff29..8402140 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,21 +14,21 @@ comment.approve: _entity_access: 'comment.approve' comment.permalink: - pattern: '/comment/{comment}' + path: '/comment/{comment}' defaults: _controller: '\Drupal\comment\Controller\CommentController::commentPermalink' requirements: _entity_access: 'comment.view' comment.confirm_delete: - pattern: '/comment/{comment}/delete' + path: '/comment/{comment}/delete' defaults: _entity_form: 'comment.delete' requirements: _entity_access: 'comment.delete' comment.reply: - pattern: 'comment/reply/{node}/{pid}' + path: 'comment/reply/{node}/{pid}' defaults: _content: '\Drupal\comment\Controller\CommentController::getReplyForm' pid: ~ @@ -36,7 +36,7 @@ comment.reply: _entity_access: 'node.view' comment.new_comments_node_links: - pattern: '/comments/render_new_comments_node_links' + path: '/comments/render_new_comments_node_links' defaults: _controller: '\Drupal\comment\Controller\CommentController::renderNewCommentsNodeLinks' requirements: diff --git a/core/modules/config/config.routing.yml b/core/modules/config/config.routing.yml index f4c60df..3a89899 100644 --- a/core/modules/config/config.routing.yml +++ b/core/modules/config/config.routing.yml @@ -1,33 +1,33 @@ 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 bd2c549..60552aa 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_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' @@ -29,7 +29,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' @@ -37,7 +37,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 eb029b8..5800615 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 4a0ec4e..0aac085 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/{entity_type}/{field_name}' + path: 'admin/config/regional/content_translation/translatable/{entity_type}/{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 73ee8e1..afd2d41 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 067109b..ebdaf9f 100644 --- a/core/modules/dblog/dblog.routing.yml +++ b/core/modules/dblog/dblog.routing.yml @@ -1,12 +1,12 @@ dblog.overview: - pattern: '/admin/reports/dblog' + path: '/admin/reports/dblog' defaults: _content: '\Drupal\dblog\Controller\DbLogController::overview' requirements: _permission: 'access site reports' dblog.event: - pattern: 'admin/reports/event/{event_id}' + path: 'admin/reports/event/{event_id}' defaults: _content: '\Drupal\dblog\Controller\DbLogController::eventDetails' requirements: diff --git a/core/modules/edit/edit.routing.yml b/core/modules/edit/edit.routing.yml index 983a55e..7e893f7 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' options: @@ -23,7 +23,7 @@ edit.field_form: _access_edit_entity_field: 'TRUE' edit.entity_save: - pattern: '/edit/entity/{entity_type}/{entity}' + path: '/edit/entity/{entity_type}/{entity}' defaults: _controller: '\Drupal\edit\EditController::entitySave' options: diff --git a/core/modules/editor/editor.routing.yml b/core/modules/editor/editor.routing.yml index 6004868..e99a0a7 100644 --- a/core/modules/editor/editor.routing.yml +++ b/core/modules/editor/editor.routing.yml @@ -1,5 +1,5 @@ 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' options: @@ -9,14 +9,14 @@ editor.field_untransformed_text: _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: _entity_access: 'filter_format.view' 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 e7ace5f..de77a94 100644 --- a/core/modules/entity/entity.routing.yml +++ b/core/modules/entity/entity.routing.yml @@ -1,75 +1,75 @@ entity.display_mode: - pattern: '/admin/structure/display-modes' + path: '/admin/structure/display-modes' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'administer display modes' 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..702e361 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 0520a44..ee2a973 100644 --- a/core/modules/field_ui/field_ui.routing.yml +++ b/core/modules/field_ui/field_ui.routing.yml @@ -1,5 +1,5 @@ field_ui.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 a972dc6..54d9b8c 100644 --- a/core/modules/file/file.routing.yml +++ b/core/modules/file/file.routing.yml @@ -1,12 +1,12 @@ 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 81fd186..256d95c 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 448be94..d536740 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: _entity_access: 'filter_format.view' 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' options: diff --git a/core/modules/forum/forum.routing.yml b/core/modules/forum/forum.routing.yml index 75bd0db..3dc2527 100644 --- a/core/modules/forum/forum.routing.yml +++ b/core/modules/forum/forum.routing.yml @@ -1,61 +1,61 @@ 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.index: - pattern: '/forum' + path: '/forum' defaults: _content: '\Drupal\forum\Controller\ForumController::forumIndex' requirements: _permission: 'access content' forum.page: - pattern: '/forum/{taxonomy_term}' + path: '/forum/{taxonomy_term}' defaults: _content: '\Drupal\forum\Controller\ForumController::forumPage' requirements: _permission: 'access content' 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: _permission: 'administer forums' forum.overview: - pattern: '/admin/structure/forum' + path: '/admin/structure/forum' defaults: _form: '\Drupal\forum\Form\Overview' requirements: diff --git a/core/modules/help/help.routing.yml b/core/modules/help/help.routing.yml index bc575bc..fbb5a98 100644 --- a/core/modules/help/help.routing.yml +++ b/core/modules/help/help.routing.yml @@ -1,12 +1,12 @@ 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/history/history.routing.yml b/core/modules/history/history.routing.yml index 7ffd289..5a35132 100644 --- a/core/modules/history/history.routing.yml +++ b/core/modules/history/history.routing.yml @@ -1,12 +1,12 @@ history.get_last_node_view: - pattern: '/history/get_node_read_timestamps' + path: '/history/get_node_read_timestamps' defaults: _controller: '\Drupal\history\Controller\HistoryController::getNodeReadTimestamps' requirements: _permission: 'access content' history.read_node: - pattern: '/history/{node}/read' + path: '/history/{node}/read' defaults: _controller: '\Drupal\history\Controller\HistoryController::readNode' requirements: diff --git a/core/modules/image/image.routing.yml b/core/modules/image/image.routing.yml index c28a48d..f5badae 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 f79da8d..9e78be1 100644 --- a/core/modules/language/language.routing.yml +++ b/core/modules/language/language.routing.yml @@ -1,54 +1,54 @@ 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.add: - pattern: '/admin/config/regional/language/add' + path: '/admin/config/regional/language/add' defaults: _entity_form: 'language_entity.add' requirements: _entity_create_access: 'language_entity' language.edit: - pattern: '/admin/config/regional/language/edit/{language_entity}' + path: '/admin/config/regional/language/edit/{language_entity}' defaults: _entity_form: 'language_entity.edit' requirements: _entity_access: 'language_entity.update' language.admin_overview: - pattern: '/admin/config/regional/language' + path: '/admin/config/regional/language' defaults: _entity_list: 'language_entity' requirements: _permission: 'administer languages' language.delete: - pattern: '/admin/config/regional/language/delete/{language_entity}' + path: '/admin/config/regional/language/delete/{language_entity}' defaults: _entity_form: 'language_entity.delete' requirements: _entity_access: 'language_entity.delete' language.negotiation_browser: - pattern: '/admin/config/regional/language/detection/browser' + path: '/admin/config/regional/language/detection/browser' defaults: _form: '\Drupal\language\Form\NegotiationBrowserForm' _title: 'Browser language detection configuration' @@ -56,7 +56,7 @@ language.negotiation_browser: _permission: 'administer languages' language.negotiation_browser_delete: - pattern: 'admin/config/regional/language/detection/browser/delete/{browser_langcode}' + path: 'admin/config/regional/language/detection/browser/delete/{browser_langcode}' defaults: _form: '\Drupal\language\Form\NegotiationBrowserDeleteForm' 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 6ed2138..ccd13f7 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/locale/locale.routing.yml b/core/modules/locale/locale.routing.yml index cbbfc00..5b4417d 100644 --- a/core/modules/locale/locale.routing.yml +++ b/core/modules/locale/locale.routing.yml @@ -1,19 +1,19 @@ 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: _permission: 'translate interface' locale.translate_page: - pattern: '/admin/config/regional/translate' + path: '/admin/config/regional/translate' defaults: _content: 'Drupal\locale\Controller\LocaleController::translatePage' requirements: diff --git a/core/modules/menu/menu.routing.yml b/core/modules/menu/menu.routing.yml index 7d0ac81..5db6932 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: _entity_create_access: 'menu_link' 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: _entity_access: 'menu_link.update' 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: _entity_access: 'menu_link.reset' 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: _entity_access: 'menu_link.delete' 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 10141ec..d06d78e 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,28 +42,28 @@ 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_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 e75e078..d866e33 100644 --- a/core/modules/overlay/overlay.routing.yml +++ b/core/modules/overlay/overlay.routing.yml @@ -1,12 +1,12 @@ overlay.message: - pattern: '/overlay/dismiss-message' + path: '/overlay/dismiss-message' defaults: _controller: '\Drupal\overlay\Controller\OverlayController::overlayMessage' requirements: _access_overlay_dismiss_message: 'TRUE' overlay.ajax: - pattern: '/overlay-ajax/{region}' + path: '/overlay-ajax/{region}' defaults: _controller: '\Drupal\overlay\Controller\OverlayController::regionRender' requirements: diff --git a/core/modules/path/path.routing.yml b/core/modules/path/path.routing.yml index 44f1fdf..d086e34 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 730f429..636dcbd 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..f2e8b61 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 4a2789f..5111cce 100644 --- a/core/modules/search/search.routing.yml +++ b/core/modules/search/search.routing.yml @@ -1,12 +1,12 @@ 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 0745206..94c3e9f 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 9bf9322..c0e192e 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 86499f5..4a7db7c 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..4abce63 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->getPat(), $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/lib/Drupal/system/Tests/Routing/RoutingFixtures.php b/core/modules/system/lib/Drupal/system/Tests/Routing/RoutingFixtures.php index db001c2..3cebc5f 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Routing/RoutingFixtures.php +++ b/core/modules/system/lib/Drupal/system/Tests/Routing/RoutingFixtures.php @@ -123,8 +123,8 @@ public function routingTableDefinition() { 'not null' => TRUE, 'default' => '', ), - 'pattern' => array( - 'description' => 'The path pattern for this URI', + 'path' => array( + 'description' => 'The path for this URI', 'type' => 'varchar', 'length' => 255, 'not null' => TRUE, diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 5222f25..1a39b4c 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -922,8 +922,8 @@ function system_schema() { 'not null' => TRUE, 'default' => '', ), - 'pattern' => array( - 'description' => 'The path pattern for this URI', + 'path' => array( + 'description' => 'The path for this URI', 'type' => 'varchar', 'length' => 255, 'not null' => TRUE, @@ -1580,8 +1580,8 @@ function system_update_8022() { 'not null' => TRUE, 'default' => '', ), - 'pattern' => array( - 'description' => 'The path pattern for this URI', + 'path' => array( + 'description' => 'The path for this URI', 'type' => 'varchar', 'length' => 255, 'not null' => TRUE, diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml index f8eed28..095df45 100644 --- a/core/modules/system/system.routing.yml +++ b/core/modules/system/system.routing.yml @@ -1,103 +1,103 @@ system.ajax: - pattern: '/system/ajax' + path: '/system/ajax' defaults: _controller: '\Drupal\system\Controller\FormAjaxController::content' requirements: _access: 'TRUE' system.admin: - pattern: '/admin' + path: '/admin' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' system.admin_structure: - pattern: '/admin/structure' + path: '/admin/structure' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' system.admin_reports: - pattern: '/admin/reports' + path: '/admin/reports' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access site reports' system.admin_config_media: - pattern: '/admin/config/media' + path: '/admin/config/media' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' system.admin_config_services: - pattern: '/admin/config/services' + path: '/admin/config/services' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' system.admin_config_development: - pattern: '/admin/config/development' + path: '/admin/config/development' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' system.admin_config_regional: - pattern: '/admin/config/regional' + path: '/admin/config/regional' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' system.admin_config_search: - pattern: '/admin/config/search' + path: '/admin/config/search' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' system.admin_config_system: - pattern: '/admin/config/system' + path: '/admin/config/system' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' system.admin_config_ui: - pattern: '/admin/config/user-interface' + path: '/admin/config/user-interface' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' system.admin_config_workflow: - pattern: '/admin/config/workflow' + path: '/admin/config/workflow' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' system.admin_config_content: - pattern: '/admin/config/content' + path: '/admin/config/content' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' system.cron: - pattern: '/cron/{key}' + path: '/cron/{key}' defaults: _controller: '\Drupal\system\CronController::run' requirements: _access_system_cron: 'TRUE' system.admin_compact_page: - pattern: '/admin/compact/{mode}' + path: '/admin/compact/{mode}' defaults: _controller: 'Drupal\system\Controller\SystemController::compactPage' mode: 'off' @@ -105,175 +105,175 @@ system.admin_compact_page: _permission: 'access administration pages' 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' system.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' system.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' system.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' system.date_format_language_overview: - pattern: '/admin/config/regional/date-time/locale' + path: '/admin/config/regional/date-time/locale' defaults: _controller: '\Drupal\system\Controller\DateFormatLanguageController::overviewPage' requirements: _permission: 'administer site configuration' system.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' system.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 @@ -281,47 +281,47 @@ 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' '': - pattern: '/' + path: '/' requirements: _access: 'TRUE' 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: _access: 'TRUE' system.admin_config: - pattern: '/admin/config' + path: '/admin/config' defaults: _content: '\Drupal\system\Controller\SystemController::overview' requirements: _permission: 'access administration pages' system.batch_page: - pattern: '/batch' + path: '/batch' defaults: _controller: '\Drupal\system\Controller\BatchController::batchPage' 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 7536e1a..1fcfedd 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,12 +1,12 @@ 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/batch_test/batch_test.routing.yml b/core/modules/system/tests/modules/batch_test/batch_test.routing.yml index b199525..5dcfcc0 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,5 +1,5 @@ batch_test.redirect: - pattern: '/batch-test/redirect' + path: '/batch-test/redirect' defaults: _content: '\Drupal\batch_test\Controller\BatchTestController::testRedirect' _title: 'Redirect' @@ -7,7 +7,7 @@ batch_test.redirect: _access: 'TRUE' batch_test.large_percentage: - pattern: '/batch-test/large-percentage' + path: '/batch-test/large-percentage' defaults: _content: '\Drupal\batch_test\Controller\BatchTestController::testLargePercentage' _title: 'Simple page with batch over 100% complete' @@ -15,7 +15,7 @@ batch_test.large_percentage: _access: 'TRUE' batch_test.nested_programmatic: - pattern: '/batch-test/nested-programmatic/{value}' + path: '/batch-test/nested-programmatic/{value}' defaults: _content: '\Drupal\batch_test\Controller\BatchTestController::testNestedDrupalFormSubmit' _title: 'Nested programmatic' @@ -24,7 +24,7 @@ batch_test.nested_programmatic: _access: 'TRUE' batch_test.no_form: - pattern: '/batch-test/no-form' + path: '/batch-test/no-form' defaults: _content: '\Drupal\batch_test\Controller\BatchTestController::testNoForm' _title: 'Simple page' @@ -32,7 +32,7 @@ batch_test.no_form: _access: 'TRUE' batch_test.programmatic: - pattern: '/batch-test/programmatic/{value}' + path: '/batch-test/programmatic/{value}' defaults: _content: '\Drupal\batch_test\Controller\BatchTestController::testProgrammatic' _title: 'Programmatic' @@ -41,7 +41,7 @@ batch_test.programmatic: _access: 'TRUE' batch_test.test_theme: - pattern: '/admin/batch-test/test-theme' + path: '/admin/batch-test/test-theme' defaults: _content: '\Drupal\batch_test\Controller\BatchTestController::testThemeBatch' 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 f96c586..96cda9f 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,19 +1,19 @@ 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: _access: 'TRUE' common_test.destination: - pattern: '/common-test/destination' + path: '/common-test/destination' defaults: _controller: '\Drupal\common_test\Controller\CommonTestController::destination' requirements: _permission: 'access content' common_test.drupal_render_invalid_keys: - pattern: 'common-test/drupal-render-invalid-keys' + path: 'common-test/drupal-render-invalid-keys' defaults: _title: 'Drupal Render' _content: '\Drupal\common_test\Controller\CommonTestController::drupalRenderInvalidKeys' @@ -21,7 +21,7 @@ common_test.drupal_render_invalid_keys: _permission: 'access content' common_test.js_and_css_querystring: - pattern: '/common-test/query-string' + path: '/common-test/query-string' defaults: _title: 'Test querystring' _content: '\Drupal\common_test\Controller\CommonTestController::jsAndCssQuerystring' 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 bf497e0..141ed95 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 3b1c73e..bc803c2 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 4553e61..d2bba23 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/error_test/error_test.routing.yml b/core/modules/system/tests/modules/error_test/error_test.routing.yml index 4c9ecdc..1d68cdf 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,12 +1,12 @@ error_test.generate_warnings: - pattern: '/error-test/generate-warnings' + path: '/error-test/generate-warnings' defaults: _content: '\Drupal\error_test\Controller\ErrorTestController::generateWarnings' requirements: _access: 'TRUE' error_test.generate_warnings_with_report: - pattern: '/error-test/generate-warnings-with-report' + path: '/error-test/generate-warnings-with-report' defaults: _content: '\Drupal\error_test\Controller\ErrorTestController::generateWarnings' collect_errors: TRUE @@ -14,14 +14,14 @@ error_test.generate_warnings_with_report: _access: 'TRUE' error_test.trigger_exception: - pattern: '/error-test/trigger-exception' + path: '/error-test/trigger-exception' defaults: _content: '\Drupal\error_test\Controller\ErrorTestController::triggerException' requirements: _access: 'TRUE' error_test.trigger_pdo_exception: - pattern: '/error-test/trigger-pdo-exception' + path: '/error-test/trigger-pdo-exception' defaults: _content: '\Drupal\error_test\Controller\ErrorTestController::triggerPDOException' 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 34e437d..3c4dabb 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,68 +1,68 @@ 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: _access: 'TRUE' form_test.route8: - pattern: '/form-test/autocomplete' + path: '/form-test/autocomplete' defaults: _form: '\Drupal\form_test\FormTestAutocompleteForm' requirements: _access: 'TRUE' form_test.autocomplete_1: - pattern: '/form-test/autocomplete-1' + path: '/form-test/autocomplete-1' defaults: controller: '\Drupal\form_test\AutocompleteController::autocomplete1' requirements: _permission: 'access autocomplete test' form_test.autocomplete_2: - pattern: '/form-test/autocomplete-2/{param}' + path: '/form-test/autocomplete-2/{param}' defaults: controller: '\Drupal\form_test\AutocompleteController::autocomplete1' 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 0168e3d..7033961 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,124 +1,124 @@ menu_test.login_callback: - pattern: '/menu_login_callback' + path: '/menu_login_callback' defaults: _content: '\Drupal\menu_test\TestControllers::testLogin' requirements: _access: 'TRUE' menu_test.callback_description: - pattern: 'menu_callback_description' + path: 'menu_callback_description' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access content' menu_test.router_test1: - pattern: '/foo/{bar}' + path: '/foo/{bar}' defaults: _content: '\Drupal\menu_test\TestControllers::test1' requirements: _access: 'TRUE' menu_test.router_test2: - pattern: '/foo/{bar}/b' + path: '/foo/{bar}/b' defaults: _content: '\Drupal\menu_test\TestControllers::test2' requirements: _access: 'TRUE' menu_test.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_test.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_test.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_test.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_test.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_test.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_test.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_test.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.local_task_test_tasks_settings_sub3: - pattern: '/menu-local-task-test/tasks/settings/sub3' + path: '/menu-local-task-test/tasks/settings/sub3' 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 31078f6..1beb1d5 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/plugin_test/plugin_test.routing.yml b/core/modules/system/tests/modules/plugin_test/plugin_test.routing.yml index 86398b5..d4e5f89 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,5 +1,5 @@ plugin_test.definition: - pattern: '/plugin_definition_test' + path: '/plugin_definition_test' defaults: _content: '\Drupal\plugin_test\Controller\PluginTest::testDefinitions' requirements: 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 a6f55a7..ba92dd4 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: @@ -71,14 +71,14 @@ router_test.11: _content: '\Drupal\router_test\TestContent::test11' router_test.12: - pattern: '/router_test/test12/{user}' + path: '/router_test/test12/{user}' requirements: _access: 'TRUE' defaults: _content: '\Drupal\router_test\TestContent::subrequestTest' router_test.13: - pattern: '/router_test/test13/{user}' + path: '/router_test/test13/{user}' requirements: _access: 'TRUE' defaults: 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 9f19002..b00fc4c 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,5 +1,5 @@ session_test.get: - pattern: '/session-test/get' + path: '/session-test/get' defaults: _title: 'Session value' _controller: '\Drupal\session_test\Controller\SessionTestController::get' @@ -7,7 +7,7 @@ session_test.get: _permission: 'access content' session_test.id: - pattern: '/session-test/id' + path: '/session-test/id' defaults: _title: 'Session ID' _controller: '\Drupal\session_test\Controller\SessionTestController::getId' @@ -15,7 +15,7 @@ session_test.id: _permission: 'access content' session_test.id_from_cookie: - pattern: '/session-test/id-from-cookie' + path: '/session-test/id-from-cookie' defaults: _title: 'Session ID from cookie' _controller: '\Drupal\session_test\Controller\SessionTestController::getIdFromCookie' @@ -23,7 +23,7 @@ session_test.id_from_cookie: _permission: 'access content' session_test.set: - pattern: '/session-test/set/{test_value}' + path: '/session-test/set/{test_value}' defaults: _title: 'Set session value' _controller: '\Drupal\session_test\Controller\SessionTestController::set' @@ -34,7 +34,7 @@ session_test.set: _permission: 'access content' session_test.no_set: - pattern: '/session-test/no-set/{test_value}' + path: '/session-test/no-set/{test_value}' defaults: _title: 'Set session value but do not save session' _controller: '\Drupal\session_test\Controller\SessionTestController::noSet' @@ -45,7 +45,7 @@ session_test.no_set: _permission: 'access content' session_test.set_message: - pattern: '/session-test/set-message' + path: '/session-test/set-message' defaults: _title: 'Set message' _controller: '\Drupal\session_test\Controller\SessionTestController::setMessage' @@ -53,7 +53,7 @@ session_test.set_message: _permission: 'access content' session_test.set_message_but_dont_save: - pattern: '/session-test/set-message-but-dont-save' + path: '/session-test/set-message-but-dont-save' defaults: _title: 'Set message but do not save session' _controller: '\Drupal\session_test\Controller\SessionTestController::setMessageButDontSave' @@ -61,7 +61,7 @@ session_test.set_message_but_dont_save: _permission: 'access content' session_test.set_not_started: - pattern: '/session-test/set-not-started' + path: '/session-test/set-not-started' defaults: _title: 'Set message when session is not started' _controller: '\Drupal\session_test\Controller\SessionTestController::setNotStarted' @@ -69,7 +69,7 @@ session_test.set_not_started: _permission: 'access content' session_test.is_logged_in: - pattern: '/session-test/is-logged-in' + path: '/session-test/is-logged-in' defaults: _title: 'Check if user is logged in' _controller: '\Drupal\session_test\Controller\SessionTestController::isLoggedIn' diff --git a/core/modules/system/tests/modules/system_test/system_test.routing.yml b/core/modules/system/tests/modules/system_test/system_test.routing.yml index 1be2566..942d126 100644 --- a/core/modules/system/tests/modules/system_test/system_test.routing.yml +++ b/core/modules/system/tests/modules/system_test/system_test.routing.yml @@ -1,5 +1,5 @@ system_test.page_cache_accept_header: - pattern: '/system-test/page-cache/accept-header' + path: '/system-test/page-cache/accept-header' defaults: _controller: '\Drupal\system_test\Controller\PageCacheAcceptHeaderController::content' requirements: 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 e0ff374..ac8e935 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,12 +1,12 @@ test_page_test.render_title: - pattern: "/test-render-title" + path: "/test-render-title" defaults: _content: 'Drupal\test_page_test\Controller\Test::renderTitle' requirements: _access: 'TRUE' test_page_test.static_title: - pattern: "/test-page-static-title" + path: "/test-page-static-title" defaults: _content: 'Drupal\test_page_test\Controller\Test::staticTitle' _title: 'Static title' @@ -14,14 +14,14 @@ test_page_test.static_title: _access: 'TRUE' test_page_test.admin_render_title: - pattern: "/admin/test-render-title" + path: "/admin/test-render-title" defaults: _content: 'Drupal\test_page_test\Controller\Test::renderTitle' requirements: _access: 'TRUE' test_page_test.render_title_controller: - pattern: "/test-render-title-controller" + path: "/test-render-title-controller" defaults: _controller: 'Drupal\test_page_test\Controller\Test::renderTitle' 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 eebff83..5e37e7f 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,26 +1,26 @@ theme_test.function_template_override: - pattern: '/theme-test/function-template-overridden' + path: '/theme-test/function-template-overridden' defaults: _content: '\Drupal\theme_test\ThemeTestController::functionTemplateOverridden' requirements: _permission: 'access content' theme_test.info_stylesheets: - pattern: '/theme-test/info/stylesheets' + path: '/theme-test/info/stylesheets' defaults: _content: '\Drupal\theme_test\ThemeTestController::testInfoStylesheets' requirements: _access: 'TRUE' theme_test.template_test: - pattern: '/theme-test/template-test' + path: '/theme-test/template-test' defaults: _content: '\Drupal\theme_test\ThemeTestController::testTemplate' requirements: _access: 'TRUE' theme_test.suggestion: - pattern: '/theme-test/suggestion' + path: '/theme-test/suggestion' defaults: _content: '\Drupal\theme_test\ThemeTestController::testSuggestion' _title: 'Suggestion' @@ -28,7 +28,7 @@ theme_test.suggestion: _access: 'TRUE' theme_test.alter: - pattern: '/theme-test/alter' + path: '/theme-test/alter' defaults: _content: '\Drupal\theme_test\ThemeTestController::testAlter' _title: 'Suggestion' @@ -36,7 +36,7 @@ theme_test.alter: _access: 'TRUE' theme_test.request_listener: - pattern: '/theme-test/request-listener' + path: '/theme-test/request-listener' defaults: _content: '\Drupal\theme_test\ThemeTestController::testRequestListener' 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..0596d49 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 60312ba..343b175 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,12 +1,12 @@ 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/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 810ae23..8d5922f 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,5 +1,5 @@ url_alter_test.foo: - pattern: 'url-alter-test/foo' + path: 'url-alter-test/foo' defaults: _content: '\Drupal\url_alter_test\Controller\URLAlterTestController::foo' requirements: diff --git a/core/modules/taxonomy/taxonomy.routing.yml b/core/modules/taxonomy/taxonomy.routing.yml index 053f4ba..ecc0fb3 100644 --- a/core/modules/taxonomy/taxonomy.routing.yml +++ b/core/modules/taxonomy/taxonomy.routing.yml @@ -1,75 +1,75 @@ 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: _entity_create_access: 'taxonomy_term:{taxonomy_vocabulary}' taxonomy.term_edit: - pattern: '/taxonomy/term/{taxonomy_term}/edit' + path: '/taxonomy/term/{taxonomy_term}/edit' defaults: _entity_form: 'taxonomy_term.default' requirements: _entity_access: 'taxonomy_term.update' 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_add: - pattern: '/admin/structure/taxonomy/add' + path: '/admin/structure/taxonomy/add' defaults: _entity_form: 'taxonomy_vocabulary' requirements: _entity_create_access: 'taxonomy_vocabulary' taxonomy.vocabulary_edit: - pattern: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/edit' + path: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/edit' defaults: _entity_form: 'taxonomy_vocabulary.default' requirements: _entity_access: 'taxonomy_vocabulary.update' 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: _permission: 'administer taxonomy' taxonomy.autocomplete: - pattern: '/taxonomy/autocomplete/{entity_type}/{field_name}' + path: '/taxonomy/autocomplete/{entity_type}/{field_name}' defaults: _controller: '\Drupal\taxonomy\Controller\TermAutocompleteController::autocomplete' requirements: _permission: 'access content' taxonomy.autocomplete_vid: - pattern: '/taxonomy/autocomplete_vid/{taxonomy_vocabulary}' + path: '/taxonomy/autocomplete_vid/{taxonomy_vocabulary}' defaults: _controller: '\Drupal\taxonomy\Controller\TermAutocompleteController::autocompletePerVid' requirements: _permission: 'access content' taxonomy.overview_terms: - pattern: 'admin/structure/taxonomy/manage/{taxonomy_vocabulary}' + path: 'admin/structure/taxonomy/manage/{taxonomy_vocabulary}' defaults: _form: 'Drupal\taxonomy\Form\OverviewTerms' requirements: diff --git a/core/modules/toolbar/toolbar.routing.yml b/core/modules/toolbar/toolbar.routing.yml index aa776c8..946037e 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/tour/tests/tour_test/tour_test.routing.yml b/core/modules/tour/tests/tour_test/tour_test.routing.yml index 58394ad..9c7f5e7 100644 --- a/core/modules/tour/tests/tour_test/tour_test.routing.yml +++ b/core/modules/tour/tests/tour_test/tour_test.routing.yml @@ -1,19 +1,19 @@ tour_test.1: - pattern : 'tour-test-1' + path: 'tour-test-1' defaults: _content: '\Drupal\tour_test\Controller\TourTestController::tourTest1' requirements: _access: 'TRUE' tour_test.1_action: - pattern : 'tour-test-1/action' + path: 'tour-test-1/action' defaults: _content: '\Drupal\tour_test\Controller\TourTestController::tourTest1' requirements: _access: 'TRUE' tour_test.2: - pattern : 'tour-test-2/subpath' + path: 'tour-test-2/subpath' defaults: _content: '\Drupal\tour_test\Controller\TourTestController::tourTest2' requirements: 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 6e40c94..6d57c23 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,5 +1,5 @@ update_test.503: - pattern: '/503-error' + path: '/503-error' defaults: _controller: 'Drupal\update_test\Controller\UpdateTestController::updateError' requirements: diff --git a/core/modules/update/update.routing.yml b/core/modules/update/update.routing.yml index 4219734..406a881 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/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 8e651e0..af09956 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,5 +1,5 @@ user_form_test.current_password: - pattern: '/user_form_test_current_password/{user}' + path: '/user_form_test_current_password/{user}' defaults: _form: '\Drupal\user_form_test\Form\TestCurrentPassword' requirements: diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml index ea4ce37..f2a891f 100644 --- a/core/modules/user/user.routing.yml +++ b/core/modules/user/user.routing.yml @@ -1,68 +1,68 @@ 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.admin_index: - pattern: '/admin/config/people' + path: '/admin/config/people' defaults: _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' requirements: _permission: 'access administration pages' user.account_settings: - pattern: '/admin/config/people/accounts' + path: '/admin/config/people/accounts' defaults: _form: '\Drupal\user\AccountSettingsForm' requirements: _permission: 'administer account settings' 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.multiple_cancel_confirm: - pattern: '/admin/people/cancel' + path: '/admin/people/cancel' defaults: _form: '\Drupal\user\Form\UserMultipleCancelConfirm' _title: 'Cancel user' @@ -70,63 +70,63 @@ user.multiple_cancel_confirm: _permission: 'administer users' 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: _access: 'TRUE' user.edit: - pattern: '/user/{user}/edit' + path: '/user/{user}/edit' defaults: _entity_form: 'user.default' requirements: _entity_access: 'user.update' user.cancel_confirm: - pattern: '/user/{user}/cancel' + path: '/user/{user}/cancel' defaults: _title: 'Cancel account' _entity_form: 'user.cancel' 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 ce61bb3..6ee99b4 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 8d9358d..3a0eb94 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 4d57bc7..73a0850 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: _content: '\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: _content: '\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.break_lock: - 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_add_item: - 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_add_item: js: 'nojs|ajax' views_ui.form_edit_details: - 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_edit_details: js: 'nojs|ajax' views_ui.form_reorder_displays: - 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_reorder_displays: 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_rearrange_filter: - 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_rearrange_filter: 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_config_item: - 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_config_item: js: 'nojs|ajax' views_ui.form_config_item_extra: - 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_config_item_extra: js: 'nojs|ajax' views_ui.form_config_item_group: - 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: