8000 [Bridge/Doctrine] remove workarounds from the past by nicolas-grekas · Pull Request #29046 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Bridge/Doctrine] remove workarounds from the past #29046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2018
Merged

[Bridge/Doctrine] remove workarounds from the past #29046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Symfony/Bridge/Doctrine/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----
Expand Down
4 changes: 3 additions & 1 deletion src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@
* Wraps all handlers in a single doctrine transaction.
*
* @author Tobias Nyholm 8000 <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;
Expand Down
36 changes: 0 additions & 36 deletions src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddlewareFactory.php
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down
0