refactor

fab2s · May 9, 2017 · 3b9ef9b · 3b9ef9b
1 parent 140d8cf
commit 3b9ef9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/Nodes/CallableNode.php b/src/Nodes/CallableNode.php
@@ -25,12 +25,8 @@ class CallableNode extends PayloadNodeAbstract implements TraversableNodeInterfa
      *
      * @throws NodalFlowException
      */
-    public function __construct($payload, $isAReturningVal, $isATraversable = false)
+    public function __construct(callable $payload, $isAReturningVal, $isATraversable = false)
     {
-        if (!\is_callable($payload)) {
-            throw new NodalFlowException('Payload is not callable');
-        }
-
         parent::__construct($payload, $isAReturningVal, $isATraversable);
     }
 

diff --git a/src/Nodes/ClosureNode.php b/src/Nodes/ClosureNode.php
@@ -14,7 +14,7 @@
 /**
  * Class ClosureNode
  */
-class ClosureNode extends PayloadNodeAbstract implements TraversableNodeInterface, ExecNodeInterface
+class ClosureNode extends CallableNode
 {
     /**
      * Instantiate a Closure Node
@@ -25,12 +25,8 @@ class ClosureNode extends PayloadNodeAbstract implements TraversableNodeInterfac
      *
      * @throws NodalFlowException
      */
-    public function __construct($payload, $isAReturningVal, $isATraversable = false)
+    public function __construct(\Closure $payload, $isAReturningVal, $isATraversable = false)
     {
-        if (!($payload instanceof \Closure)) {
-            throw new NodalFlowException('Payload is not a Closure');
-        }
-
         parent::__construct($payload, $isAReturningVal, $isATraversable);
     }