neo4j-php · p123-stack · Mar 3, 2025 · Apr 3, 2025 · Apr 10, 2025 · Apr 10, 2025
diff --git a/.gitignore b/.gitignore
@@ -19,4 +19,5 @@ coverage
 xml-coverage
 composer.lock
 
-.env
+.env
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -58,4 +58,4 @@
         "phpunit-with-coverage" : "XDEBUG_MODE=coverage php -d memory_limit=-1 vendor/bin/phpunit --configuration=phpunitCoverage.xml --testsuite=All --coverage-filter=src tests"
     }
 
-}
+}
diff --git a/phpUnit.xml b/phpUnit.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php" colors="true" verbose="true">
+    <php>
+        <!-- Database Configuration -->
+        <env name="NEO4J_ADDRESS" value="https://6f72daa1.databases.neo4j.io" />
+        <env name="NEO4J_USERNAME" value="neo4j" />
+        <env name="NEO4J_PASSWORD" value="9lWmptqBgxBOz8NVcTJjgs3cHPyYmsy63ui6Spmw1d0" />
+    </php>
+    <testsuites>
+        <testsuite name="Application Test Suite">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/phpunitCoverage.xml b/phpunitCoverage.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd">
+    <!-- Define a basic testsuite -->
+    <testsuites>
+        <testsuite name="Default">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
+
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory>src</directory>
+        </include>
+        <report>
+            <clover outputFile="./coverage/clover.xml"/>
+            <cobertura outputFile="./coverage/cobertura.xml"/>
+            <crap4j outputFile="./coverage/crap4j.xml" threshold="50"/>
+            <html outputDirectory="./coverage/html" lowUpperBound="35" highLowerBound="70"/>
+            <php outputFile="./coverage/coverage.php"/>
+            <text outputFile="./coverage/coverage.txt" showUncoveredFiles="false" showOnlySummary="true"/>
+            <xml outputDirectory="./coverage/xml"/>
+        </report>
+    </coverage>
+</phpunit>
diff --git a/src/OGM.php b/src/OGM.php
@@ -2,11 +2,19 @@
 
 namespace Neo4j\QueryAPI;
 
+use DateTimeZone;
 use Neo4j\QueryAPI\Objects\Point;
 use Neo4j\QueryAPI\Objects\Node;
 use Neo4j\QueryAPI\Objects\Relationship;
 use Neo4j\QueryAPI\Objects\Path;
 use InvalidArgumentException;
+use Neo4j\QueryAPI\Objects\Temporal\Date;
+use Neo4j\QueryAPI\Objects\Temporal\DateTime;
+use Neo4j\QueryAPI\Objects\Temporal\DateTimeZoneId;
+use Neo4j\QueryAPI\Objects\Temporal\Duration;
+use Neo4j\QueryAPI\Objects\Temporal\LocalDateTime;
+use Neo4j\QueryAPI\Objects\Temporal\LocalTime;
+use Neo4j\QueryAPI\Objects\Temporal\Time;
 
 final class OGM
 {
@@ -21,14 +29,24 @@
         }
 
         return match ($data['$type']) {
-            'Integer', 'Float', 'String', 'Boolean', 'Duration', 'OffsetDateTime' => $data['_value'],
+            'Integer', 'Float', 'Boolean' => $data['_value'],
             'Array', 'List' => is_array($data['_value']) ? array_map([$this, 'map'], $data['_value']) : [],
             'Null' => null,
             'Node' => $this->mapNode($data['_value']),
             'Map' => is_array($data['_value']) ? $this->mapProperties($data['_value']) : [],
             'Point' => $this->parsePoint($data['_value']),
             'Relationship' => $this->mapRelationship($data['_value']),
             'Path' => $this->mapPath($data['_value']),
+            'Date' => $this->mapDate($data['_value']),
+            'OffsetDateTime' => $this->mapDateTime($data['_value']),
+            'Time' => $this->mapTime($data['_value']),
+            'LocalTime' => $this->mapLocalTime($data['_value']),
+            'LocalDateTime' => $this->mapLocalDateTime($data['_value']),
+            'Duration' => $this->mapDuration($data['_value']),
+
+            'String' => $this->isValidTimeZone($data['_value'])
+                ? new DateTimeZoneId($data['_value'])  //  Convert timezone strings to `DateTimeZoneId`
+                : $data['_value'],
             default => throw new InvalidArgumentException('Unknown type: ' . json_encode($data, JSON_THROW_ON_ERROR)),
         };
     }
@@ -37,10 +55,10 @@
     private function parsePoint(string $value): Point
     {
         if (preg_match('/SRID=(\d+);POINT(?: Z)? \(([-\d.]+) ([-\d.]+)(?: ([-\d.]+))?\)/', $value, $matches)) {
-            $srid = (int) $matches[1];
-            $x = (float) $matches[2];
-            $y = (float) $matches[3];
-            $z = isset($matches[4]) ? (float) $matches[4] : null;
+            $srid = (int)$matches[1];
+            $x = (float)$matches[2];
+            $y = (float)$matches[3];
+            $z = isset($matches[4]) ? (float)$matches[4] : null;
 
             return new Point($x, $y, $z, $srid);
         }
@@ -129,5 +147,46 @@
         return $mappedProperties;
     }
 
