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

Commit b52692f

Browse files
committed
Merge branch 'hotfix/279' into develop
Forward port #279
2 parents 18b162a + f526c26 commit b52692f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ matrix:
5252
- php: 7.2
5353
env:
5454
- DEPS=latest
55-
allow_failures:
56-
- php: 7.2
5755

5856
before_install:
5957
- if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ All notable changes to this project will be documented in this file, in reverse
3333
`Response::$phrases` property. This is a new status proposed via
3434
[RFC 8297](https://datatracker.ietf.org/doc/rfc8297/).
3535

36+
- [#279](https://github.com/zendframework/zend-diactoros/pull/279) adds explicit
37+
support for PHP 7.2; previously, we'd allowed build failures, though none
38+
occured; we now require PHP 7.2 builds to pass.
39+
3640
### Changed
3741

3842
- Nothing.

0 commit comments

Comments
 (0)