Merge pull request #32 from wgevaert/bugfix-assignment-as-outer-pattern

Assignment as outer "pattern"

Author: marijnvanwezel

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/BinaryOperator.php

@@ -76,4 +76,4 @@ public function toQuery(): string
      * @return string
      */
     abstract protected function getOperator(): string;
-}
+}

src/Clauses/CallProcedureClause.php

@@ -134,13 +134,13 @@ 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);

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;
@@ -63,7 +69,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

@@ -91,7 +91,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

@@ -69,4 +69,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,19 +32,23 @@
  */
 class MatchClause extends Clause
 {
+    use ErrorTrait;
+
     /**
-     * @var StructuralType[] List of patterns
+     * @var StructuralType[]|Assignment[] List of patterns
      */
     private array $patterns = [];
 
     /**
      * 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;
@@ -63,7 +69,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/MergeClause.php

@@ -21,6 +21,8 @@
 
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
+use WikibaseSolutions\CypherDSL\Assignment;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
 
 /**
@@ -30,10 +32,12 @@
  */
 class MergeClause extends Clause
 {
+    use ErrorTrait;
+
     /**
-     * @var StructuralType|null $pattern The pattern to merge
+     * @var StructuralType|Assignment|null $pattern The pattern to merge
      */
-    private ?StructuralType $pattern;
+    private $pattern;
 
     /**
      * @var Clause|null $createClause The clause to execute when the pattern is created
@@ -48,11 +52,13 @@ class MergeClause extends Clause
     /**
      * Sets the pattern to merge.
      *
-     * @param StructuralType $pattern The pattern to merge
+     * @param StructuralType|Assignment $pattern The pattern to merge
      * @return MergeClause
      */
-    public function setPattern(StructuralType $pattern): self
+    public function setPattern($pattern): self
     {
+        $this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
+
         $this->pattern = $pattern;
 
         return $this;
@@ -117,4 +123,4 @@ protected function getSubject(): string
 
         return implode(" ", $queryParts);
     }
-}
+}