Merge branch 'hotfix/72' into develop

Forward port #72
zendframework · Mar 17, 2016 · 8dfcc16 · 8dfcc16
2 parents 3454165 + ac700c5
commit 8dfcc16
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,10 @@ All notable changes to this project will be documented in this file, in reverse
 - [#53](https://github.com/zendframework/zend-expressive-skeleton/pull/53)
   updates the default Pimple container script such that it now caches factory
   instances for re-use.
+- [#72](https://github.com/zendframework/zend-expressive-skeleton/pull/72)
+  updates the `composer.json` to remove the possibility of installing an
+  Expressive RC version, updates zend-servicemanager to allow using 3.0
+  versions, and updates whoops to allow either 1.1 or 2.0 versions.
 
 ## 1.0.0 - 2016-01-28
 

diff --git a/composer.json b/composer.json
@@ -18,22 +18,22 @@
     "require": {
         "php": "^5.5 || ^7.0",
         "roave/security-advisories": "dev-master",
-        "zendframework/zend-expressive": "~1.0.0@rc || ^1.0",
+        "zendframework/zend-expressive": "^1.0",
         "zendframework/zend-expressive-helpers": "^2.0",
         "zendframework/zend-stdlib": "~2.7"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8",
         "squizlabs/php_codesniffer": "^2.3",
         "filp/whoops": "^1.1 || ^2.0",
-        "composer/composer": ">=1.0.0-alpha11",
+        "composer/composer": ">=1.0.0-beta1",
         "zendframework/zend-expressive-aurarouter": "^1.0",
         "zendframework/zend-expressive-fastroute": "^1.0",
         "zendframework/zend-expressive-zendrouter": "^1.0",
         "zendframework/zend-expressive-platesrenderer": "^1.0",
         "zendframework/zend-expressive-twigrenderer": "^1.0",
         "zendframework/zend-expressive-zendviewrenderer": "^1.0",
-        "zendframework/zend-servicemanager": "^2.5",
+        "zendframework/zend-servicemanager": "^2.7.3 || ^3.0",
         "ocramius/proxy-manager": "^1.0",
         "aura/di": "3.0.*@beta",
         "xtreamwayz/pimple-container-interop": "^1.0"

diff --git a/src/ExpressiveInstaller/config.php b/src/ExpressiveInstaller/config.php
@@ -3,7 +3,7 @@
 return [
     'packages' => [
         'aura/di'                                        => '3.0.*@beta',
-        'filp/whoops'                                    => '^1.1',
+        'filp/whoops'                                    => '^1.1 || ^2.0',
         'xtreamwayz/pimple-container-interop'            => '^1.0',
         'ocramius/proxy-manager'                         => '^1.0',
         'zendframework/zend-expressive-aurarouter'       => '^1.0',