Merge branch 'hotfix/qa-and-docs'

Close #522
Close #525

Author: weierophinney

doc/book/cookbook/autowiring-routes-and-pipelines.md

@@ -1,6 +1,6 @@
 # How can I autowire routes and pipelines?
 
-Expressive 2.0 switches to _programmatic_ piplines and routes, versus
+Expressive 2.0 switches to _programmatic_ pipelines and routes, versus
 _configuration-driven_ pipelines and routing. One drawback is that with
 configuration-driven approaches, users could provide configuration via a module
 `ConfigProvider`, and automatically expose new pipeline middleware or routes;

doc/book/features/container/delegator-factories.md

@@ -10,7 +10,7 @@ supported by Expressive.
 _Delegator factories_ accept the following arguments:
 
 - The container itself;
-- The name of the service whose creation is being decrorated;
+- The name of the service whose creation is being decorated;
 - A callback that will produce the service being decorated.
 
 As an example, let's say we have a `UserRepository` class that composes some sort of

doc/book/getting-started/features.md

@@ -169,7 +169,7 @@ middleware prevents any middleware attached later from executing.
 You can attach middleware manually, in which case the pipeline is executed in
 the order of attachment, or use configuration. When you use configuration, you
 will specify a priority integer to dictate the order in which middleware should
-be attached.  Middleware specifying high integer prioritiess are attached (and
+be attached. Middleware specifying high integer priorities are attached (and
 thus executed) earlier, while those specifying lower and/or negative integers
 are attached later. The default priority is 1.
 
@@ -217,7 +217,7 @@ will execute in one of two conditions:
 - routed middleware called on the next middleware instead of returning a response.
 
 As such, the largest use case for such middleware is to provide a "default"
-error response for your application, ucually as an HTTP 404 Not Found response.
+error response for your application, usually as an HTTP 404 Not Found response.
 
 The main points to remember are:
 

doc/book/index.md

@@ -19,7 +19,7 @@ framework for PHP, with the following features:
   [whoops](https://github.com/filp/whoops) for debugging purposes.
 - Nested middleware applications. Write an application, and compose it later
   in another, optionally under a separate subpath.
-- [Simplfied installation](getting-started/skeleton.md). Our custom
+- [Simplified installation](getting-started/skeleton.md). Our custom
   [Composer](https://getcomposer.org)-based installer prompts you for your
   initial stack choices, giving you exactly the base you want to start from.
 

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()));
+    }
 }