Fix some type hints

Author: marijnvanwezel

src/Clauses/CallProcedureClause.php

@@ -33,7 +33,7 @@ final class CallProcedureClause extends Clause
     private ?Procedure $procedure = null;
 
     /**
-     * @var Alias[]|Variable[] The result fields that are yielded
+     * @var Alias[]|Variable[]|(Alias|Variable)[] The result fields that are yielded
      */
     private array $yields = [];
 
@@ -84,7 +84,7 @@ public function getProcedure(): ?Procedure
     /**
      * Returns the variables to yield.
      *
-     * @return Alias[]|Variable[]
+     * @return Alias[]|Variable[]|(Alias|Variable)[]
      */
     public function getYields(): array
     {

src/Clauses/RemoveClause.php

@@ -26,7 +26,7 @@ final class RemoveClause extends Clause
     use ErrorTrait;
 
     /**
-     * @var Label[]|Property[] the expressions in this REMOVE clause
+     * @var Label[]|Property[]|(Label|Property)[] the expressions in this REMOVE clause
      */
     private array $expressions = [];
 
@@ -48,7 +48,7 @@ public function addExpression(...$expressions): self
     /**
      * Returns the expressions in the REMOVE clause.
      *
-     * @return Label[]|Property[]
+     * @return Label[]|Property[]|(Label|Property)[]
      */
     public function getExpressions(): array
     {

src/Clauses/ReturnClause.php

@@ -34,7 +34,7 @@ final class ReturnClause extends Clause
     private bool $distinct = false;
 
     /**
-     * @var Alias[]|AnyType[] The expressions to return
+     * @var Alias[]|AnyType[]|(Alias|AnyType)[] The expressions to return
      */
     private array $columns = [];
 
@@ -77,7 +77,7 @@ public function setDistinct(bool $distinct = true): self
     /**
      * Returns the columns to return. Aliased columns have string keys instead of integers.
      *
-     * @return Alias[]|AnyType[]
+     * @return Alias[]|AnyType[]|(Alias|AnyType)[]
      */
     public function getColumns(): array
     {

src/Clauses/SetClause.php

@@ -26,7 +26,7 @@ final class SetClause extends Clause
     use ErrorTrait;
 
     /**
-     * @var Label[]|PropertyReplacement[] The expressions to set
+     * @var Label[]|PropertyReplacement[]|(Label|PropertyReplacement)[] The expressions to set
      */
     private array $expressions = [];
 
@@ -48,7 +48,7 @@ public function add(...$expressions): self
     /**
      * Returns the expressions to SET.
      *
-     * @return Label[]|PropertyReplacement[]
+     * @return Label[]|PropertyReplacement[]|(Label|PropertyReplacement)[]
      */
     public function getExpressions(): array
     {

src/Clauses/WithClause.php

@@ -31,7 +31,7 @@ final class WithClause extends Clause
     use CastTrait;
 
     /**
-     * @var Alias[]|Variable[] The variables to include in the clause
+     * @var Alias[]|Variable[]|(Alias|Variable)[] The variables to include in the clause
      */
     private array $entries = [];
 
@@ -58,7 +58,7 @@ public function addEntry(...$entries): self
     /**
      * Returns the expression to include in the clause.
      *
-     * @return Alias[]|Variable[]
+     * @return Alias[]|Variable[]|(Alias|Variable)[]
      */
     public function getEntries(): array
     {

src/Expressions/Literals/Map.php

@@ -9,6 +9,7 @@
  */
 namespace WikibaseSolutions\CypherDSL\Expressions\Literals;
 
+use WikibaseSolutions\CypherDSL\Traits\CastTrait;
 use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
 use WikibaseSolutions\CypherDSL\Traits\TypeTraits\CompositeTypeTraits\MapTypeTrait;
@@ -26,6 +27,7 @@
  */
 final class Map implements MapType
 {
+    use CastTrait;
     use EscapeTrait;
     use MapTypeTrait;
 

src/Expressions/Procedures/Procedure.php

@@ -35,8 +35,8 @@ abstract class Procedure implements QueryConvertible
      * Produces a raw function call. This enables the usage of unimplemented functions in your
      * Cypher queries. The parameters of this function are not type-checked.
      *
-     * @param string                                                                                                    $functionName The name of the function to call
-     * @param AnyType|AnyType[]|bool|bool[]|float|float[]|int|int[]|mixed[]|mixed[][]|Pattern|Pattern[]|string|string[] $parameters   The parameters to pass to the function call
+     * @param string                                                                                                                                                      $functionName The name of the function to call
+     * @param AnyType|AnyType[]|bool|bool[]|float|float[]|int|int[]|mixed[]|mixed[][]|Pattern|Pattern[]|string|string[]|(AnyType|bool|float|int|mixed[]|Pattern|string)[] $parameters   The parameters to pass to the function call
      */
     public static function raw(string $functionName, $parameters): Raw
     {

src/Query.php

@@ -363,7 +363,7 @@ public function __toString(): string
      * @note This feature is not part of the openCypher standard.
      *
      * @param callable|Query                                        $query     A callable decorating a Query, or an instance of Query
-     * @param Pattern|Pattern[]|string|string[]|Variable|Variable[] $variables The variables to include in the WITH clause for correlation (optional)
+     * @param Pattern|Pattern[]|string|string[]|Variable|Variable[]|(Pattern|string|Variable)[] $variables The variables to include in the WITH clause for correlation (optional)
      *
      * @return $this
      *
@@ -397,7 +397,7 @@ public function call($query, $variables = []): self
      * Creates the CALL procedure clause.
      *
      * @param Procedure                                         $procedure The procedure to call
-     * @param Alias|Alias[]|string|string[]|Variable|Variable[] $yields    The result fields that should be returned (optional)
+     * @param Alias|Alias[]|string|string[]|Variable|Variable[]|(Alias|string|Variable)[] $yields    The result fields that should be returned (optional)
      *
      * @return $this
      *
@@ -446,7 +446,7 @@ public function match($patterns): self
     /**
      * Creates the RETURN clause.
      *
-     * @param Alias|Alias[]|AnyType|AnyType[]|array|bool|bool[]|float|float[]|int|int[]|Pattern|Pattern[]|string|string[] $expressions A single expression to return, or a non-empty list of expressions to return
+     * @param Alias|Alias[]|AnyType|AnyType[]|mixed[]|bool|bool[]|float|float[]|int|int[]|Pattern|Pattern[]|string|string[]|(Alias|AnyType|mixed[]|bool|float|int|Pattern|string)[] $expressions A single expression to return, or a non-empty list of expressions to return
      * @param bool                                                                                                        $distinct    Whether to be a RETURN DISTINCT clause (optional, default: false)
      *
      * @return $this
@@ -496,7 +496,7 @@ public function create($patterns): self
     /**
      * Creates the DELETE clause.
      *
-     * @param Pattern|Pattern[]|StructuralType|StructuralType[] $structures A single structure to delete, or a non-empty list of structures to delete
+     * @param Pattern|Pattern[]|StructuralType|StructuralType[]|(Pattern|StructuralType)[] $structures A single structure to delete, or a non-empty list of structures to delete
      * @param bool                                              $detach     Whether to DETACH DELETE (optional, default: false)
      *
      * @return $this
@@ -521,7 +521,7 @@ public function delete($structures, bool $detach = false): self
     /**
      * Creates the DETACH DELETE clause.
      *
-     * @param Pattern|Pattern[]|StructuralType|StructuralType[] $structures A single structure to delete, or a non-empty list of structures to delete
+     * @param Pattern|Pattern[]|StructuralType|StructuralType[]|(Pattern|StructuralType)[] $structures A single structure to delete, or a non-empty list of structures to delete
      *
      * @return $this
      *
@@ -644,7 +644,7 @@ public function orderBy($properties, bool $descending = false): self
     /**
      * Creates the REMOVE clause.
      *
-     * @param Label|Label[]|Property|Property[] $expressions A single expression to remove, or a non-empty list of expressions to remove
+     * @param Label|Label[]|Property|Property[]|(Label|Property)[] $expressions A single expression to remove, or a non-empty list of expressions to remove
      *
      * @return $this
      *
@@ -667,7 +667,7 @@ public function remove($expressions): self
     /**
      * Create the SET clause.
      *
-     * @param Label|Label[]|PropertyReplacement|PropertyReplacement[] $expressions A single expression to set, or a non-empty list of expressions to set
+     * @param Label|Label[]|PropertyReplacement|PropertyReplacement[]|(Label|PropertyReplacement)[] $expressions A single expression to set, or a non-empty list of expressions to set
      *
      * @return $this
      *
@@ -690,7 +690,7 @@ public function set($expressions): self
     /**
      * Creates the WHERE clause.
      *
-     * @param bool|bool[]|BooleanType|BooleanType[] $expressions A boolean expression to evaluate, or a non-empty list of boolean expression to evaluate
+     * @param bool|bool[]|BooleanType|BooleanType[]|(bool|BooleanType)[] $expressions A boolean expression to evaluate, or a non-empty list of boolean expression to evaluate
      * @param string                                $operator    The operator with which to unify the given expressions, should be either WhereClause::OR,
      *                                                           WhereClause::AND or WhereClause::XOR (optional, default: 'and')
      *
@@ -718,7 +718,7 @@ public function where($expressions, string $operator = WhereClause::AND): self
     /**
      * Creates the WITH clause.
      *
-     * @param Alias|Alias[]|AnyType|AnyType[]|bool|bool[]|float|float[]|int|int[]|mixed[]|mixed[][]|Pattern|Pattern[]|string|string[] $expressions An entry to add, or a non-empty list of entries to add; if the array-key is non-numerical, it is used as the alias
+     * @param Alias|Alias[]|AnyType|AnyType[]|bool|bool[]|float|float[]|int|int[]|mixed[]|mixed[][]|Pattern|Pattern[]|string|string[]|(Alias|AnyType|bool|float|int|mixed[]|Pattern|string)[] $expressions An entry to add, or a non-empty list of entries to add; if the array-key is non-numerical, it is used as the alias
      *
      * @return $this
      *

src/Traits/TypeTraits/CompositeTypeTraits/MapTypeTrait.php

@@ -12,7 +12,7 @@
 use WikibaseSolutions\CypherDSL\Traits\TypeTraits\MethodTraits\PropertyMethodTrait;
 
 /**
- * This trait provides a default implementation to satisfy the "MapType" interface.e.
+ * This trait provides a default implementation to satisfy the "MapType" interface.
  */
 trait MapTypeTrait
 {