Merge pull request #50 from neo4j-php/structures_toString

Structures to string

Author: stefanak-michal

.gitignore

@@ -2,3 +2,4 @@
 .vscode/
 phpunit*.phar
 /index.php
+cert/

src/PackStream/v1/Unpacker.php

@@ -43,7 +43,7 @@ class Unpacker implements IUnpacker
         0x54 => [Time::class, 'unpackInteger', 'unpackInteger'],
         0x74 => [LocalTime::class, 'unpackInteger'],
         0x46 => [DateTime::class, 'unpackInteger', 'unpackInteger', 'unpackInteger'],
-        0x66 => [DateTimeZoneId::class, 'unpackInteger', 'unpackInteger', 'unpackInteger'],
+        0x66 => [DateTimeZoneId::class, 'unpackInteger', 'unpackInteger', 'unpackString'],
         0x64 => [LocalDateTime::class, 'unpackInteger', 'unpackInteger'],
         0x45 => [Duration::class, 'unpackInteger', 'unpackInteger', 'unpackInteger', 'unpackInteger'],
         0x58 => [Point2D::class, 'unpackInteger', 'unpackFloat', 'unpackFloat'],

src/structures/Date.php

@@ -12,7 +12,7 @@
  * @link https://github.com/stefanak-michal/Bolt
  * @package Bolt\structures
  */
-class Date
+class Date implements IStructure
 {
     /**
      * @var int
@@ -37,4 +37,8 @@ public function days(): int
         return $this->days;
     }
 
+    public function __toString(): string
+    {
+        return date('Y-m-d', strtotime($this->days . ' days'));
+    }
 }

src/structures/DateTime.php

@@ -16,7 +16,7 @@
  * @link https://github.com/stefanak-michal/Bolt
  * @package Bolt\structures
  */
-class DateTime
+class DateTime implements IStructure
 {
 
     /**
@@ -73,4 +73,13 @@ public function tz_offset_seconds(): int
         return $this->tz_offset_seconds;
     }
 
+    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');
+    }
 }

src/structures/DateTimeZoneId.php

@@ -16,7 +16,7 @@
  * @link https://github.com/stefanak-michal/Bolt
  * @package Bolt\structures
  */
-class DateTimeZoneId
+class DateTimeZoneId implements IStructure
 {
 
     /**
@@ -30,17 +30,17 @@ class DateTimeZoneId
     private $nanoseconds;
 
     /**
-     * @var int
+     * @var string
      */
     private $tz_id;
 
     /**
      * DateTimeZoneId constructor.
      * @param int $seconds
      * @param int $nanoseconds
-     * @param int $tz_id
+     * @param string $tz_id
      */
-    public function __construct(int $seconds, int $nanoseconds, int $tz_id)
+    public function __construct(int $seconds, int $nanoseconds, string $tz_id)
     {
         $this->seconds = $seconds;
         $this->nanoseconds = $nanoseconds;
@@ -66,11 +66,20 @@ public function nanoseconds(): int
 
     /**
      * identifier for a specific time zone
-     * @return int
+     * @return string
      */
-    public function tz_id(): int
+    public function tz_id(): string
     {
         return $this->tz_id;
     }
 
+    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');
+    }
 }

src/structures/Duration.php

@@ -12,7 +12,7 @@
  * @link https://github.com/stefanak-michal/Bolt
  * @package Bolt\structures
  */
-class Duration
+class Duration implements IStructure
 {
 
     /**
@@ -82,4 +82,8 @@ public function nanoseconds(): int
         return $this->nanoseconds;
     }
 
+    public function __toString(): string
+    {
+        return 'P' . $this->months . 'M' . $this->days . 'DT' . ($this->seconds + $this->nanoseconds / 1000000000) . 'S';
+    }
 }

src/structures/IStructure.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Bolt\structures;
+
+/**
+ * interface IStructure
+ *
+ * @author Michal Stefanak
+ * @link https://github.com/neo4j-php/Bolt
+ * @package Bolt\structures
+ */
+interface IStructure
+{
+    public function __toString () : string;
+}

src/structures/LocalDateTime.php

@@ -12,7 +12,7 @@
  * @link https://github.com/stefanak-michal/Bolt
  * @package Bolt\structures
  */
-class LocalDateTime
+class LocalDateTime implements IStructure
 {
 
     /**
@@ -53,4 +53,13 @@ public function nanoseconds(): int
         return $this->nanoseconds;
     }
 
+    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');
+    }
+
 }

src/structures/LocalTime.php

@@ -12,7 +12,7 @@
  * @link https://github.com/stefanak-michal/Bolt
  * @package Bolt\structures
  */
-class LocalTime
+class LocalTime implements IStructure
 {
     /**
      * @var int
@@ -37,4 +37,8 @@ public function nanoseconds(): int
         return $this->nanoseconds;
     }
 
+    public function __toString(): string
+    {
+        return date('H:i:s', floor($this->nanoseconds / 1000000000)) . '.' . $this->nanoseconds % 1000000000;
+    }
 }

src/structures/Node.php

@@ -10,7 +10,7 @@
  * @link https://github.com/stefanak-michal/Bolt
  * @package Bolt\structures
  */
-class Node
+class Node implements IStructure
 {
     /**
      * @var int
@@ -61,4 +61,13 @@ public function properties(): array
     {
         return $this->properties;
     }
-}
+
+    public function __toString(): string
+    {
+        return json_encode([
+            'identity' => $this->id,
+            'labels' => $this->labels,
+            'properties' => $this->properties
+        ]);
+    }
+}