Simplify and improve consistency in methods that provide current dates

doctrine-extensions · Jun 19, 2023 · af50ac1 · af50ac1
1 parent 0db3937
commit af50ac1
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 24 deletions.
diff --git a/src/SoftDeleteable/Mapping/Event/Adapter/ODM.php b/src/SoftDeleteable/Mapping/Event/Adapter/ODM.php
@@ -26,15 +26,18 @@ final class ODM extends BaseAdapterODM implements SoftDeleteableAdapter
  */
  public function getDateValue($meta, $field)
  {
+ $datetime = new \DateTime();
  $mapping = $meta->getFieldMapping($field);
- if (isset($mapping['type']) && 'timestamp' === $mapping['type']) {
- return time();
+ $type = $mapping['type'] ?? null;
+
+ if ('timestamp' === $type) {
+ return (int) $datetime->format('U');
  }
- if (isset($mapping['type']) && in_array($mapping['type'], ['date_immutable', 'time_immutable', 'datetime_immutable', 'datetimetz_immutable'], true)) {
- return new \DateTimeImmutable();
+
+ if (in_array($type, ['date_immutable', 'time_immutable', 'datetime_immutable', 'datetimetz_immutable'], true)) {
+ return \DateTimeImmutable::createFromMutable($datetime);
  }
 
- return \DateTime::createFromFormat('U.u', number_format(microtime(true), 6, '.', ''))
- ->setTimeZone(new \DateTimeZone(date_default_timezone_get()));
+ return $datetime;
  }
 }
diff --git a/src/SoftDeleteable/Mapping/Event/Adapter/ORM.php b/src/SoftDeleteable/Mapping/Event/Adapter/ORM.php
@@ -44,15 +44,17 @@ public function getDateValue($meta, $field)
  */
  private function getRawDateValue(array $mapping)
  {
- if (isset($mapping['type']) && 'integer' === $mapping['type']) {
- return time();
+ $datetime = new \DateTime();
+ $type = $mapping['type'] ?? null;
+
+ if ('integer' === $type) {
+ return (int) $datetime->format('U');
  }
 
- if (isset($mapping['type']) && in_array($mapping['type'], ['date_immutable', 'time_immutable', 'datetime_immutable', 'datetimetz_immutable'], true)) {
- return new \DateTimeImmutable();
+ if (in_array($type, ['date_immutable', 'time_immutable', 'datetime_immutable', 'datetimetz_immutable'], true)) {
+ return \DateTimeImmutable::createFromMutable($datetime);
  }
 
- return \DateTime::createFromFormat('U.u', number_format(microtime(true), 6, '.', ''))
- ->setTimeZone(new \DateTimeZone(date_default_timezone_get()));
+ return $datetime;
  }
 }
diff --git a/src/Timestampable/Mapping/Event/Adapter/ODM.php b/src/Timestampable/Mapping/Event/Adapter/ODM.php
@@ -26,15 +26,18 @@ final class ODM extends BaseAdapterODM implements TimestampableAdapter
  */
  public function getDateValue($meta, $field)
  {
+ $datetime = new \DateTime();
  $mapping = $meta->getFieldMapping($field);
- if (isset($mapping['type']) && 'timestamp' === $mapping['type']) {
- return time();
+ $type = $mapping['type'] ?? null;
+
+ if ('timestamp' === $type) {
+ return (int) $datetime->format('U');
  }
- if (isset($mapping['type']) && in_array($mapping['type'], ['date_immutable', 'time_immutable', 'datetime_immutable', 'datetimetz_immutable'], true)) {
- return new \DateTimeImmutable();
+
+ if (in_array($type, ['date_immutable', 'time_immutable', 'datetime_immutable', 'datetimetz_immutable'], true)) {
+ return \DateTimeImmutable::createFromMutable($datetime);
  }
 
- return \DateTime::createFromFormat('U.u', number_format(microtime(true), 6, '.', ''))
- ->setTimeZone(new \DateTimeZone(date_default_timezone_get()));
+ return $datetime;
  }
 }
diff --git a/src/Timestampable/Mapping/Event/Adapter/ORM.php b/src/Timestampable/Mapping/Event/Adapter/ORM.php
@@ -44,15 +44,17 @@ public function getDateValue($meta, $field)
  */
  private function getRawDateValue(array $mapping)
  {
- if (isset($mapping['type']) && 'integer' === $mapping['type']) {
- return time();
+ $datetime = new \DateTime();
+ $type = $mapping['type'] ?? null;
+
+ if ('integer' === $type) {
+ return (int) $datetime->format('U');
  }
 
- if (isset($mapping['type']) && in_array($mapping['type'], ['date_immutable', 'time_immutable', 'datetime_immutable', 'datetimetz_immutable'], true)) {
- return new \DateTimeImmutable();
+ if (in_array($type, ['date_immutable', 'time_immutable', 'datetime_immutable', 'datetimetz_immutable'], true)) {
+ return \DateTimeImmutable::createFromMutable($datetime);
  }
 
- return \DateTime::createFromFormat('U.u', number_format(microtime(true), 6, '.', ''))
- ->setTimeZone(new \DateTimeZone(date_default_timezone_get()));
+ return $datetime;
  }
 }