Merge branch 'versions/3.0.0'

3.0.0 readiness.
zendframework · Jan 12, 2016 · 8c9917f · 8c9917f
2 parents 3ae27e0 + c0f06ca
commit 8c9917f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,6 @@ matrix:
     - php: 7
     - php: hhvm 
   allow_failures:
-    - php: 7
     - php: hhvm
 
 notifications:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.0.0 - TBD
+## 3.0.0 - 2016-01-12
 
 ### Added
 

diff --git a/README.md b/README.md
@@ -13,9 +13,11 @@ The basic architecture allows you to attach and detach listeners to named events
 both on a per-instance basis as well as via shared collections; trigger events;
 and interrupt execution of listeners.
 
-
 - File issues at https://github.com/zendframework/zend-eventmanager/issues
-- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-eventmanager
+- Documentation is at http://zend-eventmanager.rtfd.org
+
+For migration from version 2 to version 3, please [read the migration
+documentation](http://zend-eventmanager.readthedocs.org/en/latest/migration/intro/).
 
 ## Benchmarks
 

diff --git a/composer.json b/composer.json
@@ -13,8 +13,8 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "2.6-dev",
-            "dev-develop": "3.0-dev"
+            "dev-master": "3.0-dev",
+            "dev-develop": "3.1-dev"
         }
     },
     "autoload": {
@@ -29,12 +29,12 @@
         }
     },
     "require": {
-        "php": ">=5.5"
+        "php": "^5.5 || ^7.0"
     },
     "require-dev": {
         "phpunit/PHPUnit": "~4.0",
         "athletic/athletic": "^0.1",
-        "squizlabs/php_codesniffer": "^2.0@dev",
+        "squizlabs/php_codesniffer": "^2.0",
         "zendframework/zend-stdlib": "^2.7.3",
         "container-interop/container-interop": "^1.1.0"
     },