From 01228ddd09aed76fa3483ff70f03618824d32d75 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Tue, 21 Jun 2016 17:11:38 -0500
Subject: [PATCH 1/4] Provide development mode

zend-development-mode has been a popular feature of Apigility, and a popular
standalone module. Unfortunately, its architecture uses the MVC <-> console
integration, which is problematic in the streamlined skeleton, which does not
include that out-of-the-box.

This patch creates development-mode as as standalone script in the project
`bin/` directory. Additionally, we add the `config/modules.config.php`, to push
modules into a separate file, and `config/development.config.php.dist`, to
provide a basic structure for segregated configuration. Finally, the bootstrap
is updated to test for the presence of `config/development.config.php` and merge
its contents with the application configuration.

Usage is:

```bash
$ ./bin/development-mode enable
```

Or, to disable:

```bash
$ ./bin/development-mode disable
```
---
 bin/development-mode               | 235 +++++++++++++++++++++++++++++
 config/application.config.php      |   8 +-
 config/development.config.php.dist |  18 +++
 config/modules.config.php          |  17 +++
 public/index.php                   |   9 +-
 5 files changed, 280 insertions(+), 7 deletions(-)
 create mode 100755 bin/development-mode
 create mode 100644 config/development.config.php.dist
 create mode 100644 config/modules.config.php

