8000 feature #29046 [Bridge/Doctrine] remove workarounds from the past (ni… · symfony/symfony@b142eae · GitHub
[go: up one dir, main page]
Skip to content

Commit b142eae

Browse files
fabpotfabpot
committed
feature #29046 [Bridge/Doctrine] remove workarounds from the past (nicolas-grekas)
This PR was merged into the 4.2-dev branch. Discussion ---------- [Bridge/Doctrine] remove workarounds from the past | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Aligns the bridge with latest Messenger improvements. Commits ------- 3858564 [Bridge/Doctrine] remove workarounds from the past
2 parents 78192e7 + 3858564 commit b142eae

File tree

5 files changed

+7
-40
lines changed

5 files changed

+7
-40
lines changed

‎src/Symfony/Bridge/Doctrine/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ CHANGELOG
77
* deprecated injecting `ClassMetadataFactory` in `DoctrineExtractor`,
88
an instance of `EntityManagerInterface` should be injected instead
99
* added support for `simple_array` type
10+
* the `DoctrineTransactionMiddlewareFactory` class has been removed
1011

1112
4.1.0
1213
-----

‎src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@
2121
* Wraps all handlers in a single doctrine transaction.
2222
*
2323
* @author Tobias Nyholm <tobias.nyholm@gmail.com>
24+
*
25+
* @experimental in 4.2
2426
*/
2527
class DoctrineTransactionMiddleware implements MiddlewareInterface
2628
{
2729
private $managerRegistry;
2830
private $entityManagerName;
2931

30-
public function __construct(ManagerRegistry $managerRegistry, ?string $entityManagerName)
32+
public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null)
3133
{
3234
$this->managerRegistry = $managerRegistry;
3335
$this->entityManagerName = $entityManagerName;

‎src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddlewareFactory.php‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function setUp()
3434
$managerRegistry = $this->createMock(ManagerRegistry::class);
3535
$managerRegistry->method('getManager')->willReturn($this->entityManager);
3636

37-
$this->middleware = new DoctrineTransactionMiddleware($managerRegistry, null);
37+
$this->middleware = new DoctrineTransactionMiddleware($managerRegistry);
3838
}
3939

4040
public function testMiddlewareWrapsInTransactionAndFlushes()

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<argument /> <!-- Bus handler resolver -->
2929
</service>
3030

31-
<service id="messenger.middleware.validation" class="Symfony\Component\Messenger\Middleware\ValidationMiddleware" abstract="true">
31+
<service id="messenger.middleware.validation" class="Symfony\Component\Messenger\Middleware\ValidationMiddleware">
3232
<argument type="service" id="validator" />
3333
</service>
3434

@@ -37,7 +37,7 @@
3737
</service>
3838

3939
<!-- Logging -->
40-
<service id="messenger.middleware.logging" class="Symfony\Component\Messenger\Middleware\LoggingMiddleware" abstract="true">
40+
<service id="messenger.middleware.logging" class="Symfony\Component\Messenger\Middleware\LoggingMiddleware">
4141
<tag name="monolog.logger" channel="messenger" />
4242
<argument type="service" id="logger" />
4343
</service>

0 commit comments

Comments
 (0)
0