Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

[DoctrineBridge] Allow doctrine_ping_connection to ping all connections#62788

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.

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

Already on GitHub?Sign in to your account

Open
fpondepeyre wants to merge1 commit intosymfony:8.1
base:8.1
Choose a base branch
Loading
fromfpondepeyre:8.1
Open
Show file tree
Hide file tree
Changes fromall commits
Commits
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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,35 @@ class DoctrinePingConnectionMiddleware extends AbstractDoctrineMiddleware
protected function handleForManager(EntityManagerInterface $entityManager, Envelope $envelope, StackInterface $stack): Envelope
{
if (null !== $envelope->last(ConsumedByWorkerStamp::class)) {
$this->pingConnection($entityManager);
foreach ($this->getTargetEntityManagers($entityManager) as $name => $targetEntityManager) {
$this->pingConnection($targetEntityManager, $name);
}
}

return $stack->next()->handle($envelope, $stack);
}

private function pingConnection(EntityManagerInterface $entityManager): void
/**
* @return iterable<string|null, EntityManagerInterface>
*/
private function getTargetEntityManagers(EntityManagerInterface $entityManager): iterable
{
if (null !== $this->entityManagerName) {
yield $this->entityManagerName => $entityManager;

return;
}

foreach ($this->managerRegistry->getManagerNames() as $name => $serviceId) {
$manager = $this->managerRegistry->getManager($name);

if ($manager instanceof EntityManagerInterface) {
yield $name => $manager;
}
}
}

private function pingConnection(EntityManagerInterface $entityManager, ?string $entityManagerName = null): void
{
$connection = $entityManager->getConnection();

Expand All@@ -47,7 +69,7 @@ private function pingConnection(EntityManagerInterface $entityManager): void
}

if (!$entityManager->isOpen()) {
$this->managerRegistry->resetManager($this->entityManagerName);
$this->managerRegistry->resetManager($entityManagerName ?? $this->entityManagerName);
}
}

Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
use Doctrine\DBAL\Result;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\Persistence\ManagerRegistry;
use PHPUnit\Framework\MockObject\MockObject;
use Symfony\Bridge\Doctrine\Messenger\DoctrinePingConnectionMiddleware;
use Symfony\Component\Messenger\Envelope;
use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
Expand All@@ -26,20 +25,20 @@

