diff --git a/core/lib/Drupal/Core/Access/DefaultAccessCheck.php b/core/lib/Drupal/Core/Access/DefaultAccessCheck.php index 47a1b8c..80afdef 100644 --- a/core/lib/Drupal/Core/Access/DefaultAccessCheck.php +++ b/core/lib/Drupal/Core/Access/DefaultAccessCheck.php @@ -19,7 +19,6 @@ class DefaultAccessCheck implements AccessCheckInterface { * Implements AccessCheckInterface::applies(). */ public function applies(Route $route) { - // The route will either fold to boolean true or false, so just return that. return array_key_exists('_access', $route->getRequirements()); } diff --git a/core/modules/system/lib/Drupal/system/Access/CronAccessCheck.php b/core/modules/system/lib/Drupal/system/Access/CronAccessCheck.php index 627a5be..ea6287c 100644 --- a/core/modules/system/lib/Drupal/system/Access/CronAccessCheck.php +++ b/core/modules/system/lib/Drupal/system/Access/CronAccessCheck.php @@ -12,7 +12,7 @@ use Symfony\Component\HttpFoundation\Request; /** - * Allows access to routes to be controlled by an '_access' boolean parameter. + * Access check for cron routes. */ class CronAccessCheck implements AccessCheckInterface { @@ -20,8 +20,7 @@ class CronAccessCheck implements AccessCheckInterface { * Implements AccessCheckInterface::applies(). */ public function applies(Route $route) { - // The route will either fold to boolean true or false, so just return that. - return $route->getRequirement('_type') == 'cron'; + return array_key_exists('_system_cron_access', $route->getRequirements()); } /** diff --git a/core/modules/system/lib/Drupal/system/CronController.php b/core/modules/system/lib/Drupal/system/CronController.php index 1996015..1a7e50e 100644 --- a/core/modules/system/lib/Drupal/system/CronController.php +++ b/core/modules/system/lib/Drupal/system/CronController.php @@ -8,10 +8,9 @@ namespace Drupal\system; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; /** - * Controllers for Cron handling. + * Controller for Cron handling. */ class CronController { @@ -21,7 +20,7 @@ class CronController { * @return Symfony\Component\HttpFoundation\Response * A Symfony response object. */ - public function run($key) { + public function run() { // @todo Make this an injected object. drupal_cron_run(); diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml index 05b92ce..ae5f80b 100644 --- a/core/modules/system/system.routing.yml +++ b/core/modules/system/system.routing.yml @@ -1,6 +1,6 @@ -cron: +system.cron: pattern: '/cron/{key}' defaults: _controller: '\Drupal\system\CronController::run' requirements: - _type: 'cron' + _system_cron_access: 'TRUE'