fixed bug with lists in properties

Author: transistive

src/Common/TransactionHelper.php

@@ -13,10 +13,10 @@
 
 namespace Laudis\Neo4j\Common;
 
-use function is_iterable;
 use Laudis\Neo4j\Contracts\TransactionInterface;
 use Laudis\Neo4j\Contracts\UnmanagedTransactionInterface;
 use Laudis\Neo4j\Exception\Neo4jException;
+use Laudis\Neo4j\Types\AbstractCypherSequence;
 
 final class TransactionHelper
 {
@@ -59,11 +59,8 @@ public static function retry(callable $tsxFactory, callable $tsxHandler)
      */
     private static function triggerLazyResult($tbr): void
     {
-        if (is_iterable($tbr)) {
-            /** @var mixed $x */
-            foreach ($tbr as $x) {
-                self::triggerLazyResult($x);
-            }
+        if ($tbr instanceof AbstractCypherSequence) {
+            $tbr->preload();
         }
     }
 }

src/Formatter/Specialised/JoltHttpOGMTranslator.php

@@ -13,7 +13,9 @@
 
 namespace Laudis\Neo4j\Formatter\Specialised;
 
+use function array_key_first;
 use Closure;
+use function is_array;
 use Laudis\Neo4j\Contracts\ConnectionInterface;
 use Laudis\Neo4j\Contracts\PointInterface;
 use Laudis\Neo4j\Formatter\OGMFormatter;
@@ -206,9 +208,18 @@ private function translateMap(stdClass $value): CypherMap
     {
         return new CypherMap(
             function () use ($value) {
-                /** @var stdClass|null $element */
+                /** @var stdClass|array|null $element */
                 foreach ((array) $value as $key => $element) {
-                    yield $key => $this->translateJoltType($element);
+                    // There is an odd case in the JOLT protocol when dealing with properties in a node. Lists appear not to receive a composite type label, which is why we have to handle them specifically here.
+                    if (is_array($element)) {
+                        if (array_key_first($element) === 0) {
+                            yield $key => new CypherList($element);
+                        } else {
+                            yield $key => new CypherMap($element);
+                        }
+                    } else {
+                        yield $key => $this->translateJoltType($element);
+                    }
                 }
             }
         );

src/Http/HttpSession.php

@@ -179,11 +179,9 @@ public function beginTransaction(?iterable $statements = null, ?TransactionConfi
         $response = $connection->getImplementation()->sendRequest($request);
 
         $response = HttpHelper::interpretResponse($response);
-        /** @var stdClass|null $info */
-        $info = $response->info;
-        if (is_object($info)) {
+        if (isset($response->info) && $response->info instanceof stdClass) {
             /** @var string */
-            $url = $info->commit;
+            $url = $response->info->commit;
         } else {
             /** @var string */
             $url = $response->commit;

tests/Integration/ClientIntegrationTest.php

@@ -74,7 +74,7 @@ public function testEqualEffect(): void
                 $x = $this->getClient()->runStatement($statement, $prev);
                 $y = $this->getClient()->runStatement($statement, $current[0]);
 
-                self::assertEquals($x->first()->getAsNode('u')->getProperties(), $y->first()->getAsNode('u')->getProperties());
+                self::assertEquals($x->first()->getAsNode('u')->getProperties()->toArray(), $y->first()->getAsNode('u')->getProperties()->toArray());
             }
             $prev = $current[0];
         }