diff --git a/.travis.yml b/.travis.yml index 9448f02..8a1ee40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,6 @@ matrix: - php: 7 - php: hhvm allow_failures: - - php: 7 - php: hhvm notifications: diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a1ebc0..5dbbf27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,26 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. +## 2.6.3 - 2016-02-18 + +### Added + +- Nothing. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- [#23](https://github.com/zendframework/zend-eventmanager/pull/23) updates the + requirements to allow usage with PHP 7, bumps zend-stdlib to `^2.7`, and + requires PHP 7 builds to pass continuous integration. + ## 2.6.2 - 2016-01-12 ### Added diff --git a/composer.json b/composer.json index a2d5b59..2a1bcac 100644 --- a/composer.json +++ b/composer.json @@ -13,15 +13,16 @@ } }, "require": { - "php": ">=5.5", - "zendframework/zend-stdlib": "~2.5" + "php": "^5.5 || ^7.0", + "zendframework/zend-stdlib": "^2.7" }, "minimum-stability": "dev", "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "3.0-dev" + "dev-release-2.6": "2.6-dev", + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" } }, "autoload-dev": {