Do not allow deletion of Nodes, only of Variables

As per the documentation, https://neo4j.com/docs/cypher-manual/4.4/clauses/delete/ there is only variables in there.

Author: Wout Gevaert

src/Clauses/DeleteClause.php

@@ -22,7 +22,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 +39,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 +60,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 +83,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 +111,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/Query.php

@@ -311,24 +311,24 @@ public function create($patterns): self
     /**
      * Creates the DELETE clause.
      *
-     * @param NodeType|NodeType[] $nodes The nodes to delete
+     * @param Variable|Variable[] $nodes The nodes to delete
      *
      * @return $this
      * @see https://neo4j.com/docs/cypher-manual/current/clauses/delete/
      *
      */
-    public function delete($nodes): self
+    public function delete($variables): self
     {
         $deleteClause = new DeleteClause();
 
-        if (!is_array($nodes)) {
-            $nodes = [$nodes];
+        if (!is_array($variables)) {
+            $variables = [$variables];
         }
 
-        foreach ($nodes as $node) {
-            $this->assertClass('node', NodeType::class, $node);
+        foreach ($variables as $variable) {
+            $this->assertClass('variable', Variable::class, $variable);
 
-            $deleteClause->addNode($node);
+            $deleteClause->addVariable($variable);
         }
 
         $this->clauses[] = $deleteClause;
@@ -339,25 +339,25 @@ public function delete($nodes): self
     /**
      * Creates the DETACH DELETE clause.
      *
-     * @param NodeType|NodeType[] $nodes The nodes to delete
+     * @param Variable|Variable[] $variables The variables to delete, including relationships
      *
      * @return $this
      * @see https://neo4j.com/docs/cypher-manual/current/clauses/delete/
      *
      */
-    public function detachDelete($nodes): self
+    public function detachDelete($variables): self
     {
         $deleteClause = new DeleteClause();
         $deleteClause->setDetach(true);
 
-        if (!is_array($nodes)) {
-            $nodes = [$nodes];
+        if (!is_array($variables)) {
+            $variables = [$variables];
         }
 
-        foreach ($nodes as $node) {
-            $this->assertClass('node', NodeType::class, $node);
+        foreach ($variables as $variable) {
+            $this->assertClass('variable', Variable::class, $variable);
 
-            $deleteClause->addNode($node);
+            $deleteClause->addVariable($variable);
         }
 
         $this->clauses[] = $deleteClause;