From c040367fd17b1e6b7a794397fbef1f8ba4c823db Mon Sep 17 00:00:00 2001 From: webchick Date: Mon, 12 May 2014 21:58:53 -0700 Subject: [PATCH] Issue #2253977 by martin107, Mixologic: Use ConfigFactoryInterface to type hint ConfigFactory, Part II. --- core/lib/Drupal/Core/Config/ConfigEvents.php | 2 +- .../Core/EventSubscriber/FinishResponseSubscriber.php | 6 +++--- .../aggregator/lib/Drupal/aggregator/ItemsImporter.php | 6 +++--- .../field_ui/lib/Drupal/field_ui/DisplayOverview.php | 2 +- .../field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php | 2 +- .../field_ui/lib/Drupal/field_ui/FormDisplayOverview.php | 2 +- .../lib/Drupal/statistics/StatisticsSettingsForm.php | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/lib/Drupal/Core/Config/ConfigEvents.php b/core/lib/Drupal/Core/Config/ConfigEvents.php index 8f611932e8..a5c8b5776d 100644 --- a/core/lib/Drupal/Core/Config/ConfigEvents.php +++ b/core/lib/Drupal/Core/Config/ConfigEvents.php @@ -30,7 +30,7 @@ final class ConfigEvents { /** * Name of event fired when renaming a configuration object. * - * @see \Drupal\Core\Config\ConfigFactory::rename(). + * @see \Drupal\Core\Config\ConfigFactoryInterface::rename(). */ const RENAME = 'config.rename'; diff --git a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php index 9c7f56cc37..3063bb2237 100644 --- a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php @@ -8,7 +8,7 @@ namespace Drupal\Core\EventSubscriber; use Drupal\Core\Config\Config; -use Drupal\Core\Config\ConfigFactory; +use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageManager; use Drupal\Core\Site\Settings; @@ -43,10 +43,10 @@ class FinishResponseSubscriber implements EventSubscriberInterface { * * @param LanguageManager $language_manager * The LanguageManager object for retrieving the correct language code. - * @param \Drupal\Core\Config\ConfigFactory $config_factory + * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * A config factory for retrieving required config objects. */ - public function __construct(LanguageManager $language_manager, ConfigFactory $config_factory) { + public function __construct(LanguageManager $language_manager, ConfigFactoryInterface $config_factory) { $this->languageManager = $language_manager; $this->config = $config_factory->get('system.performance'); } diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemsImporter.php b/core/modules/aggregator/lib/Drupal/aggregator/ItemsImporter.php index 6bc4dec9dd..ac3277dfc3 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/ItemsImporter.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/ItemsImporter.php @@ -9,7 +9,7 @@ use Drupal\aggregator\Plugin\AggregatorPluginManager; use Drupal\Component\Plugin\Exception\PluginException; -use Drupal\Core\Config\ConfigFactory; +use Drupal\Core\Config\ConfigFactoryInterface; /** * Defines an importer of aggregator items. @@ -47,7 +47,7 @@ class ItemsImporter implements ItemsImporterInterface { /** * Constructs an Importer object. * - * @param \Drupal\Core\Config\ConfigFactory $config_factory + * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * The factory for configuration objects. * @param \Drupal\aggregator\Plugin\AggregatorPluginManager $fetcher_manager * The aggregator fetcher plugin manager. @@ -56,7 +56,7 @@ class ItemsImporter implements ItemsImporterInterface { * @param \Drupal\aggregator\Plugin\AggregatorPluginManager $processor_manager * The aggregator processor plugin manager. */ - public function __construct(ConfigFactory $config_factory, AggregatorPluginManager $fetcher_manager, AggregatorPluginManager $parser_manager, AggregatorPluginManager $processor_manager) { + public function __construct(ConfigFactoryInterface $config_factory, AggregatorPluginManager $fetcher_manager, AggregatorPluginManager $parser_manager, AggregatorPluginManager $processor_manager) { $this->fetcherManager = $fetcher_manager; $this->processorManager = $processor_manager; $this->parserManager = $parser_manager; diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php index 592f0a58c9..956d15fb8b 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php @@ -44,7 +44,7 @@ class DisplayOverview extends DisplayOverviewBase { * The widget or formatter plugin manager. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler class to use for invoking hooks. - * @param \Drupal\Core\Config\ConfigFactory $config_factory + * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * The configuration factory. */ public function __construct(EntityManagerInterface $entity_manager, FieldTypePluginManager $field_type_manager, PluginManagerBase $plugin_manager, ModuleHandlerInterface $module_handler, ConfigFactoryInterface $config_factory) { diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php index 115bfc65ec..bc586103e5 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php @@ -57,7 +57,7 @@ abstract class DisplayOverviewBase extends OverviewBase { * The field type manager. * @param \Drupal\Component\Plugin\PluginManagerBase $plugin_manager * The widget or formatter plugin manager. - * @param \Drupal\Core\Config\ConfigFactory $config_factory + * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * The configuration factory. */ public function __construct(EntityManagerInterface $entity_manager, FieldTypePluginManagerInterface $field_type_manager, PluginManagerBase $plugin_manager, ConfigFactoryInterface $config_factory) { diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php index 2e19fb9771..7c0a5ff066 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php @@ -44,7 +44,7 @@ class FormDisplayOverview extends DisplayOverviewBase { * The widget or formatter plugin manager. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler to use for invoking hooks. - * @param \Drupal\Core\Config\ConfigFactory $config_factory + * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * The configuration factory. */ public function __construct(EntityManagerInterface $entity_manager, FieldTypePluginManager $field_type_manager, PluginManagerBase $plugin_manager, ModuleHandlerInterface $module_handler, ConfigFactoryInterface $config_factory) { diff --git a/core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php b/core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php index 4b7f362303..c0025908de 100644 --- a/core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php +++ b/core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php @@ -8,7 +8,7 @@ use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\ConfigFormBase; -use Drupal\Core\Config\ConfigFactory; +use Drupal\Core\Config\ConfigFactoryInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -26,12 +26,12 @@ class StatisticsSettingsForm extends ConfigFormBase { /** * Constructs a \Drupal\user\StatisticsSettingsForm object. * - * @param \Drupal\Core\Config\ConfigFactory $config_factory + * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * The factory for configuration objects. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler. */ - public function __construct(ConfigFactory $config_factory, ModuleHandlerInterface $module_handler) { + public function __construct(ConfigFactoryInterface $config_factory, ModuleHandlerInterface $module_handler) { parent::__construct($config_factory); $this->moduleHandler = $module_handler; -- GitLab