Commit 8a567823 authored by alexpott's avatar alexpott

Issue #2208475 by sun, Xano, Jalandhar, andrei.dincu: Move Settings into Drupal\Core\Site\Settings.

parent 019b6f6a
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
* @link authorize Authorized operation helper functions @endlink * @link authorize Authorized operation helper functions @endlink
*/ */
use Drupal\Component\Utility\Settings; use Drupal\Core\Site\Settings;
use Drupal\Core\Page\DefaultHtmlPageRenderer; use Drupal\Core\Page\DefaultHtmlPageRenderer;
// Change the directory to the Drupal root. // Change the directory to the Drupal root.
......
...@@ -145,8 +145,8 @@ services: ...@@ -145,8 +145,8 @@ services:
class: Drupal\Component\Serialization\Yaml class: Drupal\Component\Serialization\Yaml
settings: settings:
class: Drupal\Component\Utility\Settings class: Drupal\Core\Site\Settings
factory_class: Drupal\Component\Utility\Settings factory_class: Drupal\Core\Site\Settings
factory_method: getInstance factory_method: getInstance
state: state:
class: Drupal\Core\State\State class: Drupal\Core\State\State
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
use Drupal\Component\Utility\Crypt; use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\NestedArray; use Drupal\Component\Utility\NestedArray;
use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\String; use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Timer; use Drupal\Component\Utility\Timer;
use Drupal\Component\Utility\Unicode; use Drupal\Component\Utility\Unicode;
...@@ -15,6 +14,7 @@ ...@@ -15,6 +14,7 @@
use Drupal\Core\Database\Database; use Drupal\Core\Database\Database;
use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Core\Extension\ExtensionDiscovery; use Drupal\Core\Extension\ExtensionDiscovery;
use Drupal\Core\Site\Settings;
use Drupal\Core\Utility\Title; use Drupal\Core\Utility\Title;
use Drupal\Core\Utility\Error; use Drupal\Core\Utility\Error;
use Symfony\Component\ClassLoader\ApcClassLoader; use Symfony\Component\ClassLoader\ApcClassLoader;
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
use Drupal\Component\Serialization\Exception\InvalidDataTypeException; use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
use Drupal\Component\Utility\Crypt; use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\Number; use Drupal\Component\Utility\Number;
use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\SortArray; use Drupal\Component\Utility\SortArray;
use Drupal\Component\Utility\String; use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Tags; use Drupal\Component\Utility\Tags;
...@@ -21,6 +20,7 @@ ...@@ -21,6 +20,7 @@
use Drupal\Component\Utility\Xss; use Drupal\Component\Utility\Xss;
use Drupal\Core\Cache\Cache; use Drupal\Core\Cache\Cache;
use Drupal\Core\Language\Language; use Drupal\Core\Language\Language;
use Drupal\Core\Site\Settings;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Drupal\Core\PhpStorage\PhpStorageFactory; use Drupal\Core\PhpStorage\PhpStorageFactory;
......
<?php <?php
use Drupal\Component\Utility\Settings;
use Drupal\Core\Database\Database; use Drupal\Core\Database\Database;
use Drupal\Core\Database\Query\Condition; use Drupal\Core\Database\Query\Condition;
use Drupal\Core\Site\Settings;
/** /**
* @file * @file
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
use Drupal\Component\Utility\UrlHelper; use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\StreamWrapper\LocalStream; use Drupal\Core\StreamWrapper\LocalStream;
use Drupal\Component\PhpStorage\FileStorage; use Drupal\Component\PhpStorage\FileStorage;
use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\String; use Drupal\Component\Utility\String;
use Drupal\Core\Site\Settings;
use Drupal\Core\StreamWrapper\PublicStream; use Drupal\Core\StreamWrapper\PublicStream;
/** /**
......
<?php <?php
use Drupal\Component\Utility\UrlHelper; use Drupal\Component\Utility\UrlHelper;
use Drupal\Component\Utility\Settings;
use Drupal\Core\DrupalKernel; use Drupal\Core\DrupalKernel;
use Drupal\Core\Config\BootstrapConfigStorageFactory; use Drupal\Core\Config\BootstrapConfigStorageFactory;
use Drupal\Core\Database\Database; use Drupal\Core\Database\Database;
...@@ -13,6 +12,7 @@ ...@@ -13,6 +12,7 @@
use Drupal\Core\Language\Language; use Drupal\Core\Language\Language;
use Drupal\Core\Language\LanguageManager; use Drupal\Core\Language\LanguageManager;
use Drupal\Core\Page\DefaultHtmlPageRenderer; use Drupal\Core\Page\DefaultHtmlPageRenderer;
use Drupal\Core\Site\Settings;
use Drupal\Core\StringTranslation\Translator\FileTranslation; use Drupal\Core\StringTranslation\Translator\FileTranslation;
use Drupal\Core\Extension\ExtensionDiscovery; use Drupal\Core\Extension\ExtensionDiscovery;
use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\DependencyInjection\ContainerBuilder;
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Drupal\Component\Utility\Crypt; use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\OpCodeCache; use Drupal\Component\Utility\OpCodeCache;
use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\UrlHelper; use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Database\Database; use Drupal\Core\Database\Database;
use Drupal\Core\DrupalKernel; use Drupal\Core\DrupalKernel;
use Drupal\Core\Extension\ExtensionDiscovery; use Drupal\Core\Extension\ExtensionDiscovery;
use Drupal\Core\Site\Settings;
/** /**
* Requirement severity -- Informational message only. * Requirement severity -- Informational message only.
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
*/ */
use Drupal\Component\Utility\Html; use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\Xss; use Drupal\Component\Utility\Xss;
use Drupal\Core\Site\Settings;
/** /**
* Composes and optionally sends an e-mail message. * Composes and optionally sends an e-mail message.
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
use Drupal\Component\Utility\Unicode; use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\Settings; use Drupal\Core\Site\Settings;
/** /**
* Sets up the theming system for maintenance page. * Sets up the theming system for maintenance page.
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
*/ */
use Drupal\Component\Graph\Graph; use Drupal\Component\Graph\Graph;
use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\String; use Drupal\Component\Utility\String;
use Drupal\Core\Config\FileStorage; use Drupal\Core\Config\FileStorage;
use Drupal\Core\Config\ConfigException; use Drupal\Core\Config\ConfigException;
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
* You may copy this code freely under the conditions of the GPL. * 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\String;
use Drupal\Component\Utility\Unicode; use Drupal\Component\Utility\Unicode;
use Drupal\Core\Site\Settings;
define('USE_ASSERTS', FALSE); define('USE_ASSERTS', FALSE);
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
use Drupal\Core\Authentication\AuthenticationProviderInterface; use Drupal\Core\Authentication\AuthenticationProviderInterface;
use Drupal\Core\Session\SessionManagerInterface; use Drupal\Core\Session\SessionManagerInterface;
use Drupal\Component\Utility\Settings;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent; use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
/** /**
* Defines the cache backend factory. * Defines the cache backend factory.
*/ */
use Drupal\Component\Utility\Settings; use Drupal\Core\Site\Settings;
use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerAwareTrait; use Symfony\Component\DependencyInjection\ContainerAwareTrait;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
...@@ -22,14 +22,14 @@ class CacheFactory implements CacheFactoryInterface, ContainerAwareInterface { ...@@ -22,14 +22,14 @@ class CacheFactory implements CacheFactoryInterface, ContainerAwareInterface {
/** /**
* The settings array. * The settings array.
* *
* @var \Drupal\Component\Utility\Settings * @var \Drupal\Core\Site\Settings
*/ */
protected $settings; protected $settings;
/** /**
* Constructs CacheFactory object. * Constructs CacheFactory object.
* *
* @param \Drupal\Component\Utility\Settings $settings * @param \Drupal\Core\Site\Settings $settings
* The settings array. * The settings array.
*/ */
function __construct(Settings $settings) { function __construct(Settings $settings) {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
namespace Drupal\Core\Config; namespace Drupal\Core\Config;
use Drupal\Core\Database\Database; 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. * Defines a factory for retrieving the config storage used pre-kernel.
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
namespace Drupal\Core; namespace Drupal\Core;
use Drupal\Core\Cache\CacheContextsPass; use Drupal\Core\Cache\CacheContextsPass;
use Drupal\Component\Utility\Settings;
use Drupal\Core\Cache\ListCacheBinsPass; use Drupal\Core\Cache\ListCacheBinsPass;
use Drupal\Core\Config\ConfigFactoryOverridePass; use Drupal\Core\Config\ConfigFactoryOverridePass;
use Drupal\Core\DependencyInjection\ServiceProviderInterface; use Drupal\Core\DependencyInjection\ServiceProviderInterface;
...@@ -28,6 +27,7 @@ ...@@ -28,6 +27,7 @@
use Drupal\Core\DependencyInjection\Compiler\RegisterTwigExtensionsPass; use Drupal\Core\DependencyInjection\Compiler\RegisterTwigExtensionsPass;
use Drupal\Core\Http\HttpClientSubscriberPass; use Drupal\Core\Http\HttpClientSubscriberPass;
use Drupal\Core\Plugin\PluginManagerPass; use Drupal\Core\Plugin\PluginManagerPass;
use Drupal\Core\Site\Settings;
use Drupal\Core\Theme\ThemeNegotiatorPass; use Drupal\Core\Theme\ThemeNegotiatorPass;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\Reference;
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
namespace Drupal\Core\EventSubscriber; namespace Drupal\Core\EventSubscriber;
use Drupal\Core\Site\Settings;
use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Drupal\Component\Utility\Settings;
/** /**
* Reverse proxy subscriber for controller requests. * Reverse proxy subscriber for controller requests.
...@@ -20,14 +20,14 @@ class ReverseProxySubscriber implements EventSubscriberInterface { ...@@ -20,14 +20,14 @@ class ReverseProxySubscriber implements EventSubscriberInterface {
/** /**
* A settings object. * A settings object.
* *
* @var \Drupal\Component\Utility\Settings * @var \Drupal\Core\Site\Settings
*/ */
protected $settings; protected $settings;
/** /**
* Construct the ReverseProxySubscriber. * Construct the ReverseProxySubscriber.
* *
* @param \Drupal\Component\Utility\Settings $settings * @param \Drupal\Core\Site\Settings $settings
* The read-only settings object of this request. * The read-only settings object of this request.
*/ */
public function __construct(Settings $settings) { public function __construct(Settings $settings) {
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
namespace Drupal\Core\Extension; namespace Drupal\Core\Extension;
use Drupal\Component\Utility\Settings;
use Drupal\Core\Extension\Discovery\RecursiveExtensionFilterIterator; use Drupal\Core\Extension\Discovery\RecursiveExtensionFilterIterator;
use Drupal\Core\Site\Settings;
/** /**
* Discovers available extensions in the filesystem. * Discovers available extensions in the filesystem.
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
use Drupal\Component\Utility\Crypt; use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\NestedArray; use Drupal\Component\Utility\NestedArray;
use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\Unicode; use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\UrlHelper; use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Access\CsrfTokenGenerator; use Drupal\Core\Access\CsrfTokenGenerator;
...@@ -18,6 +17,7 @@ ...@@ -18,6 +17,7 @@
use Drupal\Core\KeyValueStore\KeyValueExpirableFactoryInterface; use Drupal\Core\KeyValueStore\KeyValueExpirableFactoryInterface;
use Drupal\Core\Render\Element; use Drupal\Core\Render\Element;
use Drupal\Core\Routing\UrlGeneratorInterface; use Drupal\Core\Routing\UrlGeneratorInterface;
use Drupal\Core\Site\Settings;
use Drupal\Core\StringTranslation\TranslationInterface; use Drupal\Core\StringTranslation\TranslationInterface;
use Drupal\Core\Url; use Drupal\Core\Url;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
namespace Drupal\Core\Http; namespace Drupal\Core\Http;
use Drupal\Component\Utility\NestedArray; use Drupal\Component\Utility\NestedArray;
use Drupal\Component\Utility\Settings; use Drupal\Core\Site\Settings;
use GuzzleHttp\Client as GuzzleClient; use GuzzleHttp\Client as GuzzleClient;
use GuzzleHttp\Event\SubscriberInterface; use GuzzleHttp\Event\SubscriberInterface;
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
*/ */
namespace Drupal\Core\KeyValueStore; namespace Drupal\Core\KeyValueStore;
use Drupal\Component\Utility\Settings;
use Drupal\Core\Site\Settings;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
/** /**
...@@ -52,14 +53,14 @@ class KeyValueFactory implements KeyValueFactoryInterface { ...@@ -52,14 +53,14 @@ class KeyValueFactory implements KeyValueFactoryInterface {
/** /**
* The read-only settings container. * The read-only settings container.
* *
* @var \Drupal\Component\Utility\Settings * @var \Drupal\Core\Site\Settings
*/ */
protected $settings; protected $settings;
/** /**
* @param \Symfony\Component\DependencyInjection\ContainerInterface $container * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
* The service container. * The service container.
* @param \Drupal\Component\Utility\Settings $settings * @param \Drupal\Core\Site\Settings $settings
* The read-only settings container. * The read-only settings container.
*/ */
function __construct(ContainerInterface $container, Settings $settings) { function __construct(ContainerInterface $container, Settings $settings) {
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
namespace Drupal\Core\Mail\Plugin\Mail; namespace Drupal\Core\Mail\Plugin\Mail;
use Drupal\Component\Utility\Settings;
use Drupal\Core\Mail\MailInterface; use Drupal\Core\Mail\MailInterface;
use Drupal\Core\Site\Settings;
/** /**
* Defines the default Drupal mail backend, using PHP's native mail() function. * Defines the default Drupal mail backend, using PHP's native mail() function.
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
namespace Drupal\Core\PhpStorage; namespace Drupal\Core\PhpStorage;
use Drupal\Component\Utility\Settings; use Drupal\Core\Site\Settings;
use Drupal\Core\StreamWrapper\PublicStream; use Drupal\Core\StreamWrapper\PublicStream;
/** /**
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
namespace Drupal\Core\Queue; namespace Drupal\Core\Queue;
use Drupal\Component\Utility\Settings; use Drupal\Core\Site\Settings;
use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerAwareTrait; use Symfony\Component\DependencyInjection\ContainerAwareTrait;
...@@ -28,7 +28,7 @@ class QueueFactory implements ContainerAwareInterface { ...@@ -28,7 +28,7 @@ class QueueFactory implements ContainerAwareInterface {
/** /**
* The settings object. * The settings object.
* *
* @var \Drupal\Component\Utility\Settings * @var \Drupal\Core\Site\Settings
*/ */
protected $settings; protected $settings;
......
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
use Symfony\Cmf\Component\Routing\ProviderBasedGenerator; use Symfony\Cmf\Component\Routing\ProviderBasedGenerator;
use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\UrlHelper; use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\PathProcessor\OutboundPathProcessorInterface; use Drupal\Core\PathProcessor\OutboundPathProcessorInterface;
use Drupal\Core\RouteProcessor\OutboundRouteProcessorInterface; use Drupal\Core\RouteProcessor\OutboundRouteProcessorInterface;
use Drupal\Core\Site\Settings;
/** /**
* Generates URLs from route names and parameters. * Generates URLs from route names and parameters.
...@@ -86,7 +86,7 @@ class UrlGenerator extends ProviderBasedGenerator implements UrlGeneratorInterfa ...@@ -86,7 +86,7 @@ class UrlGenerator extends ProviderBasedGenerator implements UrlGeneratorInterfa
* The route processor. * The route processor.
* @param \Drupal\Core\Config\ConfigFactoryInterface $config * @param \Drupal\Core\Config\ConfigFactoryInterface $config
* The config factory. * The config factory.
* @param \Drupal\Component\Utility\Settings $settings * @param \Drupal\Core\Site\Settings $settings
* The read only settings. * The read only settings.
* @param \Symfony\Component\HttpKernel\Log\LoggerInterface $logger * @param \Symfony\Component\HttpKernel\Log\LoggerInterface $logger
* An optional logger for recording errors. * An optional logger for recording errors.
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
namespace Drupal\Core\Session; namespace Drupal\Core\Session;
use Drupal\Component\Utility\Crypt; use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\Settings;
use Drupal\Core\Database\Connection; use Drupal\Core\Database\Connection;
use Drupal\Core\Site\Settings;
use Drupal\Core\Utility\Error; use Drupal\Core\Utility\Error;
use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\RequestStack;
......
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
namespace Drupal\Core\Session; namespace Drupal\Core\Session;
use Drupal\Component\Utility\Crypt; use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\Settings;
use Drupal\Core\Database\Connection; use Drupal\Core\Database\Connection;
use Drupal\Core\Session\AnonymousUserSession; use Drupal\Core\Session\AnonymousUserSession;
use Drupal\Core\Session\SessionHandler; use Drupal\Core\Session\SessionHandler;
use Drupal\Core\Site\Settings;
use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\RequestStack;
/** /**
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
/** /**
* @file * @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. * Read only settings that are initialized with the class.
...@@ -24,7 +24,7 @@ final class Settings { ...@@ -24,7 +24,7 @@ final class Settings {
/** /**
* Singleton instance. * Singleton instance.
* *
* @var \Drupal\Component\Utility\Settings * @var \Drupal\Core\Site\Settings
*/ */
private static $instance; private static $instance;
...@@ -34,7 +34,7 @@ final class Settings { ...@@ -34,7 +34,7 @@ final class Settings {
* A singleton is used because this class is used before the container is * A singleton is used because this class is used before the container is
* available. * available.
* *
* @return \Drupal\Component\Utility\Settings * @return \Drupal\Core\Site\Settings
*/ */
public static function getInstance() { public static function getInstance() {
return self::$instance; return self::$instance;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
namespace Drupal\Core\StreamWrapper; namespace Drupal\Core\StreamWrapper;
use Drupal\Component\Utility\UrlHelper; use Drupal\Component\Utility\UrlHelper;
use Drupal\Component\Utility\Settings; use Drupal\Core\Site\Settings;
/** /**
* Defines a Drupal public (public://) stream wrapper class. * Defines a Drupal public (public://) stream wrapper class.
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
namespace Drupal\Core\StringTranslation\Translator; namespace Drupal\Core\StringTranslation\Translator;
use Drupal\Component\Utility\Settings; use Drupal\Core\Site\Settings;
/** /**
* String translator using overrides from variables. * String translator using overrides from variables.
...@@ -20,14 +20,14 @@ class CustomStrings extends StaticTranslation { ...@@ -20,14 +20,14 @@ class CustomStrings extends StaticTranslation {
/** /**
* The settings read only object. * The settings read only object.
* *
* @var \Drupal\Component\Utility\Settings * @var \Drupal\Core\Site\Settings
*/ */
protected $settings; protected $settings;
/** /**
* Constructs a CustomStrings object. * Constructs a CustomStrings object.
* *
* @param \Drupal\Component\Utility\Settings $settings * @param \Drupal\Core\Site\Settings $settings
* The settings read only object. * The settings read only object.
*/ */
public function __construct(Settings $settings) { public function __construct(Settings $settings) {
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
namespace Drupal\Core\Template; namespace Drupal\Core\Template;
use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\Unicode; use Drupal\Component\Utility\Unicode;
use Drupal\Core\Site\Settings;
/** /**
* A class that defines the Twig 'trans' tag for Drupal. * A class that defines the Twig 'trans' tag for Drupal.
......
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
namespace Drupal\language\HttpKernel; namespace Drupal\language\HttpKernel;
use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\Unicode; use Drupal\Component\Utility\Unicode;
use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\PathProcessor\InboundPathProcessorInterface; use Drupal\Core\PathProcessor\InboundPathProcessorInterface;
use Drupal\Core\PathProcessor\OutboundPathProcessorInterface; use Drupal\Core\PathProcessor\OutboundPathProcessorInterface;
use Drupal\Core\Site\Settings;
use Drupal\language\ConfigurableLanguageManagerInterface; use Drupal\language\ConfigurableLanguageManagerInterface;
use Drupal\language\LanguageNegotiatorInterface; use Drupal\language\LanguageNegotiatorInterface;