diff --git a/core/modules/field/migration_templates/d7_field_instance.yml b/core/modules/field/migration_templates/d7_field_instance.yml index f3518c9..4261946 100644 --- a/core/modules/field/migration_templates/d7_field_instance.yml +++ b/core/modules/field/migration_templates/d7_field_instance.yml @@ -19,15 +19,15 @@ process: settings: plugin: d7_field_instance_settings source: - - instance_settings - - widget_settings + - settings + - widget - field_settings default_value_function: '' default_value: plugin: d7_field_instance_defaults source: - default_value - - widget_settings + - widget translatable: translatable destination: plugin: entity:field_config diff --git a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml index e2bbcf4..85a67cb 100644 --- a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml +++ b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml @@ -52,7 +52,7 @@ process: plugin: field_instance_widget_settings source: - 'widget/type' - - widget_settings + - 'widget/settings' 'options/third_party_settings': 'constants/third_party_settings' destination: plugin: component_entity_form_display diff --git a/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php b/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php index 2a46381..a6707bd 100644 --- a/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php +++ b/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php @@ -19,6 +19,11 @@ class FieldInstanceDefaults extends ProcessPluginBase { public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) { list($default_value, $widget_settings) = $value; $widget_type = $widget_settings['type']; + $default_value = $default_value ?: []; + if ($widget_type == 'email_textfield' && $default_value) { + $default_value[0]['value'] = $default_value[0]['email']; + unset($default_value[0]['email']); + } $default = []; diff --git a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php index d06336e..61f19b3 100644 --- a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php +++ b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php @@ -2,8 +2,8 @@ namespace Drupal\field\Plugin\migrate\source\d7; +use Drupal\field\Plugin\migrate\source\d7\Field; use Drupal\migrate\Row; -use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase; /** * Drupal 7 field instances source from database. @@ -13,77 +13,37 @@ * source_provider = "field" * ) */ -class FieldInstance extends DrupalSqlBase { +class FieldInstance extends Field { /** * {@inheritdoc} */ - public function query() { - $query = $this->select('field_config_instance', 'fci') - ->fields('fci') - ->condition('fci.deleted', 0) - ->condition('fc.active', 1) - ->condition('fc.deleted', 0) - ->condition('fc.storage_active', 1) - ->fields('fc', ['type']); - - $query->innerJoin('field_config', 'fc', 'fci.field_id = fc.id'); - $query->addField('fc', 'data', 'field_data'); - - // Optionally filter by entity type and bundle. - if (isset($this->configuration['entity_type'])) { - $query->condition('fci.entity_type', $this->configuration['entity_type']); - - if (isset($this->configuration['bundle'])) { - $query->condition('fci.bundle', $this->configuration['bundle']); + protected function initializeIterator() { + $rows = []; + + foreach ($this->prepareQuery()->execute() as $result) { + $instance_key = $result['instance_entity_type'] . ':' . $result['instance_bundle'] . ':' . $result['instance_field_name']; + + foreach (array_keys($this->getFieldInstanceFields()) as $instance_property) { + $rows[$instance_key][$instance_property] = $result['instance_' . $instance_property]; + } + + foreach (array_keys($this->getFieldFields()) as $field_property) { + $rows[$instance_key]['field_definition'][$field_property] = $result[$field_property]; } } - return $query; - } - - /** - * {@inheritdoc} - */ - public function fields() { - return [ - 'field_name' => $this->t('The machine name of field.'), - 'entity_type' => $this->t('The entity type.'), - 'bundle' => $this->t('The entity bundle.'), - 'default_value' => $this->t('Default value'), - 'instance_settings' => $this->t('Field instance settings.'), - 'widget_settings' => $this->t('Widget settings.'), - 'display_settings' => $this->t('Display settings.'), - 'field_settings' => $this->t('Field settings.'), - ]; + return new \ArrayIterator($rows); } /** * {@inheritdoc} */ public function prepareRow(Row $row) { - $data = unserialize($row->getSourceProperty('data')); - - $row->setSourceProperty('label', $data['label']); - $row->setSourceProperty('description', $data['description']); - $row->setSourceProperty('required', $data['required']); - - $default_value = !empty($data['default_value']) ? $data['default_value'] : []; - if ($data['widget']['type'] == 'email_textfield' && $default_value) { - $default_value[0]['value'] = $default_value[0]['email']; - unset($default_value[0]['email']); - } - $row->setSourceProperty('default_value', $default_value); - - // Settings. - $row->setSourceProperty('instance_settings', $data['settings']); - $row->setSourceProperty('widget_settings', $data['widget']); - $row->setSourceProperty('display_settings', $data['display']); - - // This is for parity with the d6_field_instance plugin. - $row->setSourceProperty('widget_type', $data['widget']['type']); + $field_definition = $row->getSourceProperty('field_definition'); + $row->setSourceProperty('type', $field_definition['type']); - $field_data = unserialize($row->getSourceProperty('field_data')); + $field_data = unserialize($field_definition['data']); $row->setSourceProperty('field_settings', $field_data['settings']); $translatable = FALSE; @@ -98,19 +58,33 @@ public function prepareRow(Row $row) { } } else { - // This is not a node entity. Get the translatable value from the source - // field_config table. - $data = unserialize($row->getSourceProperty('field_data')); - $translatable = $data['translatable']; + $translatable = $field_data['translatable']; } $row->setSourceProperty('translatable', $translatable); + // This is for backward compatibility and parity with the d6_field_instance + // plugin. + $data = unserialize($row->getSourceProperty('data')); + $row->setSourceProperty('instance_settings', $data['settings']); + $row->setSourceProperty('widget_settings', $data['widget']); + $row->setSourceProperty('display_settings', $data['display']); + $row->setSourceProperty('widget_type', $data['widget']['type']); + return parent::prepareRow($row); } /** * {@inheritdoc} */ + public function fields() { + $fields = $this->getFieldInstanceFields(); + $fields['field_definition'] = $this->t('Field definition'); + return $fields; + } + + /** + * {@inheritdoc} + */ public function getIds() { return [ 'entity_type' => [ diff --git a/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldInstanceTest.php b/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldInstanceTest.php index c9e93ef..3b243c0 100644 --- a/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldInstanceTest.php +++ b/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldInstanceTest.php @@ -65,7 +65,7 @@ public function providerSource() { 'entity_type' => 'node', 'bundle' => 'page', 'label' => 'Body', - 'widget_settings' => [ + 'widget' => [ 'module' => 'text', 'settings' => [ 'rows' => 20, @@ -74,7 +74,7 @@ public function providerSource() { 'type' => 'text_textarea_with_summary', 'weight' => -4, ], - 'display_settings' => [ + 'display' => [ 'default' => [ 'label' => 'hidden', 'type' => 'text_default', @@ -94,7 +94,16 @@ public function providerSource() { ], 'description' => '', 'required' => FALSE, - 'field_data' => 'a:6:{s:12:"entity_types";a:1:{i:0;s:4:"node";}s:12:"translatable";b:0;s:8:"settings";a:0:{}s:7:"storage";a:4:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";i:1;}s:12:"foreign keys";a:1:{s:6:"format";a:2:{s:5:"table";s:13:"filter_format";s:7:"columns";a:1:{s:6:"format";s:6:"format";}}}s:7:"indexes";a:1:{s:6:"format";a:1:{i:0;s:6:"format";}}}', + 'field_definition' => [ + 'field_name' => 'body', + 'type' => 'text_with_summary', + 'locked' => '0', + 'module' => 'text', + 'data' => 'a:6:{s:12:"entity_types";a:1:{i:0;s:4:"node";}s:12:"translatable";b:0;s:8:"settings";a:0:{}s:7:"storage";a:4:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";i:1;}s:12:"foreign keys";a:1:{s:6:"format";a:2:{s:5:"table";s:13:"filter_format";s:7:"columns";a:1:{s:6:"format";s:6:"format";}}}s:7:"indexes";a:1:{s:6:"format";a:1:{i:0;s:6:"format";}}}', + 'cardinality' => '1', + 'translatable' => '0', + 'entity_type' => 'node', + ], ], ]; diff --git a/core/modules/link/src/Plugin/migrate/field/d7/LinkField.php b/core/modules/link/src/Plugin/migrate/field/d7/LinkField.php index 4e78ee5..bb71418 100644 --- a/core/modules/link/src/Plugin/migrate/field/d7/LinkField.php +++ b/core/modules/link/src/Plugin/migrate/field/d7/LinkField.php @@ -34,7 +34,7 @@ public function getFieldWidgetMap() { public function processFieldInstance(MigrationInterface $migration) { $process = [ 'plugin' => 'static_map', - 'source' => 'instance_settings/title', + 'source' => 'settings/title', 'bypass' => TRUE, 'map' => [ 'disabled' => DRUPAL_DISABLED,