X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Flib%2FDrupal%2FCore%2FEventSubscriber%2FEarlyRenderingControllerWrapperSubscriber.php;h=0bb5b29a938d511986377738a74b07dac5289658;hb=refs%2Fheads%2Fd864;hp=447b9180561f808efb67799afabaee143bb32eba;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/web/core/lib/Drupal/Core/EventSubscriber/EarlyRenderingControllerWrapperSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/EarlyRenderingControllerWrapperSubscriber.php
index 447b91805..0bb5b29a9 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/EarlyRenderingControllerWrapperSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/EarlyRenderingControllerWrapperSubscriber.php
@@ -5,12 +5,12 @@ namespace Drupal\Core\EventSubscriber;
 use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Cache\CacheableResponseInterface;
-use Drupal\Core\Controller\ControllerResolverInterface;
 use Drupal\Core\Render\AttachmentsInterface;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Render\RendererInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
@@ -55,11 +55,11 @@ use Symfony\Component\HttpKernel\KernelEvents;
 class EarlyRenderingControllerWrapperSubscriber implements EventSubscriberInterface {
 
   /**
-   * The controller resolver.
+   * The argument resolver.
    *
-   * @var \Drupal\Core\Controller\ControllerResolverInterface
+   * @var \Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface
    */
-  protected $controllerResolver;
+  protected $argumentResolver;
 
   /**
    * The renderer.
@@ -71,13 +71,13 @@ class EarlyRenderingControllerWrapperSubscriber implements EventSubscriberInterf
   /**
    * Constructs a new EarlyRenderingControllerWrapperSubscriber instance.
    *
-   * @param \Drupal\Core\Controller\ControllerResolverInterface $controller_resolver
-   *   The controller resolver.
+   * @param \Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface $argument_resolver
+   *   The argument resolver.
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer.
    */
-  public function __construct(ControllerResolverInterface $controller_resolver, RendererInterface $renderer) {
-    $this->controllerResolver = $controller_resolver;
+  public function __construct(ArgumentResolverInterface $argument_resolver, RendererInterface $renderer) {
+    $this->argumentResolver = $argument_resolver;
     $this->renderer = $renderer;
   }
 
@@ -91,9 +91,9 @@ class EarlyRenderingControllerWrapperSubscriber implements EventSubscriberInterf
     $controller = $event->getController();
 
     // See \Symfony\Component\HttpKernel\HttpKernel::handleRaw().
-    $arguments = $this->controllerResolver->getArguments($event->getRequest(), $controller);
+    $arguments = $this->argumentResolver->getArguments($event->getRequest(), $controller);
 
-    $event->setController(function() use ($controller, $arguments) {
+    $event->setController(function () use ($controller, $arguments) {
       return $this->wrapControllerExecutionInRenderContext($controller, $arguments);
     });
   }
@@ -118,7 +118,7 @@ class EarlyRenderingControllerWrapperSubscriber implements EventSubscriberInterf
   protected function wrapControllerExecutionInRenderContext($controller, array $arguments) {
     $context = new RenderContext();
 
-    $response = $this->renderer->executeInRenderContext($context, function() use ($controller, $arguments) {
+    $response = $this->renderer->executeInRenderContext($context, function () use ($controller, $arguments) {
       // Now call the actual controller, just like HttpKernel does.
       return call_user_func_array($controller, $arguments);
     });