diff --git c/core/modules/book/book.routing.yml w/core/modules/book/book.routing.yml index b78fb5b..923157d 100644 --- c/core/modules/book/book.routing.yml +++ w/core/modules/book/book.routing.yml @@ -52,7 +52,7 @@ book.admin_edit: node: \d+ book.remove: - pattern: '/node/{node}/outline/remove' + path: '/node/{node}/outline/remove' defaults: _content: '\Drupal\book\Form\BookForm::remove' _title: 'Remove from outline' diff --git c/core/modules/book/lib/Drupal/book/Access/BookNodeIsRemovableAccessCheck.php w/core/modules/book/lib/Drupal/book/Access/BookNodeIsRemovableAccessCheck.php index eb8bb28..eeeeca7 100644 --- c/core/modules/book/lib/Drupal/book/Access/BookNodeIsRemovableAccessCheck.php +++ w/core/modules/book/lib/Drupal/book/Access/BookNodeIsRemovableAccessCheck.php @@ -37,8 +37,8 @@ public function __construct(BookManager $book_manager) { /** * {@inheritdoc} */ - public function applies(Route $route) { - return array_key_exists('_book_node_is_removable', $route->getRequirements()); + public function appliesTo() { + return array('_book_node_is_removable'); } /** diff --git c/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationManageAccessCheck.php w/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationManageAccessCheck.php index cd8c855..b7b89bd 100644 --- c/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationManageAccessCheck.php +++ w/core/modules/content_translation/lib/Drupal/content_translation/Access/ContentTranslationManageAccessCheck.php @@ -38,8 +38,8 @@ public function __construct(EntityManager $manager) { /** * {@inheritdoc} */ - public function applies(Route $route) { - return array_key_exists('_access_content_translation_manage', $route->getRequirements()); + public function appliesTo() { + return array('_access_content_translation_manage'); } /** diff --git c/core/modules/language/language.routing.yml w/core/modules/language/language.routing.yml index 8af50c8..a2628e6 100644 --- c/core/modules/language/language.routing.yml +++ w/core/modules/language/language.routing.yml @@ -63,7 +63,7 @@ language.negotiation_browser_delete: _permission: 'administer languages' language.negotiation: - pattern: '/admin/config/regional/language/detection' + path: '/admin/config/regional/language/detection' defaults: _content: '\Drupal\language\Form\LanguageForm::negotiation' _title: 'Detection and selection' diff --git c/core/modules/locale/locale.routing.yml w/core/modules/locale/locale.routing.yml index d249497..cc60aec 100644 --- c/core/modules/locale/locale.routing.yml +++ w/core/modules/locale/locale.routing.yml @@ -20,7 +20,7 @@ locale.translate_page: _permission: 'translate interface' locale.translate_import: - pattern: '/admin/config/regional/translate/import' + path: '/admin/config/regional/translate/import' defaults: _content: '\Drupal\locale\Form\LocaleForm::import' _title: 'Import' @@ -28,7 +28,7 @@ locale.translate_import: _permission: 'translate interface' locale.translate_export: - pattern: '/admin/config/regional/translate/export' + path: '/admin/config/regional/translate/export' defaults: _content: '\Drupal\locale\Form\LocaleForm::export' _title: 'Export' @@ -36,7 +36,7 @@ locale.translate_export: _permission: 'translate interface' locale.translate_status: - pattern: '/admin/reports/translations' + path: '/admin/reports/translations' defaults: _content: '\Drupal\locale\Form\LocaleForm::status' _title: 'Available translation updates' diff --git c/core/modules/shortcut/shortcut.module w/core/modules/shortcut/shortcut.module index 10aba0e..1368558 100644 --- c/core/modules/shortcut/shortcut.module +++ w/core/modules/shortcut/shortcut.module @@ -117,12 +117,12 @@ function shortcut_menu() { ); $items['admin/config/user-interface/shortcut/manage/%shortcut_set/add-link'] = array( 'title' => 'Add shortcut', - 'route_name' => 'shortcut.edit', + 'route_name' => 'shortcut.link_edit', 'type' => MENU_LOCAL_ACTION, ); $items['admin/config/user-interface/shortcut/link/%menu_link'] = array( 'title' => 'Edit shortcut', - 'route_name' => 'shortcut.edit', + 'route_name' => 'shortcut.link_edit', ); $items['admin/config/user-interface/shortcut/link/%menu_link/delete'] = array( 'title' => 'Delete shortcut', diff --git c/core/modules/shortcut/shortcut.routing.yml w/core/modules/shortcut/shortcut.routing.yml index 0533d7c..9071330 100644 --- c/core/modules/shortcut/shortcut.routing.yml +++ w/core/modules/shortcut/shortcut.routing.yml @@ -47,16 +47,16 @@ shortcut.set_customize: requirements: _entity_access: 'shortcut_set.update' -shortcut.add_link: - pattern: '/admin/config/user-interface/shortcut/manage/{shortcut_set}/add-link' +shortcut.link_add: + path: '/admin/config/user-interface/shortcut/manage/{shortcut_set}/add-link' defaults: _content: '\Drupal\shortcut\Form\ShortcutForm::add' _title: 'Add Shortcut' requirements: _access: 'TRUE' -shortcut.edit_link: - pattern: '/admin/config/user-interface/shortcut/link/{menu_link}' +shortcut.link_edit: + path: '/admin/config/user-interface/shortcut/link/{menu_link}' defaults: _content: '\Drupal\shortcut\Form\ShortcutForm::edit' _title: 'Add Shortcut' @@ -66,7 +66,7 @@ shortcut.edit_link: _access: 'TRUE' shortcut.overview: - pattern: 'user/{user}/shortcuts' + path: 'user/{user}/shortcuts' defaults: _content: '\Drupal\shortcut\Form\ShortcutForm::overview' _title: 'Add Shortcut' diff --git c/core/modules/system/system.routing.yml w/core/modules/system/system.routing.yml index a43c82b..f63dfa5 100644 --- c/core/modules/system/system.routing.yml +++ w/core/modules/system/system.routing.yml @@ -328,7 +328,7 @@ system.batch_page: _access: 'TRUE' system.localize_date_format: - pattern: '/admin/config/regional/date-time/locale/{langcode}/edit' + path: '/admin/config/regional/date-time/locale/{langcode}/edit' defaults: _content: '\Drupal\system\Form\SystemForm::localizeDateFormat' _title: 'Localize date formats' diff --git c/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php w/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php index 44b4beb..adc04c8 100644 --- c/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php +++ w/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php @@ -37,15 +37,15 @@ public function __construct(Settings $settings) { /** * {@inheritdoc} */ - public function applies(Route $route) { - return array_key_exists('_access_update_manager', $route->getRequirements()); + public function appliesTo() { + return array('_access_update_manager'); } /** * {@inheritdoc} */ public function access(Route $route, Request $request) { - return $settings->get('allow_authorize_operations', TRUE) ? static::ALLOW : static::DENY; + return $this->settings->get('allow_authorize_operations', TRUE) ? static::ALLOW : static::DENY; } } diff --git c/core/modules/update/update.routing.yml w/core/modules/update/update.routing.yml index 77fbbfa..0727bfb 100644 --- c/core/modules/update/update.routing.yml +++ w/core/modules/update/update.routing.yml @@ -13,7 +13,7 @@ update.status: _permission: 'administer site configuration' update.report_install: - pattern: '/admin/reports/updates/install' + path: '/admin/reports/updates/install' defaults: _content: '\Drupal\update\Form\UpdateForm::reportInstall' options: @@ -23,7 +23,7 @@ update.report_install: _access_update_manager: 'TRUE' update.report_update: - pattern: '/admin/reports/updates/update' + path: '/admin/reports/updates/update' defaults: _content: '\Drupal\update\Form\UpdateForm::reportUpdate' _title: 'Update' @@ -34,7 +34,7 @@ update.report_update: _access_update_manager: 'TRUE' update.module_install: - pattern: '/admin/modules/install' + path: '/admin/modules/install' defaults: _content: '\Drupal\update\Form\UpdateForm::moduleInstall' options: @@ -44,7 +44,7 @@ update.module_install: _access_update_manager: 'TRUE' update.module_update: - pattern: '/admin/modules/update' + path: '/admin/modules/update' defaults: _content: '\Drupal\update\Form\UpdateForm::moduleUpdate' _title: 'Update' @@ -55,7 +55,7 @@ update.module_update: _access_update_manager: 'TRUE' update.theme_install: - pattern: '/admin/theme/install' + path: '/admin/theme/install' defaults: _content: '\Drupal\update\Form\UpdateForm::themeInstall' options: @@ -65,7 +65,7 @@ update.theme_install: _access_update_manager: 'TRUE' update.theme_update: - pattern: '/admin/theme/update' + path: '/admin/theme/update' defaults: _content: '\Drupal\update\Form\UpdateForm::themeUpdate' _title: 'Update' @@ -76,7 +76,7 @@ update.theme_update: _access_update_manager: 'TRUE' update.confirmation_page: - pattern: '/admin/update/ready' + path: '/admin/update/ready' defaults: _content: '\Drupal\update\Form\UpdateForm::confirmUpdates' _title: 'Ready to update' diff --git c/core/modules/user/user.routing.yml w/core/modules/user/user.routing.yml index 27c864c..9b60814 100644 --- c/core/modules/user/user.routing.yml +++ w/core/modules/user/user.routing.yml @@ -134,7 +134,7 @@ user.cancel_confirm: _entity_access: 'user.delete' user.reset: - pattern: '/user/reset/{uid}/{timestamp}/{hash}/{operation}' + path: '/user/reset/{uid}/{timestamp}/{hash}/{operation}' defaults: _content: '\Drupal\user\Form\UserForm::resetPass' _title: 'Reset password'