correct properties behaviour

Author: transistive

src/Formatter/Specialised/HttpOGMTranslator.php

@@ -105,6 +105,11 @@ private function translateValue($value, HttpMetaInfo $meta): array
 
         if (is_array($value)) {
             if ($meta->getCurrentType() === 'path') {
+                /**
+                 * There are edge cases where multiple paths are wrapped in a list.
+                 *
+                 * @see OGMFormatterIntegrationTest::testPathMultiple for an example
+                 */
                 if (is_array($value[0])) {
                     $tbr = [];
                     foreach ($value as $path) {
@@ -147,9 +152,9 @@ private function translateObject(object $value, HttpMetaInfo $meta): array
 
         if ($type === 'node') {
             $node = $meta->currentNode();
-            if ($node && (array) $value === (array) $node->properties) {
+            if ($node && json_encode($value, JSON_THROW_ON_ERROR) === json_encode($node->properties, JSON_THROW_ON_ERROR)) {
                 $meta = $meta->incrementMeta();
-                [$map, $meta] = $this->translateCypherMap((array) $node->properties, $meta);
+                $map = $this->translateProperties($node->properties);
 
                 return [new Node((int) $node->id, new CypherList($node->labels), $map), $meta];
             }
@@ -158,14 +163,29 @@ private function translateObject(object $value, HttpMetaInfo $meta): array
         return $this->translateCypherMap((array) $value, $meta);
     }
 
+    private function translateProperties(stdClass $properties): CypherMap
+    {
+        $tbr = [];
+        foreach ((array) $properties as $key => $value) {
+            if ($value instanceof stdClass) {
+                $tbr[$key] = new CypherMap((array) $value);
+            } elseif (is_array($value)) {
+                $tbr[$key] = new CypherList($value);
+            } else {
+                $tbr[$key] = $value;
+            }
+        }
+
+        return new CypherMap($tbr);
+    }
+
     /**
      * @param RelationshipArray $relationship
      */
     private function relationship(stdClass $relationship, HttpMetaInfo $meta): array
     {
         $meta = $meta->incrementMeta();
-        /** @var array<string, OGMTypes> $map */
-        [$map, $meta] = $this->translateCypherMap((array) $relationship->properties, $meta);
+        $map = $this->translateProperties($relationship->properties);
 
         $tbr = new Relationship(
             (int) $relationship->id,
@@ -225,7 +245,7 @@ private function path(array $value, HttpMetaInfo $meta): Path
      */
     private function translateNode(array $node): Node
     {
-        return new Node($node['id'], new CypherList($node['labels']), $this->translateCypherMap($node['properties']));
+        return new Node($node['id'], new CypherList($node['labels']), $this->translateProperties($node['properties']));
     }
 
     /**

tests/Integration/DriverParityTest.php

@@ -14,6 +14,7 @@
 namespace Laudis\Neo4j\Tests\Integration;
 
 use Laudis\Neo4j\Contracts\FormatterInterface;
+use Laudis\Neo4j\Contracts\PointInterface;
 use Laudis\Neo4j\Formatter\SummarizedResultFormatter;
 use Laudis\Neo4j\Tests\Fixtures\MoviesFixture;
 use Laudis\Neo4j\Types\ArrayList;
@@ -64,7 +65,12 @@ public function testComplex(string $alias): void
     {
         $results = $this->getClient()->run(<<<'CYPHER'
         MATCH (n:Person)-[r:ACTED_IN]->(m), p = () - [] -> () - [] -> ()
-        RETURN n, p, {movie: m, roles: r.roles} AS actInfo, m
+        SET m.point = point({latitude:12, longitude: 56, height: 1000})
+        RETURN  n,
+                p,
+                {movie: m, roles: r.roles} AS actInfo,
+                m,
+                point({latitude:13, longitude: 56, height: 1000}) as point
         LIMIT 1
         CYPHER, [], $alias);
 
@@ -77,8 +83,13 @@ public function testComplex(string $alias): void
 
             self::assertInstanceOf(ArrayList::class, $actorInfo->get('roles'));
             self::assertInstanceOf(Node::class, $actorInfo->get('movie'));
+            // this can be a cyphermap in HTTP protocol
+            $point = $actorInfo->getAsNode('movie')->getProperty('point');
+            self::assertTrue($point instanceof PointInterface || $point instanceof CypherMap);
+            self::assertIsObject($actorInfo->getAsNode('movie')->getProperty('point'));
             self::assertInstanceOf(Path::class, $result->get('p'));
             self::assertInstanceOf(Node::class, $result->get('m'));
+            self::assertInstanceOf(PointInterface::class, $result->get('point'));
         }
     }
 }