diff --git a/.travis.yml b/.travis.yml index 04e4c1e..d61499b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,3 @@ -sudo: false - language: php cache: @@ -53,7 +51,13 @@ matrix: - php: 7.2 env: - DEPS=latest - - php: nightly + - php: 7.3 + env: + - DEPS=lowest + - php: 7.3 + env: + - DEPS=locked + - php: 7.3 env: - DEPS=latest diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f5dc6b..ec1d16f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,28 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. +## 1.2.0 - 2018-12-20 + +### Added + +- [#41](https://github.com/zendframework/zend-psr7bridge/pull/41) adds support for PHP 7.3. + +### Changed + +- Nothing. + +### Deprecated + +- Nothing. + +### Removed + +- [#41](https://github.com/zendframework/zend-psr7bridge/pull/41) removes support for zend-stdlib v2 releases. + +### Fixed + +- Nothing. + ## 1.1.1 - 2018-12-20 ### Added diff --git a/composer.json b/composer.json index 99b8644..4a88bdc 100644 --- a/composer.json +++ b/composer.json @@ -28,6 +28,9 @@ "phpunit/phpunit": "^5.7.15 || ^6.5.6", "zendframework/zend-coding-standard": "~1.0.0" }, + "conflict": { + "zendframework/zend-stdlib": "< 3.2.1" + }, "autoload": { "psr-4": { "Zend\\Psr7Bridge\\": "src/" @@ -43,8 +46,8 @@ }, "extra": { "branch-alias": { - "dev-master": "1.1.x-dev", - "dev-develop": "1.2.x-dev" + "dev-master": "1.2.x-dev", + "dev-develop": "1.3.x-dev" } }, "scripts": { diff --git a/composer.lock b/composer.lock index a53a57b..59cb7bb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "297a96db6e4269ae9186df19f2c3e8f3", + "content-hash": "70b8ff763cdda5c77630cffb9bc5b6af", "packages": [ { "name": "container-interop/container-interop",