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

Remove depreciate timestamps in DataAndTimeConverter and DateConverter #509

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove depreciate timestamps in DataAndTimeConverter and DateConverter #509

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bbfde8
Remove depreciate timestamps in DataAndTimeConverter and DateConverter
Mar 11, 2025
feb3530
Remove depreciate timestamps in DataAndTimeConverter and DateConverter
Mar 11, 2025
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
Next Next commit
Loading
Loading status checks…
Remove depreciate timestamps in DataAndTimeConverter and DateConverter
MateuszKolankowski committed Mar 11, 2025
commit 9bbfde8369f8c92cbc6bf5679583c53d9ef4681f
2 changes: 0 additions & 2 deletions src/lib/Persistence/Legacy/Content/FieldValue/Converter/DateAndTimeConverter.php
View file
Original file line number Diff line number Diff line change
@@ -100,7 +100,6 @@ public function toFieldDefinition(StorageFieldDefinition $storageDef, FieldDefin
case DateAndTimeType::DEFAULT_CURRENT_DATE:
$data = [
'rfc850' => null,
'timestamp' => time(), // @deprecated timestamp is no longer used and will be removed in a future version.
'timestring' => 'now',
];
break;
@@ -113,7 +112,6 @@ public function toFieldDefinition(StorageFieldDefinition $storageDef, FieldDefin
$date->add($dateInterval);
$data = [
'rfc850' => null,
'timestamp' => $date->getTimestamp(), // @deprecated timestamp is no longer used and will be removed in a future version.
'timestring' => $dateInterval->format('%y years, %m months, %d days, %h hours, %i minutes, %s seconds'),
];
break;
1 change: 0 additions & 1 deletion src/lib/Persistence/Legacy/Content/FieldValue/Converter/DateConverter.php
View file
Original file line number Diff line number Diff line change
@@ -80,7 +80,6 @@ public function toFieldDefinition(StorageFieldDefinition $storageDef, FieldDefin
switch ($fieldDef->fieldTypeConstraints->fieldSettings['defaultType']) {
case DateType::DEFAULT_CURRENT_DATE:
$data = [
'timestamp' => time(), // @deprecated timestamp is no longer used and will be removed in a future version.
'rfc850' => null,
'timestring' => 'now',
];
11 changes: 3 additions & 8 deletions tests/lib/Persistence/Legacy/Content/FieldValue/Converter/DateAndTimeTest.php
View file
Original file line number Diff line number Diff line change
@@ -246,9 +246,8 @@ public function testToFieldDefinitionCurrentDate()
$dateTimeFromString = new DateTime($fieldDef->defaultValue->data['timestring']);

self::assertIsArray($fieldDef->defaultValue->data);
self::assertCount(3, $fieldDef->defaultValue->data);
self::assertCount(2, $fieldDef->defaultValue->data);
self::assertNull($fieldDef->defaultValue->data['rfc850']);
self::assertGreaterThanOrEqual($time, $fieldDef->defaultValue->data['timestamp']);
self::assertEqualsWithDelta($time + 1, $dateTimeFromString->getTimestamp(), 1, 'Time does not match within 1s delta');
}

@@ -276,12 +275,10 @@ public function testToFieldDefinitionWithAdjustmentAndSeconds()
$dateTimeFromString = new DateTime($fieldDef->defaultValue->data['timestring']);

self::assertIsArray($fieldDef->defaultValue->data);
self::assertCount(3, $fieldDef->defaultValue->data);
self::assertCount(2, $fieldDef->defaultValue->data);
self::assertNull($fieldDef->defaultValue->data['rfc850']);
self::assertGreaterThanOrEqual($timestamp, $fieldDef->defaultValue->data['timestamp']);
self::assertGreaterThanOrEqual($timestamp, $dateTimeFromString->getTimestamp());
// Giving a margin of 1 second for test execution
self::assertLessThanOrEqual($timestamp + 1, $fieldDef->defaultValue->data['timestamp']);
self::assertLessThanOrEqual($timestamp + 1, $dateTimeFromString->getTimestamp());
}

@@ -311,12 +308,10 @@ public function testToFieldDefinitionWithAdjustmentNoSeconds()
$dateTimeFromString = new DateTime($fieldDef->defaultValue->data['timestring']);

self::assertIsArray($fieldDef->defaultValue->data);
self::assertCount(3, $fieldDef->defaultValue->data);
self::assertCount(2, $fieldDef->defaultValue->data);
self::assertNull($fieldDef->defaultValue->data['rfc850']);
self::assertGreaterThanOrEqual($timestamp, $fieldDef->defaultValue->data['timestamp']);
self::assertGreaterThanOrEqual($timestamp, $dateTimeFromString->getTimestamp());
// Giving a margin of 1 second for test execution
self::assertLessThanOrEqual($timestamp + 1, $fieldDef->defaultValue->data['timestamp']);
self::assertLessThanOrEqual($timestamp + 1, $dateTimeFromString->getTimestamp());
}

4 changes: 1 addition & 3 deletions tests/lib/Persistence/Legacy/Content/FieldValue/Converter/DateTest.php
View file
Original file line number Diff line number Diff line change
@@ -71,7 +71,6 @@ public function testToFieldValue()
],
$fieldValue->data
);
self::assertSame($storageFieldValue->dataInt, $fieldValue->data['timestamp']);
self::assertSame($storageFieldValue->sortKeyInt, $fieldValue->sortKey);
}

@@ -144,9 +143,8 @@ public function testToFieldDefinitionDefaultCurrentDate()

$this->converter->toFieldDefinition($storageDef, $fieldDef);
self::assertIsArray($fieldDef->defaultValue->data);
self::assertCount(3, $fieldDef->defaultValue->data);
self::assertCount(2, $fieldDef->defaultValue->data);
self::assertNull($fieldDef->defaultValue->data['rfc850']);
self::assertSame($timestamp, $fieldDef->defaultValue->data['timestamp']);
self::assertSame('now', $fieldDef->defaultValue->data['timestring']);
}
}
Loading