Skip to content

Issue #200: Alternative implementation to simplify relative date and … #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ericgsmith wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue #200: Alternative implementation to simplify relative date and … #290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace Drupal\Driver\Fields\Drupal8;

use Drupal\Core\Datetime\DrupalDateTime;
use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
use Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface;

/**
Expand All @@ -17,19 +19,23 @@ public function expand($values) {
$storageTimezone = new \DateTimeZone(DateTimeItemInterface::STORAGE_TIMEZONE);
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 TZ offset.
$values[$key] = substr(gmdate('c', strtotime($relative)), 0, 19);
$value = trim(str_replace('relative:', '', $value));
}

if ($this->fieldInfo->getSetting('datetime_type') === DateTimeItem::DATETIME_TYPE_DATE) {
// A date only value should be in the format used for date storage but
// in the site timezone.
$date = new DrupalDateTime($value, $siteTimezone);
$format = DateTimeItemInterface::DATE_STORAGE_FORMAT;
}
else {
// A Drupal install has a default site timezone, but nonetheless
// uses UTC for internal storage. If no timezone is specified in a date
// field value by the step author, assume the default timezone of
// the Drupal install, and therefore transform it into UTC for storage.
$date = new \DateTime($value, $siteTimezone);
// A datetime value is assumed to be provided in the site timezone and
// must be transformed into the storage timezone.
$date = new DrupalDateTime($value, $siteTimezone);
$date->setTimezone($storageTimezone);
$values[$key] = $date->format('Y-m-d\TH:i:s');
$format = DateTimeItemInterface::DATETIME_STORAGE_FORMAT;
}
$values[$key] = $date->format($format);
}
return $values;
}
Expand Down