summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2014-04-25 19:13:44 (GMT)
committerAlex Pott2014-04-25 19:13:44 (GMT)
commit8a567823903005e57614e69af44fe21c185e5b84 (patch)
treeae7386c76c906392930f7f47f42075aa66e089c5
parent019b6f6a413d3afe7108bb434e45eafe2141a301 (diff)
Issue #2208475 by sun, Xano, Jalandhar, andrei.dincu: Move Settings into Drupal\Core\Site\Settings.
-rw-r--r--core/authorize.php2
-rw-r--r--core/core.services.yml4
-rw-r--r--core/includes/bootstrap.inc2
-rw-r--r--core/includes/common.inc2
-rw-r--r--core/includes/database.inc2
-rw-r--r--core/includes/file.inc2
-rw-r--r--core/includes/install.core.inc2
-rw-r--r--core/includes/install.inc2
-rw-r--r--core/includes/mail.inc2
-rw-r--r--core/includes/theme.maintenance.inc2
-rw-r--r--core/includes/update.inc1
-rw-r--r--core/lib/Drupal/Component/Diff/DiffEngine.php2
-rw-r--r--core/lib/Drupal/Core/Authentication/Provider/Cookie.php1
-rw-r--r--core/lib/Drupal/Core/Cache/CacheFactory.php6
-rw-r--r--core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php2
-rw-r--r--core/lib/Drupal/Core/CoreServiceProvider.php2
-rw-r--r--core/lib/Drupal/Core/EventSubscriber/ReverseProxySubscriber.php6
-rw-r--r--core/lib/Drupal/Core/Extension/ExtensionDiscovery.php2
-rw-r--r--core/lib/Drupal/Core/Form/FormBuilder.php2
-rw-r--r--core/lib/Drupal/Core/Http/Client.php2
-rw-r--r--core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php7
-rw-r--r--core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php2
-rw-r--r--core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php2
-rw-r--r--core/lib/Drupal/Core/Queue/QueueFactory.php4
-rw-r--r--core/lib/Drupal/Core/Routing/UrlGenerator.php4
-rw-r--r--core/lib/Drupal/Core/Session/SessionHandler.php2
-rw-r--r--core/lib/Drupal/Core/Session/SessionManager.php2
-rw-r--r--core/lib/Drupal/Core/Site/Settings.php (renamed from core/lib/Drupal/Component/Utility/Settings.php)8
-rw-r--r--core/lib/Drupal/Core/StreamWrapper/PublicStream.php2
-rw-r--r--core/lib/Drupal/Core/StringTranslation/Translator/CustomStrings.php6
-rw-r--r--core/lib/Drupal/Core/Template/TwigNodeTrans.php2
-rw-r--r--core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php4
-rw-r--r--core/modules/language/lib/Drupal/language/LanguageNegotiator.php6
-rw-r--r--core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php4
-rw-r--r--core/modules/simpletest/lib/Drupal/simpletest/TestBase.php4
-rw-r--r--core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelTest.php2
-rw-r--r--core/modules/system/lib/Drupal/system/Tests/File/UnmanagedCopyTest.php2
-rw-r--r--core/modules/system/lib/Drupal/system/Tests/File/UnmanagedMoveTest.php2
-rw-r--r--core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageTestBase.php4
-rw-r--r--core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php2
-rw-r--r--core/modules/system/lib/Drupal/system/Tests/PhpStorage/PhpStorageFactoryTest.php2
-rw-r--r--core/modules/system/lib/Drupal/system/Tests/System/SettingsRewriteTest.php2
-rw-r--r--core/modules/system/system.install2
-rw-r--r--core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php6
-rw-r--r--core/modules/update/update.module2
-rw-r--r--core/rebuild.php2
-rwxr-xr-xcore/scripts/rebuild_token_calculator.sh2
-rwxr-xr-xcore/scripts/run-tests.sh2
-rw-r--r--core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php2
-rw-r--r--core/tests/Drupal/Tests/Core/EventSubscriber/ReverseProxySubscriberUnitTest.php4
-rw-r--r--core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php2
-rw-r--r--core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php2
-rw-r--r--core/tests/Drupal/Tests/Core/Site/SettingsTest.php (renamed from core/tests/Drupal/Tests/Component/Utility/SettingsTest.php)32
-rw-r--r--core/update.php2
-rw-r--r--index.php4
55 files changed, 95 insertions, 92 deletions
diff --git a/core/authorize.php b/core/authorize.php
index 982b993..46202ad 100644
--- a/core/authorize.php
+++ b/core/authorize.php
@@ -20,7 +20,7 @@
* @link authorize Authorized operation helper functions @endlink
*/
-use Drupal\Component\Utility\Settings;
+use Drupal\Core\Site\Settings;
use Drupal\Core\Page\DefaultHtmlPageRenderer;
// Change the directory to the Drupal root.
diff --git a/core/core.services.yml b/core/core.services.yml
index 9b9c80b..a1e997e 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -145,8 +145,8 @@ services:
class: Drupal\Component\Serialization\Yaml
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: getInstance
state:
class: Drupal\Core\State\State
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 83aa307..8c7c82e 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -6,7 +6,6 @@
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Timer;
use Drupal\Component\Utility\Unicode;
@@ -15,6 +14,7 @@ use Drupal\Core\DrupalKernel;
use Drupal\Core\Database\Database;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Core\Extension\ExtensionDiscovery;
+use Drupal\Core\Site\Settings;
use Drupal\Core\Utility\Title;
use Drupal\Core\Utility\Error;
use Symfony\Component\ClassLoader\ApcClassLoader;
diff --git a/core/includes/common.inc b/core/includes/common.inc
index a60ff1c..20a76ce 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -13,7 +13,6 @@ use Drupal\Component\Serialization\Yaml;
use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\Number;
-use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\SortArray;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Tags;
@@ -21,6 +20,7 @@ use Drupal\Component\Utility\UrlHelper;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Language\Language;
+use Drupal\Core\Site\Settings;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Request;
use Drupal\Core\PhpStorage\PhpStorageFactory;
diff --git a/core/includes/database.inc b/core/includes/database.inc
index 0197377..34994a8 100644
--- a/core/includes/database.inc
+++ b/core/includes/database.inc
@@ -1,8 +1,8 @@
<?php
-use Drupal\Component\Utility\Settings;
use Drupal\Core\Database\Database;
use Drupal\Core\Database\Query\Condition;
+use Drupal\Core\Site\Settings;
/**
* @file
diff --git a/core/includes/file.inc b/core/includes/file.inc
index c0cefa5..fc0b72a 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -8,8 +8,8 @@
use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\StreamWrapper\LocalStream;
use Drupal\Component\PhpStorage\FileStorage;
-use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\String;
+use Drupal\Core\Site\Settings;
use Drupal\Core\StreamWrapper\PublicStream;
/**
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 203bc89..d48ae83 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1,7 +1,6 @@
<?php
use Drupal\Component\Utility\UrlHelper;
-use Drupal\Component\Utility\Settings;
use Drupal\Core\DrupalKernel;
use Drupal\Core\Config\BootstrapConfigStorageFactory;
use Drupal\Core\Database\Database;
@@ -13,6 +12,7 @@ use Drupal\Core\Installer\Exception\NoProfilesException;
use Drupal\Core\Language\Language;
use Drupal\Core\Language\LanguageManager;
use Drupal\Core\Page\DefaultHtmlPageRenderer;
+use Drupal\Core\Site\Settings;
use Drupal\Core\StringTranslation\Translator\FileTranslation;
use Drupal\Core\Extension\ExtensionDiscovery;
use Drupal\Core\DependencyInjection\ContainerBuilder;
diff --git a/core/includes/install.inc b/core/includes/install.inc
index 5d69e9c..f080533 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -8,11 +8,11 @@
use Symfony\Component\HttpFoundation\RedirectResponse;
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\OpCodeCache;
-use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Database\Database;
use Drupal\Core\DrupalKernel;
use Drupal\Core\Extension\ExtensionDiscovery;
+use Drupal\Core\Site\Settings;
/**
* Requirement severity -- Informational message only.
diff --git a/core/includes/mail.inc b/core/includes/mail.inc
index 8c8b071..68091fb 100644
--- a/core/includes/mail.inc
+++ b/core/includes/mail.inc
@@ -6,8 +6,8 @@
*/
use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\Xss;
+use Drupal\Core\Site\Settings;
/**
* Composes and optionally sends an e-mail message.
diff --git a/core/includes/theme.maintenance.inc b/core/includes/theme.maintenance.inc
index a79adca..8a19a49 100644
--- a/core/includes/theme.maintenance.inc
+++ b/core/includes/theme.maintenance.inc
@@ -6,7 +6,7 @@
*/
use Drupal\Component\Utility\Unicode;
-use Drupal\Component\Utility\Settings;
+use Drupal\Core\Site\Settings;
/**
* Sets up the theming system for maintenance page.
diff --git a/core/includes/update.inc b/core/includes/update.inc
index 872bd7d..694a8a9 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -9,7 +9,6 @@
*/
use Drupal\Component\Graph\Graph;
-use Drupal\Component\Utility\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 21d9ad4..2dd377f 100644
--- a/core/lib/Drupal/Component/Diff/DiffEngine.php
+++ b/core/lib/Drupal/Component/Diff/DiffEngine.php
@@ -8,9 +8,9 @@
* You may copy this code freely under the conditions of the GPL.
*/
-use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Site\Settings;
define('USE_ASSERTS', FALSE);
diff --git a/core/lib/Drupal/Core/Authentication/Provider/Cookie.php b/core/lib/Drupal/Core/Authentication/Provider/Cookie.php
index 379d97e..167a0b0 100644
--- a/core/lib/Drupal/Core/Authentication/Provider/Cookie.php
+++ b/core/lib/Drupal/Core/Authentication/Provider/Cookie.php
@@ -9,7 +9,6 @@ namespace Drupal\Core\Authentication\Provider;
use Drupal\Core\Authentication\AuthenticationProviderInterface;
use Drupal\Core\Session\SessionManagerInterface;
-use Drupal\Component\Utility\Settings;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
diff --git a/core/lib/Drupal/Core/Cache/CacheFactory.php b/core/lib/Drupal/Core/Cache/CacheFactory.php
index c20979f..a3b5a01 100644
--- a/core/lib/Drupal/Core/Cache/CacheFactory.php
+++ b/core/lib/Drupal/Core/Cache/CacheFactory.php
@@ -10,7 +10,7 @@ namespace Drupal\Core\Cache;
/**
* Defines the cache backend factory.
*/
-use Drupal\Component\Utility\Settings;
+use Drupal\Core\Site\Settings;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerAwareTrait;
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -22,14 +22,14 @@ class CacheFactory implements CacheFactoryInterface, ContainerAwareInterface {
/**
* 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 ffc8f48..2462eaf 100644
--- a/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php
+++ b/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Config;
use Drupal\Core\Database\Database;
-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/CoreServiceProvider.php b/core/lib/Drupal/Core/CoreServiceProvider.php
index 1cd43a3..94ad0cf 100644
--- a/core/lib/Drupal/Core/CoreServiceProvider.php
+++ b/core/lib/Drupal/Core/CoreServiceProvider.php
@@ -8,7 +8,6 @@
namespace Drupal\Core;
use Drupal\Core\Cache\CacheContextsPass;
-use Drupal\Component\Utility\Settings;
use Drupal\Core\Cache\ListCacheBinsPass;
use Drupal\Core\Config\ConfigFactoryOverridePass;
use Drupal\Core\DependencyInjection\ServiceProviderInterface;
@@ -28,6 +27,7 @@ use Drupal\Core\DependencyInjection\Compiler\RegisterAuthenticationPass;
use Drupal\Core\DependencyInjection\Compiler\RegisterTwigExtensionsPass;
use Drupal\Core\Http\HttpClientSubscriberPass;
use Drupal\Core\Plugin\PluginManagerPass;
+use Drupal\Core\Site\Settings;
use Drupal\Core\Theme\ThemeNegotiatorPass;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\Reference;
diff --git a/core/lib/Drupal/Core/EventSubscriber/ReverseProxySubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ReverseProxySubscriber.php
index cf0003d..788076a 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ReverseProxySubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ReverseProxySubscriber.php
@@ -7,10 +7,10 @@
namespace Drupal\Core\EventSubscriber;
+use Drupal\Core\Site\Settings;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Drupal\Component\Utility\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 4873bac..0d97429 100644
--- a/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php
+++ b/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php
@@ -7,8 +7,8 @@
namespace Drupal\Core\Extension;
-use Drupal\Component\Utility\Settings;
use Drupal\Core\Extension\Discovery\RecursiveExtensionFilterIterator;
+use Drupal\Core\Site\Settings;
/**
* Discovers available extensions in the filesystem.
diff --git a/core/lib/Drupal/Core/Form/FormBuilder.php b/core/lib/Drupal/Core/Form/FormBuilder.php
index d54a895..96f06ba 100644
--- a/core/lib/Drupal/Core/Form/FormBuilder.php
+++ b/core/lib/Drupal/Core/Form/FormBuilder.php
@@ -9,7 +9,6 @@ namespace Drupal\Core\Form;
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Access\CsrfTokenGenerator;
@@ -18,6 +17,7 @@ use Drupal\Core\HttpKernel;
use Drupal\Core\KeyValueStore\KeyValueExpirableFactoryInterface;
use Drupal\Core\Render\Element;
use Drupal\Core\Routing\UrlGeneratorInterface;
+use Drupal\Core\Site\Settings;
use Drupal\Core\StringTranslation\TranslationInterface;
use Drupal\Core\Url;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
diff --git a/core/lib/Drupal/Core/Http/Client.php b/core/lib/Drupal/Core/Http/Client.php
index 0921611..7d654a9 100644
--- a/core/lib/Drupal/Core/Http/Client.php
+++ b/core/lib/Drupal/Core/Http/Client.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Http;
use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\Settings;
+use Drupal\Core\Site\Settings;
use GuzzleHttp\Client as GuzzleClient;
use GuzzleHttp\Event\SubscriberInterface;
diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
index a1a9d65..717ee04 100644
--- a/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
+++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
@@ -6,7 +6,8 @@
*/
namespace Drupal\Core\KeyValueStore;
-use Drupal\Component\Utility\Settings;
+
+use Drupal\Core\Site\Settings;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -52,14 +53,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/Mail/Plugin/Mail/PhpMail.php b/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
index 874f246..8662d0f 100644
--- a/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
+++ b/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
@@ -7,8 +7,8 @@
namespace Drupal\Core\Mail\Plugin\Mail;
-use Drupal\Component\Utility\Settings;
use Drupal\Core\Mail\MailInterface;
+use Drupal\Core\Site\Settings;
/**
* Defines the default Drupal mail backend, using PHP's native mail() function.
diff --git a/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php b/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php
index 64bcb7b..5b4effb 100644
--- a/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php
+++ b/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\PhpStorage;
-use Drupal\Component\Utility\Settings;
+use Drupal\Core\Site\Settings;
use Drupal\Core\StreamWrapper\PublicStream;
/**
diff --git a/core/lib/Drupal/Core/Queue/QueueFactory.php b/core/lib/Drupal/Core/Queue/QueueFactory.php
index 93ffebb..6dce837 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\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerAwareTrait;
@@ -28,7 +28,7 @@ class QueueFactory implements ContainerAwareInterface {
/**
* 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 eef8f77..dd09330 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -15,11 +15,11 @@ use Symfony\Component\Routing\Exception\RouteNotFoundException;
use Symfony\Cmf\Component\Routing\ProviderBasedGenerator;
-use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\PathProcessor\OutboundPathProcessorInterface;
use Drupal\Core\RouteProcessor\OutboundRouteProcessorInterface;
+use Drupal\Core\Site\Settings;
/**
* Generates URLs from route names and parameters.
@@ -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/Core/Session/SessionHandler.php b/core/lib/Drupal/Core/Session/SessionHandler.php
index 1e44763..e93e840 100644
--- a/core/lib/Drupal/Core/Session/SessionHandler.php
+++ b/core/lib/Drupal/Core/Session/SessionHandler.php
@@ -8,8 +8,8 @@
namespace Drupal\Core\Session;
use Drupal\Component\Utility\Crypt;
-use Drupal\Component\Utility\Settings;
use Drupal\Core\Database\Connection;
+use Drupal\Core\Site\Settings;
use Drupal\Core\Utility\Error;
use Symfony\Component\HttpFoundation\RequestStack;
diff --git a/core/lib/Drupal/Core/Session/SessionManager.php b/core/lib/Drupal/Core/Session/SessionManager.php
index 30ca61b..1c37dc3 100644
--- a/core/lib/Drupal/Core/Session/SessionManager.php
+++ b/core/lib/Drupal/Core/Session/SessionManager.php
@@ -8,10 +8,10 @@
namespace Drupal\Core\Session;
use Drupal\Component\Utility\Crypt;
-use Drupal\Component\Utility\Settings;
use Drupal\Core\Database\Connection;
use Drupal\Core\Session\AnonymousUserSession;
use Drupal\Core\Session\SessionHandler;
+use Drupal\Core\Site\Settings;
use Symfony\Component\HttpFoundation\RequestStack;
/**
diff --git a/core/lib/Drupal/Component/Utility/Settings.php b/core/lib/Drupal/Core/Site/Settings.php
index 2b34090..950ccd4 100644
--- a/core/lib/Drupal/Component/Utility/Settings.php
+++ b/core/lib/Drupal/Core/Site/Settings.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\Component\Utility\Settings.
+ * Contains \Drupal\Core\Site\Settings.
*/
-namespace Drupal\Component\Utility;
+namespace Drupal\Core\Site;
/**
* Read only settings that are initialized with the class.
@@ -24,7 +24,7 @@ final class Settings {
/**
* Singleton instance.
*
- * @var \Drupal\Component\Utility\Settings
+ * @var \Drupal\Core\Site\Settings
*/
private static $instance;
@@ -34,7 +34,7 @@ final class Settings {
* 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 getInstance() {
return self::$instance;
diff --git a/core/lib/Drupal/Core/StreamWrapper/PublicStream.php b/core/lib/Drupal/Core/StreamWrapper/PublicStream.php
index 3563cf1..637c9ef 100644
--- a/core/lib/Drupal/Core/StreamWrapper/PublicStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/PublicStream.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\StreamWrapper;
use Drupal\Component\Utility\UrlHelper;
-use Drupal\Component\Utility\Settings;
+use Drupal\Core\Site\Settings;
/**
* Defines a Drupal public (public://) stream wrapper class.
diff --git a/core/lib/Drupal/Core/StringTranslation/Translator/CustomStrings.php b/core/lib/Drupal/Core/StringTranslation/Translator/CustomStrings.php
index 0b564fc..8decfde 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/lib/Drupal/Core/Template/TwigNodeTrans.php b/core/lib/Drupal/Core/Template/TwigNodeTrans.php
index 2ff3b08..f905f75 100644
--- a/core/lib/Drupal/Core/Template/TwigNodeTrans.php
+++ b/core/lib/Drupal/Core/Template/TwigNodeTrans.php
@@ -14,8 +14,8 @@
namespace Drupal\Core\Template;
-use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Site\Settings;
/**
* A class that defines the Twig 'trans' tag for Drupal.
diff --git a/core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php b/core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php
index f426805..b2eb841 100644
--- a/core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php
+++ b/core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php
@@ -7,11 +7,11 @@
namespace Drupal\language\HttpKernel;
-use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\PathProcessor\InboundPathProcessorInterface;
use Drupal\Core\PathProcessor\OutboundPathProcessorInterface;
+use Drupal\Core\Site\Settings;
use Drupal\language\ConfigurableLanguageManagerInterface;
use Drupal\language\LanguageNegotiatorInterface;
use Symfony\Component\HttpFoundation\Request;
@@ -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..ec924e3 100644
--- a/core/modules/language/lib/Drupal/language/LanguageNegotiator.php
+++ b/core/modules/language/lib/Drupal/language/LanguageNegotiator.php
@@ -8,10 +8,10 @@
namespace Drupal\language;
use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Component\Utility\Settings;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Language\LanguageManagerInterface;
use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Site\Settings;
use Symfony\Component\HttpFoundation\Request;
/**
@@ -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 350fcbc..d6bd64f 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
@@ -245,8 +245,8 @@ abstract class DrupalUnitTestBase extends UnitTestBase {
// 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('getInstance');
$container
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
index 1579e4e..5aba155 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
@@ -9,7 +9,6 @@ namespace Drupal\simpletest;
use Drupal\Component\Utility\Random;
use Drupal\Core\Database\Database;
-use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\String;
use Drupal\Core\Config\ConfigImporter;
use Drupal\Core\Config\StorageComparer;
@@ -20,6 +19,7 @@ use Drupal\Core\DrupalKernel;
use Drupal\Core\Language\Language;
use Drupal\Core\Session\AccountProxy;
use Drupal\Core\Session\AnonymousUserSession;
+use Drupal\Core\Site\Settings;
use Drupal\Core\StreamWrapper\PublicStream;
use Drupal\Core\Utility\Error;
use Symfony\Component\HttpFoundation\Request;
@@ -1349,7 +1349,7 @@ abstract class TestBase {
* @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/DrupalKernel/DrupalKernelTest.php b/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelTest.php
index aaf9612..aaca572 100644
--- a/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelTest.php
@@ -7,8 +7,8 @@
namespace Drupal\system\Tests\DrupalKernel;
-use Drupal\Component\Utility\Settings;
use Drupal\Core\DrupalKernel;
+use Drupal\Core\Site\Settings;
use Drupal\simpletest\DrupalUnitTestBase;
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedCopyTest.php b/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedCopyTest.php
index ee8afff..ecd1310 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedCopyTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedCopyTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\File;
-use Drupal\Component\Utility\Settings;
+use Drupal\Core\Site\Settings;
/**
* Unmanaged copy related tests.
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedMoveTest.php b/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedMoveTest.php
index 60e6bbe..86a9330 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedMoveTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedMoveTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\File;
-use Drupal\Component\Utility\Settings;
+use Drupal\Core\Site\Settings;
/**
* Unmanaged move related tests.
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 4b48cfb..396f028 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 @@ abstract class StorageTestBase extends UnitTestBase {
->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('getInstance');
$this->container
->register('keyvalue', 'Drupal\Core\KeyValueStore\KeyValueFactory')
diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php b/core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php
index 0f6f6aa..e55e0563 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php
@@ -7,8 +7,8 @@
namespace Drupal\system\Tests\Mail;
+use Drupal\Core\Site\Settings;
use Drupal\simpletest\WebTestBase;
-use Drupal\Component\Utility\Settings;
/**
* Tests for drupal_html_to_text().
diff --git a/core/modules/system/lib/Drupal/system/Tests/PhpStorage/PhpStorageFactoryTest.php b/core/modules/system/lib/Drupal/system/Tests/PhpStorage/PhpStorageFactoryTest.php
index 5ff16d3..d7e4f34 100644
--- a/core/modules/system/lib/Drupal/system/Tests/PhpStorage/PhpStorageFactoryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/PhpStorage/PhpStorageFactoryTest.php
@@ -8,8 +8,8 @@
namespace Drupal\system\Tests\PhpStorage;
use Drupal\Component\PhpStorage\MTimeProtectedFileStorage;
-use Drupal\Component\Utility\Settings;
use Drupal\Core\PhpStorage\PhpStorageFactory;
+use Drupal\Core\Site\Settings;
use Drupal\Core\StreamWrapper\PublicStream;
use Drupal\simpletest\DrupalUnitTestBase;
use Drupal\system\PhpStorage\MockPhpStorage;
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SettingsRewriteTest.php b/core/modules/system/lib/Drupal/system/Tests/System/SettingsRewriteTest.php
index cf047ad..5ea0bda 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/SettingsRewriteTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/SettingsRewriteTest.php
@@ -7,8 +7,8 @@
namespace Drupal\system\Tests\System;
+use Drupal\Core\Site\Settings;
use Drupal\simpletest\UnitTestBase;
-use Drupal\Component\Utility\Settings;
/**
* Tests the drupal_rewrite_settings() function.
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 421491a..47c0933 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -8,8 +8,8 @@
use Drupal\Component\Utility\Crypt;
use Drupal\Core\Database\Database;
use Drupal\Core\Language\Language;
+use Drupal\Core\Site\Settings;
use Drupal\Core\StreamWrapper\PublicStream;
-use Drupal\Component\Utility\Settings;
/**
* Implements hook_requirements().
diff --git a/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php b/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php
index 89bbb1d..5fba57f 100644
--- a/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php
+++ b/core/modules/update/lib/Drupal/update/Access/UpdateManagerAccessCheck.php
@@ -7,9 +7,9 @@
namespace Drupal\update\Access;
-use Drupal\Component\Utility\Settings;
use Drupal\Core\Routing\Access\AccessInterface;
use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Site\Settings;
use Symfony\Component\Routing\Route;
use Symfony\Component\HttpFoundation\Request;
@@ -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/modules/update/update.module b/core/modules/update/update.module
index db3b893..548ee63 100644
--- a/core/modules/update/update.module
+++ b/core/modules/update/update.module
@@ -11,7 +11,7 @@
* ability to install contributed modules and themes via an user interface.
*/
-use Drupal\Component\Utility\Settings;
+use Drupal\Core\Site\Settings;
// These are internally used constants for this code, do not modify.
diff --git a/core/rebuild.php b/core/rebuild.php
index 382387c..3e8ed12 100644
--- a/core/rebuild.php
+++ b/core/rebuild.php
@@ -11,7 +11,7 @@
*/
use Drupal\Component\Utility\Crypt;
-use Drupal\Component\Utility\Settings;
+use Drupal\Core\Site\Settings;
// Change the directory to the Drupal root.
chdir('..');
diff --git a/core/scripts/rebuild_token_calculator.sh b/core/scripts/rebuild_token_calculator.sh
index c206e0b..729d34d 100755
--- a/core/scripts/rebuild_token_calculator.sh
+++ b/core/scripts/rebuild_token_calculator.sh
@@ -11,7 +11,7 @@ require_once __DIR__ . '/../vendor/autoload.php';
require_once dirname(__DIR__) . '/includes/bootstrap.inc';
use Drupal\Component\Utility\Crypt;
-use Drupal\Component\Utility\Settings;
+use Drupal\Core\Site\Settings;
drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION);
diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index 1f09534..a953dd7 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -5,10 +5,10 @@
* This script runs Drupal tests from command line.
*/
-use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\Timer;
use Drupal\Core\Database\Database;
use Drupal\Core\DrupalKernel;
+use Drupal\Core\Site\Settings;
use Symfony\Component\HttpFoundation\Request;
require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php b/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php
index eb1f40b..0f61907 100644
--- a/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php
@@ -8,8 +8,8 @@
namespace Drupal\Tests\Core\Cache;
use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Component\Utility\Settings;
use Drupal\Core\Cache\CacheFactory;
+use Drupal\Core\Site\Settings;
use Drupal\Tests\UnitTestCase;
/**
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/ReverseProxySubscriberUnitTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/ReverseProxySubscriberUnitTest.php
index e62befe..e3c8db0 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/ReverseProxySubscriberUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/ReverseProxySubscriberUnitTest.php
@@ -7,8 +7,8 @@
namespace Drupal\Tests\Core\EventSubscriber;
-use Drupal\Component\Utility\Settings;
use Drupal\Core\EventSubscriber\ReverseProxySubscriber;
+use Drupal\Core\Site\Settings;
use Drupal\Tests\UnitTestCase;
/**
@@ -73,7 +73,7 @@ class ReverseProxySubscriberUnitTest extends UnitTestCase {
* \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..8f877f7 100644
--- a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
+++ b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
@@ -7,12 +7,12 @@
namespace Drupal\Tests\Core\PathProcessor;
-use Drupal\Component\Utility\Settings;
use Drupal\Core\Language\Language;
use Drupal\Core\PathProcessor\PathProcessorAlias;
use Drupal\Core\PathProcessor\PathProcessorDecode;
use Drupal\Core\PathProcessor\PathProcessorFront;
use Drupal\Core\PathProcessor\PathProcessorManager;
+use Drupal\Core\Site\Settings;
use Drupal\language\HttpKernel\PathProcessorLanguage;
use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
use Symfony\Component\HttpFoundation\Request;
diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
index d1c59c9..151b749 100644
--- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
@@ -7,10 +7,10 @@
namespace Drupal\Tests\Core\Routing;
-use Drupal\Component\Utility\Settings;
use Drupal\Core\PathProcessor\PathProcessorAlias;
use Drupal\Core\PathProcessor\PathProcessorManager;
use Drupal\Core\Routing\UrlGenerator;
+use Drupal\Core\Site\Settings;
use Drupal\Tests\UnitTestCase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Route;
diff --git a/core/tests/Drupal/Tests/Component/Utility/SettingsTest.php b/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
index 1c913c9..541cbe8 100644
--- a/core/tests/Drupal/Tests/Component/Utility/SettingsTest.php
+++ b/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
@@ -2,18 +2,18 @@
/**
* @file
- * Contains \Drupal\Tests\Component\Utility\SettingsTest.php
+ * Contains \Drupal\Tests\Core\Site\SettingsTest.
*/
-namespace Drupal\Tests\Component\Utility;
+namespace Drupal\Tests\Core\Site;
-use Drupal\Component\Utility\Settings;
+use Drupal\Core\Site\Settings;
use Drupal\Tests\UnitTestCase;
/**
- * Tests read only settings.
+ * Tests read-only settings.
*
- * @see \Drupal\Component\Utility\Settings
+ * @coversDefaultClass \Drupal\Core\Site\Settings
*/
class SettingsTest extends UnitTestCase {
@@ -25,34 +25,36 @@ class SettingsTest extends UnitTestCase {
protected $config = array();
/**
- * The settings object to test.
+ * The class under test.
*
- * @var \Drupal\Component\Utility\Settings
+ * @var \Drupal\Core\Site\Settings
*/
protected $settings;
+ /**
+ * {@inheritdoc}
+ */
public static function getInfo() {
return array(
- 'name' => 'Read-only settings test',
- 'description' => 'Confirm that \Drupal\Component\Utility\Settings is working.',
+ 'name' => '\Drupal\Core\Site\Settings unit test',
+ 'description' => '',
'group' => 'Common',
);
}
/**
- * Setup a basic configuration array.
+ * @covers ::__construct
*/
public function setUp(){
$this->config = array(
'one' => '1',
'two' => '2',
);
-
$this->settings = new Settings($this->config);
}
/**
- * Tests Settings::get().
+ * @covers ::get
*/
public function testGet() {
// Test stored settings.
@@ -65,16 +67,16 @@ class SettingsTest extends UnitTestCase {
}
/**
- * Test Settings::getAll().
+ * @covers ::getAll
*/
public function testGetAll() {
$this->assertEquals($this->config, Settings::getAll());
}
/**
- * Tests Settings::getInstance().
+ * @covers ::getInstance
*/
- public function testGetSingleton() {
+ public function testGetInstance() {
$singleton = $this->settings->getInstance();
$this->assertEquals($singleton, $this->settings);
}
diff --git a/core/update.php b/core/update.php
index 9657ae1..3bac378 100644
--- a/core/update.php
+++ b/core/update.php
@@ -14,9 +14,9 @@
* back to its original state!
*/
-use Drupal\Component\Utility\Settings;
use Drupal\Core\DrupalKernel;
use Drupal\Core\Page\DefaultHtmlPageRenderer;
+use Drupal\Core\Site\Settings;
use Drupal\Core\Update\Form\UpdateScriptSelectionForm;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
diff --git a/index.php b/index.php
index 4916a6c..a453ecc 100644
--- a/index.php
+++ b/index.php
@@ -8,6 +8,8 @@
* See COPYRIGHT.txt and LICENSE.txt files in the "core" directory.
*/
+use Drupal\Core\Site\Settings;
+
require_once __DIR__ . '/core/vendor/autoload.php';
require_once __DIR__ . '/core/includes/bootstrap.inc';
@@ -16,7 +18,7 @@ try {
}
catch (Exception $e) {
$message = 'If you have just changed code (for example deployed a new module or moved an existing one) read <a href="http://drupal.org/documentation/rebuild">http://drupal.org/documentation/rebuild</a>';
- if (\Drupal\Component\Utility\Settings::get('rebuild_access', FALSE)) {
+ if (Settings::get('rebuild_access', FALSE)) {
$rebuild_path = $GLOBALS['base_url'] . '/rebuild.php';
$message .= " or run the <a href=\"$rebuild_path\">rebuild script</a>";
}