From 89e73c9503a0d8be1d12e0c835f1e930bd897dba Mon Sep 17 00:00:00 2001 From: Martijn Wennink Date: Tue, 4 Dec 2018 02:16:24 +0100 Subject: [PATCH 1/5] Updated export-ignores to cleanup release --- .gitattributes | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 6bdd46f7..0b8def4c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,9 +1,12 @@ -/doc export-ignore +/docs export-ignore /test export-ignore /vendor export-ignore +.coveralls.yml export-ignore .gitattributes export-ignore .gitignore export-ignore .scrutinizer.yml export-ignore .travis.yml export-ignore +composer.lock export-ignore +mkdocs.yml export-ignore phpunit.xml.dist export-ignore phpcs.xml export-ignore From b5cbe5ac596568ead4df056e105652e5231abb32 Mon Sep 17 00:00:00 2001 From: webimpress Date: Sat, 15 Dec 2018 13:15:44 +0000 Subject: [PATCH 2/5] Added PHP 7.3 support - updated Travis CI configuration --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1edccf2..6d4473ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,3 @@ -sudo: false - language: php cache: @@ -32,7 +30,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 From 44aec3f6008f6b248e6646d642e133be494f2c51 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Thu, 20 Dec 2018 10:55:54 -0600 Subject: [PATCH 3/5] Adds CHANGELOG entry for #345 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12331fbc..7954a6b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file, in reverse ### Added -- Nothing. +- [#345](https://github.com/zendframework/zend-diactoros/pull/345) adds support for PHP 7.3. ### Changed From 4d4e2b56e30cabd42cb74428ad1029a1bf227292 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Thu, 20 Dec 2018 10:56:38 -0600 Subject: [PATCH 4/5] Bumps branch aliases - dev-master => 2.1.x-dev - dev-develop => 2.2.x-dev --- composer.json | 4 ++-- composer.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index a000a896..60fdfd38 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.0.x-dev", - "dev-develop": "2.1.x-dev", + "dev-master": "2.1.x-dev", + "dev-develop": "2.2.x-dev", "dev-release-1.8": "1.8.x-dev" } }, diff --git a/composer.lock b/composer.lock index d7b2b5b0..c74a3704 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": "e730038e7fa0ad16ecf28de6fcbb72a7", + "content-hash": "d3371a4353461b951e43e35fe472b59e", "packages": [ { "name": "psr/http-factory", From 60f53942cdfeb062c3a0ac596fbd41b54a0548a5 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Thu, 20 Dec 2018 10:57:11 -0600 Subject: [PATCH 5/5] 2.2.0 readiness --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7954a6b0..86ffcc97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. -## 2.1.0 - TBD +## 2.1.0 - 2018-12-20 ### Added