Add test coverage for nested pipelines

Author: danizord

test/Application/MarshalMiddlewareTraitTest.php

@@ -13,6 +13,7 @@
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use ReflectionMethod;
 use ReflectionProperty;
 use stdClass;
@@ -159,14 +160,15 @@ public function testPreparingCallableMiddlewareWithoutContainerReturnsDecoratedM
 
     public function testPreparingArrayOfMiddlewareReturnsMiddlewarePipe()
     {
-        $first  = $this->prophesize(ServerMiddlewareInterface::class)->reveal();
-        $second = function ($request, DelegateInterface $delegate) {
+        $first   = $this->prophesize(ServerMiddlewareInterface::class)->reveal();
+        $second  = function ($request, DelegateInterface $delegate) {
         };
-        $third  = function ($request, $response, callable $next) {
+        $third   = function ($request, $response, callable $next) {
         };
-        $fourth = 'fourth';
-        $fifth  = TestAsset\CallableMiddleware::class;
-        $sixth  = TestAsset\CallableInteropMiddleware::class;
+        $fourth  = 'fourth';
+        $fifth   = TestAsset\CallableMiddleware::class;
+        $sixth   = TestAsset\CallableInteropMiddleware::class;
+        $seventh = [$first, $second];
 
         $this->container->has('fourth')->willReturn(true);
         $this->container->has(TestAsset\CallableMiddleware::class)->willReturn(false);
@@ -179,6 +181,7 @@ public function testPreparingArrayOfMiddlewareReturnsMiddlewarePipe()
             $fourth,
             $fifth,
             $sixth,
+            $seventh,
         ];
 
         $middleware = $this->prepareMiddleware($base);
@@ -188,7 +191,7 @@ public function testPreparingArrayOfMiddlewareReturnsMiddlewarePipe()
         $r->setAccessible(true);
         $pipeline = $r->getValue($middleware);
 
-        $this->assertCount(6, $pipeline);
+        $this->assertCount(7, $pipeline);
     }
 
     public function testPreparingArrayOfMiddlewareWithoutContainerReturnsMiddlewarePipe()

test/ApplicationTest.php

@@ -22,6 +22,7 @@
 use ReflectionProperty;
 use RuntimeException;
 use UnexpectedValueException;
+use Zend\Diactoros\Response;
 use Zend\Diactoros\Response\EmitterInterface;
 use Zend\Diactoros\Response\SapiEmitter;
 use Zend\Diactoros\ServerRequest;
@@ -681,4 +682,42 @@ public function testWillUseConfiguredTemplateRendererWhenCreatingDelegateFromNot
         $this->assertAttributeNotSame($appResponsePrototype, 'responsePrototype', $delegate);
         $this->assertAttributeSame($renderer, 'renderer', $delegate);
     }
+
+    public function testAllowsNestedMiddlewarePipelines()
+    {
+        $app     = $this->getApp();
+        $counter = function (ServerRequestInterface $request, DelegateInterface $delegate) {
+            $count   = $request->getAttribute('count', 0);
+            $request = $request->withAttribute('count', $count + 1);
+
+            return $delegate->process($request);
+        };
+
+        $app->pipe([
+            // First level
+            $counter,
+            [
+                // Second level
+                $counter,
+                $counter
+            ],
+            [
+                [
+                    // Third level
+                    $counter,
+                    $counter
+                ]
+            ]
+        ]);
+
+        $request  = new ServerRequest();
+        $response = new Response();
+        $delegate = $this->prophesize(DelegateInterface::class);
+
+        $delegate->process($request->withAttribute('count', 5))
+            ->shouldBeCalled()
+            ->willReturn($response);
+
+        $this->assertSame($response, $app->process($request, $delegate->reveal()));
+    }
 }