Merge branch 'qa/382'

Forward port #382
zendframework · Dec 7, 2019 · d7b53b8 · d7b53b8
2 parents 8071ee5 + f072547
commit d7b53b8
Show file tree

Hide file tree

Showing 6 changed files with 267 additions and 170 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -41,6 +41,15 @@ matrix:
     - php: 7.3
       env:
         - DEPS=latest
+    - php: 7.4
+      env:
+        - DEPS=lowest
+    - php: 7.4
+      env:
+        - DEPS=locked
+    - php: 7.4
+      env:
+        - DEPS=latest
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -370,6 +370,30 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 1.8.7 - 2019-08-06
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#364](https://github.com/zendframework/zend-diactoros/issues/364) modifies detection of HTTPS schemas via the `$_SERVER['HTTPS']` value
+  such that an empty HTTPS-key will result in a scheme of `http` and not
+  `https`.
+
 ## 1.8.6 - 2018-09-05
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -39,6 +39,9 @@
     "phpunit/phpunit": "^7.0.2",
     "zendframework/zend-coding-standard": "~1.0.0"
   },
+  "conflict": {
+    "phpspec/prophecy": "<1.9.0"
+  },
   "provide": {
     "psr/http-factory-implementation": "1.0",
     "psr/http-message-implementation": "1.0"