Further work on type system and consistency

Author: marijnvanwezel

src/Clauses/SetClause.php

@@ -21,8 +21,8 @@
 
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
-use WikibaseSolutions\CypherDSL\Expressions\Assignment;
 use WikibaseSolutions\CypherDSL\Expressions\Label;
+use WikibaseSolutions\CypherDSL\PropertyReplacement;
 use WikibaseSolutions\CypherDSL\QueryConvertible;
 use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 
@@ -36,7 +36,7 @@ class SetClause extends Clause
     use ErrorTrait;
 
     /**
-     * @var Assignment[]|Label[] $expressions The expressions to set
+     * @var PropertyReplacement[]|Label[] $expressions The expressions to set
      */
     private array $expressions = [];
 
@@ -49,7 +49,7 @@ class SetClause extends Clause
     public function setAssignments(array $expressions): self
     {
         foreach ($expressions as $expression) {
-            $this->assertClass('expressions', [Assignment::class, Label::class], $expression);
+            $this->assertClass('expressions', [PropertyReplacement::class, Label::class], $expression);
         }
 
         $this->expressions = $expressions;
@@ -60,12 +60,12 @@ public function setAssignments(array $expressions): self
     /**
      * Add an assignment.
      *
-     * @param Assignment|Label $expression The assignment to execute
+     * @param PropertyReplacement|Label $expression The assignment to execute
      * @return SetClause
      */
     public function addAssignment($expression): self
     {
-        $this->assertClass('expression', [Assignment::class, Label::class], $expression);
+        $this->assertClass('expression', [PropertyReplacement::class, Label::class], $expression);
         $this->expressions[] = $expression;
 
         return $this;
@@ -74,7 +74,7 @@ public function addAssignment($expression): self
     /**
      * Returns the expressions to SET.
      *
-     * @return Assignment[]|Label[]
+     * @return PropertyReplacement[]|Label[]
      */
     public function getExpressions(): array
     {

src/Expressions/Operators/Exists.php renamed to src/Expressions/Exists.php

@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Expressions\Operators;
+namespace WikibaseSolutions\CypherDSL\Expressions;
 
 use WikibaseSolutions\CypherDSL\Clauses\MatchClause;
 use WikibaseSolutions\CypherDSL\Clauses\WhereClause;

src/Expressions/Label.php

@@ -21,18 +21,23 @@
 
 namespace WikibaseSolutions\CypherDSL\Expressions;
 
-use InvalidArgumentException;
 use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
 use WikibaseSolutions\CypherDSL\Traits\TypeTraits\PropertyTypeTraits\BooleanTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 
 /**
- * Represents a label. A label in Cypher would be something like "n:German" or "n:German:Swedish".
+ * Represents a label. A label in Cypher would be something like "n:German" or "n:German:Swedish". Label implements
+ * BooleanType, since it can be used in a "WHERE" clause like so:
+ *
+ *  MATCH (n) WHERE n:label1:label2 RETURN n
+ *
+ * @see https://s3.amazonaws.com/artifacts.opencypher.org/openCypher9.pdf (page 85)
+ * @see https://neo4j.com/docs/cypher-manual/current/clauses/where/#filter-on-node-label
  */
 class Label implements BooleanType
 {
-    use EscapeTrait;
     use BooleanTypeTrait;
+    use EscapeTrait;
 
     /**
      * @var Variable The variable to which this label belongs
@@ -48,24 +53,40 @@ class Label implements BooleanType
      * Label constructor.
      *
      * @param Variable $variable
-     * @param string[] $labels
+     * @param string ...$labels
      */
-    public function __construct(Variable $variable, array $labels)
+    public function __construct(Variable $variable, string ...$labels)
     {
-        if (count($labels) === 0) {
-            throw new InvalidArgumentException("\$labels must have at least one label");
-        }
-
-        foreach ($labels as $label) {
-            if (!is_string($label)) {
-                throw new InvalidArgumentException("\$labels must consist of only strings");
-            }
-        }
-
         $this->variable = $variable;
         $this->labels = $labels;
     }
 
+    /**
+     * Overrides the labels of this class with the given labels.
+     *
+     * @param string ...$labels
+     * @return $this
+     */
+    public function withLabels(string ...$labels): self
+    {
+        $this->labels = $labels;
+
+        return $this;
+    }
+
+    /**
+     * Adds the given labels to this class.
+     *
+     * @param string ...$labels
+     * @return $this
+     */
+    public function addLabels(string ...$labels): self
+    {
+        $this->labels = array_merge($this->labels, $labels);
+
+        return $this;
+    }
+
     /**
      * Returns the labels.
      *