Remove depreciate timestamps in DataAndTimeConverter and DateConverter

phpstan-baseline.neon

@@ -61483,7 +61483,7 @@ parameters:
 			path: tests/lib/Persistence/Legacy/SharedGateway/GatewayFactoryTest.php
 
 		-
-			message: '#^PHPDoc tag @var with type Doctrine\\DBAL\\Platforms\\AbstractPlatform is not subtype of native type Doctrine\\DBAL\\Platforms\\MySqlPlatform\|Doctrine\\DBAL\\Platforms\\PostgreSqlPlatform\|Doctrine\\DBAL\\Platforms\\SqlitePlatform\.$#'
+			message: '#^PHPDoc tag @var with type Doctrine\\DBAL\\Platforms\\AbstractPlatform is not subtype of native type Doctrine\\DBAL\\Platforms\\MySQL80Platform\|Doctrine\\DBAL\\Platforms\\MySqlPlatform\|Doctrine\\DBAL\\Platforms\\PostgreSqlPlatform\|Doctrine\\DBAL\\Platforms\\SqlitePlatform\.$#'
 			identifier: varTag.nativeType
 			count: 1
 			path: tests/lib/Persistence/Legacy/SharedGateway/GatewayFactoryTest.php

src/lib/Persistence/Legacy/Content/FieldValue/Converter/DateAndTimeConverter.php

@@ -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;

src/lib/Persistence/Legacy/Content/FieldValue/Converter/DateConverter.php

@@ -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',
                 ];

tests/lib/Persistence/Legacy/Content/FieldValue/Converter/DateAndTimeTest.php

@@ -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());
     }
 

tests/lib/Persistence/Legacy/Content/FieldValue/Converter/DateTest.php

@@ -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']);
     }
 }