Verified Commit 0318f797 authored by Dave Long's avatar Dave Long
Browse files

fix: #3574721 FormBuilder service order causes failure 

By: smustgrave
By: nicxvan
By: larowlan
By: tim.plunkett
parent f350d615

core/core.services.yml

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ services: 
  Drupal\Core\File\FileUrlGeneratorInterface: '@file_url_generator'

  form_builder:

    class: Drupal\Core\Form\FormBuilder

    arguments: ['@form_validator', '@form_submitter', '@form_cache', '@module_handler', '@event_dispatcher', '@request_stack', '@class_resolver', '@element_info', '@theme.manager', '@?csrf_token', '@callable_resolver']

    arguments: ['@form_validator', '@form_submitter', '@form_cache', '@module_handler', '@event_dispatcher', '@request_stack', '@class_resolver', '@element_info', '@theme.manager', '@csrf_token', '@callable_resolver']

  Drupal\Core\Form\FormBuilderInterface: '@form_builder'

  form_validator:

    class: Drupal\Core\Form\FormValidator

core/lib/Drupal/Core/Form/FormBuilder.php

+2 −6
Original line number Diff line number Diff line
@@ -165,8 +165,8 @@ public function __construct( 
    ClassResolverInterface $class_resolver,

    ElementInfoManagerInterface $element_info,

    ThemeManagerInterface $theme_manager,

    ?CsrfTokenGenerator $csrf_token = NULL,

    ?CallableResolver $callableResolver = NULL,

    CsrfTokenGenerator $csrf_token,

    CallableResolver $callableResolver,

  ) {

    $this->formValidator = $form_validator;

    $this->formSubmitter = $form_submitter;
@@ -178,10 +178,6 @@ public function __construct( 
    $this->elementInfo = $element_info;

    $this->csrfToken = $csrf_token;

    $this->themeManager = $theme_manager;

    if (!$callableResolver) {

      @trigger_error(sprintf('Calling %s() without the $callableResolver param is deprecated in drupal:11.3.0 and is required in drupal:12.0.0. See https://www.drupal.org/node/3548821', __METHOD__), E_USER_DEPRECATED);

      $callableResolver = \Drupal::service(CallableResolver::class);

    }

    $this->callableResolver = $callableResolver;

  }