Mercurial > hg > isophonics-drupal-site
diff core/lib/Drupal/Core/Field/BaseFieldDefinition.php @ 16:c2387f117808
Routine composer update
author | Chris Cannam |
---|---|
date | Tue, 10 Jul 2018 15:07:59 +0100 |
parents | 1fec387a4317 |
children | 129ea1e6d783 |
line wrap: on
line diff
--- a/core/lib/Drupal/Core/Field/BaseFieldDefinition.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/lib/Drupal/Core/Field/BaseFieldDefinition.php Tue Jul 10 15:07:59 2018 +0100 @@ -232,7 +232,9 @@ * {@inheritdoc} */ public function isRevisionable() { - return !empty($this->definition['revisionable']); + // Multi-valued base fields are always considered revisionable, just like + // configurable fields. + return !empty($this->definition['revisionable']) || $this->isMultiple(); } /** @@ -263,6 +265,10 @@ * Possible values are positive integers or * FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED. * + * Note that if the entity type that this base field is attached to is + * revisionable and the field has a cardinality higher than 1, the field is + * considered revisionable by default. + * * @param int $cardinality * The field cardinality. * @@ -582,12 +588,24 @@ * * @param string $field_name * The name of the field that will be used for getting initial values. + * @param mixed $default_value + * (optional) The default value for the field, in case the inherited value + * is NULL. This can be either: + * - a literal, in which case it will be assigned to the first property of + * the first item; + * - a numerically indexed array of items, each item being a property/value + * array; + * - a non-numerically indexed array, in which case the array is assumed to + * be a property/value array and used as the first item; + * - an empty array for no initial value. + * If the field being added is required or an entity key, it is recommended + * to provide a default value. * * @return $this */ - public function setInitialValueFromField($field_name) { + public function setInitialValueFromField($field_name, $default_value = NULL) { $this->definition['initial_value_from_field'] = $field_name; - + $this->setInitialValue($default_value); return $this; }