diff --git a/core/core.services.yml b/core/core.services.yml
index 1e724a98955a073bf81a148f77ac0fa4765e0b01..92cb63c329c40c0093053c97615132861b3eb28a 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -141,7 +141,7 @@ services:
factory_class: Drupal\Component\Utility\Settings
factory_method: getInstance
state:
- class: Drupal\Core\KeyValueStore\State
+ class: Drupal\Core\State\State
arguments: ['@keyvalue']
queue:
class: Drupal\Core\Queue\QueueFactory
diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index 7bfa33e7134eb26257c01a0748f2dd80e23582a5..9ae8cbb09dc26b0d44e7494a5c63d420fc17f5bb 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -336,7 +336,7 @@ public static function keyValue($collection) {
* needs to be the same across development, production, etc. environments
* (for example, the system maintenance message) should use \Drupal::config() instead.
*
- * @return \Drupal\Core\KeyValueStore\StateInterface
+ * @return \Drupal\Core\State\StateInterface
*/
public static function state() {
return static::$container->get('state');
diff --git a/core/lib/Drupal/Core/Asset/CssCollectionOptimizer.php b/core/lib/Drupal/Core/Asset/CssCollectionOptimizer.php
index 22a4a5e654a1cae33bccc5b99b89fa830261a294..3da9d9104239fe036567f2ce273492ed9f19309b 100644
--- a/core/lib/Drupal/Core/Asset/CssCollectionOptimizer.php
+++ b/core/lib/Drupal/Core/Asset/CssCollectionOptimizer.php
@@ -6,7 +6,7 @@
namespace Drupal\Core\Asset;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
/**
* Optimizes CSS assets.
@@ -37,7 +37,7 @@ class CssCollectionOptimizer implements AssetCollectionOptimizerInterface {
/**
* The state key/value store.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -50,7 +50,7 @@ class CssCollectionOptimizer implements AssetCollectionOptimizerInterface {
* The optimizer for a single CSS asset.
* @param \Drupal\Core\Asset\AssetDumperInterface
* The dumper for optimized CSS assets.
- * @param \Drupal\Core\KeyValueStore\StateInterface
+ * @param \Drupal\Core\State\StateInterface
* The state key/value store.
*/
public function __construct(AssetCollectionGrouperInterface $grouper, AssetOptimizerInterface $optimizer, AssetDumperInterface $dumper, StateInterface $state) {
diff --git a/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php b/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
index a19c1999273346e8bfb5ef66c55fc3002546ea03..0d482fb78cb056ca2271e74ab35e1013ddcea377 100644
--- a/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
+++ b/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Asset;
use Drupal\Component\Utility\String;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
/**
* Renders CSS assets.
@@ -17,14 +17,14 @@ class CssCollectionRenderer implements AssetCollectionRendererInterface {
/**
* The state key/value store.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
/**
* Constructs a CssCollectionRenderer.
*
- * @param \Drupal\Core\KeyValueStore\StateInterface
+ * @param \Drupal\Core\State\StateInterface
* The state key/value store.
*/
public function __construct(StateInterface $state) {
diff --git a/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php b/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
index 4d39a2ef14a21dc80c09dddf5aed3ce4f5f17206..4126e57e4b010e2f2b8488c2ee5cf56101f56e38 100644
--- a/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
+++ b/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
@@ -6,7 +6,7 @@
namespace Drupal\Core\Asset;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
/**
@@ -38,7 +38,7 @@ class JsCollectionOptimizer implements AssetCollectionOptimizerInterface {
/**
* The state key/value store.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -51,7 +51,7 @@ class JsCollectionOptimizer implements AssetCollectionOptimizerInterface {
* The optimizer for a single JS asset.
* @param \Drupal\Core\Asset\AssetDumperInterface
* The dumper for optimized JS assets.
- * @param \Drupal\Core\KeyValueStore\StateInterface
+ * @param \Drupal\Core\State\StateInterface
* The state key/value store.
*/
public function __construct(AssetCollectionGrouperInterface $grouper, AssetOptimizerInterface $optimizer, AssetDumperInterface $dumper, StateInterface $state) {
diff --git a/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php b/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
index cdaf1d8288ab467c93cc11f23929c6b9eaa77887..87647894e6de92cc970b257ed8a16934333c0a3d 100644
--- a/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
+++ b/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
@@ -6,7 +6,7 @@
namespace Drupal\Core\Asset;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Component\Utility\Json;
/**
@@ -17,14 +17,14 @@ class JsCollectionRenderer implements AssetCollectionRendererInterface {
/**
* The state key/value store.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
/**
* Constructs a CssCollectionRenderer.
*
- * @param \Drupal\Core\KeyValueStore\StateInterface
+ * @param \Drupal\Core\State\StateInterface
* The state key/value store.
*/
public function __construct(StateInterface $state) {
diff --git a/core/lib/Drupal/Core/Cron.php b/core/lib/Drupal/Core/Cron.php
index 5d5b2ae371b4c6a8188ef9c4f45658d77ebda8f2..c2e8d4f05e3162e1f3f8886d9d68fc7dd8999f60 100644
--- a/core/lib/Drupal/Core/Cron.php
+++ b/core/lib/Drupal/Core/Cron.php
@@ -8,7 +8,7 @@
namespace Drupal\Core;
use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Core\Lock\LockBackendInterface;
use Drupal\Core\Queue\QueueFactory;
use Drupal\Core\Session\AccountProxyInterface;
@@ -44,7 +44,7 @@ class Cron implements CronInterface {
/**
* The state service.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -71,7 +71,7 @@ class Cron implements CronInterface {
* The lock service.
* @param \Drupal\Core\Queue\QueueFactory $queue_factory
* The queue service.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state service.
* @param \Drupal\Core\Session\AccountProxyInterface $current_user
* The current user.
diff --git a/core/lib/Drupal/Core/EventSubscriber/PathRootsSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/PathRootsSubscriber.php
index f2701bc681f50a24115052b79ab4edc256d4c99c..8d967672db765275c453f642507499e001b8fdca 100644
--- a/core/lib/Drupal/Core/EventSubscriber/PathRootsSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/PathRootsSubscriber.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\EventSubscriber;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Core\Routing\RouteBuildEvent;
use Drupal\Core\Routing\RoutingEvents;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -31,14 +31,14 @@ class PathRootsSubscriber implements EventSubscriberInterface {
/**
* The state key value store.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
/**
* Constructs a new PathRootsSubscriber instance.
*
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state key value store.
*/
public function __construct(StateInterface $state) {
diff --git a/core/lib/Drupal/Core/Extension/CachedModuleHandler.php b/core/lib/Drupal/Core/Extension/CachedModuleHandler.php
index 0def7f3c713f1fac499dbdecbccf43e3980629a0..4c373f8dd668517bf25c11131ba5aeafca9693b2 100644
--- a/core/lib/Drupal/Core/Extension/CachedModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/CachedModuleHandler.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Extension;
use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
/**
* Class that manages enabled modules in a Drupal installation.
@@ -18,7 +18,7 @@ class CachedModuleHandler extends ModuleHandler implements CachedModuleHandlerIn
/**
* State key/value store.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
diff --git a/core/lib/Drupal/Core/Path/AliasWhitelist.php b/core/lib/Drupal/Core/Path/AliasWhitelist.php
index f08e6a3fd65f7c807d34e526505318422317cb81..394dfa2b17f48ac6ae37248e46567639432c3c9a 100644
--- a/core/lib/Drupal/Core/Path/AliasWhitelist.php
+++ b/core/lib/Drupal/Core/Path/AliasWhitelist.php
@@ -10,7 +10,7 @@
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Cache\CacheCollector;
use Drupal\Core\Database\Connection;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Core\Lock\LockBackendInterface;
/**
@@ -21,7 +21,7 @@ class AliasWhitelist extends CacheCollector implements AliasWhitelistInterface {
/**
* The Key/Value Store to use for state.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -41,7 +41,7 @@ class AliasWhitelist extends CacheCollector implements AliasWhitelistInterface {
* The cache backend.
* @param \Drupal\Core\Lock\LockBackendInterface $lock
* The lock backend.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state keyvalue store.
* @param \Drupal\Core\Path\AliasStorageInterface $alias_storage
* The alias storage service.
diff --git a/core/lib/Drupal/Core/PrivateKey.php b/core/lib/Drupal/Core/PrivateKey.php
index f41adebe953a97e1912ab5127aa026defd626b17..06bbc2d84e69a87a819b9f1659d30fe117937b51 100644
--- a/core/lib/Drupal/Core/PrivateKey.php
+++ b/core/lib/Drupal/Core/PrivateKey.php
@@ -7,7 +7,7 @@
namespace Drupal\Core;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Component\Utility\Crypt;
/**
@@ -18,14 +18,14 @@ class PrivateKey {
/**
* The state service.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
/**
* Constructs the token generator.
*
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state service.
*/
function __construct(StateInterface $state) {
diff --git a/core/lib/Drupal/Core/Routing/MatcherDumper.php b/core/lib/Drupal/Core/Routing/MatcherDumper.php
index aeed49ca6c6c96c891e8ceada96812239795a2ef..b5e1338b337100a78a67dc63f3f4c5749a10aeea 100644
--- a/core/lib/Drupal/Core/Routing/MatcherDumper.php
+++ b/core/lib/Drupal/Core/Routing/MatcherDumper.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Routing;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Symfony\Component\Routing\RouteCollection;
use Drupal\Core\Database\Connection;
@@ -34,7 +34,7 @@ class MatcherDumper implements MatcherDumperInterface {
/**
* The state.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -51,7 +51,7 @@ class MatcherDumper implements MatcherDumperInterface {
* @param \Drupal\Core\Database\Connection $connection
* The database connection which will be used to store the route
* information.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state.
* @param string $table
* (optional) The table to store the route info in. Defaults to 'router'.
diff --git a/core/lib/Drupal/Core/Routing/RouteBuilder.php b/core/lib/Drupal/Core/Routing/RouteBuilder.php
index 8df9f677b8bf79f9bc7d54d475682b364bae60ee..21c80d07c1ed020acca363e4f0ad98df4f319985 100644
--- a/core/lib/Drupal/Core/Routing/RouteBuilder.php
+++ b/core/lib/Drupal/Core/Routing/RouteBuilder.php
@@ -9,7 +9,7 @@
use Drupal\Component\Discovery\YamlDiscovery;
use Drupal\Core\Controller\ControllerResolverInterface;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Routing\RouteCollection;
diff --git a/core/lib/Drupal/Core/Routing/RoutePreloader.php b/core/lib/Drupal/Core/Routing/RoutePreloader.php
index daa41301477890fb5abd3450955eec16df33a574..7952d177e6e81fa0d9d29a08e60c2999d6f1bfc9 100644
--- a/core/lib/Drupal/Core/Routing/RoutePreloader.php
+++ b/core/lib/Drupal/Core/Routing/RoutePreloader.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Routing;
use Drupal\Core\ContentNegotiation;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpKernel\Event\KernelEvent;
@@ -33,7 +33,7 @@ class RoutePreloader implements EventSubscriberInterface {
/**
* The state key value store.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -56,7 +56,7 @@ class RoutePreloader implements EventSubscriberInterface {
*
* @param \Drupal\Core\Routing\RouteProviderInterface $route_provider
* The route provider.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state key value store.
* @param \Drupal\Core\ContentNegotiation $negotiation
* The content negotiation.
diff --git a/core/lib/Drupal/Core/Routing/RouteProvider.php b/core/lib/Drupal/Core/Routing/RouteProvider.php
index 3dfe65e8f273d60372cbdae86d6155fa6f2e0f9d..0fca7f8153529d701b2f7b011220422c706a155d 100644
--- a/core/lib/Drupal/Core/Routing/RouteProvider.php
+++ b/core/lib/Drupal/Core/Routing/RouteProvider.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Routing;
use Drupal\Component\Utility\String;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Exception\RouteNotFoundException;
@@ -46,7 +46,7 @@ class RouteProvider implements RouteProviderInterface, EventSubscriberInterface
/**
* The state.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -64,7 +64,7 @@ class RouteProvider implements RouteProviderInterface, EventSubscriberInterface
* A database connection object.
* @param \Drupal\Core\Routing\RouteBuilderInterface $route_builder
* The route builder.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state.
* @param string $table
* The table in the database to use for matching.
diff --git a/core/lib/Drupal/Core/KeyValueStore/State.php b/core/lib/Drupal/Core/State/State.php
similarity index 95%
rename from core/lib/Drupal/Core/KeyValueStore/State.php
rename to core/lib/Drupal/Core/State/State.php
index f143d67288dd7a9a124608f4c2df75cc44007de4..5da5241e8d9c20bb439c64ddae40264c73d3eb11 100644
--- a/core/lib/Drupal/Core/KeyValueStore/State.php
+++ b/core/lib/Drupal/Core/State/State.php
@@ -2,10 +2,12 @@
/**
* @file
- * Contains Drupal\Core\KeyValueStore\StateInterface.
+ * Contains \Drupal\Core\State\State.
*/
-namespace Drupal\Core\KeyValueStore;
+namespace Drupal\Core\State;
+
+use Drupal\Core\KeyValueStore\KeyValueFactoryInterface;
/**
* Provides the state system using a key value store.
diff --git a/core/lib/Drupal/Core/KeyValueStore/StateInterface.php b/core/lib/Drupal/Core/State/StateInterface.php
similarity index 94%
rename from core/lib/Drupal/Core/KeyValueStore/StateInterface.php
rename to core/lib/Drupal/Core/State/StateInterface.php
index f5f3da6d58298e6543b5ca136b51caa4132d15bb..abfd2899d5362bb2a5f13557a95a94f32c5b0bed 100644
--- a/core/lib/Drupal/Core/KeyValueStore/StateInterface.php
+++ b/core/lib/Drupal/Core/State/StateInterface.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains Drupal\Core\KeyValueStore\StateInterface.
+ * Contains \Drupal\Core\State\StateInterface.
*/
-namespace Drupal\Core\KeyValueStore;
+namespace Drupal\Core\State;
/**
* Defines the interface for the state system.
diff --git a/core/modules/comment/lib/Drupal/comment/CommentStatistics.php b/core/modules/comment/lib/Drupal/comment/CommentStatistics.php
index 49bcff80c4a61f5b9f34ce8c9eed73b5955af8bf..48505c4efea57bea870bba05876027bf93a93f7d 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentStatistics.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentStatistics.php
@@ -12,7 +12,7 @@
use Drupal\Core\Entity\EntityChangedInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Core\Session\AccountInterface;
use Drupal\user\EntityOwnerInterface;
@@ -42,7 +42,7 @@ class CommentStatistics implements CommentStatisticsInterface {
/**
* The state service.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -55,7 +55,7 @@ class CommentStatistics implements CommentStatisticsInterface {
* The current logged in user.
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager service.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state service.
*/
public function __construct(Connection $database, AccountInterface $current_user, EntityManagerInterface $entity_manager, StateInterface $state) {
diff --git a/core/modules/config/tests/config_events_test/lib/Drupal/config_events_test/EventSubscriber.php b/core/modules/config/tests/config_events_test/lib/Drupal/config_events_test/EventSubscriber.php
index 853332d5209e7f4c86b3a0ceffd76a2ffa1e5127..b127555a051c3c273e280ef11d039c1574515f01 100644
--- a/core/modules/config/tests/config_events_test/lib/Drupal/config_events_test/EventSubscriber.php
+++ b/core/modules/config/tests/config_events_test/lib/Drupal/config_events_test/EventSubscriber.php
@@ -10,7 +10,7 @@
use Drupal\Core\Config\ConfigCrudEvent;
use Drupal\Core\Config\ConfigEvents;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
class EventSubscriber implements EventSubscriberInterface {
@@ -18,14 +18,14 @@ class EventSubscriber implements EventSubscriberInterface {
/**
* The state key value store.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
/**
* Constructs the Event Subscriber object.
*
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state key value store.
*/
public function __construct(StateInterface $state) {
diff --git a/core/modules/config/tests/config_import_test/lib/Drupal/config_import_test/EventSubscriber.php b/core/modules/config/tests/config_import_test/lib/Drupal/config_import_test/EventSubscriber.php
index 676be638c21422a12103b4173e87a8b732d417e7..0be4f975f1d62d685e24e440cc0dc5902864ef4c 100644
--- a/core/modules/config/tests/config_import_test/lib/Drupal/config_import_test/EventSubscriber.php
+++ b/core/modules/config/tests/config_import_test/lib/Drupal/config_import_test/EventSubscriber.php
@@ -10,7 +10,7 @@
use Drupal\Core\Config\ConfigCrudEvent;
use Drupal\Core\Config\ConfigEvents;
use Drupal\Core\Config\ConfigImporterEvent;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
/**
@@ -21,14 +21,14 @@ class EventSubscriber implements EventSubscriberInterface {
/**
* The key value store.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
/**
* Constructs the event subscriber.
*
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The key value store.
*/
public function __construct(StateInterface $state) {
diff --git a/core/modules/field/lib/Drupal/field/FieldConfigStorage.php b/core/modules/field/lib/Drupal/field/FieldConfigStorage.php
index 79caf5484a08e30f2b2825bb62528209b0a17770..b268bb74f6d2a3535bc9b19180f1a192db9709c1 100644
--- a/core/modules/field/lib/Drupal/field/FieldConfigStorage.php
+++ b/core/modules/field/lib/Drupal/field/FieldConfigStorage.php
@@ -18,7 +18,7 @@
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Config\StorageInterface;
use Drupal\Core\Extension\ModuleHandler;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
/**
* Controller class for fields.
@@ -42,7 +42,7 @@ class FieldConfigStorage extends ConfigEntityStorage {
/**
* The state keyvalue collection.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -63,7 +63,7 @@ class FieldConfigStorage extends ConfigEntityStorage {
* The entity manager.
* @param \Drupal\Core\Extension\ModuleHandler $module_handler
* The module handler.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state key value store.
*/
public function __construct(EntityTypeInterface $entity_type, ConfigFactoryInterface $config_factory, StorageInterface $config_storage, UuidInterface $uuid_service, LanguageManagerInterface $language_manager, EntityManagerInterface $entity_manager, ModuleHandler $module_handler, StateInterface $state) {
diff --git a/core/modules/field/lib/Drupal/field/FieldInstanceConfigStorage.php b/core/modules/field/lib/Drupal/field/FieldInstanceConfigStorage.php
index 9d9826adb1aa0a913d3cb94256dc60e1c0356bee..6f1edd4b60896c2f628c8353f3fe1c995e8d4808 100644
--- a/core/modules/field/lib/Drupal/field/FieldInstanceConfigStorage.php
+++ b/core/modules/field/lib/Drupal/field/FieldInstanceConfigStorage.php
@@ -18,7 +18,7 @@
use Drupal\Component\Uuid\UuidInterface;
use Drupal\Core\Config\StorageInterface;
use Drupal\Core\Extension\ModuleHandler;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
/**
* Controller class for field instances.
@@ -40,7 +40,7 @@ class FieldInstanceConfigStorage extends ConfigEntityStorage {
/**
* The state keyvalue collection.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -59,7 +59,7 @@ class FieldInstanceConfigStorage extends ConfigEntityStorage {
* The language manager.
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state key value store.
*/
public function __construct(EntityTypeInterface $entity_type, ConfigFactoryInterface $config_factory, StorageInterface $config_storage, UuidInterface $uuid_service, LanguageManagerInterface $language_manager, EntityManagerInterface $entity_manager, StateInterface $state) {
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageTestBase.php b/core/modules/language/lib/Drupal/language/Tests/LanguageTestBase.php
index 3fd2907198274a046ab22e03f0b170587267898e..7c7cb260ac3cc510d98f6aa90474eeba5083b43d 100644
--- a/core/modules/language/lib/Drupal/language/Tests/LanguageTestBase.php
+++ b/core/modules/language/lib/Drupal/language/Tests/LanguageTestBase.php
@@ -25,7 +25,7 @@ abstract class LanguageTestBase extends DrupalUnitTestBase {
/**
* The state storage service.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
diff --git a/core/modules/locale/lib/Drupal/locale/Form/TranslateFormBase.php b/core/modules/locale/lib/Drupal/locale/Form/TranslateFormBase.php
index c5447e02f4fc93dd6327c1877941708cf5974feb..24b378e4c3d7aea097378a28b41bd22889fcd04e 100644
--- a/core/modules/locale/lib/Drupal/locale/Form/TranslateFormBase.php
+++ b/core/modules/locale/lib/Drupal/locale/Form/TranslateFormBase.php
@@ -11,7 +11,7 @@
use Drupal\Core\Language\Language;
use Drupal\Core\Language\LanguageManager;
use Drupal\locale\StringStorageInterface;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -31,7 +31,7 @@ abstract class TranslateFormBase extends FormBase {
/**
* The state store.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -54,7 +54,7 @@ abstract class TranslateFormBase extends FormBase {
*
* @param \Drupal\locale\StringStorageInterface $locale_storage
* The locale storage.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state service.
* @param \Drupal\Core\Language\LanguageManager $language_manager
* The language manager.
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuTree.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuTree.php
index b1dffecfccf45c6a220705aa75ba00d8ab8331a7..adbf85d33e381e8b2647593c4e5b20f3b706b3ce 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuTree.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuTree.php
@@ -12,7 +12,7 @@
use Drupal\Core\Database\Connection;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Entity\Query\QueryFactory;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Core\Language\LanguageManagerInterface;
use Symfony\Cmf\Component\Routing\RouteObjectInterface;
use Symfony\Component\HttpFoundation\RequestStack;
@@ -68,7 +68,7 @@ class MenuTree implements MenuTreeInterface {
/**
* The state.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -131,7 +131,7 @@ class MenuTree implements MenuTreeInterface {
* The entity manager.
* @param \Drupal\Core\Entity\Query\QueryFactory $entity_query_factory
* The entity query factory.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state.
*/
public function __construct(Connection $database, CacheBackendInterface $cache_backend, LanguageManagerInterface $language_manager, RequestStack $request_stack, EntityManagerInterface $entity_manager, QueryFactory $entity_query_factory, StateInterface $state) {
diff --git a/core/modules/menu_link/tests/Drupal/menu_link/Tests/MenuTreeTest.php b/core/modules/menu_link/tests/Drupal/menu_link/Tests/MenuTreeTest.php
index a406d0f5af5792319985cfa2ada6425290414e49..bd77a45f7b0b7be28a929fd0098385c12dd09f33 100644
--- a/core/modules/menu_link/tests/Drupal/menu_link/Tests/MenuTreeTest.php
+++ b/core/modules/menu_link/tests/Drupal/menu_link/Tests/MenuTreeTest.php
@@ -82,7 +82,7 @@ class MenuTreeTest extends UnitTestCase {
/**
* The mocked state.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\State\StateInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $state;
@@ -130,7 +130,7 @@ protected function setUp() {
$this->entityQueryFactory = $this->getMockBuilder('Drupal\Core\Entity\Query\QueryFactory')
->disableOriginalConstructor()
->getMock();
- $this->state = $this->getMock('Drupal\Core\KeyValueStore\StateInterface');
+ $this->state = $this->getMock('Drupal\Core\State\StateInterface');
$this->menuTree = new TestMenuTree($this->connection, $this->cacheBackend, $this->languageManager, $this->requestStack, $this->entityManager, $this->entityQueryFactory, $this->state);
}
diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php
index cd3b11eb798afdeb85a7da9e818ea7cc72fe1a65..53d01ac4aff875dd051ef6182fab7dfe336e2af9 100644
--- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php
+++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php
@@ -8,7 +8,7 @@
namespace Drupal\migrate\Plugin\migrate\destination;
use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\field\FieldInfo;
use Drupal\migrate\Entity\MigrationInterface;
use Drupal\migrate\Plugin\MigratePluginManager;
@@ -25,7 +25,7 @@ class EntityComment extends EntityContentBase {
/**
* The state storage object.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -48,7 +48,7 @@ class EntityComment extends EntityContentBase {
* The migrate plugin manager.
* @param \Drupal\field\FieldInfo $field_info
* The field and instance definitions service.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state storage object.
*/
public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, MigratePluginManager $plugin_manager, FieldInfo $field_info, StateInterface $state) {
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php b/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
index bcbfff82003c14514f9634fcce3f8de76d6c6c4b..5de03e6e3b21acfc0911a84acb554c5a9a804aab 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
@@ -12,7 +12,7 @@
use Drupal\Core\Database\Query\SelectExtender;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Core\Language\Language;
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\Access\AccessibleInterface;
@@ -63,7 +63,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
/**
* The Drupal state object used to set 'node.cron_last'.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -135,7 +135,7 @@ static public function create(ContainerInterface $container, array $configuratio
* A module manager object.
* @param \Drupal\Core\Config\Config $search_settings
* A config object for 'search.settings'.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The Drupal state object used to set 'node.cron_last'.
* @param \Drupal\Core\Session\AccountInterface $account
* The $account object to use for checking for access to advanced search.
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php b/core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
index 650a930660050aa5dae7e369773bc086f229a23d..b28b4770854c4d9f26e4f4380826b37fadebee80 100644
--- a/core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
+++ b/core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
@@ -8,7 +8,7 @@
namespace Drupal\rest\Plugin\views\display;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Core\Routing\RouteProviderInterface;
use Drupal\Core\ContentNegotiation;
use Drupal\views\ViewExecutable;
@@ -97,7 +97,7 @@ class RestExport extends PathPluginBase {
* The plugin implementation definition.
* @param \Drupal\Core\Routing\RouteProviderInterface $route_provider
* The route provider
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state key value store.
* @param \Drupal\Core\ContentNegotiation $content_negotiation
* The content negotiation library.
diff --git a/core/modules/rest/tests/Drupal/rest/Tests/CollectRoutesTest.php b/core/modules/rest/tests/Drupal/rest/Tests/CollectRoutesTest.php
index 0d6f0eda8040439af11561d93bf1ccd5686ad7c0..5b78e769e3a82c21e0585cc3bad3015efa2f3a2e 100644
--- a/core/modules/rest/tests/Drupal/rest/Tests/CollectRoutesTest.php
+++ b/core/modules/rest/tests/Drupal/rest/Tests/CollectRoutesTest.php
@@ -82,7 +82,7 @@ protected function setUp() {
->getMock();
$container->set('router.route_provider', $route_provider);
- $state = $this->getMock('\Drupal\Core\KeyValueStore\StateInterface');
+ $state = $this->getMock('\Drupal\Core\State\StateInterface');
$container->set('state', $state);
$style_manager = $this->getMockBuilder('\Drupal\views\Plugin\ViewsPluginManager')
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
index f45de69051d97ba15d8b6a7b2bf81502778c70de..350fcbc6b1f6039bff2d469d1ead92082c266915 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
@@ -254,7 +254,7 @@ public function containerBuild(ContainerBuilder $container) {
->addArgument(new Reference('service_container'))
->addArgument(new Reference('settings'));
- $container->register('state', 'Drupal\Core\KeyValueStore\State')
+ $container->register('state', 'Drupal\Core\State\State')
->addArgument(new Reference('keyvalue'));
}
diff --git a/core/modules/system/lib/Drupal/system/EventSubscriber/AutomaticCron.php b/core/modules/system/lib/Drupal/system/EventSubscriber/AutomaticCron.php
index b04f381a9b67d47df2f872d5c7272bdfc8d33ce3..15c5b6ca36c9151796b10780a042edb5f9d53f17 100644
--- a/core/modules/system/lib/Drupal/system/EventSubscriber/AutomaticCron.php
+++ b/core/modules/system/lib/Drupal/system/EventSubscriber/AutomaticCron.php
@@ -9,7 +9,7 @@
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\CronInterface;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpKernel\Event\PostResponseEvent;
use Symfony\Component\HttpKernel\KernelEvents;
@@ -36,7 +36,7 @@ class AutomaticCron implements EventSubscriberInterface {
/**
* The state key value store.
*
- * Drupal\Core\KeyValueStore\StateInterface;
+ * Drupal\Core\State\StateInterface;
*/
protected $state;
@@ -47,7 +47,7 @@ class AutomaticCron implements EventSubscriberInterface {
* The cron service.
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
* The config factory.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state key value store.
*/
public function __construct(CronInterface $cron, ConfigFactoryInterface $config_factory, StateInterface $state) {
diff --git a/core/modules/system/lib/Drupal/system/Form/CronForm.php b/core/modules/system/lib/Drupal/system/Form/CronForm.php
index 7c81ded1f0f5b9720a406ba4c3967e6627bde5d6..8a27db2fa2441605200f45df14255377f1f9b237 100644
--- a/core/modules/system/lib/Drupal/system/Form/CronForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/CronForm.php
@@ -9,7 +9,7 @@
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\CronInterface;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Core\Form\ConfigFormBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -22,7 +22,7 @@ class CronForm extends ConfigFormBase {
/**
* Stores the state storage service.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -38,7 +38,7 @@ class CronForm extends ConfigFormBase {
*
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
* The factory for configuration objects.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state key value store.
* @param \Drupal\Core\CronInterface $cron
* The cron service.
diff --git a/core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php b/core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php
index 42bebc7a518042c018f16340f4ec84bbe76e5b5b..eff16a1d37653e41b862cda4d97b58b78b41f92e 100644
--- a/core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php
@@ -8,7 +8,7 @@
namespace Drupal\system\Form;
use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Core\Form\ConfigFormBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -20,7 +20,7 @@ class SiteMaintenanceModeForm extends ConfigFormBase {
/**
* The state keyvalue collection.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -29,7 +29,7 @@ class SiteMaintenanceModeForm extends ConfigFormBase {
*
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
* The factory for configuration objects.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state keyvalue collection to use.
*/
public function __construct(ConfigFactoryInterface $config_factory, StateInterface $state) {
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php
index 99fe76a54363c3ff7b97d2e5c4bf3b4b9df9bc43..8ea9daa67fcc0303829122378602f913d6c24bc4 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php
@@ -32,7 +32,7 @@ abstract class EntityUnitTestBase extends DrupalUnitTestBase {
/**
* The state service.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php
index 1b2fd8f1194fb9cd7b3c6033ed61391f5f388823..5d88c6cb5ac938bf75d5c32de23cbb05ad350ba8 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php
@@ -8,7 +8,7 @@
namespace Drupal\system\Tests\Routing;
use Drupal\Core\KeyValueStore\KeyValueMemoryFactory;
-use Drupal\Core\KeyValueStore\State;
+use Drupal\Core\State\State;
use Symfony\Component\Routing\Route;
use Symfony\Component\Routing\RouteCollection;
@@ -32,7 +32,7 @@ class MatcherDumperTest extends UnitTestBase {
/**
* The state.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/RouteProviderTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/RouteProviderTest.php
index 05d1131221430302a0454238c0ffd86cc527e3ef..2ae9d6105617e5f3f9974614f32f32b106e26e51 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/RouteProviderTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/RouteProviderTest.php
@@ -8,7 +8,7 @@
namespace Drupal\system\Tests\Routing;
use Drupal\Core\KeyValueStore\KeyValueMemoryFactory;
-use Drupal\Core\KeyValueStore\State;
+use Drupal\Core\State\State;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Exception\RouteNotFoundException;
use Symfony\Component\Routing\Route;
@@ -44,7 +44,7 @@ class RouteProviderTest extends UnitTestBase {
/**
* The state.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
diff --git a/core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestClass.php b/core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestClass.php
index 9078493ada67ffbc7d5b44730fbafc36a3aaca9a..aa0a5f2328f885b363254193db9d3579e60cf227 100644
--- a/core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestClass.php
+++ b/core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestClass.php
@@ -7,7 +7,7 @@
namespace Drupal\service_provider_test;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Core\DestructableInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
@@ -18,14 +18,14 @@ class TestClass implements EventSubscriberInterface, DestructableInterface {
/**
* The state keyvalue collection.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
/**
* Constructor.
*
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state key value store.
*/
public function __construct(StateInterface $state) {
diff --git a/core/modules/update/lib/Drupal/update/UpdateProcessor.php b/core/modules/update/lib/Drupal/update/UpdateProcessor.php
index fd42b7613152c775a87eee8c399171549700a8bb..d37f6431a92d6f2e96d1c5ba7a1dbaa7467f0723 100644
--- a/core/modules/update/lib/Drupal/update/UpdateProcessor.php
+++ b/core/modules/update/lib/Drupal/update/UpdateProcessor.php
@@ -9,7 +9,7 @@
use Drupal\Component\Utility\Crypt;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\KeyValueStore\KeyValueFactoryInterface;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Core\PrivateKey;
use Drupal\Core\Queue\QueueFactory;
@@ -70,7 +70,7 @@ class UpdateProcessor implements UpdateProcessorInterface {
/**
* The state service.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $stateStore;
@@ -90,7 +90,7 @@ class UpdateProcessor implements UpdateProcessorInterface {
* The queue factory
* @param \Drupal\update\UpdateFetcherInterface $update_fetcher
* The update fetcher service
- * @param \Drupal\Core\KeyValueStore\StateInterface $state_store
+ * @param \Drupal\Core\State\StateInterface $state_store
* The state service.
* @param \Drupal\Core\PrivateKey $private_key
* The private key factory service.
diff --git a/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php b/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php
index 773c09ab80b37c425a98785cb3a4b01964d56572..adccf25e2e3f9b0e355c2ec49bf1d7ef28bb668a 100644
--- a/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php
+++ b/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php
@@ -9,7 +9,7 @@
use Drupal\Core\Page\HtmlPage;
use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Core\Routing\RouteSubscriberBase;
use Drupal\Core\Routing\RoutingEvents;
use Drupal\views\Plugin\views\display\DisplayRouterInterface;
@@ -49,7 +49,7 @@ class RouteSubscriber extends RouteSubscriberBase {
/**
* The state key value store.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -65,7 +65,7 @@ class RouteSubscriber extends RouteSubscriberBase {
*
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state key value store.
*/
public function __construct(EntityManagerInterface $entity_manager, StateInterface $state) {
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsLocalTask.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsLocalTask.php
index b38c4a4c81cc33d425e0dfc3d39f13e1cc9f3b35..fb05a494690c363bc5a3cf2b374f13344df4e600 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsLocalTask.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsLocalTask.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\Derivative;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Component\Plugin\Derivative\DerivativeBase;
use Drupal\Core\Plugin\Discovery\ContainerDerivativeInterface;
use Drupal\Core\Routing\RouteProviderInterface;
@@ -29,7 +29,7 @@ class ViewsLocalTask extends DerivativeBase implements ContainerDerivativeInterf
/**
* The state key value store.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
index 1442c46ea989101ec541cb3e1efd50d662c67c54..3737a36eaabbadf3bc57a30e99685ed8940ff490 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\views\display;
-use Drupal\Core\KeyValueStore\StateInterface;
+use Drupal\Core\State\StateInterface;
use Drupal\Core\Routing\RouteCompiler;
use Drupal\Core\Routing\RouteProviderInterface;
use Drupal\views\Views;
@@ -35,7 +35,7 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
/**
* The state key value store.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface
+ * @var \Drupal\Core\State\StateInterface
*/
protected $state;
@@ -50,7 +50,7 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
* The plugin implementation definition.
* @param \Drupal\Core\Routing\RouteProviderInterface $route_provider
* The route provider.
- * @param \Drupal\Core\KeyValueStore\StateInterface $state
+ * @param \Drupal\Core\State\StateInterface $state
* The state key value store.
*/
public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteProviderInterface $route_provider, StateInterface $state) {
diff --git a/core/modules/views/tests/Drupal/views/Tests/EventSubscriber/RouteSubscriberTest.php b/core/modules/views/tests/Drupal/views/Tests/EventSubscriber/RouteSubscriberTest.php
index 6afc0258ffe8e548c9f561a19da1732d6077ddc6..059749fe3c28159d51c7eb4285c79a6ba6a3662d 100644
--- a/core/modules/views/tests/Drupal/views/Tests/EventSubscriber/RouteSubscriberTest.php
+++ b/core/modules/views/tests/Drupal/views/Tests/EventSubscriber/RouteSubscriberTest.php
@@ -44,7 +44,7 @@ class RouteSubscriberTest extends UnitTestCase {
/**
* The mocked key value storage.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\State\StateInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $state;
@@ -68,7 +68,7 @@ protected function setUp() {
->method('getStorage')
->with('view')
->will($this->returnValue($this->viewStorage));
- $this->state = $this->getMock('\Drupal\Core\KeyValueStore\StateInterface');
+ $this->state = $this->getMock('\Drupal\Core\State\StateInterface');
$this->routeSubscriber = new TestRouteSubscriber($this->entityManager, $this->state);
}
diff --git a/core/modules/views/tests/Drupal/views/Tests/Plugin/Derivative/ViewsLocalTaskTest.php b/core/modules/views/tests/Drupal/views/Tests/Plugin/Derivative/ViewsLocalTaskTest.php
index 2850b923d6cd58e01ee65889975ab33d28c8ba0f..359ae7c36c8995e0588405f10a9d115dfc218fe8 100644
--- a/core/modules/views/tests/Drupal/views/Tests/Plugin/Derivative/ViewsLocalTaskTest.php
+++ b/core/modules/views/tests/Drupal/views/Tests/Plugin/Derivative/ViewsLocalTaskTest.php
@@ -55,7 +55,7 @@ public static function getInfo() {
protected function setUp() {
$this->routeProvider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
- $this->state = $this->getMock('Drupal\Core\KeyValueStore\StateInterface');
+ $this->state = $this->getMock('Drupal\Core\State\StateInterface');
$this->localTaskDerivative = new TestViewsLocalTask($this->routeProvider, $this->state);
}
diff --git a/core/modules/views/tests/Drupal/views/Tests/Plugin/display/PathPluginBaseTest.php b/core/modules/views/tests/Drupal/views/Tests/Plugin/display/PathPluginBaseTest.php
index b3e527ee6f0c5c800608fb3c2f4b88e40fa2521f..81f8307ed1bc5b9750b9de7e56a149a87fbad8fc 100644
--- a/core/modules/views/tests/Drupal/views/Tests/Plugin/display/PathPluginBaseTest.php
+++ b/core/modules/views/tests/Drupal/views/Tests/Plugin/display/PathPluginBaseTest.php
@@ -43,7 +43,7 @@ class PathPluginBaseTest extends UnitTestCase {
/**
* The mocked key value storage.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\State\StateInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $state;
@@ -62,7 +62,7 @@ protected function setUp() {
parent::setUp();
$this->routeProvider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
- $this->state = $this->getMock('\Drupal\Core\KeyValueStore\StateInterface');
+ $this->state = $this->getMock('\Drupal\Core\State\StateInterface');
$this->pathPlugin = $this->getMockBuilder('Drupal\views\Plugin\views\display\PathPluginBase')
->setConstructorArgs(array(array(), 'path_base', array(), $this->routeProvider, $this->state))
->setMethods(NULL)
diff --git a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListBuilderTest.php b/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListBuilderTest.php
index 167d1d3d31bf6ef10b110299abf46e5016b36e97..483752593a3dc1d777b7290ba0891f3302f59d95 100644
--- a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListBuilderTest.php
+++ b/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListBuilderTest.php
@@ -78,7 +78,7 @@ public function testBuildRowEntityList() {
array(array(), 'default', $display_manager->getDefinition('default'))
);
$route_provider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
- $state = $this->getMock('\Drupal\Core\KeyValueStore\StateInterface');
+ $state = $this->getMock('\Drupal\Core\State\StateInterface');
$page_display = $this->getMock('Drupal\views\Plugin\views\display\Page',
array('initDisplay', 'getPath'),
array(array(), 'default', $display_manager->getDefinition('page'), $route_provider, $state)
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
index fecb135e1779d9949540908a7a39df27b05b9b16..4184ec6dceaee9f2409f654c473fc62b9b8a70ec 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
@@ -66,7 +66,7 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
/**
* The state mock class.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\State\StateInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $state;
@@ -81,7 +81,7 @@ public static function getInfo() {
function setUp() {
parent::setUp();
- $this->state = $this->getMock('Drupal\Core\KeyValueStore\StateInterface');
+ $this->state = $this->getMock('Drupal\Core\State\StateInterface');
$this->renderer = new CssCollectionRenderer($this->state);
$this->file_css_group = array(
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php
index 87e722b5b64322c4a1c968753b1d0e1171284ce3..565a575bd91a77e8c37904bbcc703f5e62f43a6f 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php
@@ -26,7 +26,7 @@ class PathRootsSubscriberTest extends UnitTestCase {
/**
* The mocked state.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\State\StateInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $state;
@@ -52,7 +52,7 @@ public static function getInfo() {
* {@inheritdoc}
*/
protected function setUp() {
- $this->state = $this->getMock('Drupal\Core\KeyValueStore\StateInterface');
+ $this->state = $this->getMock('Drupal\Core\State\StateInterface');
$this->pathRootsSubscriber = new PathRootsSubscriber($this->state);
}
diff --git a/core/tests/Drupal/Tests/Core/PrivateKeyTest.php b/core/tests/Drupal/Tests/Core/PrivateKeyTest.php
index 02ac1e6408be61d67a2458fa82d32502ded71853..b204387d64949d6d721d82d25b3bfbffcc2cc9de 100644
--- a/core/tests/Drupal/Tests/Core/PrivateKeyTest.php
+++ b/core/tests/Drupal/Tests/Core/PrivateKeyTest.php
@@ -19,7 +19,7 @@ class PrivateKeyTest extends UnitTestCase {
/**
* The state mock class.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\State\StateInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $state;
@@ -52,7 +52,7 @@ public function setUp() {
parent::setUp();
$this->key = Crypt::randomBytesBase64(55);
- $this->state = $this->getMock('Drupal\Core\KeyValueStore\StateInterface');
+ $this->state = $this->getMock('Drupal\Core\State\StateInterface');
$this->privateKey = new PrivateKey($this->state);
}
diff --git a/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php b/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
index 9e05a5c080a0b080aecc92cfe3b90d2892494d16..2aec9e009eae3e63ff3120965da07c50e19df642 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
@@ -78,7 +78,7 @@ class RouteBuilderTest extends UnitTestCase {
/**
* The key value store.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\State\StateInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $state;
@@ -99,7 +99,7 @@ protected function setUp() {
$this->yamlDiscovery = $this->getMockBuilder('\Drupal\Component\Discovery\YamlDiscovery')
->disableOriginalConstructor()
->getMock();
- $this->state = $this->getMock('\Drupal\Core\KeyValueStore\StateInterface');
+ $this->state = $this->getMock('\Drupal\Core\State\StateInterface');
$this->routeBuilder = new TestRouteBuilder($this->dumper, $this->lock, $this->dispatcher, $this->moduleHandler, $this->controllerResolver, $this->state);
$this->routeBuilder->setYamlDiscovery($this->yamlDiscovery);
diff --git a/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php b/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php
index 334e9039bd30485ecdb01ef423edcfa1033880f4..acb99152fa51667e959b5d1ca77a8a908ea46e09 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php
@@ -31,7 +31,7 @@ class RoutePreloaderTest extends UnitTestCase {
/**
* The mocked state.
*
- * @var \Drupal\Core\KeyValueStore\StateInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\State\StateInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $state;
@@ -65,7 +65,7 @@ public static function getInfo() {
*/
protected function setUp() {
$this->routeProvider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
- $this->state = $this->getMock('\Drupal\Core\KeyValueStore\StateInterface');
+ $this->state = $this->getMock('\Drupal\Core\State\StateInterface');
$this->negotiation = $this->getMockBuilder('\Drupal\Core\ContentNegotiation')
->disableOriginalConstructor()
->getMock();