Merge 4696c2e into 06d663b

sonata-project · Jun 14, 2020 · f9fe36f · f9fe36f
2 parents 06d663b + 4696c2e
commit f9fe36f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -32,12 +32,13 @@
         "twig/twig": "^2.9"
     },
     "conflict": {
-        "sonata-project/user-bundle": "<2.0 || >=5.0"
+        "sonata-project/user-bundle": "<2.0 || >=5.0",
+        "symfony/phpunit-bridge": "5.1.0"
     },
     "require-dev": {
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
         "sonata-project/user-bundle": "^3.6 || ^4.0",
-        "symfony/phpunit-bridge": "^5.0",
+        "symfony/phpunit-bridge": "^5.0 !=5.1.0",
         "symfony/security-core": "^4.4"
     },
     "config": {