Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit f8bedf4e7946 · 2020-05-05T15:52:57.000+02:00
* 3.4:
  Force doctrine/dbal &lt;=2.10.2 when testing
diff --git a/composer.json b/composer.json
@@ -103,7 +103,7 @@
         "doctrine/cache": "~1.6",
         "doctrine/collections": "~1.0",
         "doctrine/data-fixtures": "1.0.*",
-        "doctrine/dbal": "~2.4",
+        "doctrine/dbal": "~2.4,<=2.10.2",
         "doctrine/orm": "~2.4,>=2.4.5",
         "doctrine/reflection": "~1.0",
         "doctrine/doctrine-bundle": "^1.5|^2.0",
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -42,7 +42,7 @@
         "doctrine/cache": "~1.6",
         "doctrine/collections": "~1.0",
         "doctrine/data-fixtures": "1.0.*",
-        "doctrine/dbal": "~2.4",
+        "doctrine/dbal": "~2.4,<=2.10.2",
         "doctrine/orm": "^2.6.3",
         "doctrine/reflection": "~1.0"
     },
