updated structure classes to fixed versions

Author: stefanak-michal

src/structures/Date.php

@@ -9,7 +9,8 @@
  * An instant capturing the date, but not the time, nor the time zone
  *
  * @author Michal Stefanak
- * @link https://github.com/stefanak-michal/Bolt
+ * @link https://github.com/neo4j-php/Bolt
+ * @link https://7687.org/packstream/packstream-specification-1.html#date---structure
  * @package Bolt\structures
  */
 class Date implements IStructure
@@ -39,6 +40,6 @@ public function days(): int
 
     public function __toString(): string
     {
-        return date('Y-m-d', strtotime($this->days . ' days'));
+        return gmdate('Y-m-d', strtotime(sprintf("%+d", $this->days) . ' days +0000', 0));
     }
 }

src/structures/DateTime.php

@@ -13,7 +13,8 @@
  * <pre> utc_nanoseconds = (seconds * 1000000000) + nanoseconds - (tx_offset_minutes * 60 * 1000000000) </pre>
  *
  * @author Michal Stefanak
- * @link https://github.com/stefanak-michal/Bolt
+ * @link https://github.com/neo4j-php/Bolt
+ * @link https://7687.org/packstream/packstream-specification-1.html#datetime---structure
  * @package Bolt\structures
  */
 class DateTime implements IStructure
@@ -65,7 +66,7 @@ public function nanoseconds(): int
     }
 
     /**
-     * specifies the offset in minutes from UTC
+     * specifies the offset in seconds from UTC
      * @return int
      */
     public function tz_offset_seconds(): int
@@ -75,11 +76,10 @@ public function tz_offset_seconds(): int
 
     public function __toString(): string
     {
-        $dt = \DateTime::createFromFormat('U', $this->seconds, new \DateTimeZone('UTC'));
-        $fraction = new \DateInterval('PT0S');
-        $fraction->f = $this->nanoseconds / 1000000000;
-        $dt->add($fraction);
-        $dt->setTimezone(new \DateTimeZone(sprintf('+%04d', $this->tz_offset_seconds / 3600 * 100)));
-        return $dt->format('Y-m-d\TH:i:s.uP');
+        $datetime = sprintf("%d", $this->seconds - $this->tz_offset_seconds)
+            . '.' . substr(sprintf("%09d", $this->nanoseconds), 0, 6);
+        return \DateTime::createFromFormat('U.u', $datetime, new \DateTimeZone('UTC'))
+            ->setTimezone(new \DateTimeZone(sprintf("%+'05d", $this->tz_offset_seconds / 3600 * 100)))
+            ->format('Y-m-d\TH:i:s.uP');
     }
 }

src/structures/DateTimeZoneId.php

@@ -13,7 +13,8 @@
  * <pre> utc_nanoseconds = (seconds * 1000000000) + nanoseconds - get_offset_in_nanoseconds(tz_id) </pre>
  *
  * @author Michal Stefanak
- * @link https://github.com/stefanak-michal/Bolt
+ * @link https://github.com/neo4j-php/Bolt
+ * @link https://7687.org/packstream/packstream-specification-1.html#datetimezoneid---structure
  * @package Bolt\structures
  */
 class DateTimeZoneId implements IStructure
@@ -75,11 +76,9 @@ public function tz_id(): string
 
     public function __toString(): string
     {
-        $dt = \DateTime::createFromFormat('U', $this->seconds, new \DateTimeZone('UTC'));
-        $fraction = new \DateInterval('PT0S');
-        $fraction->f = $this->nanoseconds / 1000000000;
-        $dt->add($fraction);
-        $dt->setTimezone(new \DateTimeZone($this->tz_id));
-        return $dt->format('Y-m-d\TH:i:s.uP');
+        $datetime = sprintf("%d", $this->seconds)
+            . '.' . substr(sprintf("%09d", $this->nanoseconds), 0, 6);
+        return \DateTime::createFromFormat('U.u', $datetime, new \DateTimeZone($this->tz_id))
+                ->format('Y-m-d\TH:i:s.u') . '[' . $this->tz_id . ']';
     }
 }

src/structures/Duration.php

@@ -9,7 +9,8 @@
  * A temporal amount. This captures the difference in time between two instants. It only captures the amount of time between two instants, it does not capture a start time and end time. A unit capturing the start time and end time would be a Time Interval and is out of scope for this proposal.
  *
  * @author Michal Stefanak
- * @link https://github.com/stefanak-michal/Bolt
+ * @link https://github.com/neo4j-php/Bolt
+ * @link https://7687.org/packstream/packstream-specification-1.html#duration---structure
  * @package Bolt\structures
  */
 class Duration implements IStructure
@@ -84,6 +85,31 @@ public function nanoseconds(): int
 
     public function __toString(): string
     {
-        return 'P' . $this->months . 'M' . $this->days . 'DT' . ($this->seconds + $this->nanoseconds / 1000000000) . 'S';
+        $output = 'P';
+        $years = floor($this->months / 12);
+        if (!empty($years))
+            $output .= $years . 'Y';
+        if (!empty($this->months % 12))
+            $output .= ($this->months % 12) . 'M';
+        if (!empty($this->days))
+            $output .= $this->days . 'D';
+
+        $time = '';
+        $hours = floor($this->seconds / 3600);
+        if (!empty($hours))
+            $time .= $hours . 'H';
+        $minutes = floor($this->seconds % 3600 / 60);
+        if (!empty($minutes))
+            $time .= $minutes . 'M';
+
+        $seconds = rtrim(sprintf("%d", $this->seconds % 3600 % 60)
+            . '.' . substr(sprintf("%09d", $this->nanoseconds), 0, 6), '0.');
+        if (!empty($seconds))
+            $time .= $seconds . 'S';
+
+        if (!empty($time))
+            $output .= 'T' . $time;
+
+        return $output;
     }
 }

