upgrade to cypher datastructures 0.2.0 wip

Author: Syndesi

composer.json

@@ -53,6 +53,7 @@
     },
     "scripts": {
         "test": "export ENABLE_FEATURE_TEST=true && echo -n \"\" > ./tests/test.log && php vendor/phpunit/phpunit/phpunit",
+        "test:current": "export ENABLE_FEATURE_TEST=true && echo -n \"\" > ./tests/test.log && php vendor/phpunit/phpunit/phpunit --group current",
         "test:coverage:xml": "export XDEBUG_MODE=coverage && php ./vendor/phpunit/phpunit/phpunit --coverage-clover coverage.xml",
         "test:coverage:html": "export XDEBUG_MODE=coverage && php ./vendor/phpunit/phpunit/phpunit --coverage-html ./tmp",
         "test:mutant": "export XDEBUG_MODE=coverage && php vendor/infection/infection/bin/infection --threads=4",

src/EventListener/Neo4j/NodeConstraintCreateToStatementEventListener.php

@@ -50,7 +50,7 @@ public static function nodeConstraintStatement(NodeConstraintInterface $nodeCons
             throw InvalidArgumentException::createForConstraintForIsNull();
         }
         $properties = [];
-        foreach ($nodeConstraint->getProperties() as $propertyName) {
+        foreach ($nodeConstraint->getProperties() as $propertyName => $propertyValue) {
             $properties[] = sprintf("e.%s", $propertyName);
         }
         $type = $nodeConstraint->getType();

src/EventListener/Neo4j/RelationConstraintCreateToStatementEventListener.php

@@ -50,7 +50,7 @@ public static function relationConstraintStatement(RelationConstraintInterface $
             throw InvalidArgumentException::createForConstraintForIsNull();
         }
         $properties = [];
-        foreach ($relationConstraint->getProperties() as $propertyName) {
+        foreach ($relationConstraint->getProperties() as $propertyName => $propertyValue) {
             $properties[] = sprintf("e.%s", $propertyName);
         }
         $constraintType = $relationConstraint->getType();

src/Helper/StructureHelper.php

@@ -25,7 +25,7 @@ public static function identifiersToStructure(array $identifiers): string
     {
         $internalIdentifiers = [];
         $publicIdentifiers = [];
-        foreach ($identifiers as $key) {
+        foreach ($identifiers as $key => $value) {
             if (str_starts_with($key, '_')) {
                 $internalIdentifiers[] = $key;
             } else {
@@ -61,11 +61,15 @@ public static function getRelationStructure(RelationInterface $relation): string
     {
         $startNode = $relation->getStartNode();
         if (!$startNode) {
-            throw new InvalidArgumentException('start node can not be null');
+            throw InvalidArgumentException::createForStartNodeIsNull();
         }
         $endNode = $relation->getEndNode();
         if (!$endNode) {
-            throw new InvalidArgumentException('end node can not be null');
+            throw InvalidArgumentException::createForEndNodeIsNull();
+        }
+        $type = $relation->getType();
+        if (!$type) {
+            throw InvalidArgumentException::createForRelationTypeIsNull();
         }
         if (0 === count($relation->getIdentifiers())) {
             throw new InvalidArgumentException('at least one relation identifier is required');
@@ -74,7 +78,7 @@ public static function getRelationStructure(RelationInterface $relation): string
         $parts[] = self::getNodeStructure($startNode);
         $parts[] = sprintf(
             "-[%s %s]->",
-            $relation->getType(),
+            $type,
             self::identifiersToStructure($relation->getIdentifiers())
         );
         $parts[] = self::getNodeStructure($endNode);

tests/ContainerTestCase.php

@@ -18,6 +18,10 @@
 use Syndesi\CypherEntityManager\EventListener\Neo4j\NodeConstraintDeleteToStatementEventListener;
 use Syndesi\CypherEntityManager\EventListener\Neo4j\NodeIndexCreateToStatementEventListener;
 use Syndesi\CypherEntityManager\EventListener\Neo4j\NodeIndexDeleteToStatementEventListener;
+use Syndesi\CypherEntityManager\EventListener\Neo4j\RelationConstraintCreateToStatementEventListener;
+use Syndesi\CypherEntityManager\EventListener\Neo4j\RelationConstraintDeleteToStatementEventListener;
+use Syndesi\CypherEntityManager\EventListener\Neo4j\RelationIndexCreateToStatementEventListener;
+use Syndesi\CypherEntityManager\EventListener\Neo4j\RelationIndexDeleteToStatementEventListener;
 use Syndesi\CypherEntityManager\EventListener\OpenCypher\NodeCreateToStatementEventListener;
 use Syndesi\CypherEntityManager\EventListener\OpenCypher\NodeDeleteToStatementEventListener;
 use Syndesi\CypherEntityManager\EventListener\OpenCypher\NodeMergeToStatementEventListener;
@@ -68,6 +72,10 @@ protected function setUp(): void
         $listenerProvider->addSubscriber(NodeIndexDeleteToStatementEventListener::class, NodeIndexDeleteToStatementEventListener::class);
         $listenerProvider->addSubscriber(NodeConstraintCreateToStatementEventListener::class, NodeConstraintCreateToStatementEventListener::class);
         $listenerProvider->addSubscriber(NodeConstraintDeleteToStatementEventListener::class, NodeConstraintDeleteToStatementEventListener::class);
+        $listenerProvider->addSubscriber(RelationIndexCreateToStatementEventListener::class, RelationIndexCreateToStatementEventListener::class);
+        $listenerProvider->addSubscriber(RelationIndexDeleteToStatementEventListener::class, RelationIndexDeleteToStatementEventListener::class);
+        $listenerProvider->addSubscriber(RelationConstraintCreateToStatementEventListener::class, RelationConstraintCreateToStatementEventListener::class);
+        $listenerProvider->addSubscriber(RelationConstraintDeleteToStatementEventListener::class, RelationConstraintDeleteToStatementEventListener::class);
         $this->container->set(ListenerProviderInterface::class, $listenerProvider);
         $this->container->set(EventDispatcherInterface::class, new Dispatcher(
             $this->container->get(ListenerProviderInterface::class),