Merge branch 'main' into call-clause

Author: transistive

src/Alias.php

@@ -2,8 +2,8 @@
 
 namespace WikibaseSolutions\CypherDSL;
 
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use function sprintf;
+use WikibaseSolutions\CypherDSL\Types\AnyType;
 
 /**
  * Represents aliasing an expression or variable.

src/Clauses/CallProcedureClause.php

@@ -174,8 +174,8 @@ protected function getSubject(): string
             );
 
             return sprintf("%s(%s) YIELD %s", $this->procedure, $arguments, $yieldParameters);
-        } else {
-            return sprintf("%s(%s)", $this->procedure, $arguments);
         }
+
+        return sprintf("%s(%s)", $this->procedure, $arguments);
     }
 }

src/Clauses/CreateClause.php

@@ -22,7 +22,8 @@
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
 use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
-use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
+use WikibaseSolutions\CypherDSL\Types\StructuralTypes\NodeType;
+use WikibaseSolutions\CypherDSL\Types\StructuralTypes\PathType;
 
 /**
  * This class represents a CREATE clause.
@@ -34,18 +35,19 @@ class CreateClause extends Clause
     use ErrorTrait;
 
     /**
-     * @var StructuralType[] The patterns to create
+     * @var (PathType|NodeType)[] The patterns to create
      */
     private array $patterns = [];
 
     /**
      * Add a pattern to create.
      *
-     * @param StructuralType $pattern The pattern to create
+     * @param PathType|NodeType $pattern The pattern to create
      * @return CreateClause
      */
