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

Commit 8c9917f

Browse files
committed
Merge branch 'versions/3.0.0'
3.0.0 readiness.
2 parents 3ae27e0 + c0f06ca commit 8c9917f

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ matrix:
2424
- php: 7
2525
- php: hhvm
2626
allow_failures:
27-
- php: 7
2827
- php: hhvm
2928

3029
notifications:

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

5-
## 3.0.0 - TBD
5+
## 3.0.0 - 2016-01-12
66

77
### Added
88

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ The basic architecture allows you to attach and detach listeners to named events
1313
both on a per-instance basis as well as via shared collections; trigger events;
1414
and interrupt execution of listeners.
1515

16-
1716
- File issues at https://github.com/zendframework/zend-eventmanager/issues
18-
- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-eventmanager
17+
- Documentation is at http://zend-eventmanager.rtfd.org
18+
19+
For migration from version 2 to version 3, please [read the migration
20+
documentation](http://zend-eventmanager.readthedocs.org/en/latest/migration/intro/).
1921

2022
## Benchmarks
2123

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"prefer-stable": true,
1414
"extra": {
1515
"branch-alias": {
16-
"dev-master": "2.6-dev",
17-
"dev-develop": "3.0-dev"
16+
"dev-master": "3.0-dev",
17+
"dev-develop": "3.1-dev"
1818
}
1919
},
2020
"autoload": {
@@ -29,12 +29,12 @@
2929
}
3030
},
3131
"require": {
32-
"php": ">=5.5"
32+
"php": "^5.5 || ^7.0"
3333
},
3434
"require-dev": {
3535
"phpunit/PHPUnit": "~4.0",
3636
"athletic/athletic": "^0.1",
37-
"squizlabs/php_codesniffer": "^2.0@dev",
37+
"squizlabs/php_codesniffer": "^2.0",
3838
"zendframework/zend-stdlib": "^2.7.3",
3939
"container-interop/container-interop": "^1.1.0"
4040
},

0 commit comments

Comments
 (0)