Merge branch '4.4' into 5.0

* 4.4: [PhpUnitBridge] fix bad test [4.4] CS fixes [3.4] CS fixes Disable phpunit verbosity Queue name is a required parameter [FrameworkBundle] display actual target for error in AssetsInstallCommand Remove patches for Doctrine bugs and deprecations [Mime] fix bad method call on "EmailAddressContains" [DI][EventDispatcher] added contract for implementation
symfony · May 8, 2020 · 288e51f · 288e51f
2 parents a64d638 + 35e8c8f
commit 288e51f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Tests/Messenger/DoctrineTransactionMiddlewareTest.php b/Tests/Messenger/DoctrineTransactionMiddlewareTest.php
@@ -25,7 +25,7 @@ class DoctrineTransactionMiddlewareTest extends MiddlewareTestCase
     private $entityManager;
     private $middleware;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->connection = $this->createMock(Connection::class);
 

diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
         "doctrine/cache": "~1.6",
         "doctrine/collections": "~1.0",
         "doctrine/data-fixtures": "1.0.*",
-        "doctrine/dbal": "~2.4,<=2.10.2",
+        "doctrine/dbal": "~2.4",
         "doctrine/orm": "^2.6.3",
         "doctrine/reflection": "~1.0"
     },