wip

Author: 123kiran17

src/Authentication/AuthenticateInterface.php

@@ -9,6 +9,8 @@
  */
 interface AuthenticateInterface
 {
+    public function getHeader(): string;
+    public function getType(): string;
     /**
      * Authenticates the request by returning a new instance of the request with the authentication information attached.
      */

src/Authentication/BasicAuthentication.php

@@ -14,8 +14,8 @@ class BasicAuthentication implements AuthenticateInterface
 
     public function __construct(?string $username = null, ?string $password = null)
     {
-        $this->username = $username ?? getenv("NEO4J_USERNAME") ?: '';
-        $this->password = $password ?? getenv("NEO4J_PASSWORD") ?: '';
+        $this->username = $username ?? (getenv("NEO4J_USERNAME") !== false ? getenv("NEO4J_USERNAME") : '');
+        $this->password = $password ?? (getenv("NEO4J_PASSWORD") !== false ? getenv("NEO4J_PASSWORD") : '');
     }
 
     public function authenticate(RequestInterface $request): RequestInterface

src/Authentication/BearerAuthentication.php

@@ -11,6 +11,7 @@ class BearerAuthentication implements AuthenticateInterface
 {
     public function __construct(private string $token)
     {
+        $this->token = $token;
     }
 
     public function authenticate(RequestInterface $request): RequestInterface

src/Authentication/NoAuth.php

@@ -9,6 +9,15 @@
  */
 class NoAuth implements AuthenticateInterface
 {
+    public function getHeader(): string
+    {
+        return '';
+    }
+
+    public function getType(): string
+    {
+        return 'NoAuth';
+    }
     public function authenticate(RequestInterface $request): RequestInterface
     {
         return $request;

src/Neo4jQueryAPI.php

@@ -11,14 +11,20 @@
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Client\RequestExceptionInterface;
 use Psr\Http\Message\ResponseInterface;
+use RuntimeException;
 
 class Neo4jQueryAPI
 {
     public function __construct(
-        private ClientInterface $client,
-        private ResponseParser $responseParser,
-        private Neo4jRequestFactory $requestFactory
-    ) {
+
+        private ClientInterface     $client,
+        private ResponseParser      $responseParser,
+        private Neo4jRequestFactory $requestFactory,
+
+
+    )
+    {
+
     }
 
     /**
@@ -45,38 +51,51 @@ public static function login(string $address, AuthenticateInterface $auth = null
     }
 
 
-
     /**
      * Executes a Cypher query.
      */
     public function run(string $cypher, array $parameters = []): ResultSet
     {
         $request = $this->requestFactory->buildRunQueryRequest($cypher, $parameters);
 
+        $response = null;
+
         try {
             $response = $this->client->sendRequest($request);
         } catch (RequestExceptionInterface $e) {
             $this->handleRequestException($e);
         }
+        if ($response === null) {
+            throw new \RuntimeException('Failed to get a response');
+        }
 
         return $this->responseParser->parseRunQueryResponse($response);
     }
 
+
     /**
      * Starts a transaction.
      */
     public function beginTransaction(): Transaction
     {
         $request = $this->requestFactory->buildBeginTransactionRequest();
 
+        $response = null;
+
         try {
             $response = $this->client->sendRequest($request);
         } catch (RequestExceptionInterface $e) {
             $this->handleRequestException($e);
         }
 
+        if ($response === null) {
+            throw new \RuntimeException('No response received for transaction request');
+        }
+
         $clusterAffinity = $response->getHeaderLine('neo4j-cluster-affinity');
-        $responseData = json_decode($response->getBody(), true);
+        $body = $response->getBody()->getContents();
+
+        $responseData = json_decode($body, true);
         $transactionId = $responseData['transaction']['id'];
 
         return new Transaction(
@@ -88,19 +107,15 @@ public function beginTransaction(): Transaction
         );
     }
 
+
     /**
      * Handles request exceptions by parsing error details and throwing a Neo4jException.
      *
      * @throws Neo4jException
      */
-    private function handleRequestException(RequestExceptionInterface $e): void
+    public function handleRequestException(RequestExceptionInterface $e): void
     {
-        $response = $e->getResponse();
-        if ($response instanceof ResponseInterface) {
-            $errorResponse = json_decode((string)$response->getBody(), true);
-            throw Neo4jException::fromNeo4jResponse($errorResponse, $e);
-        }
-
-        throw new Neo4jException(['message' => $e->getMessage()], 500, $e);
+        throw new \RuntimeException('Request failed: ' . $e->getMessage(), 0, $e);
     }
 }
+

src/Neo4jRequestFactory.php

@@ -57,30 +57,31 @@ private function createRequest(string $uri, ?string $cypher, ?array $parameters)
         $request = $this->psr17Factory->createRequest('POST', $this->configuration->baseUri . $uri);
 
         $payload = [
-            'parameters' => empty($parameters) ? new \stdClass() : $parameters,
+            'parameters' => $parameters ?? new \stdClass(),
             'includeCounters' => $this->configuration->includeCounters
         ];
 
         if ($this->configuration->accessMode === AccessMode::READ) {
             $payload['accessMode'] = AccessMode::READ;
         }
 
-        if ($cypher) {
+        if ($cypher !== null && $cypher !== '') {
             $payload['statement'] = $cypher;
         }
 
-        if ($parameters) {
+        if ($parameters !== null && $parameters !== []) {
             $payload['parameters'] = $parameters;
         }
 
+        /** @psalm-suppress RedundantCondition */
         if ($this->configuration->bookmarks !== null) {
             $payload['bookmarks'] = $this->configuration->bookmarks;
         }
 
         $request = $request->withHeader('Content-Type', 'application/json');
         $request = $request->withHeader('Accept', 'application/vnd.neo4j.query');
 
-        $body = json_encode($payload);
+        $body = json_encode($payload,  JSON_THROW_ON_ERROR);
 
         $stream = $this->streamFactory->createStream($body);
 

src/OGM.php

@@ -18,11 +18,12 @@ class OGM
      */
     public function map(array $object): mixed
     {
+
         if (!isset($object['$type'])) {
-            if (isset($object['elementId'], $object['labels'], $object['properties'])) {
-                return $this->mapNode($object); // Handle as a Node
+            if (array_key_exists('elementId', $object) && array_key_exists('labels', $object) && array_key_exists('properties', $object)) {
+                return $this->mapNode($object);
             }
-            throw new \InvalidArgumentException('Unknown object type: ' . json_encode($object));
+            throw new \InvalidArgumentException('Unknown object type: ' . json_encode($object, JSON_THROW_ON_ERROR));
         }
 
         //        if (!isset($object['_value'])) {
@@ -39,21 +40,30 @@ public function map(array $object): mixed
             'Point' => $this->parseWKT($object['_value']),
             'Relationship' => $this->mapRelationship($object['_value']),
             'Path' => $this->mapPath($object['_value']),
-            default => throw new \InvalidArgumentException('Unknown type: ' . $object['$type'] . ' in object: ' . json_encode($object)),
+            default => throw new \InvalidArgumentException('Unknown type: ' . $object['$type'] . ' in object: ' . json_encode($object, JSON_THROW_ON_ERROR)),
         };
     }
 
     public static function parseWKT(string $wkt): Point
     {
-        $sridPart = substr($wkt, 0, strpos($wkt, ';'));
+        $sridPos = strpos($wkt, ';');
+        if ($sridPos === false) {
+            throw new \InvalidArgumentException("Invalid WKT format: missing ';'");
+        }
+        $sridPart = substr($wkt, 0, $sridPos);
         $srid = (int)str_replace('SRID=', '', $sridPart);
 
-        $pointPart = substr($wkt, strpos($wkt, 'POINT') + 6);
+        $pointPos = strpos($wkt, 'POINT');
+        if ($pointPos === false) {
+            throw new \InvalidArgumentException("Invalid WKT format: missing 'POINT'");
+        }
+        $pointPart = substr($wkt, $pointPos + 6);
+
         $pointPart = str_replace('Z', '', $pointPart);
         $pointPart = trim($pointPart, ' ()');
         $coordinates = explode(' ', $pointPart);
 
-        [$x, $y, $z] = array_pad(array_map('floatval', $coordinates), 3, null);
+        [$x, $y, $z] = array_pad(array_map('floatval', $coordinates), 3, 0.0);
 
         return new Point($x, $y, $z, $srid);
     }

src/Objects/Authentication.php

@@ -12,8 +12,12 @@
  */
 class Authentication
 {
+
     public static function basic(string $username, string $password): AuthenticateInterface
     {
+        $username = $username ?: 'defaultUsername';
+        $password = $password ?: 'defaultPassword';
+
         return new BasicAuthentication($username, $password);
     }