Incorporated feedback from @webimpress

Incorporated feedback from @webimpress, with the exception of updating
HTTP method names and status codes to use fig/http-message-util
constants; these are already updated on the develop branch, and changing
them in tests has no effect on the library code.

Author: weierophinney

src/Container/ApplicationFactory.php

@@ -161,8 +161,7 @@ public function __invoke(ContainerInterface $container)
             ? $container->get(RouterInterface::class)
             : new FastRouteRouter();
 
-        $finalHandler = (isset($config['zend-expressive']['raise_throwables'])
-            && $config['zend-expressive']['raise_throwables'])
+        $finalHandler = ! empty($config['zend-expressive']['raise_throwables'])
             ? $this->marshalNoopFinalHandler($container)
             : $this->marshalLegacyFinalHandler($container, $config);
 
@@ -172,15 +171,11 @@ public function __invoke(ContainerInterface $container)
 
         $app = new Application($router, $container, $finalHandler, $emitter);
 
-        if (isset($config['zend-expressive']['raise_throwables'])
-            && $config['zend-expressive']['raise_throwables']
-        ) {
+        if (! empty($config['zend-expressive']['raise_throwables'])) {
             $app->raiseThrowables();
         }
 
-        if (! isset($config['zend-expressive']['programmatic_pipeline'])
-            || ! $config['zend-expressive']['programmatic_pipeline']
-        ) {
+        if (empty($config['zend-expressive']['programmatic_pipeline'])) {
             $this->injectRoutesAndPipeline($app, $config);
         }
 

test/ApplicationMarshalMiddlewarePipeTest.php

@@ -1,16 +1,18 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
- * @copyright Copyright (c) 2016-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2016-2017 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\Expressive;
 
+use Exception;
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
 use Psr\Http\Message\ResponseInterface;
 use RuntimeException;
+use Throwable;
 use Zend\Diactoros\Response\EmitterInterface;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequest;
@@ -61,9 +63,9 @@ public function createErrorHandler($expected)
             try {
                 $response = $next($request, $response);
                 return $response;
-            } catch (\Throwable $e) {
+            } catch (Throwable $e) {
                 // fall-through
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 // fall-through
             }
 

test/ApplicationTest.php

@@ -644,6 +644,8 @@ public function invalidRequestExceptions()
      * @runInSeparateProcess
      * @preserveGlobalState disabled
      * @dataProvider invalidRequestExceptions
+     * @param string $expectedException
+     * @param string $message
      */
     public function testRunInvokesFinalHandlerWhenServerRequestFactoryRaisesException(
         $expectedException,

test/Container/ApplicationFactoryTest.php

@@ -920,9 +920,8 @@ public function testProperlyRegistersNestedErrorMiddlewareAsLazyErrorMiddleware(
      */
     public function testWillNotInjectConfiguredRoutesOrPipelineIfProgrammaticPipelineFlagEnabled()
     {
-        // @codingStandardsIgnoreStart
-        $api = function ($request, $response, $next) {};
-        // @codingStandardsIgnoreEnd
+        $api = function ($request, $response, $next) {
+        };
 
         $dynamicPath = clone $api;
         $noPath = clone $api;
@@ -933,8 +932,8 @@ public function testWillNotInjectConfiguredRoutesOrPipelineIfProgrammaticPipelin
 
         $config = [
             'middleware_pipeline' => [
-                [ 'path' => '/api', 'middleware' => $api ],
-                [ 'path' => '/dynamic-path', 'middleware' => 'DynamicPath' ],
+                ['path' => '/api', 'middleware' => $api],
+                ['path' => '/dynamic-path', 'middleware' => 'DynamicPath'],
                 ['middleware' => $noPath],
                 ['middleware' => 'Goodbye'],
                 ['middleware' => [