diff --git a/core/modules/link/config/schema/link.schema.yml b/core/modules/link/config/schema/link.schema.yml index 676016a20c3..d489174402c 100644 --- a/core/modules/link/config/schema/link.schema.yml +++ b/core/modules/link/config/schema/link.schema.yml @@ -60,7 +60,7 @@ field.field_settings.link: type: integer label: 'Allowed link type' -field.link.value: +field.value.link: type: mapping label: 'Default value' mapping: diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php index 320dae207f3..6cf36a4f1b2 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php @@ -42,7 +42,8 @@ class FieldInstanceDefaults extends ProcessPluginBase { case 'date_select': if (!empty($widget_settings['default_value'])) { - $default['value'] = $widget_settings['default_value']; + $default['default_date_type'] = 'relative'; + $default['default_date'] = $widget_settings['default_value']; } break; diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php index e98d4e44dcd..df97d24d474 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php @@ -19,6 +19,15 @@ use Drupal\link\LinkItemInterface; */ class MigrateFieldInstanceTest extends MigrateDrupalTestBase { + /** + * Set to TRUE to strict check all configuration saved. + * + * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker + * + * @var bool + */ + protected $strictConfigSchema = TRUE; + /** * Modules to enable. * @@ -144,7 +153,6 @@ class MigrateFieldInstanceTest extends MigrateDrupalTestBase { $this->assertEqual($field->getSettings(), $expected); $this->assertEqual('default link title', $entity->field_test_link->title, 'Field field_test_link default title is correct.'); $this->assertEqual('http://drupal.org', $entity->field_test_link->url, 'Field field_test_link default title is correct.'); - } /**