Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit 288e51fa6504 · 2020-05-08T14:34:39.000+02:00
* 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
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"
     },

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class DoctrineTransactionMiddlewareTest extends MiddlewareTestCase`
`25`	`25`	`private $entityManager;`
`26`	`26`	`private $middleware;`
`27`	`27`
`28`		`- public function setUp(): void`
	`28`	`+ protected function setUp(): void`
`29`	`29`	`{`
`30`	`30`	`$this->connection = $this->createMock(Connection::class);`
`31`	`31`