diff --git a/core/core.services.yml b/core/core.services.yml index 367aec1..45b7134 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -263,8 +263,8 @@ services: lock: class: Drupal\Core\Lock\DatabaseLockBackend arguments: ['@database'] - user.tempstore: - class: Drupal\user\TempStoreFactory + tempstore: + class: Drupal\Core\TempStore\TempStoreFactory arguments: ['@database', '@lock'] router.request_context: class: Symfony\Component\Routing\RequestContext diff --git a/core/modules/user/lib/Drupal/user/TempStore.php b/core/lib/Drupal/Core/TempStore/TempStore.php similarity index 99% rename from core/modules/user/lib/Drupal/user/TempStore.php rename to core/lib/Drupal/Core/TempStore/TempStore.php index 458bf5c..706a4f0 100644 --- a/core/modules/user/lib/Drupal/user/TempStore.php +++ b/core/lib/Drupal/Core/TempStore/TempStore.php @@ -5,7 +5,7 @@ * Contains Drupal\user\TempStore. */ -namespace Drupal\user; +namespace Drupal\Core\TempStore; use Drupal\Component\Utility\String; use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface; diff --git a/core/modules/user/lib/Drupal/user/TempStoreException.php b/core/lib/Drupal/Core/TempStore/TempStoreException.php similarity index 85% rename from core/modules/user/lib/Drupal/user/TempStoreException.php rename to core/lib/Drupal/Core/TempStore/TempStoreException.php index 497a2ef..6a0df5e 100644 --- a/core/modules/user/lib/Drupal/user/TempStoreException.php +++ b/core/lib/Drupal/Core/TempStore/TempStoreException.php @@ -5,7 +5,7 @@ * Contains Drupal\user\TempStoreException. */ -namespace Drupal\user; +namespace Drupal\Core\TempStore; /** * Defines the exception thrown if the TempStore cannot acquire a lock. diff --git a/core/modules/user/lib/Drupal/user/TempStoreFactory.php b/core/lib/Drupal/Core/TempStore/TempStoreFactory.php similarity index 96% rename from core/modules/user/lib/Drupal/user/TempStoreFactory.php rename to core/lib/Drupal/Core/TempStore/TempStoreFactory.php index 28d4147..abb5a05 100644 --- a/core/modules/user/lib/Drupal/user/TempStoreFactory.php +++ b/core/lib/Drupal/Core/TempStore/TempStoreFactory.php @@ -5,7 +5,7 @@ * Definition of Drupal\user\TempStoreFactory. */ -namespace Drupal\user; +namespace Drupal\Core\TempStore; use Drupal\Core\Database\Connection; use Drupal\Core\KeyValueStore\DatabaseStorageExpirable; @@ -54,7 +54,7 @@ function __construct(Connection $connection, LockBackendInterface $lockBackend) * owned by the currently authenticated user, or by the active anonymous * session if no user is logged in. * - * @return \Drupal\user\TempStore + * @return \Drupal\Core\TempStore\TempStore * An instance of the the key/value store. */ function get($collection, $owner = NULL) { diff --git a/core/modules/edit/lib/Drupal/edit/EditController.php b/core/modules/edit/lib/Drupal/edit/EditController.php index e5d3a87..0be591f 100644 --- a/core/modules/edit/lib/Drupal/edit/EditController.php +++ b/core/modules/edit/lib/Drupal/edit/EditController.php @@ -19,7 +19,7 @@ use Drupal\edit\Ajax\FieldFormSavedCommand; use Drupal\edit\Ajax\FieldFormValidationErrorsCommand; use Drupal\edit\Ajax\EntitySavedCommand; -use Drupal\user\TempStoreFactory; +use Drupal\Core\TempStore\TempStoreFactory; /** * Returns responses for Edit module routes. @@ -29,7 +29,7 @@ class EditController extends ControllerBase { /** * The TempStore factory. * - * @var \Drupal\user\TempStoreFactory + * @var \Drupal\Core\TempStore\TempStoreFactory */ protected $tempStoreFactory; @@ -57,7 +57,7 @@ class EditController extends ControllerBase { /** * Constructs a new EditController. * - * @param \Drupal\user\TempStoreFactory $temp_store_factory + * @param \Drupal\Core\TempStore\TempStoreFactory $temp_store_factory * The TempStore factory. * @param \Drupal\edit\MetadataGeneratorInterface $metadata_generator * The in-place editing metadata generator. @@ -78,7 +78,7 @@ public function __construct(TempStoreFactory $temp_store_factory, MetadataGenera */ public static function create(ContainerInterface $container) { return new static( - $container->get('user.tempstore'), + $container->get('tempstore'), $container->get('edit.metadata.generator'), $container->get('edit.editor.selector'), $container->get('field.info') diff --git a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php b/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php index e930206..5f9c4ef 100644 --- a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php +++ b/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php @@ -13,7 +13,7 @@ use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormBase; use Drupal\entity\Entity\EntityFormDisplay; -use Drupal\user\TempStoreFactory; +use Drupal\Core\TempStore\TempStoreFactory; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -24,7 +24,7 @@ class EditFieldForm extends FormBase { /** * Stores the tempstore factory. * - * @var \Drupal\user\TempStoreFactory + * @var \Drupal\Core\TempStore\TempStoreFactory */ protected $tempStoreFactory; @@ -45,7 +45,7 @@ class EditFieldForm extends FormBase { /** * Constructs a new EditFieldForm. * - * @param \Drupal\user\TempStoreFactory $temp_store_factory + * @param \Drupal\Core\TempStore\TempStoreFactory $temp_store_factory * The tempstore factory. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler. @@ -63,7 +63,7 @@ public function __construct(TempStoreFactory $temp_store_factory, ModuleHandlerI */ public static function create(ContainerInterface $container) { return new static( - $container->get('user.tempstore'), + $container->get('tempstore'), $container->get('module_handler'), $container->get('entity.manager')->getStorageController('node_type') ); diff --git a/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php b/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php index 5f474d5..a1fd24a 100644 --- a/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php +++ b/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php @@ -11,7 +11,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Form\ConfirmFormBase; use Drupal\Component\Utility\String; -use Drupal\user\TempStoreFactory; +use Drupal\Core\TempStore\TempStoreFactory; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -30,7 +30,7 @@ class DeleteMultiple extends ConfirmFormBase { /** * The tempstore factory. * - * @var \Drupal\user\TempStoreFactory + * @var \Drupal\Core\TempStore\TempStoreFactory */ protected $tempStoreFactory; @@ -44,7 +44,7 @@ class DeleteMultiple extends ConfirmFormBase { /** * Constructs a DeleteMultiple form object. * - * @param \Drupal\user\TempStoreFactory $temp_store_factory + * @param \Drupal\Core\TempStore\TempStoreFactory $temp_store_factory * The tempstore factory. * @param \Drupal\Core\Entity\EntityManagerInterface $manager * The entity manager. @@ -59,7 +59,7 @@ public function __construct(TempStoreFactory $temp_store_factory, EntityManagerI */ public static function create(ContainerInterface $container) { return new static( - $container->get('user.tempstore'), + $container->get('tempstore'), $container->get('entity.manager') ); } diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php index 603f097..6a64e5a 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php +++ b/core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php @@ -9,7 +9,7 @@ use Drupal\Core\Action\ActionBase; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\user\TempStoreFactory; +use Drupal\Core\TempStore\TempStoreFactory; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -27,7 +27,7 @@ class DeleteNode extends ActionBase implements ContainerFactoryPluginInterface { /** * The tempstore object. * - * @var \Drupal\user\TempStore + * @var \Drupal\Core\TempStore\TempStore */ protected $tempStore; @@ -40,7 +40,7 @@ class DeleteNode extends ActionBase implements ContainerFactoryPluginInterface { * The plugin ID for the plugin instance. * @param array $plugin_definition * The plugin implementation definition. - * @param \Drupal\user\TempStoreFactory $temp_store_factory + * @param \Drupal\Core\TempStore\TempStoreFactory $temp_store_factory * The tempstore factory. */ public function __construct(array $configuration, $plugin_id, array $plugin_definition, TempStoreFactory $temp_store_factory) { @@ -53,7 +53,7 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi * {@inheritdoc} */ public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) { - return new static($configuration, $plugin_id, $plugin_definition, $container->get('user.tempstore')); + return new static($configuration, $plugin_id, $plugin_definition, $container->get('tempstore')); } /** diff --git a/core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseTest.php b/core/modules/system/lib/Drupal/system/Tests/TempStore/TempStoreDatabaseTest.php similarity index 97% rename from core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseTest.php rename to core/modules/system/lib/Drupal/system/Tests/TempStore/TempStoreDatabaseTest.php index 0437837..bd0a1fc 100644 --- a/core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/TempStore/TempStoreDatabaseTest.php @@ -5,10 +5,10 @@ * Definition of Drupal\user\Tests\TempStoreDatabaseTest. */ -namespace Drupal\user\Tests; +namespace Drupal\system\Tests\TempStore; use Drupal\simpletest\UnitTestBase; -use Drupal\user\TempStoreFactory; +use Drupal\Core\TempStore\TempStoreFactory; use Drupal\Core\Lock\DatabaseLockBackend; use Drupal\Core\Database\Database; @@ -22,7 +22,7 @@ class TempStoreDatabaseTest extends UnitTestBase { /** * A key/value store factory. * - * @var \Drupal\user\TempStoreFactory + * @var \Drupal\Core\TempStore\TempStoreFactory */ protected $storeFactory; diff --git a/core/modules/user/lib/Drupal/user/Form/UserMultipleCancelConfirm.php b/core/modules/user/lib/Drupal/user/Form/UserMultipleCancelConfirm.php index 07295c5..8d54348 100644 --- a/core/modules/user/lib/Drupal/user/Form/UserMultipleCancelConfirm.php +++ b/core/modules/user/lib/Drupal/user/Form/UserMultipleCancelConfirm.php @@ -12,7 +12,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Form\ConfirmFormBase; use Drupal\Core\Routing\UrlGeneratorInterface; -use Drupal\user\TempStoreFactory; +use Drupal\Core\TempStore\TempStoreFactory; use Drupal\user\UserStorageControllerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -25,7 +25,7 @@ class UserMultipleCancelConfirm extends ConfirmFormBase { /** * The temp store factory. * - * @var \Drupal\user\TempStoreFactory + * @var \Drupal\Core\TempStore\TempStoreFactory */ protected $tempStoreFactory; @@ -53,7 +53,7 @@ class UserMultipleCancelConfirm extends ConfirmFormBase { /** * Constructs a new UserMultipleCancelConfirm. * - * @param \Drupal\user\TempStoreFactory $temp_store_factory + * @param \Drupal\Core\TempStore\TempStoreFactory $temp_store_factory * The temp store factory. * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * The config factory. @@ -74,7 +74,7 @@ public function __construct(TempStoreFactory $temp_store_factory, ConfigFactoryI */ public static function create(ContainerInterface $container) { return new static( - $container->get('user.tempstore'), + $container->get('tempstore'), $container->get('config.factory'), $container->get('entity.manager')->getStorageController('user'), $container->get('entity.manager') diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php b/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php index 75fa5f5..22f8fae 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php +++ b/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php @@ -9,7 +9,7 @@ use Drupal\Core\Action\ActionBase; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\user\TempStoreFactory; +use Drupal\Core\TempStore\TempStoreFactory; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -27,7 +27,7 @@ class CancelUser extends ActionBase implements ContainerFactoryPluginInterface { /** * The tempstore factory. * - * @var \Drupal\user\TempStoreFactory + * @var \Drupal\Core\TempStore\TempStoreFactory */ protected $tempStoreFactory; @@ -40,7 +40,7 @@ class CancelUser extends ActionBase implements ContainerFactoryPluginInterface { * The plugin ID for the plugin instance. * @param array $plugin_definition * The plugin implementation definition. - * @param \Drupal\user\TempStoreFactory $temp_store_factory + * @param \Drupal\Core\TempStore\TempStoreFactory $temp_store_factory * The tempstore factory. */ public function __construct(array $configuration, $plugin_id, array $plugin_definition, TempStoreFactory $temp_store_factory) { @@ -53,7 +53,7 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi * {@inheritdoc} */ public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) { - return new static($configuration, $plugin_id, $plugin_definition, $container->get('user.tempstore')); + return new static($configuration, $plugin_id, $plugin_definition, $container->get('tempstore')); } /** diff --git a/core/modules/views/lib/Drupal/views/Entity/View.php b/core/modules/views/lib/Drupal/views/Entity/View.php index 8eea4c1..fb19bcb 100644 --- a/core/modules/views/lib/Drupal/views/Entity/View.php +++ b/core/modules/views/lib/Drupal/views/Entity/View.php @@ -325,7 +325,7 @@ public function postCreate(EntityStorageControllerInterface $storage_controller) public static function postDelete(EntityStorageControllerInterface $storage_controller, array $entities) { parent::postDelete($storage_controller, $entities); - $tempstore = \Drupal::service('user.tempstore')->get('views'); + $tempstore = \Drupal::service('tempstore')->get('views'); $tags = array(); foreach ($entities as $entity) { diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php index 2af481f..5ab7497 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php @@ -9,7 +9,7 @@ use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Entity\EntityManagerInterface; -use Drupal\user\TempStoreFactory; +use Drupal\Core\TempStore\TempStoreFactory; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -27,7 +27,7 @@ class BreakLockForm extends EntityConfirmFormBase { /** * Stores the user tempstore. * - * @var \Drupal\user\TempStore + * @var \Drupal\Core\TempStore\TempStore */ protected $tempStore; @@ -36,7 +36,7 @@ class BreakLockForm extends EntityConfirmFormBase { * * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager * The Entity manager. - * @param \Drupal\user\TempStoreFactory $temp_store_factory + * @param \Drupal\Core\TempStore\TempStoreFactory $temp_store_factory * The factory for the temp store object. */ public function __construct(EntityManagerInterface $entity_manager, TempStoreFactory $temp_store_factory) { @@ -50,7 +50,7 @@ public function __construct(EntityManagerInterface $entity_manager, TempStoreFac public static function create(ContainerInterface $container) { return new static( $container->get('entity.manager'), - $container->get('user.tempstore') + $container->get('tempstore') ); } diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ParamConverter/ViewUIConverter.php b/core/modules/views_ui/lib/Drupal/views_ui/ParamConverter/ViewUIConverter.php index a21cd0e..18f0dee 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/ParamConverter/ViewUIConverter.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/ParamConverter/ViewUIConverter.php @@ -12,7 +12,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; use Drupal\Core\ParamConverter\ParamConverterInterface; -use Drupal\user\TempStoreFactory; +use Drupal\Core\TempStore\TempStoreFactory; use Drupal\views_ui\ViewUI; /** @@ -36,14 +36,14 @@ class ViewUIConverter extends EntityConverter implements ParamConverterInterface /** * Stores the tempstore factory. * - * @var \Drupal\user\TempStoreFactory + * @var \Drupal\Core\TempStore\TempStoreFactory */ protected $tempStoreFactory; /** * Constructs a new ViewUIConverter. * - * @param \Drupal\user\TempStoreFactory $temp_store_factory + * @param \Drupal\Core\TempStore\TempStoreFactory $temp_store_factory * The factory for the temp store object. */ public function __construct(EntityManagerInterface $entity_manager, TempStoreFactory $temp_store_factory) { diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/CachedDataUITest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/CachedDataUITest.php index 9bfde8e..9cf091f 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/CachedDataUITest.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/CachedDataUITest.php @@ -33,7 +33,7 @@ public static function getInfo() { public function testCacheData() { $views_admin_user_uid = $this->fullAdminUser->id(); - $temp_store = $this->container->get('user.tempstore')->get('views'); + $temp_store = $this->container->get('tempstore')->get('views'); // The view should not be locked. $this->assertEqual($temp_store->getMetadata('test_view'), NULL, 'The view is not locked.'); diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php index 4af7770..c97e68c 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php @@ -12,7 +12,7 @@ use Drupal\Core\Ajax\ReplaceCommand; use Drupal\Component\Utility\NestedArray; use Drupal\Component\Utility\String; -use Drupal\user\TempStoreFactory; +use Drupal\Core\TempStore\TempStoreFactory; use Drupal\views\Views; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -25,7 +25,7 @@ class ViewEditFormController extends ViewFormControllerBase { /** * The views temp store. * - * @var \Drupal\user\TempStore + * @var \Drupal\Core\TempStore\TempStore */ protected $tempStore; @@ -39,7 +39,7 @@ class ViewEditFormController extends ViewFormControllerBase { /** * Constructs a new ViewEditFormController object. * - * @param \Drupal\user\TempStoreFactory $temp_store_factory + * @param \Drupal\Core\TempStore\TempStoreFactory $temp_store_factory * The factory for the temp store object. * @param \Symfony\Component\HttpFoundation\Request $request * The request object. @@ -54,7 +54,7 @@ public function __construct(TempStoreFactory $temp_store_factory, Request $reque */ public static function create(ContainerInterface $container) { return new static( - $container->get('user.tempstore'), + $container->get('tempstore'), $container->get('request') ); } diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php index ae9f4da..f2d78f8 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php @@ -7,7 +7,7 @@ namespace Drupal\views_ui; -use Drupal\user\TempStoreFactory; +use Drupal\Core\TempStore\TempStoreFactory; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -18,14 +18,14 @@ class ViewPreviewFormController extends ViewFormControllerBase { /** * The views temp store. * - * @var \Drupal\user\TempStore + * @var \Drupal\Core\TempStore\TempStore */ protected $tempStore; /** * Constructs a new ViewPreviewFormController object. * - * @param \Drupal\user\TempStoreFactory $temp_store_factory + * @param \Drupal\Core\TempStore\TempStoreFactory $temp_store_factory * The factory for the temp store object. */ public function __construct(TempStoreFactory $temp_store_factory) { @@ -37,7 +37,7 @@ public function __construct(TempStoreFactory $temp_store_factory) { */ public static function create(ContainerInterface $container) { return new static( - $container->get('user.tempstore') + $container->get('tempstore') ); } diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php index 1ea7ee2..f7c991e 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php @@ -791,7 +791,7 @@ public function cacheSet() { unset($executable->default_display); $executable->query = NULL; unset($executable->displayHandlers); - \Drupal::service('user.tempstore')->get('views')->set($this->id(), $this); + \Drupal::service('tempstore')->get('views')->set($this->id(), $this); } /** diff --git a/core/modules/views_ui/views_ui.services.yml b/core/modules/views_ui/views_ui.services.yml index e75c7af..f9784ad 100644 --- a/core/modules/views_ui/views_ui.services.yml +++ b/core/modules/views_ui/views_ui.services.yml @@ -1,6 +1,6 @@ services: paramconverter.views_ui: class: Drupal\views_ui\ParamConverter\ViewUIConverter - arguments: ['@entity.manager', '@user.tempstore'] + arguments: ['@entity.manager', '@tempstore'] tags: - { name: paramconverter, priority: 10 } diff --git a/core/modules/user/tests/Drupal/user/Tests/TempStoreTest.php b/core/tests/Drupal/Tests/Core/TempStore/TempStoreTest.php similarity index 95% rename from core/modules/user/tests/Drupal/user/Tests/TempStoreTest.php rename to core/tests/Drupal/Tests/Core/TempStore/TempStoreTest.php index af54c81..7de17c7 100644 --- a/core/modules/user/tests/Drupal/user/Tests/TempStoreTest.php +++ b/core/tests/Drupal/Tests/Core/TempStore/TempStoreTest.php @@ -5,18 +5,18 @@ * Contains \Drupal\user\Tests\TempStoreTest. */ -namespace Drupal\user\Tests; +namespace Drupal\Tests\Core\TempStore; use Drupal\Tests\UnitTestCase; -use Drupal\user\TempStore; +use Drupal\Core\TempStore\TempStore; /** * Tests the TempStore namespace. * * @group Drupal - * @group User + * @group TempStore * - * @coversDefaultClass \Drupal\user\TempStore + * @coversDefaultClass \Drupal\Core\TempStore\TempStore */ class TempStoreTest extends UnitTestCase { @@ -37,7 +37,7 @@ class TempStoreTest extends UnitTestCase { /** * The user temp store. * - * @var \Drupal\user\TempStore + * @var \Drupal\Core\TempStore\TempStore */ protected $tempStore; @@ -68,8 +68,8 @@ class TempStoreTest extends UnitTestCase { public static function getInfo() { return array( 'name' => 'TempStore', - 'description' => 'Unit tests the Drupal\user\TempStore class.', - 'group' => 'User', + 'description' => 'Unit tests the Drupal\Core\TempStore\TempStore class.', + 'group' => 'TempStore', ); } @@ -140,7 +140,7 @@ public function testGetIfOwner() { * Tests the set() method with no lock available. * * @covers ::set() - * @expectedException \Drupal\user\TempStoreException + * @expectedException \Drupal\Core\TempStore\TempStoreException */ public function testSetWithNoLockAvailable() { $this->lock->expects($this->at(0)) @@ -304,7 +304,7 @@ public function testDelete() { * Tests the delete() method with no lock available. * * @covers ::delete() - * @expectedException \Drupal\user\TempStoreException + * @expectedException \Drupal\Core\TempStore\TempStoreException */ public function testDeleteWithNoLockAvailable() { $this->lock->expects($this->at(0))