Add the new error handler classes

src/Container/ErrorHandlerFactory.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Expressive\Container;
+
+use Interop\Container\ContainerInterface;
+use Zend\Diactoros\Response;
+use Zend\Expressive\TemplatedErrorResponseGenerator;
+use Zend\Stratigility\Middleware\ErrorHandler;
+
+class ErrorHandlerFactory
+{
+    public function __invoke(ContainerInterface $container)
+    {
+        return new ErrorHandler(
+            new Response(),
+            $container->get(TemplatedErrorResponseGenerator::class)
+        );
+    }
+}

src/Container/NotFoundHandlerFactory.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Expressive\Container;
+
+use Interop\Container\ContainerInterface;
+use Zend\Diactoros\Response;
+use Zend\Expressive\NotFoundHandler;
+use Zend\Expressive\Template\TemplateRendererInterface;
+
+class NotFoundHandlerFactory
+{
+    public function __invoke(ContainerInterface $container)
+    {
+        $config = $container->has('config')
+            ? $container->get('config')
+            : [];
+
+        $template = isset($config['zend-expressive']['error_handler']['template_404'])
+            ? $config['zend-expressive']['error_handler']['template_404']
+            : 'error/404';
+
+        return new NotFoundHandler(
+            $container->get(TemplateRendererInterface::class),
+            new Response(),
+            $template
+        );
+    }
+}

src/Container/TemplatedErrorResponseGeneratorFactory.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Expressive\Container;
+
+use Interop\Container\ContainerInterface;
+use Zend\Expressive\Template\TemplateRendererInterface;
+use Zend\Expressive\TemplatedErrorResponseGenerator;
+
+class TemplatedErrorResponseGeneratorFactory
+{
+    public function __invoke(ContainerInterface $container)
+    {
+        $config = $container->has('config') ? $container->get('config') : [];
+        $debug = isset($config['debug']) ? $config['debug'] : false;
+
+        $template = isset($config['zend-expressive']['error_handler']['template_error'])
+            ? $config['zend-expressive']['error_handler']['template_error']
+            : 'error/error';
+
+        return new TemplatedErrorResponseGenerator(
+            $container->get(TemplateRendererInterface::class),
+            $template,
+            $debug
+        );
+    }
+}

src/NotFoundHandler.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Expressive;
+
+use Interop\Http\Middleware\DelegateInterface;
+use Interop\Http\Middleware\ServerMiddlewareInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Zend\Expressive\Template\TemplateRendererInterface;
+use Zend\Stratigility\Delegate\CallableDelegateDecorator;
+
+class NotFoundHandler implements ServerMiddlewareInterface
+{
+    private $renderer;
+
+    private $responsePrototype;
+
+    private $template;
+
+    /**
+     * NotFoundHandler constructor.
+     *
+     * @param TemplateRendererInterface $renderer
+     * @param ResponseInterface         $responsePrototype
+     */
+    public function __construct(TemplateRendererInterface $renderer, ResponseInterface $responsePrototype, $template)
+    {
+        $this->renderer          = $renderer;
+        $this->responsePrototype = $responsePrototype;
+        $this->template          = $template;
+    }
+
+    /**
+     * Proxy to process()
+     *
+     * Proxies to process, after first wrapping the `$next` argument using the
+     * CallableDelegateDecorator.
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface      $response
+     * @param callable               $next
+     *
+     * @return ResponseInterface
+     */
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next)
+    {
+        return $this->process($request, new CallableDelegateDecorator($next, $response));
+    }
+
+    /**
+     * Creates and returns a 404 response.
+     *
+     * @param ServerRequestInterface $request  Ignored.
+     * @param DelegateInterface      $delegate Ignored.
+     *
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, DelegateInterface $delegate)
+    {
+        $response = $this->responsePrototype->withStatus(404);
+        $response->getBody()->write(
+            $this->renderer->render($this->template)
+        );
+
+        return $response;
+    }
+}

src/TemplatedErrorResponseGenerator.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Expressive;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Zend\Expressive\Template\TemplateRendererInterface;
+
+class TemplatedErrorResponseGenerator
+{
+    private $isDevelopmentMode;
+
+    private $renderer;
+
+    private $template;
+
+    public function __construct(TemplateRendererInterface $renderer, $template, $isDevelopmentMode = false)
+    {
+        $this->renderer          = $renderer;
+        $this->isDevelopmentMode = $isDevelopmentMode;
+        $this->template          = $template;
+    }
+
+    public function __invoke($e, ServerRequestInterface $request, ResponseInterface $response)
+    {
+        $response = $response->withStatus(500);
+        $response->getBody()->write($this->renderer->render('error::error', [
+            'exception'        => $e,
+            'development_mode' => $this->isDevelopmentMode,
+            'status'           => $response->getStatusCode(),
+            'reason'           => $response->getReasonPhrase(),
+        ]));
+
+        return $response;
+    }
+}