Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / lib / Drupal / Core / Access / CustomAccessCheck.php

diff --git a/web/core/lib/Drupal/Core/Access/CustomAccessCheck.php b/web/core/lib/Drupal/Core/Access/CustomAccessCheck.php
index e7a3b0891504b4b509dfc24c169e0a01a27869c4..353d09cd8060829bdd094ebbfec22bfc30a4a580 100644 (file)
--- a/web/core/lib/Drupal/Core/Access/CustomAccessCheck.php
+++ b/web/core/lib/Drupal/Core/Access/CustomAccessCheck.php
@@ -61,7 +61,14 @@ class CustomAccessCheck implements RoutingAccessInterface {
    *   The access result.
    */
   public function access(Route $route, RouteMatchInterface $route_match, AccountInterface $account) {
-    $callable = $this->controllerResolver->getControllerFromDefinition($route->getRequirement('_custom_access'));
+    try {
+      $callable = $this->controllerResolver->getControllerFromDefinition($route->getRequirement('_custom_access'));
+    }
+    catch (\InvalidArgumentException $e) {
+      // The custom access controller method was not found.
+      throw new \BadMethodCallException(sprintf('The "%s" method is not callable as a _custom_access callback in route "%s"', $route->getRequirement('_custom_access'), $route->getPath()));
+    }
+
     $arguments_resolver = $this->argumentsResolverFactory->getArgumentsResolver($route_match, $account);
     $arguments = $arguments_resolver->getArguments($callable);