Merge branch 'feat/tesktkit-basic-query' into test_tx_run

Author: p123-stack

Dockerfile.neo4j-okta

@@ -0,0 +1,3 @@
+FROM neo4j:5-enterprise
+
+COPY ./neo4j-with-okta.conf /var/lib/neo4j/conf/neo4j.conf

composer.json

@@ -28,7 +28,7 @@
         "psr/http-factory": "^1.0",
         "psr/http-client": "^1.0",
         "php-http/message": "^1.0",
-        "stefanak-michal/bolt": "^7.1.4",
+        "stefanak-michal/bolt": "^7.2.4",
         "symfony/polyfill-php80": "^1.2",
         "psr/simple-cache": ">=2.0",
         "ext-json": "*",

docker-compose.yml

@@ -53,7 +53,7 @@ services:
       - .env
   neo4j:
     <<: *common
-    image: neo4j:5.23-community
+    image: neo4j:5.23-enterprise
     hostname: neo4j
     networks:
       - neo4j
@@ -62,6 +62,7 @@ services:
       - "11474:7474"
     environment:
       <<: *common-env
+      NEO4J_ACCEPT_LICENSE_AGREEMENT: 'yes'  # Also add this
       NEO4J_server_bolt_advertised__address: neo4j:7687
       NEO4J_server_http_advertised__address: neo4j:7474
 

neo4j-with-okta.conf

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Neo4j PHP Client and Driver package.
+ *
+ * (c) Nagels <https://nagels.tech>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Laudis\Neo4j\Exception;
+
+use RuntimeException;
+
+final class SSLConnectionException extends RuntimeException
+{
+}

src/Exception/SSLConnectionException.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Neo4j PHP Client and Driver package.
+ *
+ * (c) Nagels <https://nagels.tech>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Laudis\Neo4j\Exception;
+
+use RuntimeException;
+
+class TimeoutException extends RuntimeException
+{
+}

src/Exception/TimeoutException.php

@@ -178,6 +178,9 @@ private function makeFromBoltRelationship(BoltRelationship $rel): Relationship
         foreach ($rel->properties as $key => $property) {
             $map[$key] = $this->mapValueToType($property);
         }
+        /** @var string|null $elementId */
+        $startNodeElementId = null;
+        $endNodeElementId = null;
 
         /** @var string|null $elementId */
         $elementId = null;
@@ -191,7 +194,9 @@ private function makeFromBoltRelationship(BoltRelationship $rel): Relationship
             $rel->endNodeId,
             $rel->type,
             new CypherMap($map),
-            $elementId
+            $elementId,
+            $startNodeElementId,  // Add this parameter
+            $endNodeElementId
         );
     }
 

src/Formatter/Specialised/BoltOGMTranslator.php

@@ -24,6 +24,9 @@
  */
 final class Relationship extends UnboundRelationship
 {
+    private string $startNodeElementId;
+    private string $endNodeElementId;
+
     /**
      * @param CypherMap<OGMTypes> $properties
      */
@@ -34,8 +37,17 @@ public function __construct(
         string $type,
         CypherMap $properties,
         ?string $elementId,
+        int|string|null $startNodeElementId = null,
+        int|string|null $endNodeElementId = null,
     ) {
         parent::__construct($id, $type, $properties, $elementId);
+        $this->startNodeElementId = $startNodeElementId !== null
+            ? (string) $startNodeElementId
+            : (string) $startNodeId;
+
+        $this->endNodeElementId = $endNodeElementId !== null
+            ? (string) $endNodeElementId
+            : (string) $endNodeId;
     }
 
     /**

src/Types/Relationship.php

@@ -32,12 +32,15 @@ class UnboundRelationship extends AbstractPropertyObject
     /**
      * @param CypherMap<OGMTypes> $properties
      */
+    private string $elementId;
+
     public function __construct(
         private readonly int $id,
         private readonly string $type,
         private readonly CypherMap $properties,
-        private readonly ?string $elementId,
+        ?string $elementId = null,
     ) {
+        $this->elementId = $elementId ?? (string) $id;
     }
 
     public function getElementId(): ?string
@@ -55,6 +58,9 @@ public function getType(): string
         return $this->type;
     }
 
+    /**
+     * @psalm-suppress MixedReturnTypeCoercion
+     */
     public function getProperties(): CypherMap
     {
         /** @psalm-suppress InvalidReturnStatement false positive with type alias. */
@@ -80,7 +86,11 @@ public function toArray(): array
      *
      * @return OGMTypes
      */
-    public function getProperty(string $key)
+
+    /**
+     * @psalm-suppress MixedReturnStatement
+     */
+    public function getProperty(string $key): string
     {
         /** @psalm-suppress ImpureMethodCall */
         if (!$this->properties->hasKey($key)) {

src/Types/UnboundRelationship.php

@@ -0,0 +1,20 @@
+<?php
+require_once 'vendor/autoload.php';
+
+use Laudis\Neo4j\ClientBuilder;
+use Laudis\Neo4j\Authentication\Authenticate;
+
+$client = ClientBuilder::create()
+    ->withDriver('bolt', 'bolt://localhost:7687',
+        Authenticate::basic('neo4j', 'testtest')
+    )
+    ->build();
+
+try {
+    $result = $client->run('RETURN "Hello World" as message');
+    echo "Connection successful!\n";
+    print_r($result->first()->get('message'));
+} catch (Exception $e) {
+    echo "Connection failed: " . $e->getMessage() . "\n";
+}
+?>