Merge pull request #562 from kokspflanze/feature/phpunit7

update to phpunit7
doctrine · Mar 30, 2018 · 06202c8 · 06202c8
2 parents dcca991 + af554db
commit 06202c8
Show file tree

Hide file tree

Showing 3 changed files with 568 additions and 490 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ matrix:
     - php: 7.1
       env:
         - DEPS=locked
-        - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.1
       env:
         - DEPS=latest
@@ -52,7 +52,6 @@ matrix:
       env:
         - DEPS=latest
   allow_failures:
-    - php: 7.2
     - php: nightly
 
 before_install:

diff --git a/composer.json b/composer.json
@@ -44,11 +44,11 @@
         "symfony/console":                   "^2.3 || ^3.0 || ^4.0",
         "zendframework/zend-stdlib":         "^2.7.7 || ^3.0.1",
         "zendframework/zend-hydrator":       "^1.1 || ^2.2.1",
-        "zendframework/zend-mvc":            "^2.7.10 || ^3.0.1",
+        "zendframework/zend-mvc":            "^2.7.13 || ^3.0.1",
         "zendframework/zend-servicemanager": "^2.7.6 || ^3.1"
     },
     "require-dev":       {
-        "phpunit/phpunit":                    "^6.5",
+        "phpunit/phpunit":                    "^7.0.3",
         "squizlabs/php_codesniffer":          "^2.7",
         "doctrine/data-fixtures":             "^1.2.1",
         "doctrine/migrations":                "^1.4.1",