Commit 8a567823 authored by alexpott's avatar alexpott
Browse files

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

parent 019b6f6a
......@@ -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.
......
......@@ -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
......
......@@ -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\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;
......
......@@ -13,7 +13,6 @@
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\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;
......
<?php
use Drupal\Component\Utility\Settings;
use Drupal\Core\Database\Database;
use Drupal\Core\Database\Query\Condition;
use Drupal\Core\Site\Settings;
/**
* @file
......
......@@ -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;
/**
......
<?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\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;
......
......@@ -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.
......
......@@ -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.
......
......@@ -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.
......
......@@ -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;
......
......@@ -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);
......
......@@ -9,7 +9,6 @@
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;
......
......@@ -10,7 +10,7 @@
/**
* 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) {
......
......@@ -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.
......
......@@ -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\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;
......
......@@ -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) {
......
......@@ -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.
......
......@@ -9,7 +9,6 @@
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\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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment