Merging develop to master in preparation for 1.2.0 release.

.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
 

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

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": {