Merging develop to master in preparation for 2.2.0 release.

Author: weierophinney

.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

.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
 

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.1.0 - 2018-12-20
+
+### Added
+
+- [#345](https://github.com/zendframework/zend-diactoros/pull/345) adds support for PHP 7.3.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 2.0.2 - 2018-12-20
 
 ### Added

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"
     }
   },