Merge pull request #501 from localheinz/feature/phpunit

Enhancement: Update phpunit/phpunit and sort out configuration
zendframework · Oct 18, 2015 · 79d36d2 · 79d36d2
2 parents 4a10f4e + 6b1a151
commit 79d36d2
Show file tree

Hide file tree

Showing 3 changed files with 267 additions and 779 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "bjyoungblood/BjyProfiler": "1.1.0",
         "fabpot/php-cs-fixer": "~1.4",
         "fzaninotto/faker": "^1.4.0",
-        "phpunit/phpunit": "~4.5",
+        "phpunit/phpunit": "^4.8",
         "zendframework/zend-developer-tools": "dev-master",
         "zendframework/zftool": "dev-master"
     },