Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2675010 by hchonov: Cloned entity will point to the same field objects if the clone was created after an entity translation has been initialized

8.2.x
Alex Pott 2016-06-24 15:14:18 +02:00
parent 0fb23527a5
commit fe08d93c26
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/lib/Drupal/Core/Entity/ContentEntityBase.php
View File

@ -1012,6 +1012,12 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
// adapter object. // adapter object.
$this->typedData = NULL; $this->typedData = NULL;
$definitions = $this->getFieldDefinitions(); $definitions = $this->getFieldDefinitions();
// Ensure the fields array is actually cloned by overwriting the original
// reference with one pointing to a copy of the array.
$fields = $this->fields;
$this->fields = &$fields;
foreach ($this->fields as $name => $values) { foreach ($this->fields as $name => $values) {
$this->fields[$name] = array(); $this->fields[$name] = array();
// Untranslatable fields may have multiple references for the same field // Untranslatable fields may have multiple references for the same field

45
core/tests/Drupal/KernelTests/Core/Entity/ContentEntityCloneTest.php
View File

@ -62,4 +62,49 @@ class ContentEntityCloneTest extends EntityKernelTestBase {
} }
} }
/**
* Tests if the entity fields are properly cloned.
*/
public function testClonedEntityFields() {
$user = $this->createUser();
// Create a test entity.
$entity = EntityTestMul::create([
'name' => $this->randomString(),
'user_id' => $user->id(),
'language' => 'en',
]);
$entity->addTranslation('de');
$entity->save();
$fields = array_keys($entity->getFieldDefinitions());
// Reload the entity, clone it and check that both entity objects reference
// different field instances.
$entity = $this->reloadEntity($entity);
$clone = clone $entity;
$different_references = TRUE;
foreach ($fields as $field_name) {
if ($entity->get($field_name) === $clone->get($field_name)) {
$different_references = FALSE;
}
}
$this->assertTrue($different_references, 'The entity object and the cloned entity object reference different field item list objects.');
// Reload the entity, initialize one translation, clone it and check that
// both entity objects reference different field instances.
$entity = $this->reloadEntity($entity);
$entity->getTranslation('de');
$clone = clone $entity;
$different_references = TRUE;
foreach ($fields as $field_name) {
if ($entity->get($field_name) === $clone->get($field_name)) {
$different_references = FALSE;
}
}
$this->assertTrue($different_references, 'The entity object and the cloned entity object reference different field item list objects if the entity is cloned after an entity translation has been initialized.');
}
} }