Replace dynamic property access (->{'prop'}) with direct access (->prop ?? null)

for element_id, startNodeElementId, and endNodeElementId properties.Restored the tests and fixed them

Author: p123-stack

src/Databags/Notification.php

@@ -19,7 +19,7 @@
 /**
  * @psalm-immutable
  *
- * @template-extends AbstractCypherObject<string, string|Position>
+ * @template-extends AbstractCypherObject<string, string|array<string, float|int|null|string>>
  */
 final class Notification extends AbstractCypherObject
 {
@@ -82,13 +82,10 @@ public function getTitle(): string
         return $this->title;
     }
 
-
     /**
-     * Matches inherited return type: array<string, string|Position>.
-     *
      * @psalm-external-mutation-free
      *
-     * @return array<string, string|Position>
+     * @return array<string, string|array<string, float|int|string|null>>
      */
     public function toArray(): array
     {
@@ -101,5 +98,4 @@ public function toArray(): array
             'category' => $this->category,
         ];
     }
-
 }

src/Formatter/Specialised/BoltOGMTranslator.php

@@ -102,10 +102,12 @@ private function makeFromBoltNode(BoltNode $node): Node
             $properties[$name] = $this->mapValueToType($property);
         }
 
-        /** @var ?string|null $elementId */
-        $elementId = null;
-        if ($node instanceof \Bolt\protocol\v5\structures\Node) {
-            $elementId = $node->element_id;
+        /** @var string|null $elementId */
+        if (property_exists($node, 'element_id')) {
+            $elementIdValue = $node->element_id ?? null;
+            $elementId = is_string($elementIdValue) ? $elementIdValue : (string) $node->id;
+        } else {
+            $elementId = (string) $node->id;
         }
 
         /**
@@ -180,9 +182,27 @@ private function makeFromBoltRelationship(BoltRelationship $rel): Relationship
         }
 
         /** @var string|null $elementId */
-        $elementId = null;
-        if ($rel instanceof \Bolt\protocol\v5\structures\Relationship) {
-            $elementId = $rel->element_id;
+        if (property_exists($rel, 'element_id')) {
+            $elementIdValue = $rel->element_id ?? null;
+            $elementId = is_string($elementIdValue) ? $elementIdValue : (string) $rel->id;
+        } else {
+            $elementId = (string) $rel->id;
+        }
+
+        // For Neo4j 5+, try to get actual element IDs if available
+        // For Neo4j 4, fallback to string representation of integer IDs
+        if (property_exists($rel, 'startNodeElementId')) {
+            $startNodeElementIdValue = $rel->startNodeElementId ?? null;
+            $startNodeElementId = is_string($startNodeElementIdValue) ? $startNodeElementIdValue : (string) $rel->startNodeId;
+        } else {
+            $startNodeElementId = (string) $rel->startNodeId;
+        }
+
+        if (property_exists($rel, 'endNodeElementId')) {
+            $endNodeElementIdValue = $rel->endNodeElementId ?? null;
+            $endNodeElementId = is_string($endNodeElementIdValue) ? $endNodeElementIdValue : (string) $rel->endNodeId;
+        } else {
+            $endNodeElementId = (string) $rel->endNodeId;
         }
 
         return new Relationship(
@@ -191,7 +211,9 @@ private function makeFromBoltRelationship(BoltRelationship $rel): Relationship
             $rel->endNodeId,
             $rel->type,
             new CypherMap($map),
-            $elementId
+            $elementId,
+            $startNodeElementId,
+            $endNodeElementId
         );
     }
 
@@ -207,9 +229,12 @@ private function makeFromBoltUnboundRelationship(BoltUnboundRelationship $rel):
             $map[$key] = $this->mapValueToType($property);
         }
 
-        $elementId = null;
-        if ($rel instanceof \Bolt\protocol\v5\structures\UnboundRelationship) {
-            $elementId = $rel->element_id;
+        /** @var string|null $elementId */
+        if (property_exists($rel, 'element_id')) {
+            $elementIdValue = $rel->element_id ?? null;
+            $elementId = is_string($elementIdValue) ? $elementIdValue : (string) $rel->id;
+        } else {
+            $elementId = (string) $rel->id;
         }
 
         return new UnboundRelationship(

src/Types/Relationship.php

@@ -34,6 +34,8 @@ public function __construct(
         string $type,
         CypherMap $properties,
         ?string $elementId,
+        private readonly ?string $startNodeElementId = null,
+        private readonly ?string $endNodeElementId = null,
     ) {
         parent::__construct($id, $type, $properties, $elementId);
     }
@@ -54,6 +56,22 @@ public function getEndNodeId(): int
         return $this->endNodeId;
     }
 
+    /**
+     * Returns the element ID of the start node.
+     */
+    public function getStartNodeElementId(): ?string
+    {
+        return $this->startNodeElementId;
+    }
+
+    /**
+     * Returns the element ID of the end node.
+     */
+    public function getEndNodeElementId(): ?string
+    {
+        return $this->endNodeElementId;
+    }
+
     /**
      * @psalm-suppress ImplementedReturnTypeMismatch False positive.
      *
@@ -62,7 +80,9 @@ public function getEndNodeId(): int
      *                type: string,
      *                startNodeId: int,
      *                endNodeId: int,
-     *                properties: CypherMap<OGMTypes>
+     *                properties: CypherMap<OGMTypes>,
+     *                startNodeElementId: ?string,
+     *                endNodeElementId: ?string
      *                }
      */
     public function toArray(): array
@@ -71,6 +91,8 @@ public function toArray(): array
 
         $tbr['startNodeId'] = $this->getStartNodeId();
         $tbr['endNodeId'] = $this->getEndNodeId();
+        $tbr['startNodeElementId'] = $this->getStartNodeElementId();
+        $tbr['endNodeElementId'] = $this->getEndNodeElementId();
 
         return $tbr;
     }

testkit-backend/src/Responses/Types/CypherObject.php

@@ -133,18 +133,18 @@ public static function autoDetect($value): TestkitResponseInterface
                 // First check if the relationship has methods to get start/end node element IDs
                 $startNodeElementId = null;
                 $endNodeElementId = null;
-                
+
                 if (method_exists($value, 'getStartNodeElementId')) {
                     $startNodeElementId = $value->getStartNodeElementId();
                 }
                 if (method_exists($value, 'getEndNodeElementId')) {
                     $endNodeElementId = $value->getEndNodeElementId();
                 }
-                
+
                 // If not available directly, check our stored mappings from paths
                 if ($startNodeElementId === null || $endNodeElementId === null) {
                     $relationshipKey = $value->getId().'_'.$value->getStartNodeId().'_'.$value->getEndNodeId();
-                    
+
                     if ($startNodeElementId === null) {
                         $startNodeElementId = self::$relationshipElementIdMap[$relationshipKey]['startNodeElementId'] ?? (string) $value->getStartNodeId();
                     }

tests/Integration/SummarizedResultFormatterTest.php

@@ -421,6 +421,8 @@ public function testRelationship(): void
                 'properties' => $result->getProperties(),
                 'startNodeId' => $result->getStartNodeId(),
                 'endNodeId' => $result->getEndNodeId(),
+                'startNodeElementId' => $result->getStartNodeElementId(),
+                'endNodeElementId' => $result->getEndNodeElementId(),
             ], JSON_THROW_ON_ERROR),
             json_encode($result, JSON_THROW_ON_ERROR)
         );