diff --git a/bin/development-mode b/bin/development-mode
new file mode 100755
index 0000000000..b728be8265
--- /dev/null
+++ b/bin/development-mode
@@ -0,0 +1,235 @@
+#!/usr/bin/env php
+<?php
+/**
+ * @link      http://github.com/zendframework/ZendSkeletonApplication for the canonical source repository
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+const CONFIG_CACHE_BASE = 'module-config-cache';
+
+$help = <<< EOH
+Enable/Disable development mode.
+
+Usage:
+
+development-mode [-h|--help] disable|enable
+
+--help|-h                    Print this usage message.
+disable                      Disable development mode.
+enable                       Enable development mode
+                             (do not use in production).
+
+To enable development mode, the following file MUST exist:
+
+- config/development.config.php.dist; this file will be copied to
+  config/development.config.php
+
+Optionally:
+
+- config/autoload/development.local.php.dist; this file will be copied to
+  config/autoload/development.local.php
+
+When disabling development mode:
+
+- config/development.config.php will be removed if it exists
+- config/autoload/development.local.php will be removed if it exists
+
+Additionally, both when disabling and enabling development mode, the
+script will remove the file cache/module-config-cache.php (or the file
+specified by the combination of the module_listener_options.cache_dir
+and module_listener_options.config_cache_key options).
+EOH;
+
+// Called without arguments
+if ($argc < 2) {
+    fwrite(STDERR, 'No arguments provided.' . PHP_EOL . PHP_EOL);
+    fwrite(STDERR, $help . PHP_EOL);
+    exit(1);
+}
+
+// Requested help
+if (in_array($argv[1], ['-h', '--help'], true)) {
+    echo $help, PHP_EOL;
+    exit(0);
+}
+
+if (! in_array($argv[1], ['disable', 'enable'], true)) {
+    fwrite(STDERR, 'Unrecognized argument.' . PHP_EOL . PHP_EOL);
+    fwrite(STDERR, $help . PHP_EOL);
+    exit(1);
+}
+
+$action = $argv[1];
+$return = $action();
+exit((int) $return);
+
+/**
+ * Disable development mode
+ *
+ * @return int
+ */
+function disable()
+{
+    if (! file_exists('config/development.config.php')) {
+        // nothing to do
+        echo "Development mode was already disabled.", PHP_EOL;
+        return 0;
+    }
+
+    if (file_exists('config/autoload/development.local.php')) {
+        // optional application config override
+        unlink('config/autoload/development.local.php');
+    }
+
+    unlink('config/development.config.php');
+
+    removeConfigCacheFile(getConfigCacheFile());
+
+    echo "Development mode is now disabled.", PHP_EOL;
+    return 0;
+}
+
+/**
+ * Enable development mode
+ *
+ * @return int
+ */
+function enable()
+{
+    if (file_exists('config/development.config.php')) {
+        // nothing to do
+        echo "Already in development mode!", PHP_EOL;
+        return 0;
+    }
+
+    if (! file_exists('config/development.config.php.dist')) {
+        fwrite(
+            STDERR,
+            "MISSING \"config/development.config.php.dist\". Could not switch to development mode!" . PHP_EOL
+        );
+        return 1;
+    }
+
+    copy('config/development.config.php.dist', 'config/development.config.php');
+
+    if (file_exists('config/autoload/development.local.php.dist')) {
+        // optional application config override
+        copy('config/autoload/development.local.php.dist', 'config/autoload/development.local.php');
+    }
+
+    removeConfigCacheFile(getConfigCacheFile());
+
+    echo 'You are now in development mode.', PHP_EOL;
+    return 0;
+}
+
+/**
+ * Removes the application configuration cache file, if present.
+ */
+function removeConfigCacheFile($configCacheFile)
+{
+    if ($configCacheFile && file_exists($configCacheFile)) {
+        unlink($configCacheFile);
+    }
+}
+
+/**
+ * Retrieve the config cache file, if any.
+ *
+ * @return false|string
+ */
+function getConfigCacheFile()
+{
+    $configCacheDir = getConfigCacheDir();
+    $configCacheKey = getConfigCacheKey();
+
+    if (empty($configCacheDir)) {
+        return false;
+    }
+
+    $path = sprintf('%s/%s.', $configCacheDir, CONFIG_CACHE_BASE);
+
+    if (! empty($configCacheKey)) {
+        $path .= $configCacheKey . '.';
+    }
+
+    return $path . 'php';
+}
+
+/**
+ * Return the configured configuration cache directory, if any.
+ *
+ * @return null|string
+ */
+function getConfigCacheDir()
+{
+    static $dir;
+
+    if ($dir) {
+        return $dir;
+    }
+
+    $config = getApplicationConfig();
+    if (isset($config['module_listener_options']['cache_dir'])
+        && ! empty($config['module_listener_options']['cache_dir'])
+    ) {
+        $dir = $config['module_listener_options']['cache_dir'];
+    }
+
+    return $dir;
+}
+
+/**
+ * Return the configured configuration cache key, if any.
+ *
+ * @return null|string
+ */
+function getConfigCacheKey()
+{
+    static $key;
+
+    if ($key) {
+        return $key;
+    }
+
+    $config = getApplicationConfig();
+    if (isset($config['module_listener_options']['config_cache_key'])
+        && ! empty($config['module_listener_options']['config_cache_key'])
+    ) {
+        $key = $config['module_listener_options']['config_cache_key'];
+    }
+
+    return $key;
+}
+
+/**
+ * Return the application configuration.
+ *
+ * Memoizes the discovered configuration so subsequent calls can re-use the
+ * value.
+ *
+ * Exits with status code 2 if unable to find the configuration.
+ *
+ * @return array
+ */
+function getApplicationConfig()
+{
+    static $config;
+
+    if ($config) {
+        return $config;
+    }
+
+    if (! file_exists('config/application.config.php')) {
+        fwrite(
+            STDERR,
+            'Cannot locate config/application.config.php; are you in the' . PHP_EOL
+            . 'application root, and is this a zendframework application?' . PHP_EOL
+        );
+        exit(1);
+    }
+
+    $config = include 'config/application.config.php';
+    return $config;
+}
diff --git a/config/application.config.php b/config/application.config.php
index 6f989633db..ea34ed59e8 100644
--- a/config/application.config.php
+++ b/config/application.config.php
@@ -6,12 +6,8 @@
  * @see http://framework.zend.com/manual/current/en/tutorials/config.advanced.html#environment-specific-application-configuration
  */
 return [
-    // This should be an array of module namespaces used in the application.
-    'modules' => [
-        'Zend\Router',
-        'Zend\Validator',
-        'Application',
-    ],
+    // Retrieve list of modules used in this application.
+    'modules' => require __DIR__ . '/modules.config.php',
 
     // These are various options for the listeners attached to the ModuleManager
     'module_listener_options' => [
diff --git a/config/development.config.php.dist b/config/development.config.php.dist
new file mode 100644
index 0000000000..2446217177
--- /dev/null
+++ b/config/development.config.php.dist
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/ZendSkeletonApplication for the canonical source repository
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return [
+    // Development time modules
+    'modules' => [
+    ],
+    // development time configuration globbing
+    'module_listener_options' => [
+        'config_glob_paths' => ['config/autoload/{,*.}{global,local}-development.php'],
+        'config_cache_enabled' => false,
+        'module_map_cache_enabled' => false,
+    ],
+];
diff --git a/config/modules.config.php b/config/modules.config.php
new file mode 100644
index 0000000000..92ac3cfd4e
--- /dev/null
+++ b/config/modules.config.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/ZendSkeletonApplication for the canonical source repository
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+/**
+ * List of enabled modules for this application.
+ *
+ * This should be an array of module namespaces used in the application.
+ */
+return [
+    'Zend\Router',
+    'Zend\Validator',
+    'Application',
+];
diff --git a/public/index.php b/public/index.php
index 1428a57ead..3dd188e282 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,6 +1,7 @@
 <?php
 
 use Zend\Mvc\Application;
+use Zend\Stdlib\ArrayUtils;
 
 /**
  * This makes our life easier when dealing with paths. Everything is relative
@@ -29,5 +30,11 @@
     );
 }
 
+// Retrieve configuration
+$appConfig = require __DIR__ . '/../config/application.config.php';
+if (file_exists(__DIR__ . '/config/development.config.php')) {
+    $appConfig = ArrayUtils::merge($appConfig, require __DIR__ . '/../config/development.config.php');
+}
+
 // Run the application!
-Application::init(require __DIR__ . '/../config/application.config.php')->run();
+Application::init($appConfig)->run();

From 1416d389fc65a88fe2652c2387563d31b3110c5c Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Tue, 21 Jun 2016 17:42:26 -0500
Subject: [PATCH 2/4] Normalize all quotation marks.

---
 bin/development-mode | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/development-mode b/bin/development-mode
index b728be8265..cb10255823 100755
--- a/bin/development-mode
+++ b/bin/development-mode
@@ -73,7 +73,7 @@ function disable()
 {
     if (! file_exists('config/development.config.php')) {
         // nothing to do
-        echo "Development mode was already disabled.", PHP_EOL;
+        echo 'Development mode was already disabled.', PHP_EOL;
         return 0;
     }
 
@@ -86,7 +86,7 @@ function disable()
 
     removeConfigCacheFile(getConfigCacheFile());
 
-    echo "Development mode is now disabled.", PHP_EOL;
+    echo 'Development mode is now disabled.', PHP_EOL;
     return 0;
 }
 
@@ -99,14 +99,14 @@ function enable()
 {
     if (file_exists('config/development.config.php')) {
         // nothing to do
-        echo "Already in development mode!", PHP_EOL;
+        echo 'Already in development mode!', PHP_EOL;
         return 0;
     }
 
     if (! file_exists('config/development.config.php.dist')) {
         fwrite(
             STDERR,
-            "MISSING \"config/development.config.php.dist\". Could not switch to development mode!" . PHP_EOL
+            'MISSING "config/development.config.php.dist". Could not switch to development mode!' . PHP_EOL
         );
         return 1;
     }

From 6995de4ff2cf7961ebd5f29b67d69cc829ec126b Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Tue, 21 Jun 2016 17:43:34 -0500
Subject: [PATCH 3/4] Fix path in bootstrap script

---
 public/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.php b/public/index.php
index 3dd188e282..4343eb7559 100644
--- a/public/index.php
+++ b/public/index.php
@@ -32,7 +32,7 @@
 
 // Retrieve configuration
 $appConfig = require __DIR__ . '/../config/application.config.php';
-if (file_exists(__DIR__ . '/config/development.config.php')) {
+if (file_exists(__DIR__ . '/../config/development.config.php')) {
     $appConfig = ArrayUtils::merge($appConfig, require __DIR__ . '/../config/development.config.php');
 }
 

From 42efb43e1a7f5f0938a95f6f0c3f81c9948b44b9 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Wed, 22 Jun 2016 15:59:19 -0500
Subject: [PATCH 4/4] Use zf-development-mode instead

This patch removes `bin/development-mode` in favor of requiring
zfcampus/zf-development-mode v3. The various commands in zf-development-mode
have been aliased as composer scripts, and documented in the README file.

It also adds `config/autoload/development.local.php.dist`, and ensures all
configuration files are properly documented and use short array notation.
---
 .gitignore                                 |   3 +-
 README.md                                  |  17 ++
 bin/development-mode                       | 235 ---------------------
 composer.json                              |   6 +-
 composer.lock                              |  89 ++++++--
 config/autoload/development.local.php.dist |  22 ++
 config/autoload/local.php.dist             |   4 +-
 config/development.config.php.dist         |   4 +-
 8 files changed, 122 insertions(+), 258 deletions(-)
 delete mode 100755 bin/development-mode
 create mode 100644 config/autoload/development.local.php.dist

diff --git a/.gitignore b/.gitignore
index a0a70c8e73..a9a82082b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ nbproject
 .idea
 .project
 .settings
-vendor
+vendor/
 composer.phar
+config/development.config.php
 phpunit.xml
diff --git a/README.md b/README.md
index 4afa7cd236..8de482fcb0 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,23 @@ interfaces.
 
 **Note:** The built-in CLI server is *for development only*.
 
+## Development mode
+
+The skeleton ships with [zf-development-mode](https://github.com/zfcampus/zf-development-mode)
+by default, and provides three aliases for consuming the script it ships with:
+
+```bash
+$ composer development-enable  # enable development mode
+$ composer development-disable # enable development mode
+$ composer development-status  # whether or not development mode is enabled
+```
+
+You may provide development-only modules and bootstrap-level configuration in
+`config/development.config.php.dist`, and development-only application
+configuration in `config/autoload/development.local.php.dist`. Enabling
+development mode will copy these files to versions removing the `.dist` suffix,
+while disabling development mode will remove those copies.
+
 ## Running Unit Tests
 
 To run the supplied skeleton unit tests, you need to do one of the following:
diff --git a/bin/development-mode b/bin/development-mode
deleted file mode 100755
index cb10255823..0000000000
--- a/bin/development-mode
+++ /dev/null
@@ -1,235 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * @link      http://github.com/zendframework/ZendSkeletonApplication for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-const CONFIG_CACHE_BASE = 'module-config-cache';
-
-$help = <<< EOH
-Enable/Disable development mode.
-
-Usage:
-
-development-mode [-h|--help] disable|enable
-
---help|-h                    Print this usage message.
-disable                      Disable development mode.
-enable                       Enable development mode
-                             (do not use in production).
-
-To enable development mode, the following file MUST exist:
-
-- config/development.config.php.dist; this file will be copied to
-  config/development.config.php
-
-Optionally:
-
-- config/autoload/development.local.php.dist; this file will be copied to
-  config/autoload/development.local.php
-
-When disabling development mode:
-
-- config/development.config.php will be removed if it exists
-- config/autoload/development.local.php will be removed if it exists
-
-Additionally, both when disabling and enabling development mode, the
-script will remove the file cache/module-config-cache.php (or the file
-specified by the combination of the module_listener_options.cache_dir
-and module_listener_options.config_cache_key options).
-EOH;
-
-// Called without arguments
-if ($argc < 2) {
-    fwrite(STDERR, 'No arguments provided.' . PHP_EOL . PHP_EOL);
-    fwrite(STDERR, $help . PHP_EOL);
-    exit(1);
-}
-
-// Requested help
-if (in_array($argv[1], ['-h', '--help'], true)) {
-    echo $help, PHP_EOL;
-    exit(0);
-}
-
-if (! in_array($argv[1], ['disable', 'enable'], true)) {
-    fwrite(STDERR, 'Unrecognized argument.' . PHP_EOL . PHP_EOL);
-    fwrite(STDERR, $help . PHP_EOL);
-    exit(1);
-}
-
-$action = $argv[1];
-$return = $action();
-exit((int) $return);
-
-/**
- * Disable development mode
- *
- * @return int
- */
-function disable()
-{
-    if (! file_exists('config/development.config.php')) {
-        // nothing to do
-        echo 'Development mode was already disabled.', PHP_EOL;
-        return 0;
-    }
-
-    if (file_exists('config/autoload/development.local.php')) {
-        // optional application config override
-        unlink('config/autoload/development.local.php');
-    }
-
-    unlink('config/development.config.php');
-
-    removeConfigCacheFile(getConfigCacheFile());
-
-    echo 'Development mode is now disabled.', PHP_EOL;
-    return 0;
-}
-
-/**
- * Enable development mode
- *
- * @return int
- */
-function enable()
-{
-    if (file_exists('config/development.config.php')) {
-        // nothing to do
-        echo 'Already in development mode!', PHP_EOL;
-        return 0;
-    }
-
-    if (! file_exists('config/development.config.php.dist')) {
-        fwrite(
-            STDERR,
-            'MISSING "config/development.config.php.dist". Could not switch to development mode!' . PHP_EOL
-        );
-        return 1;
-    }
-
-    copy('config/development.config.php.dist', 'config/development.config.php');
-
-    if (file_exists('config/autoload/development.local.php.dist')) {
-        // optional application config override
-        copy('config/autoload/development.local.php.dist', 'config/autoload/development.local.php');
-    }
-
-    removeConfigCacheFile(getConfigCacheFile());
-
-    echo 'You are now in development mode.', PHP_EOL;
-    return 0;
-}
-
-/**
- * Removes the application configuration cache file, if present.
- */
-function removeConfigCacheFile($configCacheFile)
-{
-    if ($configCacheFile && file_exists($configCacheFile)) {
-        unlink($configCacheFile);
-    }
-}
-
-/**
- * Retrieve the config cache file, if any.
- *
- * @return false|string
- */
-function getConfigCacheFile()
-{
-    $configCacheDir = getConfigCacheDir();
-    $configCacheKey = getConfigCacheKey();
-
-    if (empty($configCacheDir)) {
-        return false;
-    }
-
-    $path = sprintf('%s/%s.', $configCacheDir, CONFIG_CACHE_BASE);
-
-    if (! empty($configCacheKey)) {
-        $path .= $configCacheKey . '.';
-    }
-
-    return $path . 'php';
-}
-
-/**
- * Return the configured configuration cache directory, if any.
- *
- * @return null|string
- */
-function getConfigCacheDir()
-{
-    static $dir;
-
-    if ($dir) {
-        return $dir;
-    }
-
-    $config = getApplicationConfig();
-    if (isset($config['module_listener_options']['cache_dir'])
-        && ! empty($config['module_listener_options']['cache_dir'])
-    ) {
-        $dir = $config['module_listener_options']['cache_dir'];
-    }
-
-    return $dir;
-}
-
-/**
- * Return the configured configuration cache key, if any.
- *
- * @return null|string
- */
-function getConfigCacheKey()
-{
-    static $key;
-
-    if ($key) {
-        return $key;
-    }
-
-    $config = getApplicationConfig();
-    if (isset($config['module_listener_options']['config_cache_key'])
-        && ! empty($config['module_listener_options']['config_cache_key'])
-    ) {
-        $key = $config['module_listener_options']['config_cache_key'];
-    }
-
-    return $key;
-}
-
-/**
- * Return the application configuration.
- *
- * Memoizes the discovered configuration so subsequent calls can re-use the
- * value.
- *
- * Exits with status code 2 if unable to find the configuration.
- *
- * @return array
- */
-function getApplicationConfig()
-{
-    static $config;
-
-    if ($config) {
-        return $config;
-    }
-
-    if (! file_exists('config/application.config.php')) {
-        fwrite(
-            STDERR,
-            'Cannot locate config/application.config.php; are you in the' . PHP_EOL
-            . 'application root, and is this a zendframework application?' . PHP_EOL
-        );
-        exit(1);
-    }
-
-    $config = include 'config/application.config.php';
-    return $config;
-}
diff --git a/composer.json b/composer.json
index eb5a337ef4..5125a62072 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,8 @@
         "php": "^5.6 || ^7.0",
         "zendframework/zend-component-installer": "^1.0 || ^0.2 || ^1.0.0-dev@dev",
         "zendframework/zend-skeleton-installer": "^1.0 || ^0.1.2 || ^1.0.0-dev@dev",
-        "zendframework/zend-mvc": "^3.0"
+        "zendframework/zend-mvc": "^3.0",
+        "zfcampus/zf-development-mode": "^3.0"
     },
     "autoload": {
         "psr-4": {
@@ -102,6 +103,9 @@
         ]
     },
     "scripts": {
+        "development-disable": "zf-development-mode disable",
+        "development-enable": "zf-development-mode enable",
+        "development-status": "zf-development-mode status",
         "serve": "php -S 0.0.0.0:8080 -t public/ public/index.php"
     }
 }
