diff --git a/core/core.services.yml b/core/core.services.yml index b0cde45..1d90ae6 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -129,7 +129,7 @@ services: - { name: needs_destruction } serialization.phpserialize: - class: Drupal\Core\Serialization\PhpSerialize + class: Drupal\Component\Serialization\PhpSerialize settings: class: Drupal\Component\Utility\Settings diff --git a/core/lib/Drupal/Core/Serialization/Exception/InvalidDataTypeException.php b/core/lib/Drupal/Component/Serialization/Exception/InvalidDataTypeException.php similarity index 53% rename from core/lib/Drupal/Core/Serialization/Exception/InvalidDataTypeException.php rename to core/lib/Drupal/Component/Serialization/Exception/InvalidDataTypeException.php index e6b8ce6..e4f9211 100644 --- a/core/lib/Drupal/Core/Serialization/Exception/InvalidDataTypeException.php +++ b/core/lib/Drupal/Component/Serialization/Exception/InvalidDataTypeException.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Core\Serialization\Exception\InvalidDataTypeException. + * Contains \Drupal\Component\Serialization\Exception\InvalidDataTypeException. */ -namespace Drupal\Core\Serialization\Exception; +namespace Drupal\Component\Serialization\Exception; /** * Exception thrown when a data type is invalid. diff --git a/core/lib/Drupal/Core/Serialization/PhpSerialize.php b/core/lib/Drupal/Component/Serialization/PhpSerialize.php similarity index 82% rename from core/lib/Drupal/Core/Serialization/PhpSerialize.php rename to core/lib/Drupal/Component/Serialization/PhpSerialize.php index 4b912ba..a6f11fc 100644 --- a/core/lib/Drupal/Core/Serialization/PhpSerialize.php +++ b/core/lib/Drupal/Component/Serialization/PhpSerialize.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Core\Serialization\PhpSerialize. + * Contains \Drupal\Component\Serialization\PhpSerialize. */ -namespace Drupal\Core\Serialization; +namespace Drupal\Component\Serialization; /** * Default serialization for serialized PHP. diff --git a/core/lib/Drupal/Core/Serialization/SerializationInterface.php b/core/lib/Drupal/Component/Serialization/SerializationInterface.php similarity index 87% rename from core/lib/Drupal/Core/Serialization/SerializationInterface.php rename to core/lib/Drupal/Component/Serialization/SerializationInterface.php index 7713032..c5e68f1 100644 --- a/core/lib/Drupal/Core/Serialization/SerializationInterface.php +++ b/core/lib/Drupal/Component/Serialization/SerializationInterface.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Core\Serialization\SerializationInterface. + * Contains \Drupal\Component\Serialization\SerializationInterface. */ -namespace Drupal\Core\Serialization; +namespace Drupal\Component\Serialization; /** * Defines an interface for serialization formats. diff --git a/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php index d25d2f3..d989364 100644 --- a/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php +++ b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php @@ -7,9 +7,9 @@ namespace Drupal\Core\KeyValueStore; +use Drupal\Component\Serialization\SerializationInterface; use Drupal\Core\Database\Query\Merge; use Drupal\Core\Database\Connection; -use Drupal\Core\Serialization\SerializationInterface; /** * Defines a default key/value store implementation. @@ -22,7 +22,7 @@ class DatabaseStorage extends StorageBase { /** * The serialization class to use. * - * @var \Drupal\Core\Serialization\SerializationInterface + * @var \Drupal\Component\Serialization\SerializationInterface */ protected $serializer; @@ -45,7 +45,7 @@ class DatabaseStorage extends StorageBase { * * @param string $collection * The name of the collection holding key and value pairs. - * @param \Drupal\Core\Serialization\SerializationInterface $serializer + * @param \Drupal\Component\Serialization\SerializationInterface $serializer * The serialization class to use. * @param \Drupal\Core\Database\Connection $connection * The database connection to use. diff --git a/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php index f4923cf..3263a47 100644 --- a/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php +++ b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php @@ -7,10 +7,10 @@ namespace Drupal\Core\KeyValueStore; +use Drupal\Component\Serialization\SerializationInterface; use Drupal\Core\DestructableInterface; use Drupal\Core\Database\Connection; use Drupal\Core\Database\Query\Merge; -use Drupal\Core\Serialization\SerializationInterface; /** * Defines a default key/value store implementation for expiring items. @@ -38,7 +38,7 @@ class DatabaseStorageExpirable extends DatabaseStorage implements KeyValueStoreE * * @param string $collection * The name of the collection holding key and value pairs. - * @param \Drupal\Core\Serialization\SerializationInterface $serializer + * @param \Drupal\Component\Serialization\SerializationInterface $serializer * The serialization class to use. * @param \Drupal\Core\Database\Connection $connection * The database connection to use. diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php index 895d7ed..5ff8ae6 100644 --- a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php +++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php @@ -7,9 +7,9 @@ namespace Drupal\Core\KeyValueStore; +use Drupal\Component\Serialization\SerializationInterface; use Drupal\Core\DestructableInterface; use Drupal\Core\Database\Connection; -use Drupal\Core\Serialization\SerializationInterface; /** * Defines the key/value store factory for the database backend. @@ -26,7 +26,7 @@ class KeyValueDatabaseExpirableFactory implements KeyValueExpirableFactoryInterf /** * The serialization class to use. * - * @var \Drupal\Core\Serialization\SerializationInterface + * @var \Drupal\Component\Serialization\SerializationInterface */ protected $serializer; @@ -40,7 +40,7 @@ class KeyValueDatabaseExpirableFactory implements KeyValueExpirableFactoryInterf /** * Constructs this factory object. * - * @param \Drupal\Core\Serialization\SerializationInterface $serializer + * @param \Drupal\Component\Serialization\SerializationInterface $serializer * The serialization class to use. * @param \Drupal\Core\Database\Connection $connection * The Connection object containing the key-value tables. diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php index 43063ab..391b08e 100644 --- a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php +++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php @@ -7,9 +7,9 @@ namespace Drupal\Core\KeyValueStore; +use Drupal\Component\Serialization\SerializationInterface; use Drupal\Core\Database\Connection; use Drupal\Core\Database\Database; -use Drupal\Core\Serialization\SerializationInterface; /** * Defines the key/value store factory for the database backend. @@ -19,7 +19,7 @@ class KeyValueDatabaseFactory implements KeyValueFactoryInterface { /** * The serialization class to use. * - * @var \Drupal\Core\Serialization\SerializationInterface + * @var \Drupal\Component\Serialization\SerializationInterface */ protected $serializer; @@ -33,7 +33,7 @@ class KeyValueDatabaseFactory implements KeyValueFactoryInterface { /** * Constructs this factory object. * - * @param \Drupal\Core\Serialization\SerializationInterface $serializer + * @param \Drupal\Component\Serialization\SerializationInterface $serializer * The serialization class to use. * @param \Drupal\Core\Database\Connection $connection * The Connection object containing the key-value tables. diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageExpirableTest.php b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageExpirableTest.php index d53b914..ed4236b 100644 --- a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageExpirableTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageExpirableTest.php @@ -38,7 +38,7 @@ protected function setUp() { ->addArgument(new Reference('serialization.phpserialize')) ->addArgument(new Reference('database')); $this->container - ->register('serialization.phpserialize', 'Drupal\Core\Serialization\PhpSerialize'); + ->register('serialization.phpserialize', 'Drupal\Component\Serialization\PhpSerialize'); $this->settingsSet('keyvalue_expirable_default', 'keyvalue.expirable.database'); } diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php index 3442530..2254501 100644 --- a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php @@ -37,7 +37,7 @@ protected function setUp() { ->addArgument(new Reference('serialization.phpserialize')) ->addArgument(new Reference('database')); $this->container - ->register('serialization.phpserialize', 'Drupal\Core\Serialization\PhpSerialize'); + ->register('serialization.phpserialize', 'Drupal\Component\Serialization\PhpSerialize'); $this->settingsSet('keyvalue_default', 'keyvalue.database'); } diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/GarbageCollectionTest.php b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/GarbageCollectionTest.php index 3e20c99..e583e75 100644 --- a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/GarbageCollectionTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/GarbageCollectionTest.php @@ -7,9 +7,9 @@ namespace Drupal\system\Tests\KeyValueStore; +use Drupal\Component\Serialization\PhpSerialize; use Drupal\Core\Database\Database; use Drupal\Core\KeyValueStore\DatabaseStorageExpirable; -use Drupal\Core\Serialization\PhpSerialize; use Drupal\simpletest\UnitTestBase; /** diff --git a/core/modules/user/lib/Drupal/user/TempStoreFactory.php b/core/modules/user/lib/Drupal/user/TempStoreFactory.php index 7574ba7..c93cb58 100644 --- a/core/modules/user/lib/Drupal/user/TempStoreFactory.php +++ b/core/modules/user/lib/Drupal/user/TempStoreFactory.php @@ -7,10 +7,10 @@ namespace Drupal\user; +use Drupal\Component\Serialization\SerializationInterface; use Drupal\Core\Database\Connection; use Drupal\Core\KeyValueStore\DatabaseStorageExpirable; use Drupal\Core\Lock\LockBackendInterface; -use Drupal\Core\Serialization\SerializationInterface; /** * Creates a key/value storage object for the current user or anonymous session. @@ -20,7 +20,7 @@ class TempStoreFactory { /** * The serialization class to use. * - * @var \Drupal\Core\Serialization\SerializationInterface + * @var \Drupal\Component\Serialization\SerializationInterface */ protected $serializer; @@ -41,7 +41,7 @@ class TempStoreFactory { /** * Constructs a Drupal\user\TempStoreFactory object. * - * @param \Drupal\Core\Serialization\SerializationInterface $serializer + * @param \Drupal\Component\Serialization\SerializationInterface $serializer * The serialization class to use. * @param \Drupal\Core\Database\Connection $connection * The connection object used for this data. diff --git a/core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseTest.php b/core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseTest.php index a2af2ba..1c83eb8 100644 --- a/core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseTest.php @@ -7,11 +7,11 @@ namespace Drupal\user\Tests; +use Drupal\Component\Serialization\PhpSerialize; use Drupal\simpletest\UnitTestBase; use Drupal\user\TempStoreFactory; use Drupal\Core\Lock\DatabaseLockBackend; use Drupal\Core\Database\Database; -use Drupal\Core\Serialization\PhpSerialize; /** * Tests the TempStore namespace.