Merge 59d6dd0 into 6f2a205

nucleos · Jul 31, 2019 · 3911201 · 3911201
2 parents 6f2a205 + 59d6dd0
commit 3911201
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
@@ -6,8 +6,5 @@
         "phpstan/phpstan": "^0.11",
         "phpstan/phpstan-phpunit": "^0.11",
         "phpstan/phpstan-strict-rules": "^0.11"
-    },
-    "conflict": {
-        "phpunit/phpunit": ">=8.0"
     }
 }
diff --git a/vendor-bin/test/composer.json b/vendor-bin/test/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "phpunit/phpunit": "^7.4",
+        "phpunit/phpunit": "^8.2",
         "symfony/phpunit-bridge": "^4.1"
     }
 }