[Bridge/Doctrine] remove workarounds from the past

nicolas-grekas · nicolas-grekas · commit 385856413ca9 · 2018-10-31T18:17:13.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * deprecated injecting `ClassMetadataFactory` in `DoctrineExtractor`,
    an instance of `EntityManagerInterface` should be injected instead
  * added support for `simple_array` type
+ * the `DoctrineTransactionMiddlewareFactory` class has been removed
 
 4.1.0
 -----
diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php
@@ -21,13 +21,15 @@
  * Wraps all handlers in a single doctrine transaction.
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @experimental in 4.2
  */
 class DoctrineTransactionMiddleware implements MiddlewareInterface
 {
     private $managerRegistry;
     private $entityManagerName;
 
-    public function __construct(ManagerRegistry $managerRegistry, ?string $entityManagerName)
+    public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null)
     {
         $this->managerRegistry = $managerRegistry;
         $this->entityManagerName = $entityManagerName;
diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddlewareFactory.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddlewareFactory.php
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php
@@ -34,7 +34,7 @@ public function setUp()
         $managerRegistry = $this->createMock(ManagerRegistry::class);
         $managerRegistry->method('getManager')->willReturn($this->entityManager);
 
-        $this->middleware = new DoctrineTransactionMiddleware($managerRegistry, null);
+        $this->middleware = new DoctrineTransactionMiddleware($managerRegistry);
     }
 
     public function testMiddlewareWrapsInTransactionAndFlushes()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml
@@ -28,7 +28,7 @@
             <argument /> <!-- Bus handler resolver -->
         </service>
 
-        <service id="messenger.middleware.validation" class="Symfony\Component\Messenger\Middleware\ValidationMiddleware" abstract="true">
+        <service id="messenger.middleware.validation" class="Symfony\Component\Messenger\Middleware\ValidationMiddleware">
             <argument type="service" id="validator" />
         </service>
 
@@ -37,7 +37,7 @@
         </service>
 
         <!-- Logging -->
-        <service id="messenger.middleware.logging" class="Symfony\Component\Messenger\Middleware\LoggingMiddleware" abstract="true">
+        <service id="messenger.middleware.logging" class="Symfony\Component\Messenger\Middleware\LoggingMiddleware">
             <tag name="monolog.logger" channel="messenger" />
             <argument type="service" id="logger" />
         </service>

Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,15 @@`
`21`	`21`	`* Wraps all handlers in a single doctrine transaction.`
`22`	`22`	`*`
`23`	`23`	`* @author Tobias Nyholm <[email protected]>`
	`24`	`+ *`
	`25`	`+ * @experimental in 4.2`
`24`	`26`	`*/`
`25`	`27`	`class DoctrineTransactionMiddleware implements MiddlewareInterface`
`26`	`28`	`{`
`27`	`29`	`private $managerRegistry;`
`28`	`30`	`private $entityManagerName;`
`29`	`31`
`30`		`- public function __construct(ManagerRegistry $managerRegistry, ?string $entityManagerName)`
	`32`	`+ public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null)`
`31`	`33`	`{`
`32`	`34`	`$this->managerRegistry = $managerRegistry;`
`33`	`35`	`$this->entityManagerName = $entityManagerName;`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function setUp()`
`34`	`34`	`$managerRegistry = $this->createMock(ManagerRegistry::class);`
`35`	`35`	`$managerRegistry->method('getManager')->willReturn($this->entityManager);`
`36`	`36`
`37`		`- $this->middleware = new DoctrineTransactionMiddleware($managerRegistry, null);`
	`37`	`+ $this->middleware = new DoctrineTransactionMiddleware($managerRegistry);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public function testMiddlewareWrapsInTransactionAndFlushes()`