Merge pull request #372 from spiffyjr/release/0.8.0

Prepare for 0.8.0 release
doctrine · Jan 24, 2014 · a1be11c · a1be11c
2 parents d0f06aa + 1a00751
commit a1be11c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,7 +1,7 @@
 # 0.8.0
 
- * Dependency to zendframework has been bumped from `2.*` to `~2.1`
- * Dependency to doctrine/common has been bumped from `>=2.3-dev,<2.5-dev` to `>=2.3,<2.5-dev`
+ * Dependency to zendframework has been bumped from `2.*` to `~2.2`
+ * Dependency to doctrine/common has been bumped from `>=2.3-dev,<2.5-dev` to `>=2.4,<2.6-dev`
  * It is now possible to define a callable for option `label_generator` in `DoctrineModule\Form\Element\Proxy`
    as of [#219](https://github.com/doctrine/DoctrineModule/pull/219)
  * `DoctrineModule\Authentication\Adapter\ObjectRepository` now inherits logic from

diff --git a/composer.json b/composer.json
@@ -33,20 +33,20 @@
     "minimum-stability": "dev",
     "require": {
         "php":                                ">=5.3.3",
-        "doctrine/common":                    ">=2.3,<2.5-dev",
-        "symfony/console":                    "~2.1",
-        "zendframework/zend-authentication":  "~2.1",
-        "zendframework/zend-cache":           "~2.1",
-        "zendframework/zend-paginator":       "~2.1",
-        "zendframework/zend-stdlib":          "~2.1",
-        "zendframework/zend-mvc":             "~2.1",
-        "zendframework/zend-servicemanager":  "~2.1",
-        "zendframework/zend-validator":       "~2.1"
+        "doctrine/common":                    ">=2.4,<2.6-dev",
+        "symfony/console":                    "~2.2",
+        "zendframework/zend-authentication":  "~2.2",
+        "zendframework/zend-cache":           "~2.2",
+        "zendframework/zend-paginator":       "~2.2",
+        "zendframework/zend-stdlib":          "~2.2",
+        "zendframework/zend-mvc":             "~2.2",
+        "zendframework/zend-servicemanager":  "~2.2",
+        "zendframework/zend-validator":       "~2.2"
     },
     "require-dev": {
         "phpunit/phpunit":             "~3.7",
         "squizlabs/php_codesniffer":   "1.4.*",
-        "zendframework/zendframework": "~2.1"
+        "zendframework/zendframework": "~2.2"
     },
     "suggest": {
         "doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments"