comparison core/lib/Drupal/Core/Field/FieldConfigBase.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10

 
 /**
  * Base class for configurable field definitions.
  */
 abstract class FieldConfigBase extends ConfigEntityBase implements FieldConfigInterface {
+
+  use FieldInputValueNormalizerTrait;
 
   /**
    * The field ID.
    *
    * The ID consists of 3 parts: the entity type, bundle and the field name.

       $changed = TRUE;
     }
     return $changed;
   }
 
-
   /**
    * {@inheritdoc}
    */
   public function postCreate(EntityStorageInterface $storage) {
     parent::postCreate($storage);

    */
   public function getDefaultValue(FieldableEntityInterface $entity) {
     // Allow custom default values function.
     if ($callback = $this->getDefaultValueCallback()) {
       $value = call_user_func($callback, $entity, $this);
+      $value = $this->normalizeValue($value, $this->getFieldStorageDefinition()->getMainPropertyName());
     }
     else {
       $value = $this->getDefaultValueLiteral();
     }
     // Allow the field type to process default values.

 
   /**
    * {@inheritdoc}
    */
   public function setDefaultValue($value) {
-    if (!is_array($value)) {
-      if ($value === NULL) {
-        $value = [];
-      }
-      $key = $this->getFieldStorageDefinition()->getPropertyNames()[0];
-      // Convert to the multi value format to support fields with a cardinality
-      // greater than 1.
-      $value = [
-        [$key => $value],
-      ];
-    }
-    $this->default_value = $value;
+    $this->default_value = $this->normalizeValue($value, $this->getFieldStorageDefinition()->getMainPropertyName());
     return $this;
   }
 
   /**
    * {@inheritdoc}