class DoctrinePingConnectionMiddlewareTest extends MiddlewareTestCase
{
private Connection&MockObject $connection;
private EntityManagerInterface&MockObject $entityManager;
private ManagerRegistry&MockObject $managerRegistry;
private Connection $connection;
private EntityManagerInterface $entityManager;
private ManagerRegistry $managerRegistry;
private DoctrinePingConnectionMiddleware $middleware;
private string $entityManagerName = 'default';

protected function setUp(): void
{
$this->connection = $this->createMock(Connection::class);
$this->connection = $this->createStub(Connection::class);

$this->entityManager = $this->createMock(EntityManagerInterface::class);
$this->entityManager = $this->createStub(EntityManagerInterface::class);
$this->entityManager->method('getConnection')->willReturn($this->connection);

$this->managerRegistry = $this->createMock(ManagerRegistry::class);
$this->managerRegistry = $this->createStub(ManagerRegistry::class);
$this->managerRegistry->method('getManager')->willReturn($this->entityManager);

$this->middleware = new DoctrinePingConnectionMiddleware(
Expand All@@ -50,6 +49,14 @@ protected function setUp(): void

public function testMiddlewarePingOk()
{
$this->connection = $this->createMock(Connection::class);
$this->entityManager = $this->createStub(EntityManagerInterface::class);
$this->entityManager->method('getConnection')->willReturn($this->connection);
$this->managerRegistry = $this->createStub(ManagerRegistry::class);
$this->managerRegistry->method('getManager')->willReturn($this->entityManager);

$middleware = new DoctrinePingConnectionMiddleware($this->managerRegistry, $this->entityManagerName);

$this->connection->method('getDatabasePlatform')
->willReturn($this->mockPlatform());

Expand All@@ -59,10 +66,10 @@ public function testMiddlewarePingOk()
static $counter = 0;

if (1 === ++$counter) {
throw $this->createMock(DBALException::class);
throw $this->createStub(DBALException::class);
}

return $this->createMock(Result::class);
return $this->createStub(Result::class);
});

$this->connection->expects($this->once())
Expand All@@ -72,13 +79,25 @@ public function testMiddlewarePingOk()
$envelope = new Envelope(new \stdClass(), [
new ConsumedByWorkerStamp(),
]);
$this->middleware->handle($envelope, $this->getStackMock());
$middleware->handle($envelope, $this->getStackMock());
}

public function testMiddlewarePingResetEntityManager()
{
$this->connection = $this->createStub(Connection::class);
$this->entityManager = $this->createMock(EntityManagerInterface::class);
$this->entityManager->method('getConnection')->willReturn($this->connection);
$this->managerRegistry = $this->createMock(ManagerRegistry::class);
$this->managerRegistry->method('getManager')->willReturn($this->entityManager);

$middleware = new DoctrinePingConnectionMiddleware(
$this->managerRegistry,
$this->entityManagerName
);

$this->connection->method('getDatabasePlatform')
->willReturn($this->mockPlatform());
$this->connection->method('executeQuery')->willReturn($this->createStub(Result::class));

$this->entityManager->expects($this->once())
->method('isOpen')
Expand All@@ -92,15 +111,14 @@ public function testMiddlewarePingResetEntityManager()
$envelope = new Envelope(new \stdClass(), [
new ConsumedByWorkerStamp(),
]);
$this->middleware->handle($envelope, $this->getStackMock());
$middleware->handle($envelope, $this->getStackMock());
}

public function testInvalidEntityManagerThrowsException()
{
$managerRegistry = $this->createMock(ManagerRegistry::class);
$managerRegistry = $this->createStub(ManagerRegistry::class);
$managerRegistry
->method('getManager')
->with('unknown_manager')
->willThrowException(new \InvalidArgumentException());

$middleware = new DoctrinePingConnectionMiddleware($managerRegistry, 'unknown_manager');
Expand All@@ -112,19 +130,112 @@ public function testInvalidEntityManagerThrowsException()

public function testMiddlewareNoPingInNonWorkerContext()
{
$this->connection = $this->createMock(Connection::class);
$this->entityManager = $this->createStub(EntityManagerInterface::class);
$this->entityManager->method('getConnection')->willReturn($this->connection);
$this->managerRegistry = $this->createStub(ManagerRegistry::class);
$this->managerRegistry->method('getManager')->willReturn($this->entityManager);

$middleware = new DoctrinePingConnectionMiddleware(
$this->managerRegistry,
$this->entityManagerName
);

$this->connection->expects($this->never())
->method('close')
;

$envelope = new Envelope(new \stdClass());
$this->middleware->handle($envelope, $this->getStackMock());
$middleware->handle($envelope, $this->getStackMock());
}

public function testMiddlewarePingsAllConnectionsWhenEntityManagerNameIsNull()
{
$firstConnection = $this->connectionExpectingOnePing();
$secondConnection = $this->connectionExpectingOnePing();

$registry = $this->createRegistryForManagers([
'first' => $this->createManagerWithConnection($firstConnection),
'second' => $this->createManagerWithConnection($secondConnection),
]);

$middleware = new DoctrinePingConnectionMiddleware($registry);

$envelope = new Envelope(new \stdClass(), [
new ConsumedByWorkerStamp(),
]);
$middleware->handle($envelope, $this->getStackMock());
}

public function testMiddlewareResetsClosedManagersWhenEntityManagerNameIsNull()
{
$registry = $this->createRegistryForManagers([
'open' => $this->createManagerWithConnection($this->connectionExpectingOnePing(), true),
'closed' => $this->createManagerWithConnection($this->connectionExpectingOnePing(), false),
], true);
$registry->expects($this->once())
->method('resetManager')
->with('closed')
;

$middleware = new DoctrinePingConnectionMiddleware($registry);

$envelope = new Envelope(new \stdClass(), [
new ConsumedByWorkerStamp(),
]);
$middleware->handle($envelope, $this->getStackMock());
}

private function mockPlatform(): AbstractPlatform&MockObject
private function mockPlatform(): AbstractPlatform
{
$platform = $this->createMock(AbstractPlatform::class);
$platform = $this->createStub(AbstractPlatform::class);
$platform->method('getDummySelectSQL')->willReturn('SELECT 1');

return $platform;
}

private function connectionExpectingOnePing(): Connection
{
$connection = $this->createMock(Connection::class);
$connection->method('getDatabasePlatform')->willReturn($this->mockPlatform());
$connection->expects($this->once())->method('executeQuery');

return $connection;
}

private function createManagerWithConnection(Connection $connection, ?bool $isOpen = null): EntityManagerInterface
{
$manager = null === $isOpen ? $this->createStub(EntityManagerInterface::class) : $this->createMock(EntityManagerInterface::class);
$manager->method('getConnection')->willReturn($connection);

if (null !== $isOpen) {
$manager->expects($this->once())->method('isOpen')->willReturn($isOpen);
}

return $manager;
}

/**
* @param array<string, EntityManagerInterface> $managers
*/
private function createRegistryForManagers(array $managers, bool $withExpectations = false): ManagerRegistry
{
$defaultName = array_key_first($managers);

$registry = $withExpectations ? $this->createMock(ManagerRegistry::class) : $this->createStub(ManagerRegistry::class);

if ($withExpectations) {
$registry->expects($this->any())->method('getManagerNames')->willReturn(array_combine(array_keys($managers), array_keys($managers)));
$registry->expects($this->any())->method('getManager')->willReturnCallback(static function (?string $name) use ($managers, $defaultName): ?EntityManagerInterface {
return $managers[$name ?? $defaultName] ?? null;
});
} else {
$registry->method('getManagerNames')->willReturn(array_combine(array_keys($managers), array_keys($managers)));
$registry->method('getManager')->willReturnCallback(static function (?string $name) use ($managers, $defaultName): ?EntityManagerInterface {
return $managers[$name ?? $defaultName] ?? null;
});
}

return $registry;
}
}
Loading
[8]ページ先頭
©2009-2025 Movatter.jp