Fixed hook chaining

Author: spamoom

src/Hook.php

@@ -8,24 +8,49 @@ class Hook
 {
     use ResolvesArgumentTrait;
 
-    protected $group;
-    protected $operation;
-    protected $path;
-    protected $status = 200;
-    protected $response = 'application/json';
+    public $group;
+    public $operation;
+    public $path;
+    public $status = 200;
+    public $response = 'application/json';
+
+    public function __construct($group = null, $path = null, $operation = null, $status = null, $response = null)
+    {
+        if ($group) {
+            $this->group = $group;
+        }
+
+        if ($operation) {
+            $this->operation = $operation;
+        }
+
+        if ($path) {
+            $this->path = $path;
+        }
+
+        if ($status) {
+            $this->status = $status;
+        }
+
+        if ($response) {
+            $this->response = $response;
+        }
+    }
 
     public function __call($method, $args)
     {
         if (in_array($method, ['group', 'path', 'operation', 'status', 'response'])) {
-            $this->{$method} = $args[0];
+            $hook = $this->reCreateSelf();
+
+            $hook->{$method} = $args[0];
 
             if (isset($args[1])) {
-                if ($callable = $this->resolveArgument($args[1])) {
-                    return $callable($this);
+                if ($callable = $hook->resolveArgument($args[1])) {
+                    return $callable($hook);
                 }
             }
 
-            return $this;
+            return $hook;
         }
 
         if (in_array($method, ['before'])) {
@@ -39,6 +64,11 @@ public function __call($method, $args)
         }
     }
 
+    private function reCreateSelf()
+    {
+        return new static($this->group, $this->path, $this->operation, $this->status, $this->response);
+    }
+
     private function buildTransactionName()
     {
         return implode(' > ', [

src/ResolvesArgumentTrait.php

@@ -4,7 +4,7 @@
 
 trait ResolvesArgumentTrait
 {
-    protected function resolveArgument($argument)
+    public function resolveArgument($argument)
     {
         if (is_array($argument)) {
             $method = $argument[1];

src/Transaction.php

@@ -26,7 +26,7 @@ public function replaceInPath($old, $new)
     public function alterBody(\Closure $closure)
     {
         $requestBody = json_decode($this->transaction->request->body);
-        $requestBody = $closure($requestBody);
+        $closure($requestBody);
         $this->transaction->request->body = json_encode($requestBody);
     }