seperated all integration tests

Author: Pratiksha

src/Objects/Node.php

@@ -8,35 +8,14 @@
 
 class Node
 {
-    /**
-     * @var string[] Array of labels for the node.
-     */
-    private array $labels;
-
-    /**
-     * @var array<string, mixed> Associative array of properties (key-value pairs).
-     */
-    private array $properties;
-
     /**
      * Node constructor
      *
      * @param string[] $labels Array of labels for the node.
      * @param array<string, mixed> $properties Associative array of properties.
      */
-    public function __construct(array $labels, array $properties)
-    {
-        $this->labels = $labels;
-        $this->properties = $properties;
-    }
-
-    /**
-     * Get the properties of the node.
-     * @return array<string, mixed> Associative array of properties.
-     */
-    public function getProperties(): array
+    public function __construct(public readonly array $labels, public readonly array $properties)
     {
-        return $this->properties;
     }
 
     /**
@@ -50,4 +29,13 @@ public function toArray(): array
             '_properties' => $this->properties,
         ];
     }
+    public function getProperties(): array
+    {
+        return $this->properties;
+    }
+
+    public function getLabels(): array
+    {
+        return $this->labels;
+    }
 }

src/Objects/Path.php

@@ -30,4 +30,14 @@ public function __construct(array $nodes, array $relationships)
         $this->relationships = $relationships;
     }
 
+    public function getNodes(): array
+    {
+        return $this->nodes;
+    }
+
+    public function getRelationships(): array
+    {
+        return $this->relationships;
+    }
+
 }

src/Objects/Point.php

@@ -30,4 +30,21 @@ public function __toString(): string
     {
         return "SRID={$this->srid};POINT ({$this->x} {$this->y})";
     }
+
+    public function getX(): float
+    {
+        return $this->x;
+    }
+    public function getY(): float
+    {
+        return $this->y;
+    }
+    public function getZ(): float
+    {
+        return $this->z;
+    }
+    public function getSrid(): float
+    {
+        return $this->srid;
+    }
 }

src/Objects/Relationship.php

@@ -30,4 +30,15 @@ public function __construct(string $type, array $properties = [])
         $this->properties = $properties;
     }
 
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function getProperties(): array
+    {
+        return $this->properties;
+    }
+
+
 }

src/ResponseParser.php

@@ -12,7 +12,6 @@
 use Neo4j\QueryAPI\Results\ResultRow;
 use RuntimeException;
 use Neo4j\QueryAPI\Objects\ProfiledQueryPlan;
-use Neo4j\QueryAPI\Objects\Point;
 
 class ResponseParser
 {
@@ -50,45 +49,21 @@ private function validateAndDecodeResponse(ResponseInterface $response): array
         return $data;
     }
 
-    /**
-     * @return list<ResultRow>
-     */
-    /**
-     * @param list<string> $fields
-     * @param list<array<array-key, mixed>> $values
-     * @return list<ResultRow>
-     */
-    private function mapRows(array $fields, array $values): array
+    private function mapRows(array $keys, array $values): array
     {
-        return array_map(
-            fn (array $row): ResultRow => new ResultRow(
-                array_combine(
-                    $fields,
-                    array_map([$this, 'formatOGMOutput'], $row)
-                ) ?: [] // Ensure array_combine never returns false
-            ),
-            $values
-        );
-    }
-
-    /**
-     * Ensures mapped output follows expected format
-     *
-     * @param mixed $value
-     * @return mixed
-     */
-    private function formatOGMOutput(mixed $value): mixed
-    {
-        if (is_array($value) && array_key_exists('$type', $value) && array_key_exists('_value', $value)) {
-            return $this->ogm->map($value);
-        }
-
-        return $value;
+        return array_map(function ($row) use ($keys) {
+            $mapped = [];
+            foreach ($keys as $index => $key) {
+                $fieldData = $row[$index] ?? null;
+                if (is_string($fieldData)) {
+                    $fieldData = ['$type' => 'String', '_value' => $fieldData];
+                }
+                $mapped[$key] = $this->ogm->map($fieldData);
+            }
+            return new ResultRow($mapped);
+        }, $values);
     }
 
-
-
-
     private function buildCounters(array $countersData): ResultCounters
     {
         return new ResultCounters(
@@ -120,22 +95,17 @@ private function getAccessMode(string $accessModeData): AccessMode
 
     private function buildProfiledQueryPlan(?array $queryPlanData): ?ProfiledQueryPlan
     {
-        if ($queryPlanData === null || empty($queryPlanData)) {
+        if (!$queryPlanData) {
             return null;
         }
 
-        /**
-         * @var array<string, mixed> $mappedArguments
-         */
-        $mappedArguments = array_map(function (mixed $value): mixed {
-            if (is_array($value) && isset($value['$type']) && isset($value['_value'])) {
+        $mappedArguments = array_map(function ($value) {
+            if (is_array($value) && array_key_exists('$type', $value) && array_key_exists('_value', $value)) {
                 return $this->ogm->map($value);
             }
-
             return $value;
         }, $queryPlanData['arguments'] ?? []);
 
-
         $queryArguments = new ProfiledQueryPlanArguments(
             globalMemory: $mappedArguments['GlobalMemory'] ?? null,
             plannerImpl: $mappedArguments['planner-impl'] ?? null,
@@ -158,11 +128,7 @@ private function buildProfiledQueryPlan(?array $queryPlanData): ?ProfiledQueryPl
             planner: $mappedArguments['planner'] ?? null,
             rows: $mappedArguments['Rows'] ?? null
         );
-
-        $children = array_map(
-            fn (array $child): ?ProfiledQueryPlan => $this->buildProfiledQueryPlan($child),
-            $queryPlanData['children'] ?? []
-        );
+        $children = array_map(fn ($child) => $this->buildProfiledQueryPlan($child), $queryPlanData['children'] ?? []);
 
         return new ProfiledQueryPlan(
             $queryPlanData['dbHits'] ?? 0,
@@ -178,5 +144,4 @@ private function buildProfiledQueryPlan(?array $queryPlanData): ?ProfiledQueryPl
             $queryPlanData['identifiers'] ?? []
         );
     }
-
 }

src/Results/ResultSet.php

@@ -38,10 +38,6 @@ public function getIterator(): Traversable
         return new ArrayIterator($this->rows);
     }
 
-    public function getProfiledQueryPlan(): ?ProfiledQueryPlan
-    {
-        return $this->profiledQueryPlan;
-    }
     public function getQueryCounters(): ?ResultCounters
     {
         return $this->counters;
@@ -54,4 +50,23 @@ public function count(): int
         return count($this->rows);
     }
 
+    public function getBookmarks(): ?Bookmarks
+    {
+        return $this->bookmarks;
+    }
+
+    public function getAccessMode(): ?AccessMode
+    {
+        return $this->accessMode;
+    }
+
+    public function getData(): array
+    {
+        return $this->rows;
+    }
+
+    public function getProfiledQueryPlan(): ?ProfiledQueryPlan
+    {
+        return $this->profiledQueryPlan;
+    }
 }