From 4b7a30edd04b2452dbbc98b09a6190c909aab30e Mon Sep 17 00:00:00 2001 From: webchick Date: Mon, 16 Sep 2013 08:43:28 -0700 Subject: [PATCH] Issue #2089627 by tim.plunkett: Move \Drupal\system\SystemConfigFormBase to \Drupal\Core\Form\ConfigFormBase. --- .../Drupal/Core/Form/ConfigFormBase.php} | 8 ++++---- .../lib/Drupal/aggregator/Form/SettingsForm.php | 4 ++-- .../book/lib/Drupal/book/Form/BookSettingsForm.php | 4 ++-- core/modules/forum/lib/Drupal/forum/ForumSettingsForm.php | 4 ++-- .../Drupal/language/Form/ContentLanguageSettingsForm.php | 4 ++-- .../lib/Drupal/language/Form/NegotiationBrowserForm.php | 4 ++-- .../lib/Drupal/language/Form/NegotiationSelectedForm.php | 4 ++-- .../lib/Drupal/language/Form/NegotiationSessionForm.php | 4 ++-- .../lib/Drupal/language/Form/NegotiationUrlForm.php | 4 ++-- .../locale/lib/Drupal/locale/Form/LocaleSettingsForm.php | 4 ++-- core/modules/menu/lib/Drupal/menu/MenuSettingsForm.php | 4 ++-- .../search/lib/Drupal/search/Form/SearchSettingsForm.php | 4 ++-- .../lib/Drupal/simpletest/Form/SimpletestSettingsForm.php | 4 ++-- .../lib/Drupal/statistics/StatisticsSettingsForm.php | 4 ++-- core/modules/system/lib/Drupal/system/Form/CronForm.php | 4 ++-- .../system/lib/Drupal/system/Form/FileSystemForm.php | 4 ++-- .../system/lib/Drupal/system/Form/ImageToolkitForm.php | 4 ++-- .../modules/system/lib/Drupal/system/Form/LoggingForm.php | 4 ++-- .../system/lib/Drupal/system/Form/PerformanceForm.php | 4 ++-- .../system/lib/Drupal/system/Form/RegionalForm.php | 4 ++-- .../system/lib/Drupal/system/Form/RssFeedsForm.php | 4 ++-- .../system/lib/Drupal/system/Form/SiteInformationForm.php | 4 ++-- .../lib/Drupal/system/Form/SiteMaintenanceModeForm.php | 7 +++---- .../system/lib/Drupal/system/Form/ThemeSettingsForm.php | 4 ++-- .../lib/Drupal/form_test/SystemConfigFormTestForm.php | 6 +++--- .../update/lib/Drupal/update/UpdateSettingsForm.php | 4 ++-- core/modules/user/lib/Drupal/user/AccountSettingsForm.php | 4 ++-- .../lib/Drupal/views_ui/Form/AdvancedSettingsForm.php | 4 ++-- .../lib/Drupal/views_ui/Form/BasicSettingsForm.php | 4 ++-- 29 files changed, 62 insertions(+), 63 deletions(-) rename core/{modules/system/lib/Drupal/system/SystemConfigFormBase.php => lib/Drupal/Core/Form/ConfigFormBase.php} (91%) diff --git a/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php b/core/lib/Drupal/Core/Form/ConfigFormBase.php similarity index 91% rename from core/modules/system/lib/Drupal/system/SystemConfigFormBase.php rename to core/lib/Drupal/Core/Form/ConfigFormBase.php index 36b51e3e00..5c698358b2 100644 --- a/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php +++ b/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. diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/SettingsForm.php b/core/modules/aggregator/lib/Drupal/aggregator/Form/SettingsForm.php index ed4563c73a..85e96e00e8 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Form/SettingsForm.php +++ b/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. diff --git a/core/modules/book/lib/Drupal/book/Form/BookSettingsForm.php b/core/modules/book/lib/Drupal/book/Form/BookSettingsForm.php index 9aeb5a4f14..e5c48b1870 100644 --- a/core/modules/book/lib/Drupal/book/Form/BookSettingsForm.php +++ b/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} diff --git a/core/modules/forum/lib/Drupal/forum/ForumSettingsForm.php b/core/modules/forum/lib/Drupal/forum/ForumSettingsForm.php index 42f82801ab..9fe4931559 100644 --- a/core/modules/forum/lib/Drupal/forum/ForumSettingsForm.php +++ b/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} diff --git a/core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php b/core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php index 65becdf113..f4d7c54976 100644 --- a/core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php +++ b/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. diff --git a/core/modules/language/lib/Drupal/language/Form/NegotiationBrowserForm.php b/core/modules/language/lib/Drupal/language/Form/NegotiationBrowserForm.php index c7555c31df..b801b2b865 100644 --- a/core/modules/language/lib/Drupal/language/Form/NegotiationBrowserForm.php +++ b/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. diff --git a/core/modules/language/lib/Drupal/language/Form/NegotiationSelectedForm.php b/core/modules/language/lib/Drupal/language/Form/NegotiationSelectedForm.php index 306bcef203..4271861e0d 100644 --- a/core/modules/language/lib/Drupal/language/Form/NegotiationSelectedForm.php +++ b/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(). diff --git a/core/modules/language/lib/Drupal/language/Form/NegotiationSessionForm.php b/core/modules/language/lib/Drupal/language/Form/NegotiationSessionForm.php index 7372d810b8..1c73492884 100644 --- a/core/modules/language/lib/Drupal/language/Form/NegotiationSessionForm.php +++ b/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(). diff --git a/core/modules/language/lib/Drupal/language/Form/NegotiationUrlForm.php b/core/modules/language/lib/Drupal/language/Form/NegotiationUrlForm.php index e73ccdb9dd..6855a24e79 100644 --- a/core/modules/language/lib/Drupal/language/Form/NegotiationUrlForm.php +++ b/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(). diff --git a/core/modules/locale/lib/Drupal/locale/Form/LocaleSettingsForm.php b/core/modules/locale/lib/Drupal/locale/Form/LocaleSettingsForm.php index 826ba38be2..2791646546 100644 --- a/core/modules/locale/lib/Drupal/locale/Form/LocaleSettingsForm.php +++ b/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(). diff --git a/core/modules/menu/lib/Drupal/menu/MenuSettingsForm.php b/core/modules/menu/lib/Drupal/menu/MenuSettingsForm.php index 6bcbba2874..a354184417 100644 --- a/core/modules/menu/lib/Drupal/menu/MenuSettingsForm.php +++ b/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(). diff --git a/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php b/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php index 3433e6b3a8..b94cee0e4f 100644 --- a/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php +++ b/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. diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestSettingsForm.php b/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestSettingsForm.php index 8a59259862..ed65884a34 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestSettingsForm.php +++ b/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} diff --git a/core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php b/core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php index c2611cd5c6..437946f969 100644 --- a/core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php +++ b/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. diff --git a/core/modules/system/lib/Drupal/system/Form/CronForm.php b/core/modules/system/lib/Drupal/system/Form/CronForm.php index e805ec9b26..12802e4199 100644 --- a/core/modules/system/lib/Drupal/system/Form/CronForm.php +++ b/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. diff --git a/core/modules/system/lib/Drupal/system/Form/FileSystemForm.php b/core/modules/system/lib/Drupal/system/Form/FileSystemForm.php index 83cb9e7e49..100c921ee6 100644 --- a/core/modules/system/lib/Drupal/system/Form/FileSystemForm.php +++ b/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} diff --git a/core/modules/system/lib/Drupal/system/Form/ImageToolkitForm.php b/core/modules/system/lib/Drupal/system/Form/ImageToolkitForm.php index 100553c3c8..dcdb2ccd9d 100644 --- a/core/modules/system/lib/Drupal/system/Form/ImageToolkitForm.php +++ b/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. diff --git a/core/modules/system/lib/Drupal/system/Form/LoggingForm.php b/core/modules/system/lib/Drupal/system/Form/LoggingForm.php index bc74529ed2..f4860cfc24 100644 --- a/core/modules/system/lib/Drupal/system/Form/LoggingForm.php +++ b/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} diff --git a/core/modules/system/lib/Drupal/system/Form/PerformanceForm.php b/core/modules/system/lib/Drupal/system/Form/PerformanceForm.php index 92404b740f..8ae03822ee 100644 --- a/core/modules/system/lib/Drupal/system/Form/PerformanceForm.php +++ b/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. diff --git a/core/modules/system/lib/Drupal/system/Form/RegionalForm.php b/core/modules/system/lib/Drupal/system/Form/RegionalForm.php index 5bb5b2bfe6..569a5c6443 100644 --- a/core/modules/system/lib/Drupal/system/Form/RegionalForm.php +++ b/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. diff --git a/core/modules/system/lib/Drupal/system/Form/RssFeedsForm.php b/core/modules/system/lib/Drupal/system/Form/RssFeedsForm.php index 1899324467..b3ef82b7a3 100644 --- a/core/modules/system/lib/Drupal/system/Form/RssFeedsForm.php +++ b/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} diff --git a/core/modules/system/lib/Drupal/system/Form/SiteInformationForm.php b/core/modules/system/lib/Drupal/system/Form/SiteInformationForm.php index 55b1175cb6..1b5029b0e3 100644 --- a/core/modules/system/lib/Drupal/system/Form/SiteInformationForm.php +++ b/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. diff --git a/core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php b/core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php index e83b93ff3a..131af5bc63 100644 --- a/core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php +++ b/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. diff --git a/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php b/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php index d59d0225d2..44b34feae3 100644 --- a/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php +++ b/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. diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/SystemConfigFormTestForm.php b/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/SystemConfigFormTestForm.php index bcad05baa5..9330682ee2 100644 --- a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/SystemConfigFormTestForm.php +++ b/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} diff --git a/core/modules/update/lib/Drupal/update/UpdateSettingsForm.php b/core/modules/update/lib/Drupal/update/UpdateSettingsForm.php index 92dd0226a6..d2f80d1228 100644 --- a/core/modules/update/lib/Drupal/update/UpdateSettingsForm.php +++ b/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(). diff --git a/core/modules/user/lib/Drupal/user/AccountSettingsForm.php b/core/modules/user/lib/Drupal/user/AccountSettingsForm.php index 9b35049f04..e8077d314c 100644 --- a/core/modules/user/lib/Drupal/user/AccountSettingsForm.php +++ b/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. diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php index 17c2127e84..fd77d5e014 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php +++ b/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} diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php index 707db987ba..d1206d5fd7 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php +++ b/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} -- GitLab