diff --git a/composer.lock b/composer.lock
index b2573456c7..13489c95c1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "16ccc5a155ca7527a65d4aa29d1e4103",
-    "content-hash": "a1405a0fbb06c02da127788a690083d5",
+    "hash": "60cce4eab67f50f97ffb881225402af2",
+    "content-hash": "b54dc57df8c36223af5e033b1a7bb14c",
     "packages": [
         {
             "name": "container-interop/container-interop",
@@ -513,27 +513,30 @@
         },
         {
             "name": "zendframework/zend-servicemanager",
-            "version": "3.0.3",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-servicemanager.git",
-                "reference": "654eaec084d053c832beca10a53af078afca423e"
+                "reference": "90b88339a4b937c6bb0055ee04b2567e7e628f25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/654eaec084d053c832beca10a53af078afca423e",
-                "reference": "654eaec084d053c832beca10a53af078afca423e",
+                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/90b88339a4b937c6bb0055ee04b2567e7e628f25",
+                "reference": "90b88339a4b937c6bb0055ee04b2567e7e628f25",
                 "shasum": ""
             },
             "require": {
                 "container-interop/container-interop": "~1.0",
                 "php": "^5.5 || ^7.0"
             },
+            "provide": {
+                "container-interop/container-interop-implementation": "^1.1"
+            },
             "require-dev": {
-                "ocramius/proxy-manager": "~1.0",
+                "ocramius/proxy-manager": "^1.0 || ^2.0",
                 "phpbench/phpbench": "^0.10.0",
-                "phpunit/phpunit": "~4.6",
-                "squizlabs/php_codesniffer": "^2.0@dev"
+                "phpunit/phpunit": "^4.6 || ^5.2.10",
+                "squizlabs/php_codesniffer": "^2.5.1"
             },
             "suggest": {
                 "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services",
@@ -561,7 +564,7 @@
                 "servicemanager",
                 "zf"
             ],
-            "time": "2016-02-02 14:13:42"
+            "time": "2016-06-01 16:50:58"
         },
         {
             "name": "zendframework/zend-skeleton-installer",
@@ -772,16 +775,16 @@
         },
         {
             "name": "zendframework/zend-view",
-            "version": "2.7.0",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-view.git",
-                "reference": "001336925fec6bb36e8e6d2b2af60da30a9d087e"
+                "reference": "1516805ed7f04afedbd4600d496437c49847a6cd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/001336925fec6bb36e8e6d2b2af60da30a9d087e",
-                "reference": "001336925fec6bb36e8e6d2b2af60da30a9d087e",
+                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/1516805ed7f04afedbd4600d496437c49847a6cd",
+                "reference": "1516805ed7f04afedbd4600d496437c49847a6cd",
                 "shasum": ""
             },
             "require": {
@@ -830,11 +833,14 @@
                 "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
                 "zendframework/zend-uri": "Zend\\Uri component"
             },
