updated test

Author: p123-stack

src/Neo4jQueryAPI.php

@@ -6,6 +6,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\RequestException;
+use Neo4j\QueryAPI\Results\ResultRow;
 use Neo4j\QueryAPI\Results\ResultSet;
 use Neo4j\QueryAPI\Exception\Neo4jException;
 use Psr\Http\Client\RequestExceptionInterface;
@@ -59,7 +60,18 @@ public function run(string $cypher, array $parameters, string $database = 'neo4j
             $data = json_decode($response->getBody()->getContents(), true);
             $ogm = new OGM();
 
-            return new ResultSet($data['data']['fields'], $data['data']['values'], $ogm);
+            $keys = $data['data']['fields'];
+            $values = $data['data']['values'];
+            $rows = array_map(function ($resultRow) use ($ogm, $keys) {
+                $data = [];
+                foreach ($keys as $index => $key) {
+                    $fieldData = $resultRow[$index] ?? null;
+                    $data[$key] = $ogm->map($fieldData);
+                }
+                return new ResultRow($data);
+            }, $values);
+
+            return new ResultSet($rows);
         } catch (RequestExceptionInterface $e) {
             $response = $e->getResponse();
             if ($response !== null) {

src/OGM.php

@@ -17,21 +17,23 @@ public function map(array $object): mixed
     {
         return match ($object['$type']) {
             'Integer' => $object['_value'],
-            'float' => $object['_value'],
+            'Float' => $object['_value'],
             'String' => $object['_value'],
             'Boolean' => $object['_value'],
             'Null' => $object['_value'],
-            'Array' => $object['_value'],
+            'Array' => $object['_value'], // Handle generic arrays
+            'List' => array_map([$this, 'map'], $object['_value']), // Recursively map lists
             'Duration' => $object['_value'],
             'OffsetDateTime' => $object['_value'],
+            'Node' => $this->mapNode($object['_value']),
             'Map' => $this->mapProperties($object['_value']),
             'Point' => $this->parseWKT($object['_value']),
-            'Node' => $this->mapNode($object['_value']),
             'Relationship' => $this->mapRelationship($object['_value']),
             'Path' => $this->mapPath($object['_value']),
             default => throw new \InvalidArgumentException('Unknown type: ' . $object['$type']),
         };
     }
+
     public static function parseWKT(string $wkt): Point
     {
         $sridPart = substr($wkt, 0, strpos($wkt, ';'));
@@ -62,11 +64,12 @@ public static function parseWKT(string $wkt): Point
     private function mapNode(array $nodeData): Node
     {
         return new Node(
-            $nodeData['_labels'],
-            $this->mapProperties($nodeData['_properties'])
+            $nodeData['_labels'], // Labels of the node
+            $this->mapProperties($nodeData['_properties']) // Mapped properties
         );
     }
 
+
     private function mapRelationship(array $relationshipData): Relationship
     {
         return new Relationship(

src/Objects/Node.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Neo4j\QueryAPI\Objects;
 
 /**
@@ -48,4 +47,17 @@ public function getProperties(): array
     {
         return $this->properties;
     }
+
+    /**
+     * Convert the Node object to an array representation.
+     *
+     * @return array Node data as an array.
+     */
+    public function toArray(): array
+    {
+        return [
+            '_labels' => $this->labels,
+            '_properties' => $this->properties,
+        ];
+    }
 }

src/Results/ResultRow.php

@@ -35,6 +35,7 @@ class ResultRow implements ArrayAccess
 {
     public function __construct(private array $data)
     {
+
     }
 
 
@@ -53,11 +54,11 @@ public function offsetGet($offset): mixed
 
     public function offsetSet($offset, $value): void
     {
-        throw new BadMethodCallException("You cant set the value of column {$offset}.");
+        throw new BadMethodCallException("You can't set the value of column {$offset}.");
     }
     public function offsetUnset($offset): void
     {
-            throw new BadMethodCallException("You cant Unset {$offset}.");
+            throw new BadMethodCallException("You can't Unset {$offset}.");
 
     }
 
@@ -67,7 +68,10 @@ public function get(string $row): mixed
         return $this->offsetGet($row);
     }
 
-
+    public function toArray(): array
+    {
+        return $this->data;
+    }
 }
 
 

src/Results/ResultSet.php

@@ -1,5 +1,4 @@
 <?php
-//
 namespace Neo4j\QueryAPI\Results;
 
 use InvalidArgumentException;
@@ -9,18 +8,11 @@
 
 class ResultSet implements IteratorAggregate
 {
-    private array $rows;
-
-    public function __construct(private array $keys, private array $resultRows, private OGM $ogm)
+    /**
+     * @param list<ResultRow> $rows
+     */
+    public function __construct(private readonly array $rows)
     {
-        $this->rows = array_map(function ($resultRow) {
-            $data = [];
-            foreach ($this->keys as $index => $key) {
-                $fieldData = $resultRow[$index] ?? null;
-                $data[$key] = $this->ogm->map($fieldData);
-            }
-            return new ResultRow($data);
-        }, $this->resultRows);
     }
 
     public function getIterator(): Traversable

tests/Integration/Neo4jOGMTest.php

@@ -32,17 +32,7 @@ public static function integerDataProvider(): array
         ];
     }
 
-    public static function floatDataProvider(): array
-    {
-        return [
-            'Test with height 1.75' => [
-                'CREATE (n:Person {height: $height}) RETURN n.height',
-                ['height' => 1.75],
-                1.75, // Expecting a float value directly, not wrapped in an array
-            ],
 
-        ];
-    }
 
     public static function nullDataProvider()
     {
@@ -92,7 +82,7 @@ public function testInteger(): void
     public function testFloat(): void
     {
         $this->assertEquals(1.75, $this->ogm->map([
-            '$type' => 'float',
+            '$type' => 'Float',
             '_value' => 1.75,
         ]));
     }
@@ -397,16 +387,8 @@ public function testWithPath()
         $this->assertEquals($expectedResult, $actual);
     }
 
-    #[DataProvider('floatDataProvider')]
-    public function testWithFloat(string $query, array $parameters, float $expectedResult): void
-    {
-        $actual = $this->ogm->map([
-            '$type' => 'float',
-            '_value' => $parameters['height'],
-        ]);
 
-        $this->assertEquals($expectedResult, $actual);
-    }
+
 
 
     #[DataProvider('nullDataProvider')]