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

Commit 6c919cd

Browse files
committed
Merge branch 'hotfix/stdlib-3-support'
Close #8
2 parents 1002b40 + 4726ff3 commit 6c919cd

File tree

3 files changed

+30
-16
lines changed

3 files changed

+30
-16
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ matrix:
2727
- php: 7
2828
- php: hhvm
2929
allow_failures:
30-
- php: 7
3130
- php: hhvm
3231

3332
notifications:

CHANGELOG.md

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,31 @@
22

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

5-
## 2.5.2 - 2015-06-15
5+
## 2.5.3 - 2016-02-29
66

77
### Added
88

9-
- [#4](https://github.com/zendframework/zend-authentication/pull/4) adds
10-
documentation, which can be compiled using [bookdown](http://bookdown.io):
11-
`bookdown doc/bookdown.json`; docs can then be viewed by starting a web server
12-
via `php -S 0.0.0.0:8000 -t doc/html/` and browsing to http://localhost:8000/.
9+
- Nothing.
10+
11+
### Deprecated
12+
13+
- Nothing.
14+
15+
### Removed
16+
17+
- Nothing.
18+
19+
### Fixed
20+
21+
- Nothing.
22+
23+
## 2.5.2 - 2015-06-15
24+
25+
### Added
1326

14-
(Add bookdown globally using `composer global require bookdown/bookdown`.)
27+
- [#8](https://github.com/zendframework/zend-authentication/pull/8) updates
28+
dependencies to allow usage of zend-stdlib 3.0, and to require tests to
29+
pass against PHP 7.
1530

1631
### Deprecated
1732

composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
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 || ^3.0"
1818
},
1919
"require-dev": {
20-
"zendframework/zend-db": "~2.5",
21-
"zendframework/zend-crypt": "~2.5",
22-
"zendframework/zend-http": "~2.5",
23-
"zendframework/zend-ldap": "~2.5",
24-
"zendframework/zend-session": "~2.5",
25-
"zendframework/zend-validator": "~2.5",
26-
"zendframework/zend-uri": "~2.5",
20+
"zendframework/zend-db": "^2.7",
21+
"zendframework/zend-crypt": "^2.6",
22+
"zendframework/zend-http": "^2.5.4",
23+
"zendframework/zend-ldap": "^2.6",
24+
"zendframework/zend-session": "^2.6.2",
25+
"zendframework/zend-validator": "^2.6",
26+
"zendframework/zend-uri": "^2.5",
2727
"fabpot/php-cs-fixer": "1.7.*",
2828
"phpunit/PHPUnit": "~4.0"
2929
},

0 commit comments

Comments
 (0)