+    private function mapDate(string $value): Date
+    {
+        $totalDaysSinceEpoch = (new \DateTime($value))->diff(new \DateTime('@0'))->days;
+
+        return new Date($totalDaysSinceEpoch);
+    }
+
+    private function mapDateTime(string $value): DateTime
+    {
+        return new DateTime($value);
+    }
+
+    private function mapDateTimeZoneId(string $value): DateTimeZoneId
+    {
+        return new DateTimeZoneId($value);
+    }
+
+    private function isValidTimeZone(string $value): bool
+    {
+        return in_array($value, timezone_identifiers_list(), true);
+    }
 
+    private function mapTime(mixed $_value): Time
+    {
+        return new Time($_value);
+
+    }
+
+    private function mapLocalTime(mixed $_value): LocalTime
+    {
+        return new LocalTime($_value);
+    }
+
+    private function mapLocalDateTime(mixed $_value): LocalDateTime
+    {
+        return new LocalDateTime($_value);
+    }
+
+    private function mapDuration(mixed $_value): Duration
+    {
+        return new Duration($_value);
+    }
 }
diff --git a/src/Objects/Temporal/Date.php b/src/Objects/Temporal/Date.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Neo4j\QueryAPI\Objects\Temporal;
+
+final class Date
+{
+    public int $days;
+
+    public function __construct(int $days)
+    {
+        $this->days = $days;
+    }
+
+    /**
+     * Returns the number of days since the Unix epoch.
+     */
+    public function getDays(): int
+    {
+        return $this->days;
+    }
+
+    /**
+     * Converts the stored date into a DateTimeImmutable.
+     */
+    public function toDateTimeImmutable(): \DateTimeImmutable
+    {
+        $dt = new \DateTimeImmutable('@0');
+        return $dt->modify(sprintf('+%d days', $this->days));
+    }
+
+    public function __toString(): string
+    {
+        return sprintf("Date(%d days since epoch)", $this->days);
+    }
+}
diff --git a/src/Objects/Temporal/DateTime.php b/src/Objects/Temporal/DateTime.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Neo4j\QueryAPI\Objects\Temporal;
+
+final class DateTime
+{
+    private \DateTimeImmutable $dateTime;
+
+    public function __construct(string $dateTime)
+    {
+        $this->dateTime = new \DateTimeImmutable($dateTime);
+    }
+
+    public function getDateTime(): \DateTimeImmutable
+    {
+        return $this->dateTime;
+    }
+
+    public function __toString(): string
+    {
+        return $this->dateTime->format('c');
+    }
+}
diff --git a/src/Objects/Temporal/DateTimeZoneId.php b/src/Objects/Temporal/DateTimeZoneId.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Neo4j\QueryAPI\Objects\Temporal;
+
+final class DateTimeZoneId
+{
+    private string $zoneId;
+
+    public function __construct(string $zoneId)
+    {
+        $this->zoneId = $zoneId;
+    }
+
+    public function getZoneId(): string
+    {
+        return $this->zoneId;
+    }
+
+    public function __toString(): string
+    {
+        return $this->zoneId;
+    }
+}
diff --git a/src/Objects/Temporal/Duration.php b/src/Objects/Temporal/Duration.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Neo4j\QueryAPI\Objects\Temporal;
+
+final class Duration
+{
+    private string $duration;
+
+    public function __construct(string $duration)
+    {
+        $this->duration = $duration;
+    }
+
+    public function getDuration(): string
+    {
+        return $this->duration;
+    }
+
+    public function __toString(): string
+    {
+        return $this->duration;
+    }
+}
diff --git a/src/Objects/Temporal/LocalDateTime.php b/src/Objects/Temporal/LocalDateTime.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Neo4j\QueryAPI\Objects\Temporal;
+
+final class LocalDateTime
+{
+    private \DateTimeImmutable $localDateTime;
+
+    public function __construct(string $localDateTime)
+    {
+        $this->localDateTime = new \DateTimeImmutable($localDateTime);
+    }
+
+    public function getLocalDateTime(): \DateTimeImmutable
+    {
+        return $this->localDateTime;
+    }
+
+    public function __toString(): string
+    {
+        // Adjust the format as necessary (without timezone info)
+        return $this->localDateTime->format('Y-m-d\TH:i:s');
+    }
+}
diff --git a/src/Objects/Temporal/LocalTime.php b/src/Objects/Temporal/LocalTime.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Neo4j\QueryAPI\Objects\Temporal;
+
+final class LocalTime
+{
+    private string $localTime;
+
+    public function __construct(string $localTime)
+    {
+        $this->localTime = $localTime;
+    }
+
+    public function getLocalTime(): string
+    {
+        return $this->localTime;
+    }
+
+    public function __toString(): string
+    {
+        return $this->localTime;
+    }
+}
diff --git a/src/Objects/Temporal/Time.php b/src/Objects/Temporal/Time.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Neo4j\QueryAPI\Objects\Temporal;
+
+final class Time
+{
+    private string $time; // You might later parse this into components if needed.
+
+    public function __construct(string $time)
+    {
+        $this->time = $time;
+    }
+
+    public function getTime(): string
+    {
+        return $this->time;
+    }
+
+    public function __toString(): string
+    {
+        return $this->time;
+    }
+}
diff --git a/src/Results/ResultRow.php b/src/Results/ResultRow.php
@@ -18,7 +18,7 @@
 final class ResultRow implements ArrayAccess, Countable, IteratorAggregate
 {
     /** @var array<string, TValue> */
-    private array $data;
+    public array $data;
 
     public function __construct(array $data)
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,4 +58,4 @@ @@
             "phpunit-with-coverage" : "XDEBUG_MODE=coverage php -d memory_limit=-1 vendor/bin/phpunit --configuration=phpunitCoverage.xml --testsuite=All --coverage-filter=src tests"
         }
-    }
+    }