Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3095146 by Wim Leers, heddn: Drupal 7 date fields configured to not collect the hour/minute/second granularities can have a different "settings" structure than the migration assumes

merge-requests/2419/head
webchick 2019-12-20 17:22:06 -08:00
parent 802719a568
commit 347624ad75
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/modules/datetime/src/Plugin/migrate/field/DateField.php
View File

@ -53,11 +53,10 @@ class DateField extends FieldPluginBase {
$field_data = unserialize($data['field_definition']['data']);
if (isset($field_data['settings']['granularity'])) {
$granularity = $field_data['settings']['granularity'];
if ($granularity = $field_data['settings']['granularity'] &&
$granularity['hour'] === 0 &&
$granularity['minute'] === 0 &&
$granularity['second'] === 0) {
$collected_date_attributes = is_numeric(array_keys($granularity)[0])
? $granularity
: array_keys(array_filter($granularity));
if (empty(array_intersect($collected_date_attributes, ['hour', 'minute', 'second']))) {
$to_format = DateTimeItemInterface::DATE_STORAGE_FORMAT;
}
}

17
core/modules/datetime/tests/src/Unit/Plugin/migrate/field/DateFieldTest.php
View File

@ -70,6 +70,23 @@ class DateFieldTest extends UnitTestCase {
'Y-m-d H:i:s',
'Y-m-d',
],
[
[
'type' => 'date',
'field_definition' => [
'data' => serialize([
'settings' => [
'granularity' => [
0 => 'year',
1 => 'month',
],
],
]),
],
],
'Y-m-d\TH:i:s',
'Y-m-d',
],
];
}

7
core/modules/field/src/Plugin/migrate/process/d7/FieldSettings.php
View File

@ -29,9 +29,10 @@ class FieldSettings extends ProcessPluginBase {
case 'date':
case 'datetime':
case 'datestamp':
if ($value['granularity']['hour'] === 0
&& $value['granularity']['minute'] === 0
&& $value['granularity']['second'] === 0) {
$collected_date_attributes = is_numeric(array_keys($value['granularity'])[0])
? $value['granularity']
: array_keys(array_filter($value['granularity']));
if (empty(array_intersect($collected_date_attributes, ['hour', 'minute', 'second']))) {
$value['datetime_type'] = 'date';
}
break;