Minor fixes

Author: marijnvanwezel

src/Expressions/Literals/ExpressionList.php

@@ -21,6 +21,8 @@
 
 namespace WikibaseSolutions\CypherDSL\Expressions\Literals;
 
+use WikibaseSolutions\CypherDSL\Patterns\Pattern;
+use WikibaseSolutions\CypherDSL\Traits\CastTrait;
 use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
 use WikibaseSolutions\CypherDSL\Traits\TypeTraits\CompositeTypeTraits\ListTypeTrait;
@@ -37,6 +39,7 @@
  */
 final class ExpressionList implements ListType
 {
+    use CastTrait;
     use EscapeTrait;
     use ErrorTrait;
     use ListTypeTrait;
@@ -51,12 +54,22 @@ final class ExpressionList implements ListType
      *
      * @param array $expressions The list of expressions
      */
-    public function __construct(iterable $expressions)
+    public function __construct(array $expressions)
     {
-        $this->expressions = array_map(
-			fn ($value): AnyType => $value instanceof AnyType ? $value : Literal::literal($value),
-			$expressions
-		);
+        $this->expressions = array_map([self::class, 'toAnyType'], $expressions);
+    }
+
+    /**
+     * Add one or more expressions to the list.
+     *
+     * @param AnyType|Pattern|int|float|string|bool|array ...$expressions
+     * @return $this
+     */
+    public function addExpression(...$expressions): self
+    {
+        $this->expressions = array_merge($this->expressions, array_map([self::class, 'toAnyType'], $expressions));
+
+        return $this;
     }
 
     /**

src/Expressions/Literals/Map.php

@@ -37,9 +37,9 @@
  */
 final class Map implements MapType
 {
-	use EscapeTrait;
-	use ErrorTrait;
-	use MapTypeTrait;
+    use EscapeTrait;
+    use ErrorTrait;
+    use MapTypeTrait;
 
     /**
      * @var AnyType[] The map of properties
@@ -53,7 +53,7 @@ final class Map implements MapType
      */
     public function __construct(array $properties = [])
     {
-		$this->properties = array_map(
+        $this->properties = array_map(
             fn ($value): AnyType => $value instanceof AnyType ? $value : Literal::literal($value),
             $properties
         );

src/Expressions/Parameter.php

@@ -87,17 +87,17 @@ final class Parameter implements
     /**
      * Parameter constructor.
      *
-     * @param string|null $parameter The parameter; this parameter may only consist of alphanumeric
-     *  characters and underscores
+     * @param string|null $parameter The parameter; this parameter may only consist of alphanumeric characters and
+     * underscores
      */
     public function __construct(?string $parameter = null)
     {
         if (!isset($parameter)) {
-            $parameter = $this->generateString('param');
+            $parameter = $this->generateIdentifier('param');
         } else {
-			// Validation is only needed when the user supplied their own parameter
-			self::assertValidName($parameter);
-		}
+            // Validation is only needed when the user supplied their own parameter
+            self::assertValidName($parameter);
+        }
 
         $this->parameter = $parameter;
     }