Forward change ErrorHelper -> ErrorTrait

Wout Gevaert · Wout Gevaert · commit 79392c7664a4 · 2022-02-14T10:46:39.000+01:00
diff --git a/src/Assignment.php b/src/Assignment.php
@@ -21,7 +21,7 @@
 
 namespace WikibaseSolutions\CypherDSL;
 
-use WikibaseSolutions\CypherDSL\ErrorHandling\ErrorHelper;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 
 /**
@@ -32,6 +32,8 @@
  */
 class Assignment extends BinaryOperator
 {
+    use ErrorTrait;
+
     /**
      * @var bool Whether to use the property mutation instead of the property replacement
      * operator.
@@ -44,7 +46,7 @@ class Assignment extends BinaryOperator
      */
     public function __construct(AnyType $left, AnyType $right)
     {
-        ErrorHelper::assertClass('left', [Property::class, Variable::class], $left);
+        $this->assertClass('left', [Property::class, Variable::class], $left);
 
         parent::__construct($left, $right, false);
     }
diff --git a/src/Clauses/CallProcedureClause.php b/src/Clauses/CallProcedureClause.php
@@ -21,7 +21,7 @@
 
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
-use WikibaseSolutions\CypherDSL\ErrorHandling\ErrorHelper;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Variable;
 
@@ -32,6 +32,8 @@
  */
 class CallProcedureClause extends Clause
 {
+    use ErrorTrait;
+
     /**
      * @var string|null The procedure to call
      */
@@ -74,7 +76,7 @@ public function setProcedure(string $procedure): self
     public function withArguments(array $arguments): self
     {
         foreach ($arguments as $argument) {
-            ErrorHelper::assertClass('argument', AnyType::class, $argument);
+            $this->assertClass('argument', AnyType::class, $argument);
         }
 
         $this->arguments = $arguments;
@@ -105,7 +107,7 @@ public function addArgument(AnyType $argument): self
     public function yields(array $variables): self
     {
         foreach ($variables as $variable) {
-            ErrorHelper::assertClass('variable', Variable::class, $variable);
+            $this->assertClass('variable', Variable::class, $variable);
         }
 
         $this->yieldVariables = $variables;
diff --git a/src/Clauses/CreateClause.php b/src/Clauses/CreateClause.php
@@ -22,7 +22,7 @@
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
 use WikibaseSolutions\CypherDSL\Assignment;
-use WikibaseSolutions\CypherDSL\ErrorHandling\ErrorHelper;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
 
 /**
@@ -32,6 +32,8 @@
  */
 class CreateClause extends Clause
 {
+    use ErrorTrait;
+
     /**
      * @var StructuralType[]|Assignment[] The patterns to create
      */
@@ -45,7 +47,7 @@ class CreateClause extends Clause
      */
     public function addPattern( $pattern ): self
     {
-        ErrorHelper::assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
+        $this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
 
         $this->patterns[] = $pattern;
 
diff --git a/src/Clauses/MatchClause.php b/src/Clauses/MatchClause.php
@@ -22,7 +22,7 @@
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
 use WikibaseSolutions\CypherDSL\Assignment;
-use WikibaseSolutions\CypherDSL\ErrorHandling\ErrorHelper;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
 
 /**
@@ -32,6 +32,8 @@
  */
 class MatchClause extends Clause
 {
+    use ErrorTrait;
+
     /**
      * @var StructuralType[]|Assignment[] List of patterns
      */
@@ -45,7 +47,7 @@ class MatchClause extends Clause
      */
     public function addPattern( $pattern ): self
     {
-        ErrorHelper::assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
+        $this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
 
         $this->patterns[] = $pattern;
 
diff --git a/src/Clauses/MergeClause.php b/src/Clauses/MergeClause.php
@@ -21,7 +21,7 @@
 
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
-use WikibaseSolutions\CypherDSL\ErrorHandling\ErrorHelper;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Assignment;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
 
@@ -32,6 +32,8 @@
  */
 class MergeClause extends Clause
 {
+    use ErrorTrait;
+
     /**
      * @var StructuralType|Assignment|null $pattern The pattern to merge
      */
@@ -55,7 +57,7 @@ class MergeClause extends Clause
      */
     public function setPattern($pattern): self
     {
-        ErrorHelper::assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
+        $this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
 
         $this->pattern = $pattern;
 
diff --git a/src/Clauses/OptionalMatchClause.php b/src/Clauses/OptionalMatchClause.php
@@ -22,7 +22,7 @@
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
 use WikibaseSolutions\CypherDSL\Assignment;
-use WikibaseSolutions\CypherDSL\ErrorHandling\ErrorHelper;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
 
 /**
@@ -32,6 +32,8 @@
  */
 class OptionalMatchClause extends Clause
 {
+    use ErrorTrait;
+
     /**
      * @var StructuralType[]|Assignment[] List of patterns
      */
@@ -45,7 +47,7 @@ class OptionalMatchClause extends Clause
      */
     public function addPattern( $pattern ): self
     {
-        ErrorHelper::assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
+        $this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
 
         $this->patterns[] = $pattern;
 
diff --git a/src/Clauses/RemoveClause.php b/src/Clauses/RemoveClause.php
@@ -21,7 +21,7 @@
 
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
-use WikibaseSolutions\CypherDSL\ErrorHandling\ErrorHelper;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Label;
 use WikibaseSolutions\CypherDSL\Property;
 use WikibaseSolutions\CypherDSL\QueryConvertable;
@@ -33,6 +33,8 @@
  */
 class RemoveClause extends Clause
 {
+    use ErrorTrait;
+
     /**
      * @var Property[]|Label[] The expressions in this REMOVE clause.
      */
@@ -46,7 +48,7 @@ class RemoveClause extends Clause
      */
     public function addExpression($expression): self
     {
-        ErrorHelper::assertClass('expression', [Property::class, Label::class], $expression);
+        $this->assertClass('expression', [Property::class, Label::class], $expression);
 
         $this->expressions[] = $expression;
 
diff --git a/src/Clauses/SetClause.php b/src/Clauses/SetClause.php
@@ -22,7 +22,7 @@
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
 use WikibaseSolutions\CypherDSL\Assignment;
-use WikibaseSolutions\CypherDSL\ErrorHandling\ErrorHelper;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Label;
 use WikibaseSolutions\CypherDSL\QueryConvertable;
 
@@ -33,6 +33,8 @@
  */
 class SetClause extends Clause
 {
+    use ErrorTrait;
+
     /**
      * @var Assignment[]|Label[] $expressions The expressions to set
      */
@@ -46,7 +48,7 @@ class SetClause extends Clause
      */
     public function addAssignment($expression): self
     {
-        ErrorHelper::assertClass('expression', [Assignment::class, Label::class], $expression);
+        $this->assertClass('expression', [Assignment::class, Label::class], $expression);
 
         $this->expressions[] = $expression;
 
diff --git a/src/ExpressionList.php b/src/ExpressionList.php
@@ -22,7 +22,7 @@
 namespace WikibaseSolutions\CypherDSL;
 
 use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
-use WikibaseSolutions\CypherDSL\ErrorHandling\ErrorHelper;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Traits\ListTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\CompositeTypes\ListType;
@@ -38,6 +38,7 @@
 class ExpressionList implements ListType
 {
     use EscapeTrait;
+    use ErrorTrait;
     use ListTypeTrait;
 
     /**
@@ -53,7 +54,7 @@ class ExpressionList implements ListType
     public function __construct(array $expressions)
     {
         foreach ($expressions as $expression) {
-            ErrorHelper::assertClass('expression', AnyType::class, $expression);
+            $this->assertClass('expression', AnyType::class, $expression);
         }
 
         $this->expressions = $expressions;
diff --git a/src/Functions/IsEmpty.php b/src/Functions/IsEmpty.php
@@ -21,7 +21,7 @@
 
 namespace WikibaseSolutions\CypherDSL\Functions;
 
-use WikibaseSolutions\CypherDSL\ErrorHandling\ErrorHelper;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Traits\BooleanTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\CompositeTypes\ListType;
@@ -37,6 +37,7 @@
 class IsEmpty extends FunctionCall implements BooleanType
 {
     use BooleanTypeTrait;
+    use ErrorTrait;
 
     /**
      * @var ListType|MapType|StringType An expression that returns a list
@@ -54,7 +55,7 @@ class IsEmpty extends FunctionCall implements BooleanType
      */
     public function __construct(AnyType $list)
     {
-        ErrorHelper::assertClass('list', [ListType::class, MapType::class, StringType::class], $list);
+        $this->assertClass('list', [ListType::class, MapType::class, StringType::class], $list);
 
         $this->list = $list;
     }
diff --git a/src/Functions/RawFunction.php b/src/Functions/RawFunction.php
@@ -22,7 +22,7 @@
 namespace WikibaseSolutions\CypherDSL\Functions;
 
 use InvalidArgumentException;
-use WikibaseSolutions\CypherDSL\ErrorHandling\ErrorHelper;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Traits\BooleanTypeTrait;
 use WikibaseSolutions\CypherDSL\Traits\ListTypeTrait;
 use WikibaseSolutions\CypherDSL\Traits\MapTypeTrait;
@@ -53,6 +53,7 @@ class RawFunction extends FunctionCall implements
     PathType
 {
     use BooleanTypeTrait;
+    use ErrorTrait;
     use ListTypeTrait;
     use MapTypeTrait;
     use NodeTypeTrait;
@@ -79,7 +80,7 @@ class RawFunction extends FunctionCall implements
     public function __construct(string $functionName, array $parameters)
     {
         foreach ($parameters as $parameter) {
-            ErrorHelper::assertClass('parameter', AnyType::class, $parameter);
+            $this->assertClass('parameter', AnyType::class, $parameter);
         }
 
         if (!preg_match("/^[a-zA-Z0-9_]+$/", $functionName)) {
diff --git a/src/PropertyMap.php b/src/PropertyMap.php
@@ -21,7 +21,7 @@
 
 namespace WikibaseSolutions\CypherDSL;
 
-use WikibaseSolutions\CypherDSL\ErrorHandling\ErrorHelper;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
 use WikibaseSolutions\CypherDSL\Traits\MapTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
@@ -38,6 +38,7 @@
 class PropertyMap implements MapType
 {
     use EscapeTrait;
+    use ErrorTrait;
     use MapTypeTrait;
 
     /**
@@ -53,7 +54,7 @@ class PropertyMap implements MapType
     public function __construct(array $properties = [])
     {
         foreach ($properties as $property) {
-            ErrorHelper::assertClass('property', AnyType::class, $property);
+            $this->assertClass('property', AnyType::class, $property);
         }
 
         $this->properties = $properties;
diff --git a/src/Query.php b/src/Query.php
diff --git a/src/Traits/ErrorTrait.php b/src/Traits/ErrorTrait.php
diff --git a/tests/Unit/Traits/ErrorTraitTest.php b/tests/Unit/Traits/ErrorTraitTest.php

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`namespace WikibaseSolutions\CypherDSL\Clauses;`
`23`	`23`
`24`		`-use WikibaseSolutions\CypherDSL\ErrorHandling\ErrorHelper;`
	`24`	`+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;`
`25`	`25`	`use WikibaseSolutions\CypherDSL\Types\AnyType;`
`26`	`26`	`use WikibaseSolutions\CypherDSL\Variable;`
`27`	`27`
`@@ -32,6 +32,8 @@`
`32`	`32`	`*/`
`33`	`33`	`class CallProcedureClause extends Clause`
`34`	`34`	`{`
	`35`	`+ use ErrorTrait;`
	`36`	`+`
`35`	`37`	`/**`
`36`	`38`	`* @var string\|null The procedure to call`
`37`	`39`	`*/`
`@@ -74,7 +76,7 @@ public function setProcedure(string $procedure): self`
`74`	`76`	`public function withArguments(array $arguments): self`
`75`	`77`	`{`
`76`	`78`	`foreach ($arguments as $argument) {`
`77`		`- ErrorHelper::assertClass('argument', AnyType::class, $argument);`
	`79`	`+ $this->assertClass('argument', AnyType::class, $argument);`
`78`	`80`	`}`
`79`	`81`
`80`	`82`	`$this->arguments = $arguments;`
`@@ -105,7 +107,7 @@ public function addArgument(AnyType $argument): self`
`105`	`107`	`public function yields(array $variables): self`
`106`	`108`	`{`
`107`	`109`	`foreach ($variables as $variable) {`
`108`		`- ErrorHelper::assertClass('variable', Variable::class, $variable);`
	`110`	`+ $this->assertClass('variable', Variable::class, $variable);`
`109`	`111`	`}`
`110`	`112`
`111`	`113`	`$this->yieldVariables = $variables;`