Merge 'literalList' and 'list' functions

Author: marijnvanwezel

src/ExpressionList.php

@@ -22,23 +22,10 @@
 namespace WikibaseSolutions\CypherDSL;
 
 use TypeError;
-use WikibaseSolutions\CypherDSL\Literals\Boolean;
-use WikibaseSolutions\CypherDSL\Literals\Decimal;
-use WikibaseSolutions\CypherDSL\Literals\Literal;
-use WikibaseSolutions\CypherDSL\Literals\StringLiteral;
 use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
 use WikibaseSolutions\CypherDSL\Traits\ListTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\CompositeTypes\ListType;
-use function get_class;
-use function get_debug_type;
-use function gettype;
-use function is_bool;
-use function is_float;
-use function is_int;
-use function is_object;
-use function is_string;
-use function method_exists;
 
 /**
  * This class represents a list of expressions. For example, this class can represent the following

src/Query.php

@@ -54,14 +54,6 @@
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\NodeType;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\PathType;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
-use function get_class;
-use function gettype;
-use function is_bool;
-use function is_float;
-use function is_int;
-use function is_object;
-use function is_string;
-use function method_exists;
 
 /**
  * Builder class for building complex Cypher queries.
@@ -151,35 +143,25 @@ public static function literal($literal): PropertyType
         }
 
         $actualType = is_object($literal) ? get_class($literal) : gettype($literal);
+
         throw new InvalidArgumentException("The literal type " . $actualType . " is not supported by Cypher");
     }
 
     /**
      * Creates a list of expressions.
      *
-     * @param AnyType[] $expressions
+     * @param iterable $values
      * @return ExpressionList
      */
-    public static function list(array $expressions): ExpressionList
+    public static function list(iterable $values): ExpressionList
     {
-        return new ExpressionList($expressions);
-    }
-
-    /**
-     * Creates a list of literal expressions.
-     *
-     * @param mixed[] $expressions
-     *
-     * @return ExpressionList
-     */
-    public static function literalList(iterable $literals): ExpressionList
-    {
-        $tbr = [];
-        foreach ($literals as $literal) {
-            $tbr[] = self::literal($literal);
+        $expressions = [];
+        foreach ($values as $value) {
+            $expressions[] = $value instanceof AnyType ?
+                $value : self::literal($value);
         }
 
-        return new ExpressionList($tbr);
+        return new ExpressionList($expressions);
     }
 
     /**

tests/Unit/QueryTest.php

@@ -23,7 +23,6 @@
 
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
-use TypeError;
 use WikibaseSolutions\CypherDSL\Assignment;
 use WikibaseSolutions\CypherDSL\Clauses\Clause;
 use WikibaseSolutions\CypherDSL\Clauses\MatchClause;
@@ -116,6 +115,77 @@ public function testList()
         $this->assertInstanceOf(ExpressionList::class, $list);
     }
 
+    public function testListOfLiterals()
+    {
+        $list = Query::list(["hello", "world", 1.0, 1, 2, 3, true]);
+
+        $this->assertInstanceOf(ExpressionList::class, $list);
+    }
+
+    public function testListOfMixed()
+    {
+        $list = Query::list([$this->getQueryConvertableMock(AnyType::class, "hello"), "world"]);
+
+        $this->assertInstanceOf(ExpressionList::class, $list);
+    }
+
+    public function testListOfAnyType()
+    {
+        $list = Query::list([$this->getQueryConvertableMock(AnyType::class, "hello"), $this->getQueryConvertableMock(AnyType::class, "world")]);
+
+        $this->assertInstanceOf(ExpressionList::class, $list);
+    }
+
+    public function testNestedList()
+    {
+        $list = Query::list([Query::list([])]);
+
+        $this->assertInstanceOf(ExpressionList::class, $list);
+    }
+
+    public function testIteratorList()
+    {
+        $iterator = new class implements \Iterator {
+            private int $count = 0;
+
+            public function current()
+            {
+                return 1;
+            }
+
+            public function next()
+            {
+                $this->count++;
+                return 1;
+            }
+
+            public function key()
+            {
+                return 0;
+            }
+
+            public function valid()
+            {
+                // In order to avoid an infinite loop
+                return $this->count < 10;
+            }
+
+            public function rewind()
+            {
+            }
+        };
+
+        $list = Query::list($iterator);
+
+        $this->assertInstanceOf(ExpressionList::class, $list);
+    }
+
+    public function testInvalidList()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        Query::list([new class() {}]);
+    }
+
     public function testMap()
     {
         $map = Query::map([]);
@@ -422,20 +492,6 @@ public function testInvalidLiteral(): void
         Query::literal($literal);
     }
 
-    public function testFromLiterals(): void
-    {
-        $expressionList = Query::literalList(['a', 'b', 234.3, 1, true, false]);
-
-        $this->assertSame("['a', 'b', 234.3, 1, true, false]", $expressionList->toQuery());
-    }
-
-    public function testFromLiteralsError(): void
-    {
-        $expressionList = Query::literalList(['a', 'b', 234.3, 1, true, false]);
-        $this->expectException(InvalidArgumentException::class);
-        $expressionList = Query::literalList([$expressionList]);
-    }
-
     public function testWikiExamples()
     {
         /*