Merge remote-tracking branch 'origin/main' into workinprogress

Author: 123kiran17

.gitignore

@@ -1,4 +1,5 @@
 .idea/
 vendor
 phpunit.xml
-test
+test
+.phpunit.result.cache

.phpunit.result.cache

@@ -6,8 +6,7 @@
         "guzzlehttp/guzzle": "^7.9",
         "psr/http-client": "^1.0",
       "ext-json": "*",
-        "php": "^8.1",
-        "laudis/neo4j-php-client": "^3.2"
+        "php": "^8.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^11.0"

composer.json

@@ -0,0 +1,12 @@
+version: '3.8'
+
+services:
+  neo4j:
+    image: neo4j:5
+    container_name: neo4j
+    environment:
+      # Change the password here as desired
+      NEO4J_AUTH: "neo4j/your_password"
+    ports:
+      - "7474:7474"  # HTTP
+      - "7687:7687"  # Bolt

composer.lock

@@ -7,7 +7,7 @@ class queryCountersTest extends TestCase
 {
     public function testGetExistingCounter(): void
     {
-        $counters = new queryCounters([
+        $counters = new \Neo4j\QueryAPI\Objects\ResultCounters([
             'nodes_created' => 1,
             'relationships_created' => 2,
             'properties_set' => 3,

docker-compose.yaml

@@ -0,0 +1,37 @@
+<?php
+
+namespace Neo4j\QueryAPI;
+require './vendor/autoload.php'; // Make sure Guzzle is installed (composer require guzzlehttp/guzzle)
+
+use GuzzleHttp\Client;
+
+
+$neo4j_url = 'https://6f72daa1.databases.neo4j.io/';
+$username  = 'neo4j';
+//$password = 'your_password';
+$password  = '9lWmptqBgxBOz8NVcTJjgs3cHPyYmsy63ui6Spmw1d0';
+
+$query = 'CREATE (n:Person {name: "Bobby"}) RETURN n';
+
+$auth = base64_encode("$username:$password");
+
+$payload = json_encode([
+    'statement' => $query,
+]);
+
+$headers = [
+    'Authorization' => 'Basic ' . $auth,
+    'Content-Type'  => 'application/json',
+    'Accept'        => 'application/json',
+];
+
+
+$client = new Client();
+
+$response = $client->post('https://6f72daa1.databases.neo4j.io/db/neo4j/query/v2/tx', [
+    'headers' => $headers,
+    'body'    => $payload,
+]);
+$responseData = json_decode($response->getBody(), true);
+
+print_r($responseData);

queryCounters/queryCountersTest.php

@@ -29,7 +29,7 @@ public static function login(string $address, string $username, string $password
             'base_uri' => rtrim($address, '/'),
             'timeout' => 10.0,
             'headers' => [
-                'Authorization' => '',
+                'Authorization' => 'Basic ' . base64_encode("$username:$password"),
                 'Content-Type' => 'application/vnd.neo4j.query',
                 'Accept'=>'application/vnd.neo4j.query',
             ],
@@ -45,17 +45,18 @@ public static function login(string $address, string $username, string $password
     public function run(string $cypher, array $parameters, string $database = 'neo4j'): ResultSet
     {
         try {
-
+            // Prepare the payload for the request
             $payload = [
                 'statement' => $cypher,
                 'parameters' => empty($parameters) ? new stdClass() : $parameters,
             ];
 
+            // Execute the request to the Neo4j server
             $response = $this->client->post('/db/' . $database . '/query/v2', [
                 'json' => $payload,
             ]);
 
-
+            // Decode the response body
             $data = json_decode($response->getBody()->getContents(), true);
             $ogm = new OGM();
 
@@ -70,7 +71,7 @@ public function run(string $cypher, array $parameters, string $database = 'neo4j
                 return new ResultRow($data);
             }, $values);
 
-            return new ResultSet($ogm, $rows);
+            return new ResultSet($rows);
         } catch (RequestExceptionInterface $e) {
             $response = $e->getResponse();
             if ($response !== null) {
@@ -84,4 +85,16 @@ public function run(string $cypher, array $parameters, string $database = 'neo4j
         }
     }
 
+    public function beginTransaction(string $database = 'neo4j'): Transaction
+    {
+        $response = $this->client->post("/db/neo4j/query/v2/tx");
+
+        $clusterAffinity = $response->getHeaderLine('neo4j-cluster-affinity');
+        $responseData = json_decode($response->getBody(), true);
+        $transactionId = $responseData['transaction']['id'];
+
+
+
+        return new Transaction($this->client, $clusterAffinity, $transactionId);
+    }
 }

run.php

@@ -1,44 +1,34 @@
 <?php
 namespace Neo4j\QueryAPI\Results;
 
+use ArrayIterator;
+use Countable;
 use IteratorAggregate;
 use Neo4j\QueryAPI\Objects\ResultCounters;
-use Neo4j\QueryAPI\OGM;
-use queryCounters;
 use Traversable;
 
-class ResultSet implements IteratorAggregate
+class ResultSet implements IteratorAggregate, Countable
 {
     /**
-     * @var list<ResultRow>
+     * @param list<ResultRow> $rows
      */
-    private array $rows = [];
-
-    /**
-     * @param OGM $ogm
-     */
-    public function __construct(private OGM $ogm, private ResultCounters $counters)
+    public function __construct(private readonly array $rows,private ResultCounters $counters)
     {
     }
 
-    /**
-     *
-     * @param array $keys
-     * @param array $dataRows
-     */
-    public function initialize(array $dataRows): void
-    {
-        foreach ($dataRows as $dataRow) {
-            $this->rows[] = new ResultRow($this->ogm->map($dataRow));
-        }
-    }
-
     public function getIterator(): Traversable
     {
-        return new \ArrayIterator($this->rows);
+        return new ArrayIterator($this->rows);
     }
-    public function getqueryCounters(): ?QueryCounters
+    public function getQueryCounters(): ?ResultCounters
     {
         return $this->counters;
     }
+
+    public function count(): int
+    {
+        return count($this->rows);
+    }
+
+
 }

src/Neo4jQueryAPI.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace Neo4j\QueryAPI;
+
+use GuzzleHttp\Client;
+use Neo4j\QueryAPI\Exception\Neo4jException;
+use Neo4j\QueryAPI\Results\ResultRow;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Client\RequestExceptionInterface;
+use stdClass;
+
+class Transaction
+{
+
+    public function __construct(private ClientInterface $client, private string $clusterAffinity, private string $transactionId)
+    {
+    }
+
+    /**
+     * Create a node in Neo4j with a specified label and properties.
+     *
+     * @param string $query The Cypher query to be executed.
+     * @param $parameters
+     * @return array The response data from Neo4j.
+     */
+    public function run(string $query, array $parameters): array
+    {
+            // Execute the request to the Neo4j server
+            $response = $this->client->post("/db/neo4j/query/v2/tx", [
+                'headers' => [
+                    'neo4j-cluster-affinity' => $this->clusterAffinity,
+                ],
+                'json' => [
+
+                            'statement' => $query,
+                            'parameters' => empty($parameters) ? new stdClass() : $parameters, // Pass the parameters array here
+
+                ],
+            ]);
+
+            // Decode the response body
+            $data = json_decode($response->getBody()->getContents(), true);
+
+            // Initialize the OGM (Object Graph Mapping) class
+            $ogm = new OGM();
+
+            // Extract keys (field names) and values (actual data)
+            $keys = $data['results'][0]['columns'];
+            $values = $data['results'][0]['data'];
+
+            // Process each row of the result and map them using OGM
+            $rows = array_map(function ($resultRow) use ($ogm, $keys) {
+                $data = [];
+                foreach ($keys as $index => $key) {
+                    $fieldData = $resultRow['row'][$index] ?? null;
+                    $data[$key] = $ogm->map($fieldData); // Map the field data to the appropriate object format
+                }
+                return new ResultRow($data); // Wrap the mapped data in a ResultRow object
+            }, $values);
+
+            return $rows; // Return the processed rows as an array of ResultRow objects
+
+
+    }
+
+
+
+    public function commit(): void
+    {
+        $this->client->post("/db/neo4j/query/v2/tx/{$this->transactionId}/commit", [
+            'headers' => [
+                'neo4j-cluster-affinity' => $this->clusterAffinity,
+            ]
+        ]);
+    }
+
+    public function rollback(): void
+    {
+        $this->client->delete("/db/neo4j/query/v2/tx/{$this->transactionId}", [
+            'headers' => [
+                'neo4j-cluster-affinity' => $this->clusterAffinity,
+            ]
+        ]);
+    }
+}