From 1e98be1b6cef232a7abbef4eafe7028329a21d72 Mon Sep 17 00:00:00 2001
From: webimpress <contact@webimpress.com>
Date: Sat, 15 Dec 2018 13:16:07 +0000
Subject: [PATCH 1/4] 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 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
 

From 714a681b5079a5bc918fffb15302425ab6ab3ee3 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Thu, 20 Dec 2018 10:03:12 -0600
Subject: [PATCH 2/4] Require at least zendframework/zend-stdlib 3.2.1

First release with support for PHP 7.3. We can safely do this, as
zend-mvc v3 requires a 3.X version of zend-stdlib, and zend-mvc v2 is
pinned to an older of the psr7bridge.
---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 99b8644..9551174 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/"

From 8f16ef04b75f6afd2e0690650cdcf8c856935098 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Thu, 20 Dec 2018 10:47:25 -0600
Subject: [PATCH 3/4] Adds CHANGELOG entry for #41

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da24b33..5f8bd7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,11 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.2.0 - TBD
+## 1.2.0 - 2018-12-20
 
 ### Added
 
-- Nothing.
+- [#41](https://github.com/zendframework/zend-psr7bridge/pull/41) adds support for PHP 7.3.
 
 ### Changed
 
@@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#41](https://github.com/zendframework/zend-psr7bridge/pull/41) removes support for zend-stdlib v2 releases.
 
 ### Fixed
 

From 03616512ca34232b89c5de37d77ba213e3df0a0a Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Thu, 20 Dec 2018 10:48:17 -0600
Subject: [PATCH 4/4] Updates branch aliases

- dev-master => 1.2.x-dev
- dev-develop => 1.3.x-dev
---
 composer.json | 4 ++--
 composer.lock | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 9551174..4a88bdc 100644
--- a/composer.json
+++ b/composer.json
@@ -46,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",