Updates to 404 handling

- Updated configuration settings
- Updated 404 handler to display controller and exception, if present
- Do not merge until all outstanding view layer PRs are merged on ZF2
  master

diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index dd2f0d7..fd748ee 100644 (file)
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -54,19 +54,20 @@ return array(
             ),
             'Zend\Mvc\View\DefaultRenderingStrategy' => array(
                 'parameters' => array(
-                    'baseTemplate' => 'layout/layout',
+                    'layoutTemplate' => 'layout/layout',
                 ),
             ),
             'Zend\Mvc\View\ExceptionStrategy' => array(
                 'parameters' => array(
                     'displayExceptions' => true,
-                    'template'          => 'error/index',
+                    'exceptionTemplate' => 'error/index',
                 ),
             ),
             'Zend\Mvc\View\RouteNotFoundStrategy' => array(
                 'parameters' => array(
-                    'notFoundTemplate' => 'error/404',
                     'displayNotFoundReason' => true,
+                    'displayExceptions'     => true,
+                    'notFoundTemplate'      => 'error/404',
                 ),
             ),
 

diff --git a/module/Application/view/error/404.phtml b/module/Application/view/error/404.phtml
index aa5771d..468953f 100644 (file)
--- a/module/Application/view/error/404.phtml
+++ b/module/Application/view/error/404.phtml
@@ -26,8 +26,35 @@ switch ($this->reason) {
 
 <p><?php echo $reasonMessage ?></p>
 
-<?php else: ?>
+<?php endif ?>
+
+<?php if (isset($this->controller) && $this->controller): ?>
+
+<dl>
+    <dt>Controller:</dt>
+    <dd><?php $this->escape($this->controller) ?>
+<?php
+if (isset($this->controller_class) 
+    && $this->controller_class
+    && $this->controller_class != $this->controller
+) {
+    echo " (resolves to " . $this->escape($this->controller_class) . ")";
+}
+?>
+</dd>
+
+<?php endif ?>
+
+<?php if (isset($this->exception) && $this->exception): ?>
+
+<h2>Exception:</h2>
+
+<p><b><?php echo $this->escape($this->exception->getMessage()) ?></b></p>
+
+<h3>Stack trace</h3>
 
-<h3>No Exception available</h3>
+<pre>
+<?php echo $this->exception->getTraceAsString() ?>
+</pre>
 
 <?php endif ?>