cleanup object model

Author: p123-stack

src/Types/CypherList.php

@@ -338,9 +338,9 @@ public function getAsWGS843DPoint(int $key): WGS843DPoint
         return $this->getAsObject($key, WGS843DPoint::class);
     }
 
-    public function key(): string
+    public function key(): int
     {
-        /** @var string */
+        /** @var int */
         return $this->cacheKey();
     }
 

src/Types/CypherMap.php

@@ -572,8 +572,9 @@ public function getAsWGS843DPoint(string $key): WGS843DPoint
 
     public function key(): string
     {
-        /** @var string */
-        return $this->cacheKey();
+        // we have to cast to a string, as the value is potentially an integer if the key is numeric:
+        // https://stackoverflow.com/questions/4100488/a-numeric-string-as-array-key-in-php
+        return (string) $this->cacheKey();
     }
 
     /**

src/Types/CypherSequenceTrait.php

@@ -366,7 +366,7 @@ public function next(): void
 
     protected function cacheKey(): string|int
     {
-        return (string) $this->keyCache[$this->currentPosition % max($this->cacheLimit, 1)];
+        return $this->keyCache[$this->currentPosition % max($this->cacheLimit, 1)];
     }
 
     /**

testkit-backend/src/Handlers/AbstractRunner.php

@@ -24,6 +24,7 @@
 use Laudis\Neo4j\TestkitBackend\Responses\FrontendErrorResponse;
 use Laudis\Neo4j\TestkitBackend\Responses\ResultResponse;
 use Laudis\Neo4j\Types\AbstractCypherObject;
+use Laudis\Neo4j\Types\CypherList;
 use Laudis\Neo4j\Types\CypherMap;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Uid\Uuid;
@@ -106,7 +107,7 @@ private function decodeToValue(array $param)
                     $list[] = $this->decodeToValue($v);
                 }
 
-                return new CypherMap($list);
+                return new CypherList($list);
             }
         }
 

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

@@ -20,12 +20,14 @@ final class CypherNode implements TestkitResponseInterface
     private CypherObject $id;
     private CypherObject $labels;
     private CypherObject $props;
+    private CypherObject $elementId;
 
-    public function __construct(CypherObject $id, CypherObject $labels, CypherObject $props)
+    public function __construct(CypherObject $id, CypherObject $labels, CypherObject $props, CypherObject $elementId)
     {
         $this->id = $id;
         $this->labels = $labels;
         $this->props = $props;
+        $this->elementId = $elementId;
     }
 
     public function jsonSerialize(): array
@@ -36,6 +38,7 @@ public function jsonSerialize(): array
                 'id' => $this->id,
                 'labels' => $this->labels,
                 'props' => $this->props,
+                'elementId' => $this->elementId,
             ],
         ];
     }

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

@@ -107,7 +107,8 @@ public static function autoDetect($value): TestkitResponseInterface
                 $tbr = new CypherNode(
                     new CypherObject('CypherInt', $value->getId()),
                     new CypherObject('CypherList', new CypherList($labels)),
-                    new CypherObject('CypherMap', new CypherMap($props))
+                    new CypherObject('CypherMap', new CypherMap($props)),
+                    new CypherObject('CypherString', $value->getElementId())
                 );
                 break;
             case Relationship::class:
@@ -123,6 +124,7 @@ public static function autoDetect($value): TestkitResponseInterface
                     new CypherObject('CypherInt', $value->getEndNodeId()),
                     new CypherObject('CypherString', $value->getType()),
                     new CypherObject('CypherMap', new CypherMap($props)),
+                    new CypherObject('CypherString', $value->getElementId())
                 );
                 break;
             case Path::class:
@@ -157,7 +159,8 @@ public static function autoDetect($value): TestkitResponseInterface
                     new CypherObject('CypherNull', null),
                     new CypherObject('CypherNull', null),
                     new CypherObject('CypherString', $value->getType()),
-                    new CypherObject('CypherMap', new CypherMap($props))
+                    new CypherObject('CypherMap', new CypherMap($props)),
+                    new CypherObject('CypherString', $value->getElementId())
                 );
                 break;
             default:

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

@@ -22,14 +22,16 @@ final class CypherRelationship implements TestkitResponseInterface
     private CypherObject $endNodeId;
     private CypherObject $type;
     private CypherObject $props;
+    private CypherObject $elementId;
 
-    public function __construct(CypherObject $id, CypherObject $startNodeId, CypherObject $endNodeId, CypherObject $type, CypherObject $props)
+    public function __construct(CypherObject $id, CypherObject $startNodeId, CypherObject $endNodeId, CypherObject $type, CypherObject $props, CypherObject $elementId)
     {
         $this->id = $id;
         $this->startNodeId = $startNodeId;
         $this->endNodeId = $endNodeId;
         $this->type = $type;
         $this->props = $props;
+        $this->elementId = $elementId;
     }
 
     public function jsonSerialize(): array
@@ -42,6 +44,7 @@ public function jsonSerialize(): array
                 'endNodeId' => $this->endNodeId,
                 'type' => $this->type,
                 'props' => $this->props,
+                'elementId' => $this->elementId,
             ],
         ];
     }

testkit-backend/testkit.sh

@@ -34,8 +34,9 @@ pip install -r requirements.txt
 echo "Starting tests..."
 # exec python3 main.py --tests UNIT_TESTS
 (exec python3 -m unittest tests.neo4j.test_authentication.TestAuthenticationBasic) || true
-echo "TestAuthenticationBasic Done"
-(exec python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks) || true
+#echo "TestAuthenticationBasic Done"
+python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks || true
 echo "TestBookmarks Done"
-(exec python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_nested) || true
-echo "TestSessionRun Done"
+#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_recover_from_fail_on_streaming|| true
+#echo "TestSessionRun Done"
+