fixes #20

Author: transistive

composer.json

@@ -29,7 +29,7 @@
         "php-ds/php-ds": "1.*",
         "psr/http-client": "^1.0",
         "php-http/message-factory": "^1.0",
-        "stefanak-michal/bolt": "^2.0"
+        "stefanak-michal/bolt": "^2.1"
     },
     "suggest": {
         "ext-sockets": "Needed to implement bolt protocol",

composer.lock

@@ -13,6 +13,7 @@
 
 namespace Laudis\Neo4j\Formatter;
 
+use Bolt\structures\Path;
 use Ds\Map;
 use Ds\Vector;
 use UnexpectedValueException;
@@ -53,13 +54,37 @@ private function formatRow(array $meta, array $result): Map
         return $map;
     }
 
+    private function mapPath(Path $path): array
+    {
+        $rels = $path->rels();
+        $nodes = $path->nodes();
+        $tbr = [];
+        /**
+         * @var mixed $node
+         */
+        foreach ($nodes as $i => $node) {
+            /** @var mixed */
+            $tbr[] = $node;
+            if (isset($rels[$i])) {
+                /** @var mixed */
+                $tbr[] = $rels[$i];
+            }
+        }
+
+        return $tbr;
+    }
+
     /**
      * @param mixed $value
      *
      * @return scalar|array|null
      */
     private function mapValue($value)
     {
+        if ($value instanceof Path) {
+            $value = $this->mapPath($value);
+        }
+
         if (is_object($value)) {
             return $this->objectToProperty($value);
         }
@@ -77,8 +102,13 @@ private function mapValue($value)
 
     private function objectToProperty(object $object): array
     {
+        if ($object instanceof Path) {
+            return $this->mapPath($object);
+        }
+
         if (!method_exists($object, 'properties')) {
-            throw new UnexpectedValueException('Cannot handle objects without a properties method. Class given: '.get_class($object));
+            $message = 'Cannot handle objects without a properties method. Class given: '.get_class($object);
+            throw new UnexpectedValueException($message);
         }
 
         /** @var array $properties */

src/Formatter/BoltCypherFormatter.php

@@ -40,7 +40,7 @@ protected function setUp(): void
     public function testListParameterHelper(string $alias): void
     {
         $result = $this->client->run(<<<'CYPHER'
-MATCH (x) WHERE x.slug in $listOrMap RETURN x
+MATCH (x) WHERE x.slug IN $listOrMap RETURN x
 CYPHER, ['listOrMap' => ParameterHelper::asList([])], $alias);
         self::assertEquals(0, $result->count());
     }
@@ -79,7 +79,7 @@ public function testMapParameterHelper(string $alias): void
         $this->client->run(<<<'CYPHER'
 MERGE (x:Node {slug: 'a'})
 WITH x
-MATCH (x) WHERE x.slug in $listOrMap RETURN x
+MATCH (x) WHERE x.slug IN $listOrMap RETURN x
 CYPHER, ['listOrMap' => ParameterHelper::asMap(['a' => 'b'])], $alias);
     }
 
@@ -92,7 +92,7 @@ public function testArrayParameterHelper(string $alias): void
         $this->client->run(<<<'CYPHER'
 MERGE (x:Node {slug: 'a'})
 WITH x
-MATCH (x) WHERE x.slug in $listOrMap RETURN x
+MATCH (x) WHERE x.slug IN $listOrMap RETURN x
 CYPHER, ['listOrMap' => []], $alias);
     }
 
@@ -105,7 +105,7 @@ public function testInvalidParameter(string $alias): void
         $this->client->run(<<<'CYPHER'
 MERGE (x:Node {slug: 'a'})
 WITH x
-MATCH (x) WHERE x.slug in $listOrMap RETURN x
+MATCH (x) WHERE x.slug IN $listOrMap RETURN x
 CYPHER, ['listOrMap' => self::generate()], $alias);
     }
 
@@ -125,7 +125,7 @@ public function testInvalidParameters(string $alias): void
         $this->client->run(<<<'CYPHER'
 MERGE (x:Node {slug: 'a'})
 WITH x
-MATCH (x) WHERE x.slug in $listOrMap RETURN x
+MATCH (x) WHERE x.slug IN $listOrMap RETURN x
 CYPHER, self::generate(), $alias);
     }
 
@@ -170,7 +170,7 @@ public function testPath(string $alias): void
     public function testNullListAndMap(string $alias): void
     {
         $results = $this->client->run(<<<'CYPHER'
-RETURN null as x, [1, 2, 3] as y, {x: 'x', y: 'y', z: 'z'} as z
+RETURN null AS x, [1, 2, 3] AS y, {x: 'x', y: 'y', z: 'z'} AS z
 CYPHER
             , ['x' => 'x', 'xy' => 'xy', 'y' => 'y', 'yz' => 'yz', 'z' => 'z'], $alias);
 
@@ -203,6 +203,36 @@ public function testListAndMapInput(string $alias): void
         self::assertEquals(['list' => [1, 2, 3]], $result->get('y'));
     }
 
+    /**
+     * @dataProvider transactionProvider
+     */
+    public function testPathRetunType(string $alias): void
+    {
+        $this->client->run(<<<'CYPHER'
+MERGE (:Node {x: 'x'}) - [:Rel] -> (x:Node {x: 'y'})
+WITH x
+MERGE (x) - [:Rel] -> (:Node {x: 'z'})
+CYPHER
+            , [], $alias);
+
+        $results = $this->client->run(<<<'CYPHER'
+MATCH (a:Node {x: 'x'}), (b:Node {x: 'z'}), p = shortestPath((a)-[*]-(b))
+RETURN p
+CYPHER
+            , [], $alias);
+
+        self::assertEquals(1, $results->count());
+        $result = $results->first();
+        self::assertEquals(1, $result->count());
+        self::assertEquals([
+            ['x' => 'x'],
+            [],
+            ['x' => 'y'],
+            [],
+            ['x' => 'z'],
+        ], $result->get('p'));
+    }
+
     /**
      * @return array<int, array<int, string>>
      */