diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php b/core/modules/config/lib/Drupal/config/Form/ConfigSync.php index 3aa3261..0dd9734 100644 --- a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php +++ b/core/modules/config/lib/Drupal/config/Form/ConfigSync.php @@ -7,15 +7,13 @@ namespace Drupal\config\Form; -use Drupal\Component\Uuid\UuidInterface; -use Drupal\Core\Entity\EntityManagerInterface; +use Drupal\Core\Config\ConfigManagerInterface; use Drupal\Core\Form\FormBase; use Drupal\Core\Config\StorageInterface; use Drupal\Core\Lock\LockBackendInterface; use Drupal\Core\Config\StorageComparer; use Drupal\Core\Config\ConfigImporter; use Drupal\Core\Config\ConfigException; -use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Config\TypedConfigManager; use Drupal\Core\Routing\UrlGeneratorInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -57,7 +55,7 @@ class ConfigSync extends FormBase { /** * @var \Drupal\Core\Entity\EntityManagerInterface; */ - protected $entity_manager; + protected $configManager; /** * URL generator service. @@ -102,15 +100,13 @@ class ConfigSync extends FormBase { * @param \Drupal\Core\Config\TypedConfigManager $typed_config * The typed configuration manager. */ - public function __construct(StorageInterface $sourceStorage, StorageInterface $targetStorage, LockBackendInterface $lock, EventDispatcherInterface $event_dispatcher, ConfigFactoryInterface $config_factory, EntityManagerInterface $entity_manager, UrlGeneratorInterface $url_generator, UuidInterface $uuid_service, TypedConfigManager $typed_config) { + public function __construct(StorageInterface $sourceStorage, StorageInterface $targetStorage, LockBackendInterface $lock, EventDispatcherInterface $event_dispatcher, ConfigManagerInterface $config_manager, UrlGeneratorInterface $url_generator, TypedConfigManager $typed_config) { $this->sourceStorage = $sourceStorage; $this->targetStorage = $targetStorage; $this->lock = $lock; $this->eventDispatcher = $event_dispatcher; - $this->configFactory = $config_factory; - $this->entity_manager = $entity_manager; + $this->configManager = $config_manager; $this->urlGenerator = $url_generator; - $this->uuidService = $uuid_service; $this->typedConfigManager = $typed_config; } @@ -123,10 +119,8 @@ public static function create(ContainerInterface $container) { $container->get('config.storage'), $container->get('lock'), $container->get('event_dispatcher'), - $container->get('config.factory'), - $container->get('entity.manager'), + $container->get('config.manager'), $container->get('url_generator'), - $container->get('uuid'), $container->get('config.typed') ); } @@ -236,10 +230,8 @@ public function submitForm(array &$form, array &$form_state) { $config_importer = new ConfigImporter( $form_state['storage_comparer'], $this->eventDispatcher, - $this->configFactory, - $this->entity_manager, + $this->configManager, $this->lock, - $this->uuidService, $this->typedConfigManager ); if ($config_importer->alreadyImporting()) {