Rewrite CALL clause

Author: marijnvanwezel

src/Clauses/CallClause.php

@@ -23,6 +23,7 @@
 
 use WikibaseSolutions\CypherDSL\Expressions\Variable;
 use WikibaseSolutions\CypherDSL\Query;
+use WikibaseSolutions\CypherDSL\Traits\CastTrait;
 use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 
 /**
@@ -34,8 +35,9 @@
  * @see https://neo4j.com/docs/cypher-manual/current/clauses/call-subquery/
  * @see Query::call() for a more convenient method to construct this class
  */
-class CallClause extends Clause
+final class CallClause extends Clause
 {
+    use CastTrait;
     use ErrorTrait;
 
     /**
@@ -61,47 +63,30 @@ public function withSubQuery(Query $subQuery): self
         return $this;
     }
 
-	/**
-	 * Sets the variables to include in the WITH clause. This overwrites any previously set variables.
-	 *
-	 * @param Variable[]|string[] $variables A list of variable objects, or strings to cast to variables
-	 * @return $this
-	 *
-	 * @see https://neo4j.com/docs/cypher-manual/current/clauses/call-subquery/#subquery-correlated-importing
-	 */
-	public function withVariables(...$variables): self
-	{
-		$res = [];
+    /**
+     * Add one or more variables to include in the WITH clause.
+     *
+     * @param Variable|string ...$variables
+     * @return $this
+     *
+     * @see https://neo4j.com/docs/cypher-manual/current/clauses/call-subquery/#subquery-correlated-importing
+     */
+    public function addVariable(...$variables): self
+    {
+        $res = [];
 
         foreach ($variables as $variable) {
-            $this->assertClass('variables', [Variable::class, 'string'], $variable);
-            $res[] = is_string($variable) ? new Variable($variable) : $variable;
+            $res[] = self::toVariable($variable);
         }
 
-        $this->withVariables = $res;
+        $this->withVariables = array_merge($this->withVariables, $res);
 
         return $this;
     }
 
-	/**
-	 * Add a variable to include in the WITH clause.
-	 *
-	 * @param Variable|string $variable A variable or a string to cast to a variable
-	 * @return $this
-	 *
-	 * @see https://neo4j.com/docs/cypher-manual/current/clauses/call-subquery/#subquery-correlated-importing
-	 */
-	public function addVariable($variable): self
-	{
-		$this->assertClass('variable', [Variable::class, 'string'], $variable);
-		$this->withVariables[] = is_string($variable) ? new Variable($variable) : $variable;
-
-		return $this;
-	}
-
     /**
      * Returns the query that is being called. This query does not include the WITH clause that is inserted
-	 * if there are any correlated variables.
+     * if there are any correlated variables.
      *
      * @return Query|null
      */
@@ -110,15 +95,15 @@ public function getSubQuery(): ?Query
         return $this->subQuery;
     }
 
-	/**
-	 * Returns the variables that will be included in the WITH clause.
-	 *
-	 * @return Variable[]
-	 */
-	public function getWithVariables(): array
-	{
-		return $this->withVariables;
-	}
+    /**
+     * Returns the variables that will be included in the WITH clause.
+     *
+     * @return Variable[]
+     */
+    public function getWithVariables(): array
+    {
+        return $this->withVariables;
+    }
 
     /**
      * @inheritDoc
@@ -138,7 +123,6 @@ protected function getSubject(): string
         if ($this->withVariables !== []) {
             $withClause = new WithClause();
             $withClause->setEntries($this->withVariables);
-
             $subQuery = $withClause->toQuery() . ' ' . $subQuery;
         }
 

src/Query.php

@@ -345,7 +345,7 @@ public static function exists($match, $where = null, bool $insertParentheses = f
      * Creates a CALL sub query clause and adds it to the query.
      *
      * @param Query|callable(Query):void $query A callable decorating a query, or the actual CALL subquery
-     * @param Variable|Variable[]|string $variables The variables to include in the WITH clause for correlation
+     * @param Variable|Variable[]|string|string[] $variables The variables to include in the WITH clause for correlation
      *
      * @return Query
      *
@@ -367,19 +367,9 @@ public function call($query = null, $variables = []): self
             $variables = [$variables];
         }
 
-        $variables = array_map(function ($variable): Variable {
-            self::assertClass();
-
-            if (is_string($variable)) {
-                return self::variable($variable);
-            }
-
-            return $variable->getVariable();
-        }, $variables);
-
         $callClause = new CallClause();
         $callClause->withSubQuery($subQuery);
-        $callClause->withVariables($variables);
+        $callClause->addVariable(...$variables);
 
         $this->clauses[] = $callClause;