Update phpunit and integration tests to php 7.0

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Feb 20, 2018 · 971bef2 · 971bef2
1 parent c08e867
commit 971bef2
Show file tree

Hide file tree

Showing 4 changed files with 2,686 additions and 45 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,7 +59,6 @@ nbproject
 /tests/Unit/clover.xml
 /tests/Unit/js/node_modules
 
-/tests/Integration/composer.lock
 /tests/Integration/output
 /tests/Integration/vendor
 

diff --git a/tests/Integration/composer.json b/tests/Integration/composer.json
@@ -1,6 +1,6 @@
 {
   "require-dev": {
-    "phpunit/phpunit": "~4.8",
+    "phpunit/phpunit": "~6.5",
     "behat/behat": "^3.0",
     "guzzlehttp/guzzle": "~5.0",
     "jarnaiz/behat-junit-formatter": "^1.3"