+            "bin": [
+                "bin/templatemap_generator.php"
+            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
+                    "dev-master": "2.8-dev",
+                    "dev-develop": "2.9-dev"
                 }
             },
             "autoload": {
@@ -852,7 +858,56 @@
                 "view",
                 "zf2"
             ],
-            "time": "2016-05-12 14:24:52"
+            "time": "2016-06-21 20:58:34"
+        },
+        {
+            "name": "zfcampus/zf-development-mode",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zfcampus/zf-development-mode.git",
+                "reference": "909413a0a6b45995de804db75b52b44428102dd4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zfcampus/zf-development-mode/zipball/909413a0a6b45995de804db75b52b44428102dd4",
+                "reference": "909413a0a6b45995de804db75b52b44428102dd4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "mikey179/vfsstream": "^1.6",
+                "phpunit/phpunit": "^5.4",
+                "squizlabs/php_codesniffer": "^2.3.1"
+            },
+            "bin": [
+                "bin/zf-development-mode"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev",
+                    "dev-develop": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "ZF\\DevelopmentMode\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Zend Framework development mode script",
+            "homepage": "http://github.com/zfcampus/zf-development-mode",
+            "keywords": [
+                "framework",
+                "zf2"
+            ],
+            "time": "2016-06-22 20:39:20"
         }
     ],
     "packages-dev": [],
