Issue #2089627 by tim.plunkett: Move \Drupal\system\SystemConfigFormBase to...

Issue #2089627 by tim.plunkett: Move \Drupal\system\SystemConfigFormBase to \Drupal\Core\Form\ConfigFormBase.

core/modules/system/lib/Drupal/system/SystemConfigFormBase.php → core/lib/Drupal/Core/Form/ConfigFormBase.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\system\SystemConfigFormBase.
+ * Contains \Drupal\Core\Form\ConfigFormBase.
  */
 
-namespace Drupal\system;
+namespace Drupal\Core\Form;
 
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
@@ -15,7 +15,7 @@
 /**
  * Base class for implementing system configuration forms.
  */
-abstract class SystemConfigFormBase extends FormBase {
+abstract class ConfigFormBase extends FormBase {
 
   /**
    * Stores the configuration factory.
@@ -25,7 +25,7 @@ abstract class SystemConfigFormBase extends FormBase {
   protected $configFactory;
 
   /**
-   * Constructs a \Drupal\system\SystemConfigFormBase object.
+   * Constructs a \Drupal\system\ConfigFormBase object.
    *
    * @param \Drupal\Core\Config\ConfigFactory $config_factory
    *   The factory for configuration objects.

core/modules/aggregator/lib/Drupal/aggregator/Form/SettingsForm.php

@@ -13,13 +13,13 @@
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Plugin\PluginFormInterface;
 use Drupal\Core\StringTranslation\TranslationInterface;
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Configures aggregator settings for this site.
  */
-class SettingsForm extends SystemConfigFormBase {
+class SettingsForm extends ConfigFormBase {
 
   /**
    * The aggregator plugin managers.

core/modules/book/lib/Drupal/book/Form/BookSettingsForm.php

@@ -7,12 +7,12 @@
 
 namespace Drupal\book\Form;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Configure book settings for this site.
  */
-class BookSettingsForm extends SystemConfigFormBase {
+class BookSettingsForm extends ConfigFormBase {
 
   /**
    * {@inheritdoc}

core/modules/forum/lib/Drupal/forum/ForumSettingsForm.php

@@ -7,12 +7,12 @@
 
 namespace Drupal\forum;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Configure forum settings for this site.
  */
-class ForumSettingsForm extends SystemConfigFormBase {
+class ForumSettingsForm extends ConfigFormBase {
 
   /**
    * {@inheritdoc}

core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php

@@ -10,13 +10,13 @@
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
 use Drupal\Core\Entity\EntityManager;
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Configure the content language settings for this site.
  */
-class ContentLanguageSettingsForm extends SystemConfigFormBase {
+class ContentLanguageSettingsForm extends ConfigFormBase {
 
   /**
    * The entity manager.

core/modules/language/lib/Drupal/language/Form/NegotiationBrowserForm.php

@@ -10,13 +10,13 @@
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Configure the browser language negotiation method for this site.
  */
-class NegotiationBrowserForm extends SystemConfigFormBase {
+class NegotiationBrowserForm extends ConfigFormBase {
 
   /**
    * The module handler.

core/modules/language/lib/Drupal/language/Form/NegotiationSelectedForm.php

@@ -8,12 +8,12 @@
 namespace Drupal\language\Form;
 
 use Drupal\Core\Language\Language;
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Configure the selected language negotiation method for this site.
  */
-class NegotiationSelectedForm extends SystemConfigFormBase {
+class NegotiationSelectedForm extends ConfigFormBase {
 
   /**
    * Implements \Drupal\Core\Form\FormInterface::getFormID().

core/modules/language/lib/Drupal/language/Form/NegotiationSessionForm.php

@@ -7,12 +7,12 @@
 
 namespace Drupal\language\Form;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Configure the session language negotiation method for this site.
  */
-class NegotiationSessionForm extends SystemConfigFormBase {
+class NegotiationSessionForm extends ConfigFormBase {
 
   /**
    * Implements \Drupal\Core\Form\FormInterface::getFormID().

core/modules/language/lib/Drupal/language/Form/NegotiationUrlForm.php

@@ -7,12 +7,12 @@
 
 namespace Drupal\language\Form;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Configure the URL language negotiation method for this site.
  */
-class NegotiationUrlForm extends SystemConfigFormBase {
+class NegotiationUrlForm extends ConfigFormBase {
 
   /**
    * Implements \Drupal\Core\Form\FormInterface::getFormID().

core/modules/locale/lib/Drupal/locale/Form/LocaleSettingsForm.php

@@ -6,12 +6,12 @@
 
 namespace Drupal\locale\Form;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Configure locale settings for this site.
  */
-class LocaleSettingsForm extends SystemConfigFormBase {
+class LocaleSettingsForm extends ConfigFormBase {
 
   /**
    * Implements \Drupal\Core\Form\FormInterface::getFormID().

core/modules/menu/lib/Drupal/menu/MenuSettingsForm.php

@@ -7,12 +7,12 @@
 
 namespace Drupal\menu;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Select the menus to be used for the main and secondary links for this site.
  */
-class MenuSettingsForm extends SystemConfigFormBase {
+class MenuSettingsForm extends ConfigFormBase {
 
   /**
    * Implements \Drupal\Core\Form\FormInterface::getFormID().

core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php

@@ -12,13 +12,13 @@
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\KeyValueStore\KeyValueStoreInterface;
 use Drupal\search\SearchPluginManager;
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Configure search settings for this site.
  */
-class SearchSettingsForm extends SystemConfigFormBase {
+class SearchSettingsForm extends ConfigFormBase {
 
   /**
    * A configuration object with the current search settings.

core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestSettingsForm.php

@@ -7,12 +7,12 @@
 
 namespace Drupal\simpletest\Form;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Configure simpletest settings for this site.
  */
-class SimpletestSettingsForm extends SystemConfigFormBase {
+class SimpletestSettingsForm extends ConfigFormBase {
 
   /**
    * {@inheritdoc}

core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php

@@ -8,14 +8,14 @@
 
 use Drupal\Core\Config\Context\ContextInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Config\ConfigFactory;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Configure statistics settings for this site.
  */
-class StatisticsSettingsForm extends SystemConfigFormBase {
+class StatisticsSettingsForm extends ConfigFormBase {
 
   /**
    * The module handler.

core/modules/system/lib/Drupal/system/Form/CronForm.php

@@ -10,14 +10,14 @@
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
 use Drupal\Core\KeyValueStore\KeyValueStoreInterface;
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
 /**
  * Configure cron settings for this site.
  */
-class CronForm extends SystemConfigFormBase {
+class CronForm extends ConfigFormBase {
 
   /**
    * Stores the state storage service.

core/modules/system/lib/Drupal/system/Form/FileSystemForm.php

@@ -8,12 +8,12 @@
 namespace Drupal\system\Form;
 
 use Drupal\Core\StreamWrapper\PublicStream;
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Configure file system settings for this site.
  */
-class FileSystemForm extends SystemConfigFormBase {
+class FileSystemForm extends ConfigFormBase {
 
   /**
    * {@inheritdoc}

core/modules/system/lib/Drupal/system/Form/ImageToolkitForm.php

@@ -9,14 +9,14 @@
 
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 use Drupal\system\Plugin\ImageToolkitManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Configures image toolkit settings for this site.
  */
-class ImageToolkitForm extends SystemConfigFormBase {
+class ImageToolkitForm extends ConfigFormBase {
 
   /**
    * An array containing currently available toolkits.

core/modules/system/lib/Drupal/system/Form/LoggingForm.php

@@ -7,12 +7,12 @@
 
 namespace Drupal\system\Form;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Configure logging settings for this site.
  */
-class LoggingForm extends SystemConfigFormBase {
+class LoggingForm extends ConfigFormBase {
 
   /**
    * {@inheritdoc}

core/modules/system/lib/Drupal/system/Form/PerformanceForm.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\system\Form;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
 use Drupal\Core\Cache\CacheBackendInterface;
@@ -16,7 +16,7 @@
 /**
  * Configure performance settings for this site.
  */
-class PerformanceForm extends SystemConfigFormBase {
+class PerformanceForm extends ConfigFormBase {
 
   /**
    * The page cache object.

core/modules/system/lib/Drupal/system/Form/RegionalForm.php

@@ -10,13 +10,13 @@
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
 use Drupal\Core\Locale\CountryManagerInterface;
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Configure regional settings for this site.
  */
-class RegionalForm extends SystemConfigFormBase {
+class RegionalForm extends ConfigFormBase {
 
   /**
    * The country manager.

core/modules/system/lib/Drupal/system/Form/RssFeedsForm.php

@@ -7,12 +7,12 @@
 
 namespace Drupal\system\Form;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Configure RSS settings for this site.
  */
-class RssFeedsForm extends SystemConfigFormBase {
+class RssFeedsForm extends ConfigFormBase {
 
   /**
    * {@inheritdoc}

core/modules/system/lib/Drupal/system/Form/SiteInformationForm.php

@@ -10,13 +10,13 @@
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
 use Drupal\Core\Path\AliasManagerInterface;
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Configure site information settings for this site.
  */
-class SiteInformationForm extends SystemConfigFormBase {
+class SiteInformationForm extends ConfigFormBase {
 
   /**
    * The path alias manager.

core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php

@@ -10,14 +10,13 @@
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
 use Drupal\Core\KeyValueStore\KeyValueStoreInterface;
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-
 /**
  * Configure maintenance settings for this site.
  */
-class SiteMaintenanceModeForm extends SystemConfigFormBase {
+class SiteMaintenanceModeForm extends ConfigFormBase {
 
   /**
    * The state keyvalue collection.
@@ -27,7 +26,7 @@ class SiteMaintenanceModeForm extends SystemConfigFormBase {
   protected $state;
 
   /**
-   * Constructs a \Drupal\system\SystemConfigFormBase object.
+   * Constructs a new SiteMaintenanceModeForm.
    *
    * @param \Drupal\Core\Config\ConfigFactory $config_factory
    *   The factory for configuration objects.

core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php

@@ -14,12 +14,12 @@
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Displays theme configuration for entire site and individual themes.
  */
-class ThemeSettingsForm extends SystemConfigFormBase {
+class ThemeSettingsForm extends ConfigFormBase {
 
   /**
    * The module handler.

core/modules/system/tests/modules/form_test/lib/Drupal/form_test/SystemConfigFormTestForm.php

@@ -7,12 +7,12 @@
 
 namespace Drupal\form_test;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
- * Tests the SystemConfigFormBase class.
+ * Tests the ConfigFormBase class.
  */
-class SystemConfigFormTestForm extends SystemConfigFormBase {
+class SystemConfigFormTestForm extends ConfigFormBase {
 
   /**
    * {@inheritdoc}

core/modules/update/lib/Drupal/update/UpdateSettingsForm.php

@@ -7,12 +7,12 @@
 
 namespace Drupal\update;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Configure update settings for this site.
  */
-class UpdateSettingsForm extends SystemConfigFormBase {
+class UpdateSettingsForm extends ConfigFormBase {
 
   /**
    * Implements \Drupal\Core\Form\FormInterface::getFormID().

core/modules/user/lib/Drupal/user/AccountSettingsForm.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\user;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
 use Drupal\Core\Extension\ModuleHandler;
@@ -16,7 +16,7 @@
 /**
  * Configure user settings for this site.
  */
-class AccountSettingsForm extends SystemConfigFormBase {
+class AccountSettingsForm extends ConfigFormBase {
 
   /**
    * The module handler.

core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php

@@ -7,12 +7,12 @@
 
 namespace Drupal\views_ui\Form;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Form builder for the advanced admin settings page.
  */
-class AdvancedSettingsForm extends SystemConfigFormBase {
+class AdvancedSettingsForm extends ConfigFormBase {
 
   /**
    * {@inheritdoc}

core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php

@@ -7,12 +7,12 @@
 
 namespace Drupal\views_ui\Form;
 
-use Drupal\system\SystemConfigFormBase;
+use Drupal\Core\Form\ConfigFormBase;
 
 /**
  * Form builder for the admin display defaults page.
  */
-class BasicSettingsForm extends SystemConfigFormBase {
+class BasicSettingsForm extends ConfigFormBase {
 
   /**
    * {@inheritdoc}