Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit 3d41b61

Browse files
committed
Merge branch 'hotfix/stdlib' into release-2.6
Close #23
2 parents 79c6e17 + 526e7a7 commit 3d41b61

File tree

3 files changed

+25
-5
lines changed

3 files changed

+25
-5
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ matrix:
2323
- php: 7
2424
- php: hhvm
2525
allow_failures:
26-
- php: 7
2726
- php: hhvm
2827

2928
notifications:

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,26 @@
22

33
All notable changes to this project will be documented in this file, in reverse chronological order by release.
44

5+
## 2.6.3 - 2016-02-18
6+
7+
### Added
8+
9+
- Nothing.
10+
11+
### Deprecated
12+
13+
- Nothing.
14+
15+
### Removed
16+
17+
- Nothing.
18+
19+
### Fixed
20+
21+
- [#23](https://github.com/zendframework/zend-eventmanager/pull/23) updates the
22+
requirements to allow usage with PHP 7, bumps zend-stdlib to `^2.7`, and
23+
requires PHP 7 builds to pass continuous integration.
24+
525
## 2.6.2 - 2016-01-12
626

727
### Added

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@
1313
}
1414
},
1515
"require": {
16-
"php": ">=5.5",
17-
"zendframework/zend-stdlib": "~2.5"
16+
"php": "^5.5 || ^7.0",
17+
"zendframework/zend-stdlib": "^2.7"
1818
},
1919
"minimum-stability": "dev",
2020
"prefer-stable": true,
2121
"extra": {
2222
"branch-alias": {
23-
"dev-master": "2.6-dev",
24-
"dev-develop": "3.0-dev"
23+
"dev-release-2.6": "2.6-dev",
24+
"dev-master": "3.0-dev",
25+
"dev-develop": "3.1-dev"
2526
}
2627
},
2728
"autoload-dev": {

0 commit comments

Comments
 (0)