src/structures/LocalDateTime.php

@@ -9,7 +9,8 @@
  * An instant capturing the date and the time, but not the time zone
  *
  * @author Michal Stefanak
- * @link https://github.com/stefanak-michal/Bolt
+ * @link https://github.com/neo4j-php/Bolt
+ * @link https://7687.org/packstream/packstream-specification-1.html#localdatetime---structure
  * @package Bolt\structures
  */
 class LocalDateTime implements IStructure
@@ -55,11 +56,10 @@ public function nanoseconds(): int
 
     public function __toString(): string
     {
-        $dt = \DateTime::createFromFormat('U', $this->seconds, new \DateTimeZone('UTC'));
-        $fraction = new \DateInterval('PT0S');
-        $fraction->f = $this->nanoseconds / 1000000000;
-        $dt->add($fraction);
-        return $dt->format('Y-m-d\TH:i:s.u');
+        $datetime = sprintf("%d", $this->seconds)
+            . '.' . substr(sprintf("%09d", $this->nanoseconds), 0, 6);
+        return \DateTime::createFromFormat('U.u', $datetime)
+            ->format('Y-m-d\TH:i:s.u');
     }
 
 }

src/structures/LocalTime.php

@@ -9,7 +9,8 @@
  * An instant capturing the time of day, but not the date, nor the time zone
  *
  * @author Michal Stefanak
- * @link https://github.com/stefanak-michal/Bolt
+ * @link https://github.com/neo4j-php/Bolt
+ * @link https://7687.org/packstream/packstream-specification-1.html#localtime---structure
  * @package Bolt\structures
  */
 class LocalTime implements IStructure
@@ -39,6 +40,13 @@ public function nanoseconds(): int
 
     public function __toString(): string
     {
-        return date('H:i:s', floor($this->nanoseconds / 1000000000)) . '.' . $this->nanoseconds % 1000000000;
+        $value = sprintf("%09d", $this->nanoseconds);
+        $seconds = substr($value, 0, -9);
+        if (empty($seconds))
+            $seconds = '0';
+        $fraction = substr($value, -9, 6);
+
+        return \DateTime::createFromFormat('U.u', $seconds . '.' . $fraction)
+            ->format('H:i:s.u');
     }
 }

src/structures/Node.php

@@ -7,7 +7,8 @@
  * Immutable
  *
  * @author Michal Stefanak
- * @link https://github.com/stefanak-michal/Bolt
+ * @link https://github.com/neo4j-php/Bolt
+ * @link https://7687.org/packstream/packstream-specification-1.html#node---structure
  * @package Bolt\structures
  */
 class Node implements IStructure

src/structures/Path.php

@@ -7,29 +7,30 @@
  * Immutable
  *
  * @author Michal Stefanak
- * @link https://github.com/stefanak-michal/Bolt
+ * @link https://github.com/neo4j-php/Bolt
+ * @link https://7687.org/packstream/packstream-specification-1.html#path---structure
  * @package Bolt\structures
  */
 class Path implements IStructure
 {
     /**
-     * @var array
+     * @var Node[]
      */
     private $nodes;
     /**
-     * @var array
+     * @var UnboundRelationship[]
      */
     private $rels;
     /**
-     * @var array
+     * @var int[]
      */
     private $ids;
 
     /**
      * Path constructor.
-     * @param array $nodes
-     * @param array $rels
-     * @param array $ids
+     * @param Node[] $nodes
+     * @param UnboundRelationship[] $rels
+     * @param int[] $ids
      */
     public function __construct(array $nodes, array $rels, array $ids)
     {
@@ -39,7 +40,7 @@ public function __construct(array $nodes, array $rels, array $ids)
     }
 
     /**
-     * @return array
+     * @return Node[]
      */
     public function nodes(): array
     {
@@ -48,7 +49,7 @@ public function nodes(): array
 
     /**
      * list of unbound relationships
-     * @return array
+     * @return UnboundRelationship[]
      */
     public function rels(): array
     {
@@ -57,7 +58,7 @@ public function rels(): array
 
     /**
      * relationship id and node id to represent the path
-     * @return array
+     * @return int[]
      */
     public function ids(): array
     {

src/structures/Point2D.php

@@ -9,7 +9,8 @@
  * Represents a single location in 2-dimensional space.
  *
  * @author Michal Stefanak
- * @link https://github.com/stefanak-michal/Bolt
+ * @link https://github.com/neo4j-php/Bolt
+ * @link https://7687.org/packstream/packstream-specification-1.html#point2d---structure
  * @package Bolt\structures
  */
 class Point2D implements IStructure

src/structures/Point3D.php

@@ -9,7 +9,8 @@
  * Represents a single location in space.
  *
  * @author Michal Stefanak
- * @link https://github.com/stefanak-michal/Bolt
+ * @link https://github.com/neo4j-php/Bolt
+ * @link https://7687.org/packstream/packstream-specification-1.html#point3d---structure
  * @package Bolt\structures
  */
 class Point3D implements IStructure