Allow filters to return a new response or request

jenssegers · Apr 5, 2015 · 7dd08ba · 7dd08ba
1 parent 3c3baff
commit 7dd08ba
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 12 deletions.
diff --git a/src/Proxy.php b/src/Proxy.php
@@ -142,19 +142,17 @@ public function addResponseFilter($filter)
      */
     protected function applyRequestFilter(Request $request)
     {
-        $callback = function($filter) use ($request)
+        foreach ($this->requestFilters as $filter)
         {
             if ($filter instanceof RequestFilterInterface)
             {
-                return $filter->filter($request);
+                $request = $filter->filter($request) ?: $request;
             }
             else if ($filter instanceof Closure)
             {
-                return $filter($request);
+                $request = $filter($request) ?: $request;
             }
-        };
-
-        array_map($callback, $this->requestFilters);
+        }
 
         return $request;
     }
@@ -167,19 +165,17 @@ protected function applyRequestFilter(Request $request)
      */
     protected function applyResponseFilter(Response $response)
     {
-        $callback = function($filter) use ($response)
+        foreach ($this->responseFilters as $filter)
         {
             if ($filter instanceof ResponseFilterInterface)
             {
-                return $filter->filter($response);
+                $response = $filter->filter($response) ?: $response;
             }
             else if ($filter instanceof Closure)
             {
-                return $filter($response);
+                $response = $filter($response) ?: $response;
             }
-        };
-
-        array_map($callback, $this->responseFilters);
+        }
 
         return $response;
     }

diff --git a/tests/Proxy/ProxyTest.php b/tests/Proxy/ProxyTest.php
@@ -159,4 +159,21 @@ public function to_applies_response_filter_closure()
         $this->assertTrue($executed);
     }
 
+    /**
+     * @test
+     */
+    public function to_request_filter_returns_new_request()
+    {
+        $replace = new Request;
+
+        $this->proxy->addRequestFilter(function(Request $request) use ($replace)
+        {
+            return $replace;
+        });
+
+        $this->proxy->forward(Request::createFromGlobals())->to('/');
+
+        $this->assertEquals($this->proxy->getRequest(), $replace);
+    }
+
 }