merged main into qol

Author: transistive

src/Addition.php

@@ -48,4 +48,4 @@ protected function getOperator(): string
     {
         return "+";
     }
-}
+}

src/AndOperator.php

@@ -48,4 +48,4 @@ protected function getOperator(): string
     {
         return "AND";
     }
-}
+}

src/Assignment.php

@@ -21,7 +21,7 @@
 
 namespace WikibaseSolutions\CypherDSL;
 
-use TypeError;
+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,9 +46,7 @@ class Assignment extends BinaryOperator
      */
     public function __construct(AnyType $left, AnyType $right)
     {
-        if (!($left instanceof Property) && !($left instanceof Variable)) {
-            throw new TypeError("\$left must be either a Property or a Variable");
-        }
+        $this->assertClass('left', [Property::class, Variable::class], $left);
 
         parent::__construct($left, $right, false);
     }
@@ -82,4 +82,4 @@ protected function getOperator(): string
     {
         return $this->mutate ? "+=" : "=";
     }
-}
+}

src/BinaryOperator.php

@@ -106,4 +106,4 @@ public function insertsParentheses(): bool
     {
         return $this->insertParentheses;
     }
-}
+}

src/Clauses/CallProcedureClause.php

@@ -21,7 +21,7 @@
 
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
-use InvalidArgumentException;
+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
      */
@@ -104,9 +106,7 @@ public function getArguments(): array
     public function withArguments(array $arguments): self
     {
         foreach ($arguments as $argument) {
-            if (!($argument instanceof AnyType)) {
-                throw new InvalidArgumentException("\$arguments should only consist of AnyType objects");
-            }
+            $this->assertClass('argument', AnyType::class, $argument);
         }
 
         $this->arguments = $arguments;
@@ -137,9 +137,7 @@ public function addArgument(AnyType $argument): self
     public function yields(array $variables): self
     {
         foreach ($variables as $variable) {
-            if (!($variable instanceof Variable)) {
-                throw new InvalidArgumentException("\$variables should only consist of Variable objects");
-            }
+            $this->assertClass('variable', Variable::class, $variable);
         }
 
         $this->yieldVariables = $variables;
@@ -166,18 +164,18 @@ protected function getSubject(): string
 
         $arguments = implode(
             ", ",
-            array_map(fn(AnyType $pattern): string => $pattern->toQuery(), $this->arguments)
+            array_map(fn (AnyType $pattern): string => $pattern->toQuery(), $this->arguments)
         );
 
         if (count($this->yieldVariables) > 0) {
             $yieldParameters = implode(
                 ", ",
-                array_map(fn(Variable $variable): string => $variable->toQuery(), $this->yieldVariables)
+                array_map(fn (Variable $variable): string => $variable->toQuery(), $this->yieldVariables)
             );
 
             return sprintf("%s(%s) YIELD %s", $this->procedure, $arguments, $yieldParameters);
         } else {
             return sprintf("%s(%s)", $this->procedure, $arguments);
         }
     }
-}
+}

src/Clauses/Clause.php

@@ -68,4 +68,4 @@ public function canBeEmpty(): bool
      * @return string
      */
     abstract protected function getClause(): string;
-}
+}

src/Clauses/CreateClause.php

@@ -21,6 +21,8 @@
 
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
+use WikibaseSolutions\CypherDSL\Assignment;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
 
 /**
@@ -30,19 +32,23 @@
  */
 class CreateClause extends Clause
 {
+    use ErrorTrait;
+
     /**
-     * @var StructuralType[] The patterns to create
+     * @var StructuralType[]|Assignment[] The patterns to create
      */
     private array $patterns = [];
 
     /**
      * Add a pattern to create.
      *
-     * @param StructuralType $pattern The pattern to create
+     * @param StructuralType|Assignment $pattern The pattern to create
      * @return CreateClause
      */
-    public function addPattern(StructuralType $pattern): self
+    public function addPattern($pattern): self
     {
+        $this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
+
         $this->patterns[] = $pattern;
 
         return $this;
@@ -73,7 +79,7 @@ protected function getSubject(): string
     {
         return implode(
             ", ",
-            array_map(fn(StructuralType $pattern): string => $pattern->toQuery(), $this->patterns)
+            array_map(fn ($pattern): string => $pattern->toQuery(), $this->patterns)
         );
     }
-}
+}

src/Clauses/DeleteClause.php

@@ -111,7 +111,7 @@ protected function getSubject(): string
     {
         return implode(
             ", ",
-            array_map(fn(NodeType $node) => $node->toQuery(), $this->nodes)
+            array_map(fn (NodeType $node) => $node->toQuery(), $this->nodes)
         );
     }
-}
+}

src/Clauses/LimitClause.php

@@ -79,4 +79,4 @@ protected function getSubject(): string
 
         return "";
     }
-}
+}

src/Clauses/MatchClause.php

@@ -21,6 +21,8 @@
 
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
+use WikibaseSolutions\CypherDSL\Assignment;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
 
 /**
@@ -30,8 +32,10 @@
  */
 class MatchClause extends Clause
 {
+    use ErrorTrait;
+
     /**
-     * @var StructuralType[] List of patterns
+     * @var StructuralType[]|Assignment[] List of patterns
      */
     private array $patterns = [];
 
@@ -48,11 +52,13 @@ public function getPatterns(): array
     /**
      * Add a pattern to the match clause.
      *
-     * @param StructuralType $pattern
+     * @param StructuralType|Assignment $pattern
      * @return MatchClause
      */
-    public function addPattern(StructuralType $pattern): self
+    public function addPattern($pattern): self
     {
+        $this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
+
         $this->patterns[] = $pattern;
 
         return $this;
@@ -73,7 +79,7 @@ protected function getSubject(): string
     {
         return implode(
             ", ",
-            array_map(fn(StructuralType $pattern): string => $pattern->toQuery(), $this->patterns)
+            array_map(fn ($pattern): string => $pattern->toQuery(), $this->patterns)
         );
     }
-}
+}