Merge branch 'qa/382' into release-1.8

Close #382
zendframework · Dec 7, 2019 · 437ea32 · 437ea32
2 parents e03f490 + f072547
commit 437ea32
Show file tree

Hide file tree

Showing 3 changed files with 297 additions and 268 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,3 @@
-sudo: false
-
 language: php
 
 cache:
@@ -56,6 +54,24 @@ matrix:
       name: Integration tests
       env:
         - INTEGRATION_DEPS="http-interop/http-factory-diactoros"
+    - php: 7.3
+      env:
+        - DEPS=lowest
+    - php: 7.3
+      env:
+        - DEPS=locked
+    - 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' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

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