diff --git a/core/core.services.yml b/core/core.services.yml index d2de794..c7e3ed4 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -128,8 +128,8 @@ services: - { name: needs_destruction } arguments: ['@database'] settings: - class: Drupal\Component\Utility\Settings - factory_class: Drupal\Component\Utility\Settings + class: Drupal\Core\Site\Settings + factory_class: Drupal\Core\Site\Settings factory_method: getSingleton state: class: Drupal\Core\KeyValueStore\State diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 851c259..e92b119 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -2,7 +2,7 @@ use Drupal\Component\Utility\Crypt; use Drupal\Component\Utility\NestedArray; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Component\Utility\String; use Drupal\Component\Utility\Timer; use Drupal\Component\Utility\Unicode; @@ -702,7 +702,7 @@ function drupal_get_filename($type, $name, $filename = NULL) { * by this function. Settings should be used over configuration for read-only, * possibly low bootstrap configuration that is environment specific. * - * @return \Drupal\Component\Utility\Settings + * @return \Drupal\Core\Site\Settings * The settings object. */ function settings() { diff --git a/core/includes/common.inc b/core/includes/common.inc index ab11ddf..059fb0c 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -3,7 +3,7 @@ use Drupal\Component\Utility\Crypt; use Drupal\Component\Utility\Json; use Drupal\Component\Utility\Number; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Component\Utility\SortArray; use Drupal\Component\Utility\String; use Drupal\Component\Utility\Tags; diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 6b75250..bdf8764 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -3,7 +3,7 @@ use Drupal\Component\Utility\UserAgent; use Drupal\Component\Utility\Crypt; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Core\Config\FileStorage; use Drupal\Core\DrupalKernel; use Drupal\Core\CoreServiceProvider; @@ -424,8 +424,8 @@ function install_begin_request(&$install_state) { )) ->addMethodCall('setUserAgent', array('Drupal (+http://drupal.org/)')); - $container->register('settings', 'Drupal\Component\Utility\Settings') - ->setFactoryClass('Drupal\Component\Utility\Settings') + $container->register('settings', 'Drupal\Core\Site\Settings') + ->setFactoryClass('Drupal\Core\Site\Settings') ->setFactoryMethod('getSingleton'); $container diff --git a/core/includes/install.inc b/core/includes/install.inc index 74d8e39..4e21002 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -7,7 +7,7 @@ use Symfony\Component\HttpFoundation\RedirectResponse; use Drupal\Component\Utility\Crypt; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Core\Database\Database; use Drupal\Core\DrupalKernel; use Drupal\Core\Extension\ExtensionDiscovery; diff --git a/core/includes/update.inc b/core/includes/update.inc index 5700d38..d3dba23 100644 --- a/core/includes/update.inc +++ b/core/includes/update.inc @@ -9,7 +9,7 @@ */ use Drupal\Component\Graph\Graph; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Component\Utility\String; use Drupal\Core\Config\FileStorage; use Drupal\Core\Config\ConfigException; diff --git a/core/lib/Drupal/Component/Diff/DiffEngine.php b/core/lib/Drupal/Component/Diff/DiffEngine.php index 0194379..1449ac8 100644 --- a/core/lib/Drupal/Component/Diff/DiffEngine.php +++ b/core/lib/Drupal/Component/Diff/DiffEngine.php @@ -8,7 +8,7 @@ * You may copy this code freely under the conditions of the GPL. */ -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Component\Utility\String; use Drupal\Component\Utility\Unicode; diff --git a/core/lib/Drupal/Component/PhpStorage/PhpStorageFactory.php b/core/lib/Drupal/Component/PhpStorage/PhpStorageFactory.php index 0939799..4364d00 100644 --- a/core/lib/Drupal/Component/PhpStorage/PhpStorageFactory.php +++ b/core/lib/Drupal/Component/PhpStorage/PhpStorageFactory.php @@ -7,7 +7,7 @@ namespace Drupal\Component\PhpStorage; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Core\StreamWrapper\PublicStream; /** diff --git a/core/lib/Drupal/Core/Cache/CacheFactory.php b/core/lib/Drupal/Core/Cache/CacheFactory.php index b756e91..90b9de0 100644 --- a/core/lib/Drupal/Core/Cache/CacheFactory.php +++ b/core/lib/Drupal/Core/Cache/CacheFactory.php @@ -10,7 +10,7 @@ /** * Defines the cache backend factory. */ -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Symfony\Component\DependencyInjection\ContainerAware; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -19,14 +19,14 @@ class CacheFactory extends ContainerAware implements CacheFactoryInterface { /** * The settings array. * - * @var \Drupal\Component\Utility\Settings + * @var \Drupal\Core\Site\Settings */ protected $settings; /** * Constructs CacheFactory object. * - * @param \Drupal\Component\Utility\Settings $settings + * @param \Drupal\Core\Site\Settings $settings * The settings array. */ function __construct(Settings $settings) { diff --git a/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php b/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php index 054e690..12c2d1e 100644 --- a/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php +++ b/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php @@ -6,7 +6,7 @@ */ namespace Drupal\Core\Config; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; /** * Defines a factory for retrieving the config storage used pre-kernel. diff --git a/core/lib/Drupal/Core/EventSubscriber/ReverseProxySubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ReverseProxySubscriber.php index cf0003d..330d6f0 100644 --- a/core/lib/Drupal/Core/EventSubscriber/ReverseProxySubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/ReverseProxySubscriber.php @@ -10,7 +10,7 @@ use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; /** * Reverse proxy subscriber for controller requests. @@ -20,14 +20,14 @@ class ReverseProxySubscriber implements EventSubscriberInterface { /** * A settings object. * - * @var \Drupal\Component\Utility\Settings + * @var \Drupal\Core\Site\Settings */ protected $settings; /** * Construct the ReverseProxySubscriber. * - * @param \Drupal\Component\Utility\Settings $settings + * @param \Drupal\Core\Site\Settings $settings * The read-only settings object of this request. */ public function __construct(Settings $settings) { diff --git a/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php b/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php index 2d35d00..7445043 100644 --- a/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php +++ b/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php @@ -7,7 +7,7 @@ namespace Drupal\Core\Extension; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Core\Extension\Discovery\RecursiveExtensionFilterIterator; /** diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php index a1a9d65..1c172b5 100644 --- a/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php +++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php @@ -6,7 +6,7 @@ */ namespace Drupal\Core\KeyValueStore; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -52,14 +52,14 @@ class KeyValueFactory implements KeyValueFactoryInterface { /** * The read-only settings container. * - * @var \Drupal\Component\Utility\Settings + * @var \Drupal\Core\Site\Settings */ protected $settings; /** * @param \Symfony\Component\DependencyInjection\ContainerInterface $container * The service container. - * @param \Drupal\Component\Utility\Settings $settings + * @param \Drupal\Core\Site\Settings $settings * The read-only settings container. */ function __construct(ContainerInterface $container, Settings $settings) { diff --git a/core/lib/Drupal/Core/Queue/QueueFactory.php b/core/lib/Drupal/Core/Queue/QueueFactory.php index 114123f..a93a473 100644 --- a/core/lib/Drupal/Core/Queue/QueueFactory.php +++ b/core/lib/Drupal/Core/Queue/QueueFactory.php @@ -7,7 +7,7 @@ namespace Drupal\Core\Queue; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Symfony\Component\DependencyInjection\ContainerAware; /** @@ -25,7 +25,7 @@ class QueueFactory extends ContainerAware { /** * The settings object. * - * @var \Drupal\Component\Utility\Settings + * @var \Drupal\Core\Site\Settings */ protected $settings; diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php index cfd90a9..7e45b9a 100644 --- a/core/lib/Drupal/Core/Routing/UrlGenerator.php +++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php @@ -15,7 +15,7 @@ use Symfony\Cmf\Component\Routing\ProviderBasedGenerator; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Component\Utility\Url; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\PathProcessor\OutboundPathProcessorInterface; @@ -86,7 +86,7 @@ class UrlGenerator extends ProviderBasedGenerator implements UrlGeneratorInterfa * The route processor. * @param \Drupal\Core\Config\ConfigFactoryInterface $config * The config factory. - * @param \Drupal\Component\Utility\Settings $settings + * @param \Drupal\Core\Site\Settings $settings * The read only settings. * @param \Symfony\Component\HttpKernel\Log\LoggerInterface $logger * An optional logger for recording errors. diff --git a/core/lib/Drupal/Component/Utility/Settings.php b/core/lib/Drupal/Core/Site/Settings.php similarity index 91% rename from core/lib/Drupal/Component/Utility/Settings.php rename to core/lib/Drupal/Core/Site/Settings.php index eb59e66..76ef18c 100644 --- a/core/lib/Drupal/Component/Utility/Settings.php +++ b/core/lib/Drupal/Core/Site/Settings.php @@ -2,7 +2,7 @@ /** * @file - * Contains \Drupal\Component\Utility\Settings. + * Contains \Drupal\Core\Site\Settings. */ namespace Drupal\Component\Utility; @@ -22,7 +22,7 @@ /** * Singleton instance. * - * @var \Drupal\Component\Utility\Settings + * @var \Drupal\Core\Site\Settings */ private static $instance; @@ -32,7 +32,7 @@ * A singleton is used because this class is used before the container is * available. * - * @return \Drupal\Component\Utility\Settings + * @return \Drupal\Core\Site\Settings */ public static function getSingleton() { return self::$instance; diff --git a/core/lib/Drupal/Core/StringTranslation/Translator/CustomStrings.php b/core/lib/Drupal/Core/StringTranslation/Translator/CustomStrings.php index 667c3eb..24f5085 100644 --- a/core/lib/Drupal/Core/StringTranslation/Translator/CustomStrings.php +++ b/core/lib/Drupal/Core/StringTranslation/Translator/CustomStrings.php @@ -7,7 +7,7 @@ namespace Drupal\Core\StringTranslation\Translator; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; /** * String translator using overrides from variables. @@ -20,14 +20,14 @@ class CustomStrings extends StaticTranslation { /** * The settings read only object. * - * @var \Drupal\Component\Utility\Settings + * @var \Drupal\Core\Site\Settings */ protected $settings; /** * Constructs a CustomStrings object. * - * @param \Drupal\Component\Utility\Settings $settings + * @param \Drupal\Core\Site\Settings $settings * The settings read only object. */ public function __construct(Settings $settings) { diff --git a/core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php b/core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php index f426805..0b88ee6 100644 --- a/core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php +++ b/core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php @@ -7,7 +7,7 @@ namespace Drupal\language\HttpKernel; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Component\Utility\Unicode; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\PathProcessor\InboundPathProcessorInterface; @@ -69,7 +69,7 @@ class PathProcessorLanguage implements InboundPathProcessorInterface, OutboundPa * * @param \Drupal\Core\Config\ConfigFactoryInterface $config * A config factory object for retrieving configuration settings. - * @param \Drupal\Component\Utility\Settings $settings + * @param \Drupal\Core\Site\Settings $settings * The settings instance. * @param \Drupal\language\ConfigurableLanguageManagerInterface $language_manager * The configurable language manager. diff --git a/core/modules/language/lib/Drupal/language/LanguageNegotiator.php b/core/modules/language/lib/Drupal/language/LanguageNegotiator.php index 7841bab..685315e 100644 --- a/core/modules/language/lib/Drupal/language/LanguageNegotiator.php +++ b/core/modules/language/lib/Drupal/language/LanguageNegotiator.php @@ -8,7 +8,7 @@ namespace Drupal\language; use Drupal\Component\Plugin\PluginManagerInterface; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Language\LanguageManagerInterface; use Drupal\Core\Session\AccountInterface; @@ -43,7 +43,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface { /** * The settings instance. * - * @return \Drupal\Component\Utility\Settings + * @return \Drupal\Core\Site\Settings */ protected $settings; @@ -84,7 +84,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface { * The language negotiation methods plugin manager * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * The configuration factory. - * @param \Drupal\Component\Utility\Settings $settings + * @param \Drupal\Core\Site\Settings $settings * The settings instance. */ public function __construct(ConfigurableLanguageManagerInterface $language_manager, PluginManagerInterface $negotiator_manager, ConfigFactoryInterface $config_factory, Settings $settings) { diff --git a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php index cab4b9e..8b1b8bd 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php @@ -241,8 +241,8 @@ public function containerBuild(ContainerBuilder $container) { // together here, it still might a keyvalue storage for anything using // \Drupal::state() -- that's why a memory service was added in the first // place. - $container->register('settings', 'Drupal\Component\Utility\Settings') - ->setFactoryClass('Drupal\Component\Utility\Settings') + $container->register('settings', 'Drupal\Core\Site\Settings') + ->setFactoryClass('Drupal\Core\Site\Settings') ->setFactoryMethod('getSingleton'); $container diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php index e1bcc90..0626568 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php @@ -9,7 +9,7 @@ use Drupal\Component\Utility\Random; use Drupal\Core\Database\Database; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Component\Utility\String; use Drupal\Core\Config\ConfigImporter; use Drupal\Core\Config\StorageComparer; @@ -1304,7 +1304,7 @@ protected function exceptionHandler($exception) { * @param $value * The value of the setting. * - * @see \Drupal\Component\Utility\Settings::get() + * @see \Drupal\Core\Site\Settings::get() */ protected function settingsSet($name, $value) { $settings = settings()->getAll(); diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageTestBase.php b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageTestBase.php index 86e6ce8..ca1c859 100644 --- a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageTestBase.php +++ b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageTestBase.php @@ -52,8 +52,8 @@ protected function setUp() { ->register('service_container', 'Symfony\Component\DependencyInjection\ContainerBuilder') ->setSynthetic(TRUE); $this->container->set('service_container', $this->container); - $this->container->register('settings', 'Drupal\Component\Utility\Settings') - ->setFactoryClass('Drupal\Component\Utility\Settings') + $this->container->register('settings', 'Drupal\Core\Site\Settings') + ->setFactoryClass('Drupal\Core\Site\Settings') ->setFactoryMethod('getSingleton'); $this->container ->register('keyvalue', 'Drupal\Core\KeyValueStore\KeyValueFactory') diff --git a/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php b/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php index 89bbb1d..bdf6e77 100644 --- a/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php +++ b/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php @@ -7,7 +7,7 @@ namespace Drupal\update\Access; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Core\Routing\Access\AccessInterface; use Drupal\Core\Session\AccountInterface; use Symfony\Component\Routing\Route; @@ -21,14 +21,14 @@ class UpdateManagerAccessCheck implements AccessInterface { /** * Settings Service. * - * @var \Drupal\Component\Utility\Settings + * @var \Drupal\Core\Site\Settings */ protected $settings; /** * Constructs a UpdateManagerAccessCheck object. * - * @param \Drupal\Component\Utility\Settings $settings + * @param \Drupal\Core\Site\Settings $settings * The read-only settings container. */ public function __construct(Settings $settings) { diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php b/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php index cb4c810..c2d0f3d 100644 --- a/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php +++ b/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php @@ -7,7 +7,7 @@ namespace Drupal\Tests\Component\PhpStorage; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; /** * Tests the simple file storage. diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php index 49cc53a..5d2fade 100644 --- a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php +++ b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php @@ -8,7 +8,7 @@ namespace Drupal\Tests\Component\PhpStorage; use Drupal\Component\PhpStorage\PhpStorageFactory; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; /** * Tests the directory mtime based PHP loader implementation. diff --git a/core/tests/Drupal/Tests/Component/Utility/SettingsTest.php b/core/tests/Drupal/Tests/Component/Utility/SettingsTest.php index 7117bcb..ec51380 100644 --- a/core/tests/Drupal/Tests/Component/Utility/SettingsTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/SettingsTest.php @@ -2,18 +2,18 @@ /** * @file - * Contains \Drupal\Tests\Component\Utility\SettingsTest.php + * Contains \Drupal\Tests\Core\Site\SettingsTest.php */ namespace Drupal\Tests\Component\Utility; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Tests\UnitTestCase; /** * Tests read only settings. * - * @see \Drupal\Component\Utility\Settings + * @see \Drupal\Core\Site\Settings */ class SettingsTest extends UnitTestCase { @@ -27,14 +27,14 @@ class SettingsTest extends UnitTestCase { /** * The settings object to test. * - * @var \Drupal\Component\Utility\Settings + * @var \Drupal\Core\Site\Settings */ protected $settings; public static function getInfo() { return array( 'name' => 'Read-only settings test', - 'description' => 'Confirm that \Drupal\Component\Utility\Settings is working.', + 'description' => 'Confirm that \Drupal\Core\Site\Settings is working.', 'group' => 'Common', ); } diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/ReverseProxySubscriberUnitTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/ReverseProxySubscriberUnitTest.php index e62befe..803206c 100644 --- a/core/tests/Drupal/Tests/Core/EventSubscriber/ReverseProxySubscriberUnitTest.php +++ b/core/tests/Drupal/Tests/Core/EventSubscriber/ReverseProxySubscriberUnitTest.php @@ -7,7 +7,7 @@ namespace Drupal\Tests\Core\EventSubscriber; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Core\EventSubscriber\ReverseProxySubscriber; use Drupal\Tests\UnitTestCase; @@ -73,7 +73,7 @@ public function testReverseProxyEnabled() { * \Symfony\Component\HttpFoundation\Request::setTrustedProxies() should * always be called when reverse proxy settings are enabled. * - * @param \Drupal\Component\Utility\Settings $settings + * @param \Drupal\Core\Site\Settings $settings * The settings object that holds reverse proxy configuration. */ protected function trustedHeadersAreSet(Settings $settings) { diff --git a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php index 9197085..c5f5605 100644 --- a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php +++ b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php @@ -7,7 +7,7 @@ namespace Drupal\Tests\Core\PathProcessor; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Core\Language\Language; use Drupal\Core\PathProcessor\PathProcessorAlias; use Drupal\Core\PathProcessor\PathProcessorDecode; diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php index d1c59c9..39fb795 100644 --- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php +++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php @@ -7,7 +7,7 @@ namespace Drupal\Tests\Core\Routing; -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Core\PathProcessor\PathProcessorAlias; use Drupal\Core\PathProcessor\PathProcessorManager; use Drupal\Core\Routing\UrlGenerator; diff --git a/core/update.php b/core/update.php index 433d5cf..f78e1aa 100644 --- a/core/update.php +++ b/core/update.php @@ -14,7 +14,7 @@ * back to its original state! */ -use Drupal\Component\Utility\Settings; +use Drupal\Core\Site\Settings; use Drupal\Core\DrupalKernel; use Drupal\Core\Update\Form\UpdateScriptSelectionForm; use Symfony\Component\HttpFoundation\Request;