Commit d8bd62b7 authored by catch's avatar catch
Browse files

Issue #3265605 by andypost, paulocs: Remove constructor argument shim from... 

Issue #3265605 by andypost, paulocs: Remove constructor argument shim from core/lib/Drupal/Core/Config namespace
parent c97eb132

core/lib/Drupal/Core/Config/ConfigInstaller.php

+1 −5
Original line number Diff line number Diff line
@@ -91,17 +91,13 @@ class ConfigInstaller implements ConfigInstallerInterface { 
   * @param \Drupal\Core\Extension\ExtensionPathResolver $extension_path_resolver

   *   The extension path resolver.

   */

  public function __construct(ConfigFactoryInterface $config_factory, StorageInterface $active_storage, TypedConfigManagerInterface $typed_config, ConfigManagerInterface $config_manager, EventDispatcherInterface $event_dispatcher, $install_profile, ExtensionPathResolver $extension_path_resolver = NULL) {

  public function __construct(ConfigFactoryInterface $config_factory, StorageInterface $active_storage, TypedConfigManagerInterface $typed_config, ConfigManagerInterface $config_manager, EventDispatcherInterface $event_dispatcher, $install_profile, ExtensionPathResolver $extension_path_resolver) {

    $this->configFactory = $config_factory;

    $this->activeStorages[$active_storage->getCollectionName()] = $active_storage;

    $this->typedConfig = $typed_config;

    $this->configManager = $config_manager;

    $this->eventDispatcher = $event_dispatcher;

    $this->installProfile = $install_profile;

    if (!$extension_path_resolver) {

      @trigger_error('Calling ConfigInstaller::__construct() without the $extension_path_resolver argument is deprecated in drupal:9.3.0 and is removed from drupal:10.0.0. See https://www.drupal.org/node/2940438', E_USER_DEPRECATED);

      $extension_path_resolver = \Drupal::service('extension.path.resolver');

    }

    $this->extensionPathResolver = $extension_path_resolver;

  }

core/lib/Drupal/Core/Config/ConfigManager.php

+1 −5
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ class ConfigManager implements ConfigManagerInterface { 
   * @param \Drupal\Core\Extension\ExtensionPathResolver $extension_path_resolver

   *   The extension path resolver.

   */

  public function __construct(EntityTypeManagerInterface $entity_type_manager, ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typed_config_manager, TranslationInterface $string_translation, StorageInterface $active_storage, EventDispatcherInterface $event_dispatcher, EntityRepositoryInterface $entity_repository, ExtensionPathResolver $extension_path_resolver = NULL) {

  public function __construct(EntityTypeManagerInterface $entity_type_manager, ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typed_config_manager, TranslationInterface $string_translation, StorageInterface $active_storage, EventDispatcherInterface $event_dispatcher, EntityRepositoryInterface $entity_repository, ExtensionPathResolver $extension_path_resolver) {

    $this->entityTypeManager = $entity_type_manager;

    $this->configFactory = $config_factory;

    $this->typedConfigManager = $typed_config_manager;
@@ -113,10 +113,6 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager, Con 
    $this->activeStorage = $active_storage;

    $this->eventDispatcher = $event_dispatcher;

    $this->entityRepository = $entity_repository;

    if (!$extension_path_resolver) {

      @trigger_error('Calling ConfigManager::__construct without the $extension_path_resolver argument is deprecated in drupal:9.3.0 and is required in drupal:10.0.0. See https://www.drupal.org/node/2940438', E_USER_DEPRECATED);

      $extension_path_resolver = \Drupal::service('extension.path.resolver');

    }

    $this->extensionPathResolver = $extension_path_resolver;

  }