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

Issue #2405165 by yched, alexpott, xjm: Entity::setOriginalId() does enforceIsNew(FALSE), that is wrong for ConfigEntities

8.0.x
xjm 2015-04-27 17:05:36 -05:00
parent b838fd5f09
commit 1f9eabbd92
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
View File

@ -130,9 +130,13 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
* {@inheritdoc} * {@inheritdoc}
*/ */
public function setOriginalId($id) { public function setOriginalId($id) {
// Do not call the parent method since that would mark this entity as no
// longer new. Unlike content entities, new configuration entities have an
// ID.
// @todo https://www.drupal.org/node/2478811 Document the entity life cycle
// and the differences between config and content.
$this->originalId = $id; $this->originalId = $id;
return $this;
return parent::setOriginalId($id);
} }
/** /**

2
core/lib/Drupal/Core/Entity/EntityDisplayBase.php
View File

@ -472,7 +472,6 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
* {@inheritdoc} * {@inheritdoc}
*/ */
public function __wakeup() { public function __wakeup() {
$is_new = $this->isNew();
// Determine what were the properties from toArray() that were saved in // Determine what were the properties from toArray() that were saved in
// __sleep(). // __sleep().
$keys = $this->_serializedKeys; $keys = $this->_serializedKeys;
@ -481,7 +480,6 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
// Run those values through the __construct(), as if they came from a // Run those values through the __construct(), as if they came from a
// regular entity load. // regular entity load.
$this->__construct($values, $this->entityTypeId); $this->__construct($values, $this->entityTypeId);
$this->enforceIsNew($is_new);
} }
} }

11
core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
View File

@ -7,9 +7,7 @@
namespace Drupal\Tests\Core\Config\Entity; namespace Drupal\Tests\Core\Config\Entity;
use Drupal\Component\Plugin\ConfigurablePluginInterface;
use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Component\Plugin\PluginBase;
use Drupal\Core\Language\Language; use Drupal\Core\Language\Language;
use Drupal\Tests\Core\Plugin\Fixtures\TestConfigurablePlugin; use Drupal\Tests\Core\Plugin\Fixtures\TestConfigurablePlugin;
use Drupal\Tests\UnitTestCase; use Drupal\Tests\UnitTestCase;
@ -317,6 +315,15 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
$this->assertSame($this->id, $this->entity->getOriginalId()); $this->assertSame($this->id, $this->entity->getOriginalId());
$this->assertSame($this->entity, $this->entity->setOriginalId($new_id)); $this->assertSame($this->entity, $this->entity->setOriginalId($new_id));
$this->assertSame($new_id, $this->entity->getOriginalId()); $this->assertSame($new_id, $this->entity->getOriginalId());
// Check that setOriginalId() does not change the entity "isNew" status.
$this->assertFalse($this->entity->isNew());
$this->entity->setOriginalId($this->randomMachineName());
$this->assertFalse($this->entity->isNew());
$this->entity->enforceIsNew();
$this->assertTrue($this->entity->isNew());
$this->entity->setOriginalId($this->randomMachineName());
$this->assertTrue($this->entity->isNew());
} }
/** /**