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

[yaffs-website] / web / core / lib / Drupal / Core / Controller / ControllerResolver.php

diff --git a/web/core/lib/Drupal/Core/Controller/ControllerResolver.php b/web/core/lib/Drupal/Core/Controller/ControllerResolver.php
index c16a087449b0151fb216bf995f201c3ee46d1ff8..35d433a2abdbd867a2197b32cf5fe3ba790feae8 100644 (file)
--- a/web/core/lib/Drupal/Core/Controller/ControllerResolver.php
+++ b/web/core/lib/Drupal/Core/Controller/ControllerResolver.php
@@ -80,7 +80,6 @@ class ControllerResolver extends BaseControllerResolver implements ControllerRes
     return $callable;
   }
 
-
   /**
    * {@inheritdoc}
    */
@@ -129,6 +128,10 @@ class ControllerResolver extends BaseControllerResolver implements ControllerRes
    * {@inheritdoc}
    */
   protected function doGetArguments(Request $request, $controller, array $parameters) {
+    // Note this duplicates the deprecation message of
+    // Symfony\Component\HttpKernel\Controller\ControllerResolver::getArguments()
+    // to ensure it is removed in Drupal 9.
+    @trigger_error(sprintf('%s is deprecated as of 8.6.0 and will be removed in 9.0. Inject the "http_kernel.controller.argument_resolver" service instead.', __METHOD__, ArgumentResolverInterface::class), E_USER_DEPRECATED);
     $attributes = $request->attributes->all();
     $raw_parameters = $request->attributes->has('_raw_variables') ? $request->attributes->get('_raw_variables') : [];
     $arguments = [];