-    public function addPattern(StructuralType $pattern): self
+    public function addPattern($pattern): self
     {
+        $this->assertClass('pattern', [PathType::class, NodeType::class], $pattern);
         $this->patterns[] = $pattern;
 
         return $this;
@@ -54,7 +56,7 @@ public function addPattern(StructuralType $pattern): self
     /**
      * Returns the patterns of the create clause.
      *
-     * @return StructuralType[]
+     * @return (PathType|NodeType)[]
      */
     public function getPatterns(): array
     {

src/Clauses/DeleteClause.php

@@ -21,8 +21,7 @@
 
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
-use WikibaseSolutions\CypherDSL\Types\AnyType;
-use WikibaseSolutions\CypherDSL\Types\StructuralTypes\NodeType;
+use WikibaseSolutions\CypherDSL\Variable;
 
 /**
  * This class represents a DELETE clause.
@@ -39,11 +38,11 @@ class DeleteClause extends Clause
     private bool $detach = false;
 
     /**
-     * The nodes that needs to be deleted.
+     * The variables that needs to be deleted.
      *
-     * @var AnyType[] $nodes
+     * @var Variable[] $variables
      */
-    private array $nodes = [];
+    private array $variables = [];
 
     /**
      * Sets the clause to DETACH DELETE. Without DETACH DELETE, all relationships need to be explicitly
@@ -60,14 +59,14 @@ public function setDetach(bool $detach = true): self
     }
 
     /**
-     * Add the node to be deleted. The expression must return a node when evaluated.
+     * Add the variable to be deleted. The expression must return a node when evaluated.
      *
-     * @param NodeType $node Expression that returns the node to be deleted
+     * @param Variable $variable The name of the object that should be deleted
      * @return DeleteClause
      */
-    public function addNode(NodeType $node): self
+    public function addVariable(Variable $variable): self
     {
-        $this->nodes[] = $node;
+        $this->variables[] = $variable;
 
         return $this;
     }
@@ -83,13 +82,13 @@ public function detachesDeletion(): bool
     }
 
     /**
-     * Returns the nodes to delete.
+     * Returns the variables to delete.
      *
-     * @return AnyType[]
+     * @return Variable[]
      */
-    public function getNodes(): array
+    public function getVariables(): array
     {
-        return $this->nodes;
+        return $this->variables;
     }
 
     /**
@@ -111,7 +110,7 @@ protected function getSubject(): string
     {
         return implode(
             ", ",
-            array_map(fn (NodeType $node) => $node->toQuery(), $this->nodes)
+            array_map(fn (Variable $variable) => $variable->toQuery(), $this->variables)
         );
     }
 }

src/Clauses/MatchClause.php

@@ -22,7 +22,8 @@
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
 use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
-use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
+use WikibaseSolutions\CypherDSL\Types\StructuralTypes\NodeType;
+use WikibaseSolutions\CypherDSL\Types\StructuralTypes\PathType;
 
 /**
  * This class represents a MATCH clause.
@@ -34,14 +35,14 @@ class MatchClause extends Clause
     use ErrorTrait;
 
     /**
-     * @var StructuralType[] List of patterns
+     * @var (PathType|NodeType)[] List of patterns
      */
     private array $patterns = [];
 
     /**
      * Returns the patterns to match.
      *
-     * @return StructuralType[]
+     * @return (PathType|NodeType)[]
      */
     public function getPatterns(): array
     {
@@ -51,11 +52,12 @@ public function getPatterns(): array
     /**
      * Add a pattern to the match clause.
      *
-     * @param StructuralType $pattern
+     * @param PathType|NodeType $pattern
      * @return MatchClause
      */
-    public function addPattern(StructuralType $pattern): self
+    public function addPattern($pattern): self
     {
+        $this->assertClass('pattern', [PathType::class, NodeType::class], $pattern);
         $this->patterns[] = $pattern;
 
         return $this;

src/Clauses/MergeClause.php

@@ -22,6 +22,8 @@
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
 use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
+use WikibaseSolutions\CypherDSL\Types\StructuralTypes\NodeType;
+use WikibaseSolutions\CypherDSL\Types\StructuralTypes\PathType;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
 
 /**
@@ -34,7 +36,7 @@ class MergeClause extends Clause
     use ErrorTrait;
 
     /**
-     * @var StructuralType|null $pattern The pattern to merge
+     * @var PathType|NodeType|null $pattern The pattern to merge
      */
     private ?StructuralType $pattern = null;
 
@@ -71,7 +73,7 @@ public function getOnMatchClause(): ?Clause
     /**
      * Returns the pattern to MERGE.
      *
-     * @return StructuralType|null
+     * @return PathType|NodeType|null
      */
     public function getPattern(): ?StructuralType
     {
@@ -81,11 +83,12 @@ public function getPattern(): ?StructuralType
     /**
      * Sets the pattern to merge.
      *
-     * @param StructuralType $pattern The pattern to merge
+     * @param PathType|NodeType $pattern The pattern to merge
      * @return MergeClause
      */
-    public function setPattern(StructuralType $pattern): self
+    public function setPattern($pattern): self
     {
+        $this->assertClass('pattern', [PathType::class, NodeType::class], $pattern);
         $this->pattern = $pattern;
 
         return $this;

src/Clauses/OptionalMatchClause.php

@@ -22,7 +22,8 @@
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
 use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
-use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
+use WikibaseSolutions\CypherDSL\Types\StructuralTypes\NodeType;
+use WikibaseSolutions\CypherDSL\Types\StructuralTypes\PathType;
 
 /**
  * This class represents an OPTIONAL MATCH clause.
@@ -34,14 +35,14 @@ class OptionalMatchClause extends Clause
     use ErrorTrait;
 
     /**
-     * @var StructuralType[] List of patterns
+     * @var (PathType|NodeType)[] List of patterns
      */
     private array $patterns = [];
 
     /**
      * Returns the patterns to optionally match.
      *
-     * @return StructuralType[]
+     * @return (PathType|NodeType)[]
      */
     public function getPatterns(): array
     {
@@ -51,11 +52,12 @@ public function getPatterns(): array
     /**
      * Add a pattern to the optional match clause.
      *
-     * @param StructuralType $pattern
+     * @param PathType|NodeType $pattern
      * @return OptionalMatchClause
      */
-    public function addPattern(StructuralType $pattern): self
+    public function addPattern($pattern): self
     {
+        $this->assertClass('pattern', [NodeType::class, PathType::class], $pattern);
         $this->patterns[] = $pattern;
 
         return $this;

src/Clauses/RemoveClause.php

@@ -21,10 +21,10 @@
 
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
-use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Label;
 use WikibaseSolutions\CypherDSL\Property;
 use WikibaseSolutions\CypherDSL\QueryConvertable;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 
 /**
  * This class represents a REMOVE clause.

src/Clauses/SetClause.php

@@ -22,9 +22,9 @@
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
 use WikibaseSolutions\CypherDSL\Assignment;
-use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Label;
 use WikibaseSolutions\CypherDSL\QueryConvertable;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 
 /**
  * This class represents a SET clause.

src/Exists.php

@@ -84,8 +84,8 @@ public function toQuery(): string
     {
         if (isset($this->where)) {
             return sprintf("EXISTS { %s %s }", $this->match->toQuery(), $this->where->toQuery());
-        } else {
-            return sprintf("EXISTS { %s }", $this->match->toQuery());
         }
+
+        return sprintf("EXISTS { %s }", $this->match->toQuery());
     }
 }