Skip to content
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

IBX-300: Added timezone offset to timestamp #181

Merged
merged 9 commits into from
May 12, 2021
Merged

IBX-300: Added timezone offset to timestamp #181

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9869b9a
IBX-300: Added timezone offset to timestamp
mateuszdebinski May 6, 2021
3eb857f
changed provideInputForToHash for DateTest
mateuszdebinski May 6, 2021
e1b87b4
changed after CR, set timestamp using function not via constructor Da…
mateuszdebinski May 10, 2021
efe960a
Removed unused add getOffset
mateuszdebinski May 10, 2021
e2d7621
changed test to cover using setTimestamp function
mateuszdebinski May 10, 2021
fc824fe
corrected tests
mateuszdebinski May 10, 2021
f46bec6
corrected integration tests
mateuszdebinski May 10, 2021
d4b62d4
corrected integration tests to using date with timezone instead times…
mateuszdebinski May 10, 2021
53558e6
removed setTime
mateuszdebinski May 10, 2021
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
31 changes: 19 additions & 12 deletions eZ/Publish/API/Repository/Tests/FieldType/DateIntegrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ public function getInvalidValidatorConfiguration()
*/
public function getValidCreationFieldData()
{
// We may only create times from timestamps here, since storing will
// loose information about the timezone.
return DateValue::fromTimestamp(86400);
$dateTime = $this->getValueOneDate();

return DateValue::fromTimestamp($dateTime->getTimestamp());
}

/**
Expand Down Expand Up @@ -147,8 +147,7 @@ public function assertFieldDataLoadedCorrect(Field $field)
$field->value
);

$dateTime = new DateTime();
$dateTime->setTimestamp(86400)->setTime(0, 0, 0);
$dateTime = $this->getValueOneDate();

$expectedData = [
'date' => $dateTime,
Expand Down Expand Up @@ -198,7 +197,9 @@ public function provideInvalidCreationFieldData()
*/
public function getValidUpdateFieldData()
{
return DateValue::fromTimestamp(86400);
$dateTime = $this->getValueOneDate();

return DateValue::fromTimestamp($dateTime->getTimestamp());
}

/**
Expand All @@ -216,8 +217,7 @@ public function assertUpdatedFieldDataLoadedCorrect(Field $field)
$field->value
);

$dateTime = new DateTime();
$dateTime->setTimestamp(86400)->setTime(0, 0, 0);
$dateTime = $this->getValueOneDate();

$expectedData = [
'date' => $dateTime,
Expand Down Expand Up @@ -367,16 +367,15 @@ public function providerForTestIsNotEmptyValue()

protected function getValidSearchValueOne()
{
$dateTime = new DateTime();
$dateTime->setTimestamp(86400)->setTime(0, 0, 0);
$dateTime = $this->getValueOneDate();

return $dateTime->getTimestamp();
}

protected function getValidSearchValueTwo()
{
$dateTime = new DateTime();
$dateTime->setTimestamp(172800)->setTime(0, 0, 0);
$dateTime = new DateTime('1970-01-03');
$dateTime->setTime(0, 0, 0);

return $dateTime->getTimestamp();
}
Expand All @@ -400,4 +399,12 @@ protected function getSearchTargetValueTwo()

return '1970-01-03T00:00:00Z';
}

protected function getValueOneDate(): DateTime
{
$dateTime = new DateTime('1970-01-02');
mateuszdebinski marked this conversation as resolved.
Show resolved Hide resolved
$dateTime->setTime(0, 0, 0);

return $dateTime;
}
}