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

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

diff --git a/web/core/lib/Drupal/Core/Controller/HtmlFormController.php b/web/core/lib/Drupal/Core/Controller/HtmlFormController.php
index fe63038037f7ea5aed10814d2f1cc1c5f84c3e28..6dd27ee1e1d97a58f042ea36bfaa421a3d65e9ed 100644 (file)
--- a/web/core/lib/Drupal/Core/Controller/HtmlFormController.php
+++ b/web/core/lib/Drupal/Core/Controller/HtmlFormController.php
@@ -5,6 +5,7 @@ namespace Drupal\Core\Controller;
 use Drupal\Core\Form\FormBuilderInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 
 /**
  * Wrapping controller for forms that serve as the main page body.
@@ -14,22 +15,22 @@ class HtmlFormController extends FormController {
   /**
    * The class resolver.
    *
-   * @var \Drupal\Core\DependencyInjection\ClassResolverInterface;
+   * @var \Drupal\Core\DependencyInjection\ClassResolverInterface
    */
   protected $classResolver;
 
   /**
    * Constructs a new \Drupal\Core\Routing\Enhancer\FormEnhancer object.
    *
-   * @param \Drupal\Core\Controller\ControllerResolverInterface $controller_resolver
-   *   The controller resolver.
+   * @param \Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface $argument_resolver
+   *   The argument resolver.
    * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
    *   The form builder.
    * @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
    *   The class resolver.
    */
-  public function __construct(ControllerResolverInterface $controller_resolver, FormBuilderInterface $form_builder, ClassResolverInterface $class_resolver) {
-    parent::__construct($controller_resolver, $form_builder);
+  public function __construct(ArgumentResolverInterface $argument_resolver, FormBuilderInterface $form_builder, ClassResolverInterface $class_resolver) {
+    parent::__construct($argument_resolver, $form_builder);
     $this->classResolver = $class_resolver;
   }