diff core/lib/Drupal/Core/Controller/ControllerResolver.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10

--- a/core/lib/Drupal/Core/Controller/ControllerResolver.php	Tue Jul 10 15:07:59 2018 +0100
+++ b/core/lib/Drupal/Core/Controller/ControllerResolver.php	Thu Feb 28 13:21:36 2019 +0000
@@ -80,7 +80,6 @@
     return $callable;
   }
 
-
   /**
    * {@inheritdoc}
    */
@@ -129,6 +128,10 @@
    * {@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 = [];