Merge branch 'main' into point-and-date-support

Author: marijnvanwezel

src/Patterns/Node.php

@@ -22,8 +22,11 @@
 namespace WikibaseSolutions\CypherDSL\Patterns;
 
 use InvalidArgumentException;
+use WikibaseSolutions\CypherDSL\PropertyMap;
 use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
 use WikibaseSolutions\CypherDSL\Traits\NodeTypeTrait;
+use WikibaseSolutions\CypherDSL\Types\AnyType;
+use WikibaseSolutions\CypherDSL\Types\CompositeTypes\MapType;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\NodeType;
 use WikibaseSolutions\CypherDSL\Variable;
 
@@ -47,6 +50,11 @@ class Node implements NodeType
      */
     private ?Variable $variable;
 
+    /**
+     * @var MapType|null
+     */
+    private ?MapType $properties;
+
     /**
      * Node constructor.
      *
@@ -59,6 +67,47 @@ public function __construct(string $label = null)
         }
     }
 
+    /**
+     * Add the given property to the properties of this node.
+     *
+     * @param string $key The name of the property
+     * @param AnyType $value The value of the property
+     * @return NodeType
+     */
+    public function withProperty(string $key, AnyType $value): NodeType
+    {
+        if (!isset($this->properties)) {
+            $this->properties = new PropertyMap();
+        }
+
+        $this->properties->addProperty($key, $value);
+
+        return $this;
+    }
+
+    /**
+     * Add the given properties to the properties of this node.
+     *
+     * @param PropertyMap|array $properties
+     * @return NodeType
+     */
+    public function withProperties($properties): NodeType
+    {
+        if (!isset($this->properties)) {
+            $this->properties = new PropertyMap();
+        }
+
+        if (is_array($properties)) {
+            $properties = new PropertyMap($properties);
+        } elseif (!($properties instanceof PropertyMap)) {
+            throw new InvalidArgumentException("\$properties must either be an array or a PropertyMap object");
+        }
+
+        $this->properties = $this->properties->mergeWith($properties);
+
+        return $this;
+    }
+
     /**
      * @param Variable|string $variable
      * @return Node

src/Patterns/Path.php

@@ -24,9 +24,11 @@
 use DomainException;
 use InvalidArgumentException;
 use LogicException;
+use WikibaseSolutions\CypherDSL\PropertyMap;
 use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
 use WikibaseSolutions\CypherDSL\Traits\PathTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
+use WikibaseSolutions\CypherDSL\Types\CompositeTypes\MapType;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\PathType;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
 use WikibaseSolutions\CypherDSL\Variable;
@@ -49,12 +51,12 @@ class Path implements PathType
     /**
      * @var StructuralType The pattern left of the relationship
      */
-    private AnyType $a;
+    private StructuralType $a;
 
     /**
      * @var StructuralType The pattern right of the relationship
      */
-    private AnyType $b;
+    private StructuralType $b;
 
     /**
      * @var string[] The direction of the relationship
@@ -86,6 +88,11 @@ class Path implements PathType
      */
     private int $exactHops;
 
+    /**
+     * @var MapType|null
+     */
+    private ?MapType $properties;
+
     /**
      * Path constructor.
      *
@@ -109,6 +116,47 @@ public function __construct(StructuralType $a, StructuralType $b, array $directi
         $this->direction = $direction;
     }
 
+    /**
+     * Add the given property to the properties of this path.
+     *
+     * @param string $key The name of the property
+     * @param AnyType $value The value of the property
+     * @return PathType
+     */
+    public function withProperty(string $key, AnyType $value): PathType
+    {
+        if (!isset($this->properties)) {
+            $this->properties = new PropertyMap();
+        }
+
+        $this->properties->addProperty($key, $value);
+
+        return $this;
+    }
+
+    /**
+     * Add the given properties to the properties of this path.
+     *
+     * @param PropertyMap|array $properties
+     * @return PathType
+     */
+    public function withProperties($properties): PathType
+    {
+        if (!isset($this->properties)) {
+            $this->properties = new PropertyMap();
+        }
+
+        if (is_array($properties)) {
+            $properties = new PropertyMap($properties);
+        } elseif (!($properties instanceof PropertyMap)) {
+            throw new InvalidArgumentException("\$properties must either be an array or a PropertyMap object");
+        }
+
+        $this->properties = $this->properties->mergeWith($properties);
+
+        return $this;
+    }
+
     /**
      * @param Variable|string $variable
      * @return Path

src/Traits/StructuralTypeTrait.php

@@ -22,9 +22,6 @@
 namespace WikibaseSolutions\CypherDSL\Traits;
 
 use WikibaseSolutions\CypherDSL\Patterns\Path;
-use WikibaseSolutions\CypherDSL\PropertyMap;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
-use WikibaseSolutions\CypherDSL\Types\CompositeTypes\MapType;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
 
 /**
@@ -35,52 +32,6 @@
  */
 trait StructuralTypeTrait
 {
-    /**
-     * @var MapType|null
-     */
-    private ?MapType $properties;
-
-    /**
-     * Add the given property to the properties of this node.
-     *
-     * @param string $key The name of the property
-     * @param AnyType $value The value of the property
-     * @return Node
-     */
-    public function withProperty(string $key, AnyType $value): self
-    {
-        if (!isset($this->properties)) {
-            $this->properties = new PropertyMap();
-        }
-
-        $this->properties->addProperty($key, $value);
-
-        return $this;
-    }
-
-    /**
-     * Add the given properties to the properties of this node.
-     *
-     * @param PropertyMap|array $properties
-     * @return Node
-     */
-    public function withProperties($properties): self
-    {
-        if (!isset($this->properties)) {
-            $this->properties = new PropertyMap();
-        }
-
-        if (is_array($properties)) {
-            $properties = new PropertyMap($properties);
-        } elseif (!($properties instanceof PropertyMap)) {
-            throw new InvalidArgumentException("\$properties must either be an array or a PropertyMap object");
-        }
-
-        $this->properties = $this->properties->mergeWith($properties);
-
-        return $this;
-    }
-
     /**
      * Creates a new relationship from this node to the given pattern.
      *