winp

Author: p123-stack

src/BasicAuthentication.php

@@ -9,6 +9,8 @@ class BasicAuthentication implements AuthenticateInterface
 {
     public function __construct(private string $username, private string $password)
     {
+        $this->username = $username;
+        $this->password = $password;
     }
 
     public function authenticate(RequestInterface $request): RequestInterface
@@ -26,4 +28,4 @@ public function getType(): string
         return 'Basic';
     }
 
-}
+}

src/BearerAuthentication.php

@@ -24,4 +24,4 @@ public function getType(): string
     {
         return 'Bearer';
     }
-}
+}

src/Neo4jQueryAPI.php

@@ -2,6 +2,7 @@
 
 namespace Neo4j\QueryAPI;
 
+use Exception;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Utils;
@@ -90,7 +91,6 @@ public function run(string $cypher, array $parameters = [], string $database = '
                     0,
                     null,
                     $error
-
                 );
             }
 
@@ -164,17 +164,32 @@ private function handleException(RequestExceptionInterface $e): void
         throw $e;
     }
 
-    public function beginTransaction(string $database = 'neo4j'): Transaction
+    public function beginTransaction(): array
     {
-        $response = $this->client->sendRequest(new Request('POST', '/db/neo4j/query/v2/tx'));
+        $request = new Request('POST', '/db/neo4j/tx'); // Adjust endpoint as needed
+
+        // Apply authentication, if provided
+        if ($this->auth instanceof AuthenticateInterface) {
+            $request = $this->auth->authenticate($request);
+        }
+
+        try {
+            $response = $this->client->send($request);
+            $responseBody = json_decode($response->getBody()->getContents(), true);
 
-        $clusterAffinity = $response->getHeaderLine('neo4j-cluster-affinity');
-        $responseData = json_decode($response->getBody(), true);
-        $transactionId = $responseData['transaction']['id'];
+            // Validate the response for transaction ID
+            if (isset($responseBody['commit'])) {
+                return $responseBody; // Successful transaction
+            }
 
-        return new Transaction($this->client, $clusterAffinity, $transactionId);
+            throw new RuntimeException('Missing transaction ID in the response.');
+        } catch (Exception $e) {
+            throw new RuntimeException("Failed to begin transaction: {$e->getMessage()}", 0, $e);
+        }
     }
 
+
+
     private function createProfileData(array $data): ProfiledQueryPlan
     {
         $ogm = new OGM();
@@ -229,4 +244,4 @@ private function createProfileData(array $data): ProfiledQueryPlan
 
         return $profiledQueryPlan;
     }
-}
+}

src/NoAuth.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Neo4j\QueryAPI;
 
 use Psr\Http\Message\RequestInterface;
@@ -9,4 +10,4 @@ public function authenticate(RequestInterface $request): RequestInterface
     {
         return $request;
     }
-}
+}

src/Objects/Authentication.php

@@ -27,4 +27,3 @@ public static function bearer(string $token): AuthenticateInterface
         return new BearerAuthentication($token);
     }
 }
-

tests/Integration/Neo4jQueryAPIIntegrationTest.php

@@ -232,32 +232,6 @@ public function testChildQueryPlanExistence(): void
 
 
 
-     public function testTransactionCommit(): void
-     {
-         // Begin a new transaction
-         $tsx = $this->api->beginTransaction();
-
-         // Generate a random name for the node
-         $name = (string)mt_rand(1, 100000);
-
-         // Create a node within the transaction
-         $tsx->run("CREATE (x:Human {name: \$name})", ['name' => $name]);
-
-         // Validate that the node does not exist in the database before the transaction is committed
-         $results = $this->api->run("MATCH (x:Human {name: \$name}) RETURN x", ['name' => $name]);
-         $this->assertCount(0, $results);
-
-         // Validate that the node exists within the transaction
-         $results = $tsx->run("MATCH (x:Human {name: \$name}) RETURN x", ['name' => $name]);
-         $this->assertCount(1, $results);
-
-         // Commit the transaction
-         $tsx->commit();
-
-         // Validate that the node now exists in the database
-         $results = $this->api->run("MATCH (x:Human {name: \$name}) RETURN x", ['name' => $name]);
-         $this->assertCount(1, $results); // Updated to expect 1 result
-     }
 
 
     /**

tests/Unit/Neo4jQueryAPIUnitTest.php

@@ -17,7 +17,6 @@
 
 class Neo4jQueryAPIUnitTest extends TestCase
 {
-
     protected string $address;
 
     protected function setUp(): void