diff --git a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php index f6e8155380..c65b159fe0 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php @@ -4,7 +4,6 @@ use Drupal\Core\Cache\Cache; use Drupal\Core\Cache\CacheBackendInterface; -use Drupal\Core\Entity\EntityTypeBundleInfoInterface; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueContentEntityStorage.php b/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueContentEntityStorage.php index c42e7c0de5..e271f5ca0b 100644 --- a/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueContentEntityStorage.php +++ b/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueContentEntityStorage.php @@ -18,4 +18,9 @@ public function createTranslation(ContentEntityInterface $entity, $langcode, arr // https://www.drupal.org/node/2618436. } + /** + * {@inheritdoc} + */ + public function createWithSampleValues($bundle, array $values = []) {} + } diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php index b3e339b897..0d34ac6ac8 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php @@ -93,6 +93,13 @@ class SqlContentEntityStorageTest extends UnitTestCase { protected $connection; /** + * The entity type bundle information object. + * + * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $entityTypeBundleInfo; + + /** * {@inheritdoc} */ protected function setUp() { @@ -111,6 +118,7 @@ protected function setUp() { $this->languageManager->expects($this->any()) ->method('getDefaultLanguage') ->will($this->returnValue(new Language(['langcode' => 'en']))); + $this->entityTypeBundleInfo = $this->getMock('Drupal\Core\Entity\EntityTypeBundleInfoInterface'); $this->connection = $this->getMockBuilder('Drupal\Core\Database\Connection') ->disableOriginalConstructor() ->getMock(); @@ -343,7 +351,7 @@ public function testOnEntityTypeCreate() { ->will($this->returnValue($schema_handler)); $storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage') - ->setConstructorArgs([$this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager]) + ->setConstructorArgs([$this->entityType, $this->connection, $this->entityManager, $this->cache, $this->entityTypeBundleInfo, $this->languageManager]) ->setMethods(['getStorageSchema']) ->getMock(); @@ -1105,7 +1113,7 @@ protected function setUpEntityStorage() { ->method('getBaseFieldDefinitions') ->will($this->returnValue($this->fieldDefinitions)); - $this->entityStorage = new SqlContentEntityStorage($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager); + $this->entityStorage = new SqlContentEntityStorage($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->entityTypeBundleInfo, $this->languageManager); } /** @@ -1182,7 +1190,7 @@ public function testLoadMultipleNoPersistentCache() { ->method('set'); $entity_storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage') - ->setConstructorArgs([$this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager]) + ->setConstructorArgs([$this->entityType, $this->connection, $this->entityManager, $this->cache, $this->entityTypeBundleInfo, $this->languageManager]) ->setMethods(['getFromStorage', 'invokeStorageLoadHook']) ->getMock(); $entity_storage->method('invokeStorageLoadHook') @@ -1234,7 +1242,7 @@ public function testLoadMultiplePersistentCacheMiss() { ->with($key, $entity, CacheBackendInterface::CACHE_PERMANENT, [$this->entityTypeId . '_values', 'entity_field_info']); $entity_storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage') - ->setConstructorArgs([$this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager]) + ->setConstructorArgs([$this->entityType, $this->connection, $this->entityManager, $this->cache, $this->entityTypeBundleInfo, $this->languageManager]) ->setMethods(['getFromStorage', 'invokeStorageLoadHook']) ->getMock(); $entity_storage->method('invokeStorageLoadHook') @@ -1289,7 +1297,7 @@ public function testHasData() { ->method('getBaseFieldDefinitions') ->will($this->returnValue($this->fieldDefinitions)); - $this->entityStorage = new SqlContentEntityStorage($this->entityType, $database, $this->entityManager, $this->cache, $this->languageManager); + $this->entityStorage = new SqlContentEntityStorage($this->entityType, $database, $this->entityManager, $this->cache, $this->entityTypeBundleInfo, $this->languageManager); $result = $this->entityStorage->hasData();