X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Flib%2FDrupal%2FCore%2FController%2FControllerResolver.php;h=35d433a2abdbd867a2197b32cf5fe3ba790feae8;hb=refs%2Fheads%2Fd864;hp=c16a087449b0151fb216bf995f201c3ee46d1ff8;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/web/core/lib/Drupal/Core/Controller/ControllerResolver.php b/web/core/lib/Drupal/Core/Controller/ControllerResolver.php
index c16a08744..35d433a2a 100644
--- 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 = [];