Fix failing test by adding additional method to mock

Author: marijnvanwezel

src/Patterns/Node.php

@@ -148,12 +148,27 @@ public function getName(): ?Variable
         return $this->variable;
     }
 
+    /**
+     * Alias of Node::named().
+     *
+     * @param $variable
+     * @return $this
+     * @see Node::named()
+     *
+     */
+    public function setName($variable): self
+    {
+        return $this->named($variable);
+    }
 
-    public function hasName(): bool {
-        if (!isset($this->variable)) {
-            return false;
-        }
-        return ($this->variable !== null);
+    /**
+     * Returns true if and only if this node has a name.
+     *
+     * @return bool
+     */
+    public function hasName(): bool
+    {
+        return isset($this->variable);
     }
 
     /**
@@ -186,6 +201,4 @@ public function toQuery(): string
 
         return "($nodeInner)";
     }
-
-
 }

src/Query.php

@@ -273,16 +273,13 @@ public function returning($expressions, bool $distinct = false): self
 
             // check if expression is node, then replace with variable
             if ($expression instanceof Node) {
-                print_r(["test" => $expression instanceof Node, "hasname" => $expression->hasName() === true, "expression" => $expression]);
                 // check if Node has Name setted
-                if (!($expression->hasName())) {
-                    $expression = $expression->named(uniqid())->getName();
-                } else {
-                    $expression = $expression->getName();
+                if (!$expression->hasName()) {
+                    $expression->setName(uniqid());
                 }
-                print_r(["test" => $expression instanceof AnyType, "expression" => $expression]);
-            }
 
+                $expression = $expression->getName();
+            }
 
             $alias = is_integer($maybeAlias) ? "" : $maybeAlias;
             $returnClause->addColumn($expression, $alias);

tests/Unit/QueryTest.php

@@ -430,8 +430,10 @@ public function testBuild()
 
         $this->assertSame("WITH foobar WHERE foobar", $statement);
 
-        $pathMock = $this->getQueryConvertableMock(Path::class, "(a)->(b)");
         $nodeMock = $this->getQueryConvertableMock(Node::class, "(a)");
+        $nodeMock->method('getName')->willReturn($this->getQueryConvertableMock(Variable::class, 'a'));
+
+        $pathMock = $this->getQueryConvertableMock(Path::class, "(a)->(b)");
         $numeralMock = $this->getQueryConvertableMock(NumeralType::class, "12");
         $booleanMock = $this->getQueryConvertableMock(BooleanType::class, "a > b");
         $propertyMock = $this->getQueryConvertableMock(Property::class, "a.b");
@@ -453,7 +455,7 @@ public function testBuild()
             ->with(["#" => $nodeMock])
             ->build();
 
-        $this->assertSame("MATCH (a)->(b), (a) RETURN (a) AS `#` CREATE (a)->(b), (a) CREATE (a)->(b) DELETE (a), (a) DETACH DELETE (a), (a) LIMIT 12 MERGE (a) OPTIONAL MATCH (a), (a) ORDER BY a.b, a.b DESCENDING REMOVE a.b WHERE a > b WITH (a) AS `#`", $statement);
+        $this->assertSame("MATCH (a)->(b), (a) RETURN a AS `#` CREATE (a)->(b), (a) CREATE (a)->(b) DELETE (a), (a) DETACH DELETE (a), (a) LIMIT 12 MERGE (a) OPTIONAL MATCH (a), (a) ORDER BY a.b, a.b DESCENDING REMOVE a.b WHERE a > b WITH a AS `#`", $statement);
     }
 
     public function testBuildEmpty()