Merge branch 'hotfix/67'

Close #67

CHANGELOG.md

@@ -23,6 +23,11 @@ Eighth release candidate.
 - [#66](https://github.com/zendframework/zend-expressive-skeleton/pull/66)
   adds the `'error' => true,` declaration to the `'error'` pipeline middleware
   specification.
+- [#67](https://github.com/zendframework/zend-expressive-skeleton/pull/67)
+  updates the `filp/whoops` dependency for installer development to `^1.1 || ^2.0`;
+  the two are compatible for our use cases, but we should prefer the latest
+  that can be installed. As 2.0 requires PHP 5.5.9, but our minimum PHP version
+  is 5.5.0, we must specify both.
 
 ## 1.0.0rc7 - 2016-01-19
 

composer.json

@@ -25,7 +25,7 @@
     "require-dev": {
         "phpunit/phpunit": "^4.8",
         "squizlabs/php_codesniffer": "^2.3",
-        "filp/whoops": "^1.1",
+        "filp/whoops": "^1.1 || ^2.0",
         "composer/composer": ">=1.0.0-alpha11",
         "zendframework/zend-expressive-aurarouter": "^1.0",
         "zendframework/zend-expressive-fastroute": "^1.0",