Commit eebf624a authored by alexpott's avatar alexpott

Issue #2030633 by hussainweb, Mile23, carsonevans, czigor, Berdir,...

Issue #2030633 by hussainweb, Mile23, carsonevans, czigor, Berdir, fernando_calsa, Geijutsuka, amitgoyal, Jānis Bebrītis, undertext: Expand FieldStorageConfig with methods
parent 6eb18e4f
...@@ -50,7 +50,7 @@ function setUp() { ...@@ -50,7 +50,7 @@ function setUp() {
// Make the body field translatable. The info is already translatable by // Make the body field translatable. The info is already translatable by
// definition. // definition.
$field_storage = FieldStorageConfig::loadByName('block_content', 'body'); $field_storage = FieldStorageConfig::loadByName('block_content', 'body');
$field_storage->translatable = TRUE; $field_storage->setTranslatable(TRUE);
$field_storage->save(); $field_storage->save();
// Set up block_content infos. // Set up block_content infos.
......
...@@ -97,7 +97,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { ...@@ -97,7 +97,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$caption = ''; $caption = '';
foreach (array_keys($this->commentManager->getFields($entity_type)) as $field_name) { foreach (array_keys($this->commentManager->getFields($entity_type)) as $field_name) {
/** @var \Drupal\field\FieldStorageConfigInterface $field_storage */ /** @var \Drupal\field\FieldStorageConfigInterface $field_storage */
if (($field_storage = FieldStorageConfig::loadByName($entity_type, $field_name)) && $field_storage->getSetting('comment_type') == $this->entity->id() && !$field_storage->deleted) { if (($field_storage = FieldStorageConfig::loadByName($entity_type, $field_name)) && $field_storage->getSetting('comment_type') == $this->entity->id() && !$field_storage->isDeleted()) {
$caption .= '<p>' . $this->t('%label is used by the %field field on your site. You can not remove this comment type until you have removed the field.', array( $caption .= '<p>' . $this->t('%label is used by the %field field on your site. You can not remove this comment type until you have removed the field.', array(
'%label' => $this->entity->label(), '%label' => $this->entity->label(),
'%field' => $field_storage->label(), '%field' => $field_storage->label(),
......
...@@ -73,7 +73,7 @@ protected function setUp() { ...@@ -73,7 +73,7 @@ protected function setUp() {
// Make comment body translatable. // Make comment body translatable.
$field_storage = FieldStorageConfig::loadByName('comment', 'comment_body'); $field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
$field_storage->translatable = TRUE; $field_storage->setTranslatable(TRUE);
$field_storage->save(); $field_storage->save();
$this->assertTrue($field_storage->isTranslatable(), 'Comment body is translatable.'); $this->assertTrue($field_storage->isTranslatable(), 'Comment body is translatable.');
} }
......
...@@ -143,7 +143,7 @@ public function testExportImport() { ...@@ -143,7 +143,7 @@ public function testExportImport() {
} }
$field_storages = FieldStorageConfig::loadMultiple(); $field_storages = FieldStorageConfig::loadMultiple();
foreach ($field_storages as $field_storage) { foreach ($field_storages as $field_storage) {
if ($field_storage->field_name == $this->fieldName) { if ($field_storage->getName() == $this->fieldName) {
$field_storage->delete(); $field_storage->delete();
} }
} }
......
...@@ -95,7 +95,7 @@ protected function setUp() { ...@@ -95,7 +95,7 @@ protected function setUp() {
* Tests date field functionality. * Tests date field functionality.
*/ */
function testDateField() { function testDateField() {
$field_name = $this->fieldStorage->field_name; $field_name = $this->fieldStorage->getName();
// Display creation form. // Display creation form.
$this->drupalGet('entity_test/add'); $this->drupalGet('entity_test/add');
...@@ -163,7 +163,7 @@ function testDateField() { ...@@ -163,7 +163,7 @@ function testDateField() {
function testDatetimeField() { function testDatetimeField() {
$field_name = $this->fieldStorage->getName(); $field_name = $this->fieldStorage->getName();
// Change the field to a datetime field. // Change the field to a datetime field.
$this->fieldStorage->settings['datetime_type'] = 'datetime'; $this->fieldStorage->setSetting('datetime_type', 'datetime');
$this->fieldStorage->save(); $this->fieldStorage->save();
// Display creation form. // Display creation form.
...@@ -229,7 +229,7 @@ function testDatetimeField() { ...@@ -229,7 +229,7 @@ function testDatetimeField() {
function testDatelistWidget() { function testDatelistWidget() {
$field_name = $this->fieldStorage->getName(); $field_name = $this->fieldStorage->getName();
// Change the field to a datetime field. // Change the field to a datetime field.
$this->fieldStorage->settings['datetime_type'] = 'datetime'; $this->fieldStorage->setSetting('datetime_type', 'datetime');
$this->fieldStorage->save(); $this->fieldStorage->save();
// Change the widget to a datelist widget. // Change the widget to a datelist widget.
...@@ -393,7 +393,7 @@ function testDefaultValue() { ...@@ -393,7 +393,7 @@ function testDefaultValue() {
function testInvalidField() { function testInvalidField() {
// Change the field to a datetime field. // Change the field to a datetime field.
$this->fieldStorage->settings['datetime_type'] = 'datetime'; $this->fieldStorage->setSetting('datetime_type', 'datetime');
$this->fieldStorage->save(); $this->fieldStorage->save();
$field_name = $this->fieldStorage->getName(); $field_name = $this->fieldStorage->getName();
......
...@@ -145,7 +145,7 @@ public function testEditorSelection() { ...@@ -145,7 +145,7 @@ public function testEditorSelection() {
$this->assertEqual('editor', $this->getSelectedEditor($entity->id(), $this->fieldName), "With cardinality 1, and the full_html text format, the 'editor' editor is selected."); $this->assertEqual('editor', $this->getSelectedEditor($entity->id(), $this->fieldName), "With cardinality 1, and the full_html text format, the 'editor' editor is selected.");
// Editor selection with text processing, cardinality >1 // Editor selection with text processing, cardinality >1
$this->fields->field_textarea_field_storage->cardinality = 2; $this->fields->field_textarea_field_storage->setCardinality(2);
$this->fields->field_textarea_field_storage->save(); $this->fields->field_textarea_field_storage->save();
$this->assertEqual('form', $this->getSelectedEditor($entity->id(), $this->fieldName), "With cardinality >1, and both items using the full_html text format, the 'form' editor is selected."); $this->assertEqual('form', $this->getSelectedEditor($entity->id(), $this->fieldName), "With cardinality >1, and both items using the full_html text format, the 'form' editor is selected.");
} }
......
...@@ -69,7 +69,7 @@ function entity_reference_field_widget_info_alter(&$info) { ...@@ -69,7 +69,7 @@ function entity_reference_field_widget_info_alter(&$info) {
* Reset the instance handler settings, when the target type is changed. * Reset the instance handler settings, when the target type is changed.
*/ */
function entity_reference_field_storage_config_update(FieldStorageConfigInterface $field_storage) { function entity_reference_field_storage_config_update(FieldStorageConfigInterface $field_storage) {
if ($field_storage->type != 'entity_reference') { if ($field_storage->getType() != 'entity_reference') {
// Only act on entity reference fields. // Only act on entity reference fields.
return; return;
} }
......
...@@ -81,7 +81,7 @@ function hook_field_storage_config_update_forbid(\Drupal\field\FieldStorageConfi ...@@ -81,7 +81,7 @@ function hook_field_storage_config_update_forbid(\Drupal\field\FieldStorageConfi
$allowed_values = $field_storage->getSetting('allowed_values'); $allowed_values = $field_storage->getSetting('allowed_values');
$prior_allowed_values = $prior_field_storage->getSetting('allowed_values'); $prior_allowed_values = $prior_field_storage->getSetting('allowed_values');
$lost_keys = array_keys(array_diff_key($prior_allowed_values,$allowed_values)); $lost_keys = array_keys(array_diff_key($prior_allowed_values,$allowed_values));
if (_options_values_in_use($field_storage->entity_type, $field_storage->getName(), $lost_keys)) { if (_options_values_in_use($field_storage->getTargetEntityTypeId(), $field_storage->getName(), $lost_keys)) {
throw new \Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException(t('A list field (@field_name) with existing data cannot have its keys changed.', array('@field_name' => $field_storage->getName()))); throw new \Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException(t('A list field (@field_name) with existing data cannot have its keys changed.', array('@field_name' => $field_storage->getName())));
} }
} }
......
...@@ -153,7 +153,7 @@ function field_system_info_alter(&$info, Extension $file, $type) { ...@@ -153,7 +153,7 @@ function field_system_info_alter(&$info, Extension $file, $type) {
// remains no actual, non-deleted fields) // remains no actual, non-deleted fields)
$non_deleted = FALSE; $non_deleted = FALSE;
foreach ($field_storages as $field_storage) { foreach ($field_storages as $field_storage) {
if (empty($field_storage->deleted)) { if (!$field_storage->isDeleted()) {
$non_deleted = TRUE; $non_deleted = TRUE;
break; break;
} }
......
...@@ -84,7 +84,7 @@ function field_purge_batch($batch_size, $field_storage_uuid = NULL) { ...@@ -84,7 +84,7 @@ function field_purge_batch($batch_size, $field_storage_uuid = NULL) {
$info = \Drupal::entityManager()->getDefinitions(); $info = \Drupal::entityManager()->getDefinitions();
foreach ($fields as $field) { foreach ($fields as $field) {
$entity_type = $field->entity_type; $entity_type = $field->getTargetEntityTypeId();
// We cannot purge anything if the entity type is unknown (e.g. the // We cannot purge anything if the entity type is unknown (e.g. the
// providing module was uninstalled). // providing module was uninstalled).
...@@ -117,7 +117,7 @@ function field_purge_batch($batch_size, $field_storage_uuid = NULL) { ...@@ -117,7 +117,7 @@ function field_purge_batch($batch_size, $field_storage_uuid = NULL) {
// We cannot purge anything if the entity type is unknown (e.g. the // We cannot purge anything if the entity type is unknown (e.g. the
// providing module was uninstalled). // providing module was uninstalled).
// @todo Revisit after https://drupal.org/node/2080823. // @todo Revisit after https://drupal.org/node/2080823.
if (!isset($info[$field_storage->entity_type])) { if (!isset($info[$field_storage->getTargetEntityTypeId()])) {
continue; continue;
} }
...@@ -170,7 +170,7 @@ function field_purge_field_storage(FieldStorageConfigInterface $field_storage) { ...@@ -170,7 +170,7 @@ function field_purge_field_storage(FieldStorageConfigInterface $field_storage) {
$state->set('field.storage.deleted', $deleted_storages); $state->set('field.storage.deleted', $deleted_storages);
// Notify the storage layer. // Notify the storage layer.
\Drupal::entityManager()->getStorage($field_storage->entity_type)->finalizePurge($field_storage); \Drupal::entityManager()->getStorage($field_storage->getTargetEntityTypeId())->finalizePurge($field_storage);
// Invoke external hooks after the cache is cleared for API consistency. // Invoke external hooks after the cache is cleared for API consistency.
\Drupal::moduleHandler()->invokeAll('field_purge_field_storage', array($field_storage)); \Drupal::moduleHandler()->invokeAll('field_purge_field_storage', array($field_storage));
......
...@@ -40,7 +40,7 @@ public static function process(array &$context, ConfigImporter $config_importer) ...@@ -40,7 +40,7 @@ public static function process(array &$context, ConfigImporter $config_importer)
$context['sandbox']['field']['current_storage_id'] = $field_storage->id(); $context['sandbox']['field']['current_storage_id'] = $field_storage->id();
// If the storage has not been deleted yet we need to do that. This is the // If the storage has not been deleted yet we need to do that. This is the
// case when the storage deletion is staged. // case when the storage deletion is staged.
if (!$field_storage->deleted) { if (!$field_storage->isDeleted()) {
$field_storage->delete(); $field_storage->delete();
} }
} }
...@@ -138,9 +138,10 @@ public static function getFieldStoragesToPurge(array $extensions, array $deletes ...@@ -138,9 +138,10 @@ public static function getFieldStoragesToPurge(array $extensions, array $deletes
} }
// Gather deleted fields from modules that are being uninstalled. // Gather deleted fields from modules that are being uninstalled.
/** @var \Drupal\field\FieldStorageConfigInterface[] $field_storages */
$field_storages = entity_load_multiple_by_properties('field_storage_config', array('deleted' => TRUE, 'include_deleted' => TRUE)); $field_storages = entity_load_multiple_by_properties('field_storage_config', array('deleted' => TRUE, 'include_deleted' => TRUE));
foreach ($field_storages as $field_storage) { foreach ($field_storages as $field_storage) {
if (!in_array($field_storage->module, $providers)) { if (!in_array($field_storage->getTypeProvider(), $providers)) {
$storages_to_delete[$field_storage->id()] = $field_storage; $storages_to_delete[$field_storage->id()] = $field_storage;
} }
} }
......
...@@ -141,7 +141,7 @@ public function preSave(EntityStorageInterface $storage) { ...@@ -141,7 +141,7 @@ public function preSave(EntityStorageInterface $storage) {
// Filter out unknown settings and make sure all settings are present, so // Filter out unknown settings and make sure all settings are present, so
// that a complete field definition is passed to the various hooks and // that a complete field definition is passed to the various hooks and
// written to config. // written to config.
$default_settings = $field_type_manager->getDefaultFieldSettings($storage_definition->type); $default_settings = $field_type_manager->getDefaultFieldSettings($storage_definition->getType());
$this->settings = array_intersect_key($this->settings, $default_settings) + $default_settings; $this->settings = array_intersect_key($this->settings, $default_settings) + $default_settings;
if ($this->isNew()) { if ($this->isNew()) {
......
...@@ -51,7 +51,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI ...@@ -51,7 +51,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
* *
* @var string * @var string
*/ */
public $id; protected $id;
/** /**
* The field name. * The field name.
...@@ -64,14 +64,14 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI ...@@ -64,14 +64,14 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
* *
* @var string * @var string
*/ */
public $field_name; protected $field_name;
/** /**
* The name of the entity type the field can be attached to. * The name of the entity type the field can be attached to.
* *
* @var string * @var string
*/ */
public $entity_type; protected $entity_type;
/** /**
* The field type. * The field type.
...@@ -80,14 +80,14 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI ...@@ -80,14 +80,14 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
* *
* @var string * @var string
*/ */
public $type; protected $type;
/** /**
* The name of the module that provides the field type. * The name of the module that provides the field type.
* *
* @var string * @var string
*/ */
public $module; protected $module;
/** /**
* Field-type specific settings. * Field-type specific settings.
...@@ -97,7 +97,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI ...@@ -97,7 +97,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
* *
* @var array * @var array
*/ */
public $settings = array(); protected $settings = [];
/** /**
* The field cardinality. * The field cardinality.
...@@ -108,7 +108,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI ...@@ -108,7 +108,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
* *
* @var int * @var int
*/ */
public $cardinality = 1; protected $cardinality = 1;
/** /**
* Flag indicating whether the field is translatable. * Flag indicating whether the field is translatable.
...@@ -117,7 +117,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI ...@@ -117,7 +117,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
* *
* @var bool * @var bool
*/ */
public $translatable = TRUE; protected $translatable = TRUE;
/** /**
* Flag indicating whether the field is available for editing. * Flag indicating whether the field is available for editing.
...@@ -131,7 +131,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI ...@@ -131,7 +131,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
* *
* @var bool * @var bool
*/ */
public $locked = FALSE; protected $locked = FALSE;
/** /**
* Flag indicating whether the field storage should be deleted when orphaned. * Flag indicating whether the field storage should be deleted when orphaned.
...@@ -164,7 +164,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI ...@@ -164,7 +164,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
* *
* @var array * @var array
*/ */
public $indexes = array(); protected $indexes = [];
/** /**
* Flag indicating whether the field is deleted. * Flag indicating whether the field is deleted.
...@@ -179,7 +179,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI ...@@ -179,7 +179,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
* *
* @var bool * @var bool
*/ */
public $deleted = FALSE; protected $deleted = FALSE;
/** /**
* The field schema. * The field schema.
...@@ -238,7 +238,7 @@ public function __construct(array $values, $entity_type = 'field_storage_config' ...@@ -238,7 +238,7 @@ public function __construct(array $values, $entity_type = 'field_storage_config'
* {@inheritdoc} * {@inheritdoc}
*/ */
public function id() { public function id() {
return $this->entity_type . '.' . $this->field_name; return $this->getTargetEntityTypeId() . '.' . $this->getName();
} }
/** /**
...@@ -288,25 +288,25 @@ protected function preSaveNew(EntityStorageInterface $storage) { ...@@ -288,25 +288,25 @@ protected function preSaveNew(EntityStorageInterface $storage) {
// Field name cannot be longer than FieldStorageConfig::NAME_MAX_LENGTH characters. // Field name cannot be longer than FieldStorageConfig::NAME_MAX_LENGTH characters.
// We use Unicode::strlen() because the DB layer assumes that column widths // We use Unicode::strlen() because the DB layer assumes that column widths
// are given in characters rather than bytes. // are given in characters rather than bytes.
if (Unicode::strlen($this->field_name) > static::NAME_MAX_LENGTH) { if (Unicode::strlen($this->getName()) > static::NAME_MAX_LENGTH) {
throw new FieldException(String::format( throw new FieldException(String::format(
'Attempt to create a field storage with an name longer than @max characters: %name', array( 'Attempt to create a field storage with an name longer than @max characters: %name', array(
'@max' => static::NAME_MAX_LENGTH, '@max' => static::NAME_MAX_LENGTH,
'%name' => $this->field_name, '%name' => $this->getName(),
) )
)); ));
} }
// Disallow reserved field names. // Disallow reserved field names.
$disallowed_field_names = array_keys($entity_manager->getBaseFieldDefinitions($this->entity_type)); $disallowed_field_names = array_keys($entity_manager->getBaseFieldDefinitions($this->getTargetEntityTypeId()));
if (in_array($this->field_name, $disallowed_field_names)) { if (in_array($this->getName(), $disallowed_field_names)) {
throw new FieldException(String::format('Attempt to create field storage %name which is reserved by entity type %type.', array('%name' => $this->field_name, '%type' => $this->entity_type))); throw new FieldException(String::format('Attempt to create field storage %name which is reserved by entity type %type.', array('%name' => $this->getName(), '%type' => $this->getTargetEntityTypeId())));
} }
// Check that the field type is known. // Check that the field type is known.
$field_type = $field_type_manager->getDefinition($this->type, FALSE); $field_type = $field_type_manager->getDefinition($this->getType(), FALSE);
if (!$field_type) { if (!$field_type) {
throw new FieldException(String::format('Attempt to create a field storage of unknown type %type.', array('%type' => $this->type))); throw new FieldException(String::format('Attempt to create a field storage of unknown type %type.', array('%type' => $this->getType())));
} }
$this->module = $field_type['provider']; $this->module = $field_type['provider'];
...@@ -320,7 +320,7 @@ protected function preSaveNew(EntityStorageInterface $storage) { ...@@ -320,7 +320,7 @@ protected function preSaveNew(EntityStorageInterface $storage) {
public function calculateDependencies() { public function calculateDependencies() {
parent::calculateDependencies(); parent::calculateDependencies();
// Ensure the field is dependent on the providing module. // Ensure the field is dependent on the providing module.
$this->addDependency('module', $this->module); $this->addDependency('module', $this->getTypeProvider());
// Ensure the field is dependent on the provider of the entity type. // Ensure the field is dependent on the provider of the entity type.
$entity_type = \Drupal::entityManager()->getDefinition($this->entity_type); $entity_type = \Drupal::entityManager()->getDefinition($this->entity_type);
$this->addDependency('module', $entity_type->getProvider()); $this->addDependency('module', $entity_type->getProvider());
...@@ -338,10 +338,10 @@ protected function preSaveUpdated(EntityStorageInterface $storage) { ...@@ -338,10 +338,10 @@ protected function preSaveUpdated(EntityStorageInterface $storage) {
$entity_manager = \Drupal::entityManager(); $entity_manager = \Drupal::entityManager();
// Some updates are always disallowed. // Some updates are always disallowed.
if ($this->type != $this->original->type) { if ($this->getType() != $this->original->getType()) {
throw new FieldException("Cannot change the field type for an existing field storage."); throw new FieldException("Cannot change the field type for an existing field storage.");
} }
if ($this->entity_type != $this->original->entity_type) { if ($this->getTargetEntityTypeId() != $this->original->getTargetEntityTypeId()) {
throw new FieldException("Cannot change the entity type for an existing field storage."); throw new FieldException("Cannot change the entity type for an existing field storage.");
} }
...@@ -383,7 +383,9 @@ public static function preDelete(EntityStorageInterface $storage, array $field_s ...@@ -383,7 +383,9 @@ public static function preDelete(EntityStorageInterface $storage, array $field_s
foreach ($field_storages as $field_storage) { foreach ($field_storages as $field_storage) {
if (!$field_storage->deleted) { if (!$field_storage->deleted) {
foreach ($field_storage->getBundles() as $bundle) { foreach ($field_storage->getBundles() as $bundle) {
$field_ids[] = "{$field_storage->entity_type}.$bundle.{$field_storage->field_name}"; $entity_type = $field_storage->getTargetEntityTypeId();
$field_name = $field_storage->getName();
$field_ids[] = "{$entity_type}.$bundle.{$field_name}";
} }
} }
} }
...@@ -481,10 +483,10 @@ public function getColumns() { ...@@ -481,10 +483,10 @@ public function getColumns() {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getBundles() { public function getBundles() {
if (empty($this->deleted)) { if (!$this->isDeleted()) {
$map = \Drupal::entityManager()->getFieldMap(); $map = \Drupal::entityManager()->getFieldMap();
if (isset($map[$this->entity_type][$this->field_name]['bundles'])) { if (isset($map[$this->getTargetEntityTypeId()][$this->getName()]['bundles'])) {
return $map[$this->entity_type][$this->field_name]['bundles']; return $map[$this->getTargetEntityTypeId()][$this->getName()]['bundles'];
} }
} }
return array(); return array();
...@@ -497,6 +499,20 @@ public function getName() { ...@@ -497,6 +499,20 @@ public function getName() {
return $this->field_name; return $this->field_name;
} }
/**
* {@inheritdoc}
*/
public function isDeleted() {
return $this->deleted;
}
/**
* {@inheritdoc}
*/
public function getTypeProvider() {
return $this->module;
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
...@@ -514,7 +530,7 @@ public function getSettings() { ...@@ -514,7 +530,7 @@ public function getSettings() {
// within $this. // within $this.
$field_type_manager = \Drupal::service('plugin.manager.field.field_type'); $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
$settings = $field_type_manager->getDefaultStorageSettings($this->type); $settings = $field_type_manager->getDefaultStorageSettings($this->getType());
return $this->settings + $settings; return $this->settings + $settings;
} }
...@@ -537,6 +553,22 @@ public function getSetting($setting_name) { ...@@ -537,6 +553,22 @@ public function getSetting($setting_name) {
} }
} }
/**
* {@inheritdoc}
*/
public function setSetting($setting_name, $value) {
$this->settings[$setting_name] = $value;
return $this;
}
/**
* {@inheritdoc}
*/
public function setSettings(array $settings) {
$this->settings = $settings;
return $this;
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
...@@ -588,6 +620,14 @@ public function getCardinality() { ...@@ -588,6 +620,14 @@ public function getCardinality() {
return $this->cardinality; return $this->cardinality;
} }
/**
* {@inheritdoc}
*/
public function setCardinality($cardinality) {