implemented structural types to contain path factory methods

Author: transistive

src/Patterns/Node.php

@@ -22,9 +22,12 @@
 namespace WikibaseSolutions\CypherDSL\Patterns;
 
 use WikibaseSolutions\CypherDSL\Property;
+use WikibaseSolutions\CypherDSL\PropertyMap;
 use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
 use WikibaseSolutions\CypherDSL\Traits\NodeTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\NodeType;
+use WikibaseSolutions\CypherDSL\Types\StructuralTypes\RelationshipType;
+use WikibaseSolutions\CypherDSL\Variable;
 
 /**
  * This class represents a node.
@@ -109,4 +112,24 @@ public function property(string $property): Property
     {
         return new Property($this->getName(), $property);
     }
+
+    public function relationship(RelationshipType $relationship, NodeType $node): Path
+    {
+        return (new Path($this))->relationship($relationship, $node);
+    }
+
+    public function relationshipTo(NodeType $node, $properties = null, $name = null): Path
+    {
+        return (new Path($this))->relationshipTo($node, $properties, $name);
+    }
+
+    public function relationshipFrom(NodeType $node, $properties = null, $name = null): Path
+    {
+        return (new Path($this))->relationshipFrom($node, $properties, $name);
+    }
+
+    public function relationshipUni(NodeType $node, $properties = null, $name = null): Path
+    {
+        return (new Path($this))->relationshipUni($node, $properties, $name);
+    }
 }

src/Traits/NodeTypeTrait.php

@@ -26,7 +26,6 @@
  */
 trait NodeTypeTrait
 {
-    use StructuralTypeTrait;
     use HasPropertiesTrait;
     use HasVariableTrait;
 }

src/Traits/StructuralTypeTrait.php

@@ -21,11 +21,9 @@
 
 namespace WikibaseSolutions\CypherDSL\Types\StructuralTypes;
 
-use WikibaseSolutions\CypherDSL\Types\AnyType;
-
 /**
  * Represents the type "node".
  */
-interface PathType extends AnyType
+interface PathType extends StructuralType
 {
 }

src/Types/StructuralTypes/PathType.php

@@ -2,7 +2,9 @@
 
 namespace WikibaseSolutions\CypherDSL\Types\StructuralTypes;
 
-interface RelationshipType extends StructuralType
+use WikibaseSolutions\CypherDSL\Types\AnyType;
+
+interface RelationshipType extends AnyType
 {
 
 }

src/Types/StructuralTypes/RelationshipType.php

@@ -21,8 +21,11 @@
 
 namespace WikibaseSolutions\CypherDSL\Types\StructuralTypes;
 
+use WikibaseSolutions\CypherDSL\Patterns\Path;
 use WikibaseSolutions\CypherDSL\Patterns\Relationship;
+use WikibaseSolutions\CypherDSL\PropertyMap;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
+use WikibaseSolutions\CypherDSL\Variable;
 
 /**
  * Represents any structural type in Cypher.
@@ -40,32 +43,48 @@
  * - relationship
  * - path
  *
- * @note This interface should not be implemented by any class directly.
  * @see https://neo4j.com/docs/cypher-manual/current/syntax/values/#structural-types
  */
 interface StructuralType extends AnyType
 {
     /**
-     * Creates a new relationship from this node to the given pattern.
+     * Adds a new relationship from the end of the structural type to the node pattern.
+     * @param RelationshipType $relationship
+     * @param NodeType $node
+     * @return Path
+     */
+    public function relationship(RelationshipType $relationship, NodeType $node): Path;
+
+    /**
+     * Adds a new relationship to the node pattern at the end of the structural type to form a path.
      *
-     * @param StructuralType $pattern
-     * @return Relationship
+     * @param NodeType $node The node to attach to the end of the structural type.
+     * @param array|PropertyMap|null $properties The properties to attach to the relationship
+     * @param string|Variable|null $name The name fo the relationship
+     *
+     * @return Path
      */
-    public function relationshipTo(StructuralType $pattern): Relationship;
+    public function relationshipTo(NodeType $node, $properties = null, $name = null): Path;
 
     /**
-     * Creates a new relationship from the given pattern to this node.
+     * Adds a new relationship from the node pattern at the end of the structural type to form a path.
+     *
+     * @param NodeType $node The node to attach to the end of the structural type.
+     * @param array|PropertyMap|null $properties The properties to attach to the relationship
+     * @param string|Variable|null $name The name fo the relationship
      *
-     * @param StructuralType $pattern
-     * @return Relationship
+     * @return Path
      */
-    public function relationshipFrom(StructuralType $pattern): Relationship;
+    public function relationshipFrom(NodeType $node, $properties = null, $name = null): Path;
 
     /**
-     * Creates a new unidirectional relationship between this node and the given pattern.
+     * Adds a new unidirectional relationship to the node pattern at the end of the structural type to form a path.
+     *
+     * @param NodeType $node The node to attach to the end of the structural type.
+     * @param array|PropertyMap|null $properties The properties to attach to the relationship
+     * @param string|Variable|null $name The name fo the relationship
      *
-     * @param StructuralType $pattern
-     * @return Relationship
+     * @return Path
      */
-    public function relationshipUni(StructuralType $pattern): Relationship;
+    public function relationshipUni(NodeType $node, $properties = null, $name = null): Path;
 }

src/Types/StructuralTypes/StructuralType.php

@@ -4,5 +4,5 @@
 
 class PathTest
 {
-
+    public function test
 }