Commit 2d1113ba authored by Jibran Ijaz's avatar Jibran Ijaz
Browse files

Issue #2137309 by jibran: Typed data does not handle set() and onChange() consistently

parent 9b2f4652

src/Plugin/DataType/DynamicEntityReference.php

+1 −7
Original line number Diff line number Diff line
@@ -38,15 +38,10 @@ class DynamicEntityReference extends EntityReference { 
    if (!isset($this->target) && isset($this->id)) {

      // If we have a valid reference, return the entity object which is typed

      // data itself.

      $target_type = $this->getTargetDefinition()->getEntityTypeId() ?: $this->parent->getValue()['target_type'];

      $target_type = $this->parent->getValue()['target_type'];

      $entity = entity_load($target_type, $this->id);

      $this->target = isset($entity) ? $entity->getTypedData() : NULL;

    }

    // Keep the entity-type in sync.

    if ($this->target) {

      $this->getTargetDefinition()->setEntityTypeId($this->target->getValue()

        ->getEntityTypeId());

    }

    return $this->target;

  }
@@ -64,7 +59,6 @@ class DynamicEntityReference extends EntityReference { 
    }

    elseif ($value instanceof EntityInterface) {

      $this->target = $value->getTypedData();

      $this->getTargetDefinition()->setEntityTypeId($value->getEntityTypeId());

    }

    elseif (!is_scalar($value) || $this->getTargetDefinition()->getEntityTypeId() === NULL) {

      throw new \InvalidArgumentException('Value is not a valid entity.');

src/Plugin/Field/FieldType/DynamicEntityReferenceItem.php

+4 −7
Original line number Diff line number Diff line
@@ -214,11 +214,6 @@ class DynamicEntityReferenceItem extends ConfigurableEntityReferenceItem { 
    if (empty($values['target_type']) && !empty($values['target_id'])) {

      throw new \InvalidArgumentException('No entity type was provided, value is not a valid entity.');

    }

    // Make sure that the reference object has the correct target type

    // set, so it can load the entity when requested.

    if (!empty($values['target_type'])) {

      $this->properties['entity']->getDataDefinition()->getTargetDefinition()->setEntityTypeId($values['target_type']);

    }

    if (isset($values) && !is_array($values)) {

      // If either a scalar or an object was passed as the value for the item,

      // assign it to the 'entity' property since that works for both cases.
@@ -271,14 +266,16 @@ class DynamicEntityReferenceItem extends ConfigurableEntityReferenceItem { 
  public function preSave() {

    if ($this->hasNewEntity()) {

      $this->entity->save();

      $this->target_id = $this->entity->id();

      $this->target_type = $this->entity->getEntityTypeId();

    }

    // Handle the case where an unsaved entity was directly set using the public

    // 'entity' property and then saved before this entity. In this case

    // ::hasNewEntity() will return FALSE but $this->target_id will still be

    // empty.

    if ((empty($this->target_id) || empty($this->target_type)) && $this->entity) {

      $this->set('target_id', $this->entity->id(), FALSE);

      $this->set('target_type', $this->entity->getEntityTypeId(), FALSE);

      $this->target_id = $this->entity->id();

      $this->target_type = $this->entity->getEntityTypeId();

    }

  }