Merge 8000b75 into 22b01ca

zendframework · Dec 10, 2019 · df13a03 · df13a03
2 parents 22b01ca + 8000b75
commit df13a03
Show file tree

Hide file tree

Showing 16 changed files with 329 additions and 217 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,24 +18,26 @@ env:
 
 matrix:
   include:
-    - php: 7.1
+    - php: 7.3
       env:
         - DEPS=lowest
-    - php: 7.1
+    - php: 7.3
       env:
         - DEPS=locked
         - TEST_COVERAGE=true
         - CHECK_CS=true
-    - php: 7.1
+    - php: 7.3
       env:
         - DEPS=latest
-    - php: 7.2
+    - php: 7.4
       env:
         - DEPS=lowest
-    - php: 7.2
+    - php: 7.4
       env:
         - DEPS=locked
-    - php: 7.2
+        - TEST_COVERAGE=true
+        - CHECK_CS=true
+    - php: 7.4
       env:
         - DEPS=latest
 

diff --git a/composer.json b/composer.json
@@ -17,15 +17,15 @@
         "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
-        "php": "^7.1",
+        "php": "^7.3",
         "psr/container": "^1.0",
         "psr/log": "^1.0",
         "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
         "container-interop/container-interop": "^1.2.0",
         "mikey179/vfsstream": "^1.6.7",
-        "phpunit/phpunit": "^7.3",
+        "phpunit/phpunit": "^8.5",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-servicemanager": "^3.0"
     },