diff --git a/config/autoload/development.local.php.dist b/config/autoload/development.local.php.dist
new file mode 100644
index 0000000000..587f93cec3
--- /dev/null
+++ b/config/autoload/development.local.php.dist
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Local Configuration Override for DEVELOPMENT MODE.
+ *
+ * This configuration override file is for providing configuration to use while
+ * in development mode. Run:
+ *
+ * <code>
+ * $ composer development-enable
+ * </code>
+ *
+ * from the project root to copy this file to development.local.php and enable
+ * the settings it contains.
+ *
+ * You may also create files matching the glob pattern `{,*.}{global,local}-development.php`.
+ */
+
+return [
+    'view_manager' => [
+        'display_exceptions' => true,
+    ],
+];
diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist
index 78145f3012..dd3fa6e83e 100644
--- a/config/autoload/local.php.dist
+++ b/config/autoload/local.php.dist
@@ -11,5 +11,5 @@
  * credentials from accidentally being committed into version control.
  */
 
-return array(
-);
+return [
+];
diff --git a/config/development.config.php.dist b/config/development.config.php.dist
index 2446217177..9d56187c17 100644
--- a/config/development.config.php.dist
+++ b/config/development.config.php.dist
@@ -6,10 +6,10 @@
  */
 
 return [
-    // Development time modules
+    // Additional modules to include when in development mode
     'modules' => [
     ],
-    // development time configuration globbing
+    // Configuration overrides during development mode
     'module_listener_options' => [
         'config_glob_paths' => ['config/autoload/{,*.}{global,local}-development.php'],
         'config_cache_enabled' => false,