wip improve exception messages

Syndesi · Syndesi · commit e606e607bf76 · 2022-11-06T20:38:41.000+01:00
diff --git a/src/EventListener/Neo4j/ConstraintCreateToStatementEventListener.php b/src/EventListener/Neo4j/ConstraintCreateToStatementEventListener.php
@@ -45,12 +45,12 @@ public static function constraintStatement(ConstraintInterface $constraint): Sta
     {
         $constraintName = $constraint->getConstraintName();
         if (null === $constraintName) {
-            throw new InvalidArgumentException("constraint name can not be null");
+            throw InvalidArgumentException::createForConstraintNameIsNull();
         }
         $elementIdentifier = '';
         $elementLabel = $constraint->getFor();
         if (null === $elementLabel) {
-            throw new InvalidArgumentException("constraint for label/type can not be null");
+            throw InvalidArgumentException::createForConstraintForIsNull();
         }
         if ($elementLabel instanceof NodeLabelInterface) {
             $elementIdentifier = '(e:'.((string) $elementLabel).')';
@@ -66,7 +66,7 @@ public static function constraintStatement(ConstraintInterface $constraint): Sta
         }
         $constraintType = $constraint->getConstraintType();
         if (null === $constraintType) {
-            throw new InvalidArgumentException("constraint type can not be null");
+            throw InvalidArgumentException::createForConstraintTypeIsNull();
         }
 
         return new Statement(sprintf(
diff --git a/src/EventListener/Neo4j/ConstraintDeleteToStatementEventListener.php b/src/EventListener/Neo4j/ConstraintDeleteToStatementEventListener.php
@@ -43,7 +43,7 @@ public static function constraintStatement(ConstraintInterface $constraint): Sta
     {
         $constraintName = $constraint->getConstraintName();
         if (null === $constraintName) {
-            throw new InvalidArgumentException('constraint name can not be null when deleting a constraint');
+            throw InvalidArgumentException::createForConstraintNameIsNull();
         }
 
         return new Statement(sprintf(
diff --git a/src/EventListener/Neo4j/IndexCreateToStatementEventListener.php b/src/EventListener/Neo4j/IndexCreateToStatementEventListener.php
@@ -47,13 +47,13 @@ public static function indexStatement(IndexInterface $index): Statement
         $propertyIdentifier = '';
 
         $indexType = $index->getIndexType();
-        if (null === $indexType) {
-            throw new InvalidArgumentException('index type can not be null when creating an index');
+        if (!$indexType) {
+            throw InvalidArgumentException::createForIndexTypeIsNull();
         }
 
         $elementLabel = $index->getFor();
-        if (null === $elementLabel) {
-            throw new InvalidArgumentException("index for label/type can not be null");
+        if (!$elementLabel) {
+            throw InvalidArgumentException::createForIndexForIsNull();
         }
         if ($elementLabel instanceof NodeLabelInterface) {
             $elementIdentifier = '(e:'.((string) $elementLabel).')';
diff --git a/src/EventListener/Neo4j/IndexDeleteToStatementEventListener.php b/src/EventListener/Neo4j/IndexDeleteToStatementEventListener.php
@@ -43,7 +43,7 @@ public static function indexStatement(IndexInterface $index): Statement
     {
         $indexName = $index->getIndexName();
         if (null === $indexName) {
-            throw new InvalidArgumentException('index name can not be null when deleting an index');
+            throw InvalidArgumentException::createForIndexNameIsNull();
         }
 
         return new Statement(sprintf(
diff --git a/src/EventListener/OpenCypher/RelationCreateToStatementEventListener.php b/src/EventListener/OpenCypher/RelationCreateToStatementEventListener.php
@@ -57,11 +57,11 @@ public static function relationStatement(RelationInterface $relation): Statement
         }
         $startNode = $relation->getStartNode();
         if (null === $startNode) {
-            throw new InvalidArgumentException('the start node of relations can not be null');
+            throw InvalidArgumentException::createForStartNodeIsNull();
         }
         $endNode = $relation->getEndNode();
         if (null === $endNode) {
-            throw new InvalidArgumentException('the end node of relations can not be null');
+            throw InvalidArgumentException::createForEndNodeIsNull();
         }
 
         return new Statement(
diff --git a/src/EventListener/OpenCypher/RelationDeleteToStatementEventListener.php b/src/EventListener/OpenCypher/RelationDeleteToStatementEventListener.php
@@ -45,11 +45,11 @@ public static function relationStatement(RelationInterface $relation): Statement
     {
         $startNode = $relation->getStartNode();
         if (null === $startNode) {
-            throw new InvalidArgumentException('the start node of relations can not be null');
+            throw InvalidArgumentException::createForStartNodeIsNull();
         }
         $endNode = $relation->getEndNode();
         if (null === $endNode) {
-            throw new InvalidArgumentException('the end node of relations can not be null');
+            throw InvalidArgumentException::createForEndNodeIsNull();
         }
 
         return new Statement(
diff --git a/src/EventListener/OpenCypher/RelationMergeToStatementEventListener.php b/src/EventListener/OpenCypher/RelationMergeToStatementEventListener.php
@@ -45,11 +45,11 @@ public static function relationStatement(RelationInterface $relation): Statement
     {
         $startNode = $relation->getStartNode();
         if (null === $startNode) {
-            throw new InvalidArgumentException('the start node of relations can not be null');
+            throw InvalidArgumentException::createForStartNodeIsNull();
         }
         $endNode = $relation->getEndNode();
         if (null === $endNode) {
-            throw new InvalidArgumentException('the end node of relations can not be null');
+            throw InvalidArgumentException::createForEndNodeIsNull();
         }
 
         return new Statement(
diff --git a/src/EventListener/OpenCypher/SimilarRelationQueueCreateToStatementEventListener.php b/src/EventListener/OpenCypher/SimilarRelationQueueCreateToStatementEventListener.php
@@ -53,10 +53,10 @@ public static function similarRelationQueueStatement(SimilarRelationQueueInterfa
             $startNode = $relation->getStartNode();
             $endNode = $relation->getEndNode();
             if (!$startNode) {
-                throw new InvalidArgumentException('start node of relations can not be null');
+                throw InvalidArgumentException::createForStartNodeIsNull();
             }
             if (!$endNode) {
-                throw new InvalidArgumentException('start node of relations can not be null');
+                throw InvalidArgumentException::createForEndNodeIsNull();
             }
             if (!$firstRelation) {
                 $firstRelation = $relation;
@@ -74,10 +74,14 @@ public static function similarRelationQueueStatement(SimilarRelationQueueInterfa
             return StructureHelper::getEmptyStatement();
         }
         if (!$firstRelationStartNode) {
-            throw new InvalidArgumentException('start node of relations can not be null');
+            throw InvalidArgumentException::createForStartNodeIsNull();
         }
         if (!$firstRelationEndNode) {
-            throw new InvalidArgumentException('end node of relations can not be null');
+            throw InvalidArgumentException::createForEndNodeIsNull();
+        }
+        $relationType = $firstRelation->getRelationType();
+        if (!$relationType) {
+            throw InvalidArgumentException::createForRelationTypeIsNull();
         }
 
         return new Statement(
@@ -92,7 +96,7 @@ public static function similarRelationQueueStatement(SimilarRelationQueueInterfa
                 StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstRelationStartNode, 'row.startNodeIdentifier'),
                 ToCypherHelper::nodeLabelStorageToCypherLabelString($firstRelationEndNode->getNodeLabels()),
                 StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstRelationEndNode, 'row.endNodeIdentifier'),
-                (string) $firstRelation->getRelationType(),
+                (string) $relationType,
                 StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstRelation, 'row.relationIdentifier')
             ),
             [
diff --git a/src/EventListener/OpenCypher/SimilarRelationQueueDeleteToStatementEventListener.php b/src/EventListener/OpenCypher/SimilarRelationQueueDeleteToStatementEventListener.php
@@ -53,10 +53,10 @@ public static function similarRelationQueueStatement(SimilarRelationQueueInterfa
             $startNode = $relation->getStartNode();
             $endNode = $relation->getEndNode();
             if (!$startNode) {
-                throw new InvalidArgumentException('start node of relations can not be null');
+                throw InvalidArgumentException::createForStartNodeIsNull();
             }
             if (!$endNode) {
-                throw new InvalidArgumentException('start node of relations can not be null');
+                throw InvalidArgumentException::createForEndNodeIsNull();
             }
             if (!$firstRelation) {
                 $firstRelation = $relation;
@@ -73,10 +73,14 @@ public static function similarRelationQueueStatement(SimilarRelationQueueInterfa
             return StructureHelper::getEmptyStatement();
         }
         if (!$firstRelationStartNode) {
-            throw new InvalidArgumentException('start node of relations can not be null');
+            throw InvalidArgumentException::createForStartNodeIsNull();
         }
         if (!$firstRelationEndNode) {
-            throw new InvalidArgumentException('end node of relations can not be null');
+            throw InvalidArgumentException::createForEndNodeIsNull();
+        }
+        $relationType = $firstRelation->getRelationType();
+        if (!$relationType) {
+            throw InvalidArgumentException::createForRelationTypeIsNull();
         }
 
         return new Statement(
@@ -86,7 +90,7 @@ public static function similarRelationQueueStatement(SimilarRelationQueueInterfa
                 "DELETE relation",
                 ToCypherHelper::nodeLabelStorageToCypherLabelString($firstRelationStartNode->getNodeLabels()),
                 StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstRelationStartNode, 'row.startNodeIdentifier'),
-                (string) $firstRelation->getRelationType(),
+                (string) $relationType,
                 StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstRelation, 'row.relationIdentifier'),
                 ToCypherHelper::nodeLabelStorageToCypherLabelString($firstRelationEndNode->getNodeLabels()),
                 StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstRelationEndNode, 'row.endNodeIdentifier'),
diff --git a/src/EventListener/OpenCypher/SimilarRelationQueueMergeToStatementEventListener.php b/src/EventListener/OpenCypher/SimilarRelationQueueMergeToStatementEventListener.php
@@ -53,10 +53,10 @@ public static function similarRelationQueueStatement(SimilarRelationQueueInterfa
             $startNode = $relation->getStartNode();
             $endNode = $relation->getEndNode();
             if (!$startNode) {
-                throw new InvalidArgumentException('start node of relations can not be null');
+                throw InvalidArgumentException::createForStartNodeIsNull();
             }
             if (!$endNode) {
-                throw new InvalidArgumentException('start node of relations can not be null');
+                throw InvalidArgumentException::createForEndNodeIsNull();
             }
             if (!$firstRelation) {
                 $firstRelation = $relation;
@@ -74,10 +74,14 @@ public static function similarRelationQueueStatement(SimilarRelationQueueInterfa
             return StructureHelper::getEmptyStatement();
         }
         if (!$firstRelationStartNode) {
-            throw new InvalidArgumentException('start node of relations can not be null');
+            throw InvalidArgumentException::createForStartNodeIsNull();
         }
         if (!$firstRelationEndNode) {
-            throw new InvalidArgumentException('end node of relations can not be null');
+            throw InvalidArgumentException::createForEndNodeIsNull();
+        }
+        $relationType = $firstRelation->getRelationType();
+        if (!$relationType) {
+            throw InvalidArgumentException::createForRelationTypeIsNull();
         }
 
         return new Statement(
@@ -92,7 +96,7 @@ public static function similarRelationQueueStatement(SimilarRelationQueueInterfa
                 StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstRelationStartNode, 'row.startNodeIdentifier'),
                 ToCypherHelper::nodeLabelStorageToCypherLabelString($firstRelationEndNode->getNodeLabels()),
                 StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstRelationEndNode, 'row.endNodeIdentifier'),
-                (string) $firstRelation->getRelationType(),
+                (string) $relationType,
                 StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstRelation, 'row.relationIdentifier')
             ),
             [
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -27,8 +27,48 @@ public static function createForTypeMismatch(string $typeExpected, string $typeG
         ));
     }
 
-    public static function createForNotCypherElementType(string $typeGot): self
+    public static function createForStartNodeIsNull(): self
     {
-        return self::createForTypeMismatch('NodeInterface|RelationInterface|IndexInterface|ConstraintInterface', $typeGot);
+        return new InvalidArgumentException("Start node of relation can not be null");
+    }
+
+    public static function createForEndNodeIsNull(): self
+    {
+        return new InvalidArgumentException("End node of relation can not be null");
+    }
+
+    public static function createForRelationTypeIsNull(): self
+    {
+        return new InvalidArgumentException("Relation type of relation can not be null");
+    }
+
+    public static function createForIndexNameIsNull(): self
+    {
+        return new InvalidArgumentException("Index name can not be null");
+    }
+
+    public static function createForIndexTypeIsNull(): self
+    {
+        return new InvalidArgumentException("Index type can not be null");
+    }
+
+    public static function createForIndexForIsNull(): self
+    {
+        return new InvalidArgumentException("Index for (node label / relation type) can not be null");
+    }
+
+    public static function createForConstraintTypeIsNull(): self
+    {
+        return new InvalidArgumentException("Constraint type can not be null");
+    }
+
+    public static function createForConstraintNameIsNull(): self
+    {
+        return new InvalidArgumentException("Constraint name can not be null");
+    }
+
+    public static function createForConstraintForIsNull(): self
+    {
+        return new InvalidArgumentException("Constraint for (node label / relation type) can not be null");
     }
 }
diff --git a/tests/EventListener/Neo4j/ConstraintCreateToStatementEventListenerTest.php b/tests/EventListener/Neo4j/ConstraintCreateToStatementEventListenerTest.php
@@ -107,7 +107,7 @@ public function testInvalidIndexStatementWithEmptyConstraintName(): void
             ->addProperty(new PropertyName('id'));
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('constraint name can not be null');
+        $this->expectExceptionMessage('Constraint name can not be null');
         ConstraintCreateToStatementEventListener::constraintStatement($constraint);
     }
 
@@ -122,7 +122,7 @@ public function testInvalidIndexStatementWithEmptyElementLabel(): void
             ->addProperty(new PropertyName('id'));
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('constraint for label/type can not be null');
+        $this->expectExceptionMessage('Constraint for (node label / relation type) can not be null');
         ConstraintCreateToStatementEventListener::constraintStatement($constraint);
     }
 
@@ -137,7 +137,7 @@ public function testInvalidIndexStatementWithEmptyConstraintType(): void
             ->addProperty(new PropertyName('id'));
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('constraint type can not be null');
+        $this->expectExceptionMessage('Constraint type can not be null');
         ConstraintCreateToStatementEventListener::constraintStatement($constraint);
     }
 }
diff --git a/tests/EventListener/Neo4j/ConstraintDeleteToStatementEventListenerTest.php b/tests/EventListener/Neo4j/ConstraintDeleteToStatementEventListenerTest.php
@@ -107,7 +107,7 @@ public function testInvalidIndexStatementWithEmptyConstraintName(): void
             ->addProperty(new PropertyName('id'));
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('constraint name can not be null');
+        $this->expectExceptionMessage('Constraint name can not be null');
         ConstraintDeleteToStatementEventListener::constraintStatement($constraint);
     }
 }
diff --git a/tests/EventListener/Neo4j/IndexCreateToStatementEventListenerTest.php b/tests/EventListener/Neo4j/IndexCreateToStatementEventListenerTest.php
@@ -107,7 +107,7 @@ public function testInvalidIndexStatementWithEmptyIndexType(): void
             ->addProperty(new PropertyName('id'));
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('index type can not be null when creating an index');
+        $this->expectExceptionMessage('Index type can not be null');
         IndexCreateToStatementEventListener::indexStatement($nodeIndex);
     }
 
@@ -122,7 +122,7 @@ public function testInvalidIndexStatementWithEmptyElementLabel(): void
             ->addProperty(new PropertyName('id'));
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('index for label/type can not be null');
+        $this->expectExceptionMessage('Index for (node label / relation type) can not be null');
         IndexCreateToStatementEventListener::indexStatement($nodeIndex);
     }
 }
diff --git a/tests/EventListener/Neo4j/IndexDeleteToStatementEventListenerTest.php b/tests/EventListener/Neo4j/IndexDeleteToStatementEventListenerTest.php
@@ -107,7 +107,7 @@ public function testInvalidIndexStatementWithEmptyIndexName(): void
             ->addProperty(new PropertyName('id'));
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('index name can not be null when deleting an index');
+        $this->expectExceptionMessage('Index name can not be null');
         IndexDeleteToStatementEventListener::indexStatement($nodeIndex);
     }
 }
diff --git a/tests/EventListener/OpenCypher/RelationCreateToStatementEventListenerTest.php b/tests/EventListener/OpenCypher/RelationCreateToStatementEventListenerTest.php
@@ -106,7 +106,7 @@ public function testInvalidOnActionCypherElementToStatementEventWithNoStartNode(
             ->addIdentifier(new PropertyName('id'));
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('the start node of relations can not be null');
+        $this->expectExceptionMessage('Start node of relation can not be null');
         RelationCreateToStatementEventListener::relationStatement($relation);
     }
 
@@ -129,7 +129,7 @@ public function testInvalidOnActionCypherElementToStatementEventWithNoEndNode():
             ->addIdentifier(new PropertyName('id'));
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('the end node of relations can not be null');
+        $this->expectExceptionMessage('End node of relation can not be null');
         RelationCreateToStatementEventListener::relationStatement($relation);
     }
 
diff --git a/tests/EventListener/OpenCypher/RelationDeleteToStatementEventListenerTest.php b/tests/EventListener/OpenCypher/RelationDeleteToStatementEventListenerTest.php
@@ -106,7 +106,7 @@ public function testInvalidOnActionCypherElementToStatementEventWithNoStartNode(
             ->addIdentifier(new PropertyName('id'));
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('the start node of relations can not be null');
+        $this->expectExceptionMessage('Start node of relation can not be null');
         RelationDeleteToStatementEventListener::relationStatement($relation);
     }
 
@@ -129,7 +129,7 @@ public function testInvalidOnActionCypherElementToStatementEventWithNoEndNode():
             ->addIdentifier(new PropertyName('id'));
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('the end node of relations can not be null');
+        $this->expectExceptionMessage('End node of relation can not be null');
         RelationDeleteToStatementEventListener::relationStatement($relation);
     }
 
diff --git a/tests/EventListener/OpenCypher/RelationMergeToStatementEventListenerTest.php b/tests/EventListener/OpenCypher/RelationMergeToStatementEventListenerTest.php
@@ -106,7 +106,7 @@ public function testInvalidOnActionCypherElementToStatementEventWithNoStartNode(
             ->addIdentifier(new PropertyName('id'));
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('the start node of relations can not be null');
+        $this->expectExceptionMessage('Start node of relation can not be null');
         RelationMergeToStatementEventListener::relationStatement($relation);
     }
 
@@ -129,7 +129,7 @@ public function testInvalidOnActionCypherElementToStatementEventWithNoEndNode():
             ->addIdentifier(new PropertyName('id'));
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('the end node of relations can not be null');
+        $this->expectExceptionMessage('End node of relation can not be null');
         RelationMergeToStatementEventListener::relationStatement($relation);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,12 @@ public static function constraintStatement(ConstraintInterface $constraint): Sta`
`45`	`45`	`{`
`46`	`46`	`$constraintName = $constraint->getConstraintName();`
`47`	`47`	`if (null === $constraintName) {`
`48`		`- throw new InvalidArgumentException("constraint name can not be null");`
	`48`	`+ throw InvalidArgumentException::createForConstraintNameIsNull();`
`49`	`49`	`}`
`50`	`50`	`$elementIdentifier = '';`
`51`	`51`	`$elementLabel = $constraint->getFor();`
`52`	`52`	`if (null === $elementLabel) {`
`53`		`- throw new InvalidArgumentException("constraint for label/type can not be null");`
	`53`	`+ throw InvalidArgumentException::createForConstraintForIsNull();`
`54`	`54`	`}`
`55`	`55`	`if ($elementLabel instanceof NodeLabelInterface) {`
`56`	`56`	`$elementIdentifier = '(e:'.((string) $elementLabel).')';`
`@@ -66,7 +66,7 @@ public static function constraintStatement(ConstraintInterface $constraint): Sta`
`66`	`66`	`}`
`67`	`67`	`$constraintType = $constraint->getConstraintType();`
`68`	`68`	`if (null === $constraintType) {`
`69`		`- throw new InvalidArgumentException("constraint type can not be null");`
	`69`	`+ throw InvalidArgumentException::createForConstraintTypeIsNull();`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`return new Statement(sprintf(`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static function constraintStatement(ConstraintInterface $constraint): Sta`
`43`	`43`	`{`
`44`	`44`	`$constraintName = $constraint->getConstraintName();`
`45`	`45`	`if (null === $constraintName) {`
`46`		`- throw new InvalidArgumentException('constraint name can not be null when deleting a constraint');`
	`46`	`+ throw InvalidArgumentException::createForConstraintNameIsNull();`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`return new Statement(sprintf(`
Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,11 @@ public static function relationStatement(RelationInterface $relation): Statement`
`57`	`57`	`}`
`58`	`58`	`$startNode = $relation->getStartNode();`
`59`	`59`	`if (null === $startNode) {`
`60`		`- throw new InvalidArgumentException('the start node of relations can not be null');`
	`60`	`+ throw InvalidArgumentException::createForStartNodeIsNull();`
`61`	`61`	`}`
`62`	`62`	`$endNode = $relation->getEndNode();`
`63`	`63`	`if (null === $endNode) {`
`64`		`- throw new InvalidArgumentException('the end node of relations can not be null');`
	`64`	`+ throw InvalidArgumentException::createForEndNodeIsNull();`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`return new Statement(`
Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,11 @@ public static function relationStatement(RelationInterface $relation): Statement`
`45`	`45`	`{`
`46`	`46`	`$startNode = $relation->getStartNode();`
`47`	`47`	`if (null === $startNode) {`
`48`		`- throw new InvalidArgumentException('the start node of relations can not be null');`
	`48`	`+ throw InvalidArgumentException::createForStartNodeIsNull();`
`49`	`49`	`}`
`50`	`50`	`$endNode = $relation->getEndNode();`
`51`	`51`	`if (null === $endNode) {`
`52`		`- throw new InvalidArgumentException('the end node of relations can not be null');`
	`52`	`+ throw InvalidArgumentException::createForEndNodeIsNull();`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`return new Statement(`