diff --git a/core/modules/config/src/Form/ConfigSingleImportForm.php b/core/modules/config/src/Form/ConfigSingleImportForm.php
index 316ee598fabc97ba8bf7b8adad01a9341ac7fe10..d90c2bb33341e72c370ae0f5f92460e6faf370d1 100644
--- a/core/modules/config/src/Form/ConfigSingleImportForm.php
+++ b/core/modules/config/src/Form/ConfigSingleImportForm.php
@@ -35,90 +35,6 @@
*/
class ConfigSingleImportForm extends ConfirmFormBase {
- /**
- * The entity type manager.
- *
- * @var \Drupal\Core\Entity\EntityTypeManagerInterface
- */
- protected $entityTypeManager;
-
- /**
- * The config storage.
- *
- * @var \Drupal\Core\Config\StorageInterface
- */
- protected $configStorage;
-
- /**
- * The renderer service.
- *
- * @var \Drupal\Core\Render\RendererInterface
- */
- protected $renderer;
-
- /**
- * The event dispatcher.
- *
- * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface
- */
- protected $eventDispatcher;
-
- /**
- * The configuration manager.
- *
- * @var \Drupal\Core\Config\ConfigManagerInterface
- */
- protected $configManager;
-
- /**
- * The database lock object.
- *
- * @var \Drupal\Core\Lock\LockBackendInterface
- */
- protected $lock;
-
- /**
- * The typed config manager.
- *
- * @var \Drupal\Core\Config\TypedConfigManagerInterface
- */
- protected $typedConfigManager;
-
- /**
- * The module handler.
- *
- * @var \Drupal\Core\Extension\ModuleHandlerInterface
- */
- protected $moduleHandler;
-
- /**
- * The theme handler.
- *
- * @var \Drupal\Core\Extension\ThemeHandlerInterface
- */
- protected $themeHandler;
-
- /**
- * The module extension list.
- *
- * @var \Drupal\Core\Extension\ModuleExtensionList
- */
- protected $moduleExtensionList;
-
- /**
- * The theme extension list.
- *
- * @var \Drupal\Core\Extension\ThemeExtensionList
- */
- protected $themeExtensionList;
-
- /**
- * The module installer.
- *
- * @var \Drupal\Core\Extension\ModuleInstallerInterface
- */
- protected $moduleInstaller;
-
/**
* If the config exists, this is that object. Otherwise, FALSE.
*
@@ -136,50 +52,45 @@ class ConfigSingleImportForm extends ConfirmFormBase {
/**
* Constructs a new ConfigSingleImportForm.
*
- * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+ * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
* The entity type manager.
- * @param \Drupal\Core\Config\StorageInterface $config_storage
+ * @param \Drupal\Core\Config\StorageInterface $configStorage
* The config storage.
* @param \Drupal\Core\Render\RendererInterface $renderer
* The renderer service.
- * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher
+ * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $eventDispatcher
* The event dispatcher used to notify subscribers of config import events.
- * @param \Drupal\Core\Config\ConfigManagerInterface $config_manager
+ * @param \Drupal\Core\Config\ConfigManagerInterface $configManager
* The configuration manager.
* @param \Drupal\Core\Lock\LockBackendInterface $lock
* The lock backend to ensure multiple imports do not occur at the same time.
- * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config
+ * @param \Drupal\Core\Config\TypedConfigManagerInterface $typedConfigManager
* The typed configuration manager.
- * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+ * @param \Drupal\Core\Extension\ModuleHandlerInterface $moduleHandler
* The module handler.
- * @param \Drupal\Core\Extension\ModuleInstallerInterface $module_installer
+ * @param \Drupal\Core\Extension\ModuleInstallerInterface $moduleInstaller
* The module installer.
- * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
+ * @param \Drupal\Core\Extension\ThemeHandlerInterface $themeHandler
* The theme handler.
- * @param \Drupal\Core\Extension\ModuleExtensionList $extension_list_module
+ * @param \Drupal\Core\Extension\ModuleExtensionList $moduleExtensionList
* The module extension list.
- * @param \Drupal\Core\Extension\ThemeExtensionList $extension_list_theme
+ * @param \Drupal\Core\Extension\ThemeExtensionList $themeExtensionList
* The theme extension list.
*/
- public function __construct(EntityTypeManagerInterface $entity_type_manager, StorageInterface $config_storage, RendererInterface $renderer, EventDispatcherInterface $event_dispatcher, ConfigManagerInterface $config_manager, LockBackendInterface $lock, TypedConfigManagerInterface $typed_config, ModuleHandlerInterface $module_handler, ModuleInstallerInterface $module_installer, ThemeHandlerInterface $theme_handler, ModuleExtensionList $extension_list_module, ThemeExtensionList $extension_list_theme = NULL) {
- $this->entityTypeManager = $entity_type_manager;
- $this->configStorage = $config_storage;
- $this->renderer = $renderer;
-
- // Services necessary for \Drupal\Core\Config\ConfigImporter.
- $this->eventDispatcher = $event_dispatcher;
- $this->configManager = $config_manager;
- $this->lock = $lock;
- $this->typedConfigManager = $typed_config;
- $this->moduleHandler = $module_handler;
- $this->moduleInstaller = $module_installer;
- $this->themeHandler = $theme_handler;
- $this->moduleExtensionList = $extension_list_module;
- if ($extension_list_theme === NULL) {
- @trigger_error('Calling ' . __METHOD__ . ' without the $extension_list_theme argument is deprecated in drupal:10.1.0 and will be required in drupal:11.0.0. See https://www.drupal.org/node/3284397', E_USER_DEPRECATED);
- $extension_list_theme = \Drupal::service('extension.list.theme');
- }
- $this->themeExtensionList = $extension_list_theme;
+ public function __construct(
+ protected EntityTypeManagerInterface $entityTypeManager,
+ protected StorageInterface $configStorage,
+ protected RendererInterface $renderer,
+ protected EventDispatcherInterface $eventDispatcher,
+ protected ConfigManagerInterface $configManager,
+ protected LockBackendInterface $lock,
+ protected TypedConfigManagerInterface $typedConfigManager,
+ protected ModuleHandlerInterface $moduleHandler,
+ protected ModuleInstallerInterface $moduleInstaller,
+ protected ThemeHandlerInterface $themeHandler,
+ protected ModuleExtensionList $moduleExtensionList,
+ protected ThemeExtensionList $themeExtensionList
+ ) {
}
/**
diff --git a/core/modules/config/src/Form/ConfigSync.php b/core/modules/config/src/Form/ConfigSync.php
index c98c23e1bb397c7c251b20b2512f74ecbd819139..61566d9d6c43169be3118e4311513b195f386f2f 100644
--- a/core/modules/config/src/Form/ConfigSync.php
+++ b/core/modules/config/src/Form/ConfigSync.php
@@ -31,155 +31,54 @@
*/
class ConfigSync extends FormBase {
- /**
- * The database lock object.
- *
- * @var \Drupal\Core\Lock\LockBackendInterface
- */
- protected $lock;
-
- /**
- * The sync configuration object.
- *
- * @var \Drupal\Core\Config\StorageInterface
- */
- protected $syncStorage;
-
- /**
- * The active configuration object.
- *
- * @var \Drupal\Core\Config\StorageInterface
- */
- protected $activeStorage;
-
- /**
- * The snapshot configuration object.
- *
- * @var \Drupal\Core\Config\StorageInterface
- */
- protected $snapshotStorage;
-
- /**
- * Event dispatcher.
- *
- * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface
- */
- protected $eventDispatcher;
-
- /**
- * The configuration manager.
- *
- * @var \Drupal\Core\Config\ConfigManagerInterface
- */
- protected $configManager;
-
- /**
- * The typed config manager.
- *
- * @var \Drupal\Core\Config\TypedConfigManagerInterface
- */
- protected $typedConfigManager;
-
- /**
- * The module handler.
- *
- * @var \Drupal\Core\Extension\ModuleHandlerInterface
- */
- protected $moduleHandler;
-
- /**
- * The theme handler.
- *
- * @var \Drupal\Core\Extension\ThemeHandlerInterface
- */
- protected $themeHandler;
-
- /**
- * The module installer.
- *
- * @var \Drupal\Core\Extension\ModuleInstallerInterface
- */
- protected $moduleInstaller;
-
- /**
- * The renderer.
- *
- * @var \Drupal\Core\Render\RendererInterface
- */
- protected $renderer;
-
- /**
- * The module extension list.
- *
- * @var \Drupal\Core\Extension\ModuleExtensionList
- */
- protected $moduleExtensionList;
-
- /**
- * The import transformer service.
- *
- * @var \Drupal\Core\Config\ImportStorageTransformer
- */
- protected $importTransformer;
-
- /**
- * The theme extension list.
- *
- * @var \Drupal\Core\Extension\ThemeExtensionList
- */
- protected $themeExtensionList;
-
/**
* Constructs the object.
*
- * @param \Drupal\Core\Config\StorageInterface $sync_storage
+ * @param \Drupal\Core\Config\StorageInterface $syncStorage
* The source storage.
- * @param \Drupal\Core\Config\StorageInterface $active_storage
+ * @param \Drupal\Core\Config\StorageInterface $activeStorage
* The target storage.
- * @param \Drupal\Core\Config\StorageInterface $snapshot_storage
+ * @param \Drupal\Core\Config\StorageInterface $snapshotStorage
* The snapshot storage.
* @param \Drupal\Core\Lock\LockBackendInterface $lock
* The lock object.
- * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher
+ * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $eventDispatcher
* Event dispatcher.
- * @param \Drupal\Core\Config\ConfigManagerInterface $config_manager
+ * @param \Drupal\Core\Config\ConfigManagerInterface $configManager
* Configuration manager.
- * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config
+ * @param \Drupal\Core\Config\TypedConfigManagerInterface $typedConfigManager
* The typed configuration manager.
- * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+ * @param \Drupal\Core\Extension\ModuleHandlerInterface $moduleHandler
* The module handler.
- * @param \Drupal\Core\Extension\ModuleInstallerInterface $module_installer
+ * @param \Drupal\Core\Extension\ModuleInstallerInterface $moduleInstaller
* The module installer.
- * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
+ * @param \Drupal\Core\Extension\ThemeHandlerInterface $themeHandler
* The theme handler.
* @param \Drupal\Core\Render\RendererInterface $renderer
* The renderer.
- * @param \Drupal\Core\Extension\ModuleExtensionList $extension_list_module
+ * @param \Drupal\Core\Extension\ModuleExtensionList $moduleExtensionList
* The module extension list
- * @param \Drupal\Core\Config\ImportStorageTransformer $import_transformer
+ * @param \Drupal\Core\Config\ImportStorageTransformer $importTransformer
* The import transformer service.
- * @param \Drupal\Core\Extension\ThemeExtensionList $extension_list_theme
+ * @param \Drupal\Core\Extension\ThemeExtensionList $themeExtensionList
* The theme extension list.
*/
- public function __construct(StorageInterface $sync_storage, StorageInterface $active_storage, StorageInterface $snapshot_storage, LockBackendInterface $lock, EventDispatcherInterface $event_dispatcher, ConfigManagerInterface $config_manager, TypedConfigManagerInterface $typed_config, ModuleHandlerInterface $module_handler, ModuleInstallerInterface $module_installer, ThemeHandlerInterface $theme_handler, RendererInterface $renderer, ModuleExtensionList $extension_list_module, ImportStorageTransformer $import_transformer, ThemeExtensionList $extension_list_theme = NULL) {
- $this->syncStorage = $sync_storage;
- $this->activeStorage = $active_storage;
- $this->snapshotStorage = $snapshot_storage;
- $this->lock = $lock;
- $this->eventDispatcher = $event_dispatcher;
- $this->configManager = $config_manager;
- $this->typedConfigManager = $typed_config;
- $this->moduleHandler = $module_handler;
- $this->moduleInstaller = $module_installer;
- $this->themeHandler = $theme_handler;
- $this->renderer = $renderer;
- $this->moduleExtensionList = $extension_list_module;
- $this->importTransformer = $import_transformer;
- if ($extension_list_theme === NULL) {
- @trigger_error('Calling ' . __METHOD__ . ' without the $extension_list_theme argument is deprecated in drupal:10.1.0 and will be required in drupal:11.0.0. See https://www.drupal.org/node/3284397', E_USER_DEPRECATED);
- $extension_list_theme = \Drupal::service('extension.list.theme');
- }
- $this->themeExtensionList = $extension_list_theme;
+ public function __construct(
+ protected StorageInterface $syncStorage,
+ protected StorageInterface $activeStorage,
+ protected StorageInterface $snapshotStorage,
+ protected LockBackendInterface $lock,
+ protected EventDispatcherInterface $eventDispatcher,
+ protected ConfigManagerInterface $configManager,
+ protected TypedConfigManagerInterface $typedConfigManager,
+ protected ModuleHandlerInterface $moduleHandler,
+ protected ModuleInstallerInterface $moduleInstaller,
+ protected ThemeHandlerInterface $themeHandler,
+ protected RendererInterface $renderer,
+ protected ModuleExtensionList $moduleExtensionList,
+ protected ImportStorageTransformer $importTransformer,
+ protected ThemeExtensionList $themeExtensionList
+ ) {
}
/**