Unverified Commit b2b7f466 authored by larowlan's avatar larowlan
Browse files

Issue #2936725 by gabesullice, Wim Leers, dawehner, Berdir:...

Issue #2936725 by gabesullice, Wim Leers, dawehner, Berdir: EntityDataDefinition::create() does not respect derived entity definitions
parent f69af23f
......@@ -18,13 +18,35 @@ class EntityDataDefinition extends ComplexDataDefinitionBase implements EntityDa
*
* @return static
*/
public static function create($entity_type_id = NULL) {
$definition = new static([]);
// Set the passed entity type.
public static function create($entity_type_id = NULL, $bundle = NULL) {
// If the entity type is known, use the derived definition.
if (isset($entity_type_id)) {
$data_type = "entity:{$entity_type_id}";
// If a bundle was given, use the bundle-specific definition.
if ($bundle) {
$data_type .= ":{$bundle}";
}
// It's possible that the given entity type ID or bundle wasn't discovered
// by the TypedData plugin manager and/or weren't created by the
// EntityDeriver. In that case, this is a new definition and we'll just
// create the definition from defaults by using an empty array.
$values = \Drupal::typedDataManager()->getDefinition($data_type, FALSE);
$definition = new static(is_array($values) ? $values : []);
// Set the EntityType constraint using the given entity type ID.
$definition->setEntityTypeId($entity_type_id);
// If available, set the Bundle constraint.
if ($bundle) {
$definition->setBundles([$bundle]);
}
return $definition;
}
return $definition;
return new static([]);
}
/**
......@@ -35,15 +57,10 @@ public static function createFromDataType($data_type) {
if ($parts[0] != 'entity') {
throw new \InvalidArgumentException('Data type must be in the form of "entity:ENTITY_TYPE:BUNDLE."');
}
$definition = static::create();
// Set the passed entity type and bundle.
if (isset($parts[1])) {
$definition->setEntityTypeId($parts[1]);
}
if (isset($parts[2])) {
$definition->setBundles([$parts[2]]);
}
return $definition;
return static::create(
isset($parts[1]) ? $parts[1] : NULL,
isset($parts[2]) ? $parts[2] : NULL
);
}
/**
......
......@@ -93,8 +93,10 @@ protected function setUp() {
$typed_data_manager->expects($this->any())
->method('getDefinition')
->with($this->equalTo('field_item:string_long'))
->willReturn(['class' => '\Drupal\Core\Field\Plugin\Field\FieldType\StringLongItem']);
->will($this->returnValueMap([
'entity:user' => ['class' => '\Drupal\Core\TypedData\DataDefinitionInterface'],
'field_item:string_long' => ['class' => '\Drupal\Core\Field\Plugin\Field\FieldType\StringLongItem'],
]));
$this->baseEntityType = new TestEntityType([
'base_table' => 'entity_test',
......
......@@ -11,6 +11,7 @@
use Drupal\Core\TypedData\DataReferenceDefinitionInterface;
use Drupal\Core\TypedData\ListDataDefinitionInterface;
use Drupal\KernelTests\KernelTestBase;
use Drupal\node\Entity\NodeType;
/**
* Tests deriving metadata of entity and field data types.
......@@ -31,10 +32,16 @@ class EntityTypedDataDefinitionTest extends KernelTestBase {
*
* @var array
*/
public static $modules = ['filter', 'text', 'node', 'user'];
public static $modules = ['system', 'filter', 'text', 'node', 'user'];
protected function setUp() {
parent::setup();
NodeType::create([
'type' => 'article',
'name' => 'Article',
])->save();
$this->typedDataManager = $this->container->get('typed_data_manager');
}
......@@ -82,10 +89,15 @@ public function testFields() {
*/
public function testEntities() {
$entity_definition = EntityDataDefinition::create('node');
$bundle_definition = EntityDataDefinition::create('node', 'article');
// Entities are complex data.
$this->assertFalse($entity_definition instanceof ListDataDefinitionInterface);
$this->assertTrue($entity_definition instanceof ComplexDataDefinitionInterface);
// Entity definitions should inherit their labels from the entity type.
$this->assertEquals('Content', $entity_definition->getLabel());
$this->assertEquals('Article', $bundle_definition->getLabel());
$field_definitions = $entity_definition->getPropertyDefinitions();
// Comparison should ignore the internal static cache, so compare the
// serialized objects instead.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment