Lauri Timmanee · 7b6e8419
--- a/core/lib/Drupal/Core/Form/ConfigFormBase.php
+++ b/core/lib/Drupal/Core/Form/ConfigFormBase.php
   *
   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
   *   The factory for configuration objects.
-   * @param \Drupal\Core\Config\TypedConfigManagerInterface|null $typedConfigManager
+   * @param \Drupal\Core\Config\TypedConfigManagerInterface|null $_typedConfigManager
   *   The typed config manager.
   */
  public function __construct(
    ConfigFactoryInterface $config_factory,
-    protected ?TypedConfigManagerInterface $typedConfigManager = NULL,
+    private ?TypedConfigManagerInterface $_typedConfigManager = NULL,
--- a/core/lib/Drupal/Core/Form/ConfigFormBase.php
+++ b/core/lib/Drupal/Core/Form/ConfigFormBase.php
   */
  public function __construct(
    ConfigFactoryInterface $config_factory,
-    protected ?TypedConfigManagerInterface $typedConfigManager = NULL,
+    protected $typedConfigManager = NULL,
  ) {
    $this->setConfigFactory($config_factory);
-    if ($this->typedConfigManager === NULL) {
-      @trigger_error('Calling ConfigFormBase::__construct() without the $typedConfigManager argument is deprecated in drupal:10.2.0 and will be required in drupal:11.0.0. See https://www.drupal.org/node/3373502', E_USER_DEPRECATED);
-      $this->typedConfigManager = \Drupal::service('config.typed');
+
+    if (!$typedConfigManager instanceof TypedConfigManagerInterface) {
+      $type = get_debug_type($typedConfigManager);