simplified datetime conversion

neo4j-php · Mar 24, 2023 · 6add25a · 6add25a
1 parent f4022af
commit 6add25a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/src/Types/DateTime.php b/src/Types/DateTime.php
@@ -18,7 +18,6 @@
 use DateTimeZone;
 use Exception;
 use Laudis\Neo4j\Contracts\BoltConvertibleInterface;
-use RuntimeException;
 
 use function sprintf;
 
@@ -77,22 +76,22 @@ public function getTimeZoneOffsetSeconds(): int
      */
     public function toDateTime(): DateTimeImmutable
     {
-        /** @psalm-suppress all */
-        foreach (DateTimeZone::listAbbreviations() as $tz) {
-            /** @psalm-suppress all */
-            if ($tz[0]['offset'] === $this->getTimeZoneOffsetSeconds()) {
-                $dateTime = new DateTimeImmutable(sprintf('@%s', $this->getSeconds()));
-
-                if ($this->legacy) {
-                    $dateTime = $dateTime->modify(sprintf('+%s microseconds', $this->nanoseconds / 1000));
-                }
-
-                return $dateTime->setTimezone(new DateTimeZone($tz[0]['timezone_id']));
-            }
+        $dateTime = new DateTimeImmutable(sprintf('@%s', $this->getSeconds()));
+        $dateTime = $dateTime->modify(sprintf('+%s microseconds', $this->nanoseconds / 1000));
+        /** @psalm-suppress PossiblyFalseReference */
+        $dateTime = $dateTime->setTimezone(new DateTimeZone(sprintf("%+'05d", $this->getTimeZoneOffsetSeconds() / 3600 * 100)));
+
+        if ($this->legacy) {
+            /**
+             * @psalm-suppress FalsableReturnStatement
+             *
+             * @var DateTimeImmutable
+             */
+            return $dateTime->modify(sprintf('-%s seconds', $this->getTimeZoneOffsetSeconds()));
         }
 
-        $message = sprintf('Cannot find an timezone with %s seconds as offset.', $this->tzOffsetSeconds);
-        throw new RuntimeException($message);
+        /** @var DateTimeImmutable */
+        return $dateTime;
     }
 
     /**

diff --git a/tests/Integration/OGMFormatterIntegrationTest.php b/tests/Integration/OGMFormatterIntegrationTest.php
@@ -259,15 +259,6 @@ public function testDateTime(string $alias): void
         } else {
             self::assertEquals('{"seconds":1559410832,"nanoseconds":142000000,"tzOffsetSeconds":3600}', json_encode($createdAt, JSON_THROW_ON_ERROR));
         }
-
-        self::assertInstanceOf(DateTime::class, $results[1]['created_at']);
-        self::assertEquals(1_559_471_012, $results[1]['created_at']->getSeconds());
-        self::assertEquals(122_000_000, $results[1]['created_at']->getNanoseconds());
-        self::assertEquals('{"seconds":1559471012,"nanoseconds":122000000,"tzOffsetSeconds":3600}', json_encode($results[1]['created_at'], JSON_THROW_ON_ERROR));
-
-        self::assertInstanceOf(DateTime::class, $results[2]['created_at']);
-        self::assertGreaterThan(0, $results[2]['created_at']->getSeconds());
-        self::assertGreaterThan(0, $results[2]['created_at']->getNanoseconds());
     }
 
     /**