From 64f54ab48012f9f6f425640204ac5465aeea091e Mon Sep 17 00:00:00 2001 From: Matthew Grasmick Date: Tue, 19 Sep 2017 14:29:07 -0400 Subject: [PATCH 1/3] Allowing relative date format. --- src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php b/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php index 435e42f2..b390833e 100644 --- a/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php +++ b/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php @@ -2,6 +2,9 @@ namespace Drupal\Driver\Fields\Drupal8; +use function strpos; +use function substr; + /** * Datetime field handler for Drupal 8. */ @@ -12,7 +15,14 @@ class DatetimeHandler extends AbstractHandler { */ public function expand($values) { foreach ($values as $key => $value) { - $values[$key] = str_replace(' ', 'T', $value); + if (strpos($value, "relative:") !== FALSE) { + $relative = trim(str_replace('relative:', '', $value)); + // Get time, convert to ISO 8601 date in GMT/UTC, remove time zone offset. + $values[$key] = substr(gmdate('c', strtotime($relative)), 0, 19); + } + else { + $values[$key] = str_replace(' ', 'T', $value); + } } return $values; } From 572fdd46a396dcbdb91469995cf404a23a021892 Mon Sep 17 00:00:00 2001 From: Matthew Grasmick Date: Tue, 12 Dec 2017 10:47:34 -0500 Subject: [PATCH 2/3] Update DatetimeHandler.php --- src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php b/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php index b390833e..78e8ac73 100644 --- a/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php +++ b/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php @@ -2,9 +2,6 @@ namespace Drupal\Driver\Fields\Drupal8; -use function strpos; -use function substr; - /** * Datetime field handler for Drupal 8. */ From 97e6e79abba2111cbb65813cb15497cb554715ab Mon Sep 17 00:00:00 2001 From: Matthew Grasmick Date: Tue, 12 Dec 2017 14:44:51 -0500 Subject: [PATCH 3/3] Update DatetimeHandler.php --- src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php b/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php index 78e8ac73..006db8fc 100644 --- a/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php +++ b/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php @@ -14,7 +14,7 @@ public function expand($values) { foreach ($values as $key => $value) { if (strpos($value, "relative:") !== FALSE) { $relative = trim(str_replace('relative:', '', $value)); - // Get time, convert to ISO 8601 date in GMT/UTC, remove time zone offset. + // Get time, convert to ISO 8601 date in GMT/UTC, remove TZ offset. $values[$key] = substr(gmdate('c', strtotime($relative)), 0, 19); } else {