Merge cc58a3a into af32bf6

nucleos · Aug 5, 2019 · 28109d1 · 28109d1
2 parents af32bf6 + cc58a3a
commit 28109d1
Show file tree

Hide file tree

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