Improve Query::returning, Query::with and Query::callProcedure and fix CastTrait::toAnyType

Author: Wout Gevaert

src/Query.php

@@ -48,6 +48,7 @@
 use WikibaseSolutions\CypherDSL\Patterns\Relationship;
 use WikibaseSolutions\CypherDSL\Syntax\Alias;
 use WikibaseSolutions\CypherDSL\Syntax\PropertyReplacement;
+use WikibaseSolutions\CypherDSL\Traits\CastTrait;
 use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
@@ -63,6 +64,7 @@ final class Query implements QueryConvertible
 {
     use EscapeTrait;
     use ErrorTrait;
+    use CastTrait;
 
     // A reference to the Literal class
     public const literal = Literal::class;
@@ -358,7 +360,7 @@ public function call($query = null, $variables = []): self
      * Creates the CALL procedure clause.
      *
      * @param Procedure $procedure The procedure to call
-     * @param string|Variable|Alias|string[]|Variable[]|Alias[] $yields The result fields that should be returned
+     * @param string|Variable|Alias|(string|Variable|Alias)[] $yields The result fields that should be returned
      *
      * @return $this
      *
@@ -370,6 +372,7 @@ public function callProcedure(Procedure $procedure, $yields = []): self
         if (!is_array($yields)) {
             $yields = [$yields];
         }
+        $yields = $this->makeAliasArray($yields, 'toName');
 
         $callProcedureClause = new CallProcedureClause();
         $callProcedureClause->setProcedure($procedure);
@@ -407,7 +410,7 @@ public function match($patterns): self
     /**
      * Creates the RETURN clause.
      *
-     * @param AnyType|Alias|Pattern|int|float|string|bool|array|AnyType[]|Alias[]|Pattern[]|int[]|float[]|string[]|bool[]|array[] $expressions The expressions to return
+     * @param AnyType|Alias|Pattern|int|float|string|bool|array|(AnyType|Alias|Pattern|int|float|string|bool|array)[] $expressions The expressions to return
      * @param bool $distinct Whether to be a RETURN DISTINCT query
      *
      * @return $this
@@ -420,6 +423,7 @@ public function returning($expressions, bool $distinct = false): self
         if (!is_array($expressions)) {
             $expressions = [$expressions];
         }
+        $expressions = $this->makeAliasArray($expressions);
 
         $returnClause = new ReturnClause();
         $returnClause->addColumn(...$expressions);
@@ -689,7 +693,7 @@ public function where($expressions, string $operator = WhereClause::AND): self
     /**
      * Creates the WITH clause.
      *
-     * @param AnyType|Alias|Pattern|int|float|string|bool|array|AnyType[]|Alias[]|Pattern[]|int[]|float[]|string[]|bool[]|array[] $expressions The entries to add; if the array-key is non-numerical, it is used as the alias
+     * @param AnyType|Alias|Pattern|int|float|string|bool|array|(AnyType|Alias|Pattern|int|float|string|bool|array)[] $expressions The entries to add; if the array-key is non-numerical, it is used as the alias
      *
      * @return $this
      *
@@ -701,6 +705,7 @@ public function with($expressions): self
         if (!is_array($expressions)) {
             $expressions = [$expressions];
         }
+        $expressions = $this->makeAliasArray($expressions);
 
         $withClause = new WithClause();
         $withClause->addEntry(...$expressions);
@@ -814,4 +819,23 @@ public function __toString(): string
     {
         return $this->build();
     }
+
+    /**
+     * Changes an associative array into an array of aliasses.
+     *
+     * @param  array   $array     The array to change into a sequential array
+     * @param  string  $castFunc  Name of the (static) method to use to cast the elements of $array.
+     * @return array   A sequential array, possibly consisting of aliasses.
+     */
+    private function makeAliasArray(array $array, string $castFunc = 'toAnyType'): array
+    {
+        if (array_is_list($array)) {
+            return array_map([self::class, $castFunc], $array);
+        }
+        $newArray = [];
+        foreach ($array as $key => $value) {
+            $newArray []= new Alias(call_user_func([self::class, $castFunc], $value), new Variable($key));
+        }
+        return $newArray;
+    }
 }

src/Traits/CastTrait.php

@@ -165,14 +165,14 @@ private static function toAnyType($value): AnyType
     {
         self::assertClass('value', [AnyType::class, Pattern::class, 'int', 'float', 'string', 'bool', 'array'], $value);
 
-        if ($value instanceof AnyType) {
-            return $value;
-        }
-
         if ($value instanceof Pattern) {
             return $value->getVariable();
         }
 
+        if ($value instanceof AnyType) {
+            return $value;
+        }
+
         return Literal::literal($value);
     }
 }