Skip to content
Open
Show file tree
Hide file tree
Changes from 6 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
22 changes: 17 additions & 5 deletions src/DependencyInjection/DoctrineExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -1450,11 +1450,6 @@ private function registerDbalMiddlewares(
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
$loader->load('middlewares.php');

$loggingMiddlewareAbstractDef = $container->getDefinition('doctrine.dbal.logging_middleware');
foreach ($connWithLogging as $connName) {
$loggingMiddlewareAbstractDef->addTag('doctrine.middleware', ['connection' => $connName, 'priority' => 10]);
}

$container->getDefinition('doctrine.debug_data_holder')->replaceArgument(0, $connWithBacktrace);
$debugMiddlewareAbstractDef = $container->getDefinition('doctrine.dbal.debug_middleware');
foreach ($connWithProfiling as $connName) {
Expand All @@ -1467,5 +1462,22 @@ private function registerDbalMiddlewares(
$idleConnectionMiddlewareAbstractDef
->addTag('doctrine.middleware', ['connection' => $connName, 'priority' => 10]);
}

$loggingMiddlewareAbstractDef = $container->getDefinition('doctrine.dbal.logging_middleware');

foreach ($connWithLogging as $connName) {
// Register logging middlewares only when a logger service is available
if (! $container->has('logger')) {
continue;
}
Comment on lines 1472 to 1475
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be moved below? Otherwise doctrine.middleware tag is not being added to logging middleware

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 9c72fc3 and bab865a

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not really solved. Line 1475 is still skipped if logger doesn't exist, while that is not the case without this PR

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, should be resolved now at 30d17ab


// Preserve legacy behavior: also tag the abstract definition per-connection
$loggingMiddlewareAbstractDef->addTag('doctrine.middleware', ['connection' => $connName, 'priority' => 10]);

// Create a child service for the connection
$child = new ChildDefinition('doctrine.dbal.logging_middleware');
$child->addTag('doctrine.middleware', ['connection' => $connName, 'priority' => 10]);
$container->setDefinition(sprintf('doctrine.dbal.logging_middleware.%s', $connName), $child);
}
}
}
82 changes: 82 additions & 0 deletions tests/DependencyInjection/DoctrineExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1064,6 +1064,8 @@ public function testAsDoctrineListenerAttribute(): void
public function testRegistrationsWithMiddlewaresAndSfDebugMiddleware(): void
{
$container = $this->getContainer();
// Register a dummy logger service to enable logging middleware registration
$container->setDefinition('logger', (new Definition('\stdClass'))->setPublic(true));
Comment on lines +1067 to +1068
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see why are these needed. Probably because of my other comment.

$extension = new DoctrineExtension();

$config = BundleConfigurationBuilder::createBuilder()
Expand Down Expand Up @@ -1133,6 +1135,8 @@ public function testRegistrationsWithMiddlewaresAndSfDebugMiddleware(): void
public function testDefinitionsToLogAndProfile(): void
{
$container = $this->getContainer();
// Register a dummy logger service to enable logging middleware registration
$container->setDefinition('logger', (new Definition('\stdClass'))->setPublic(true));
$extension = new DoctrineExtension();

$config = BundleConfigurationBuilder::createBuilder()
Expand Down Expand Up @@ -1206,6 +1210,84 @@ public function testDefinitionsToLogQueriesLoggingFalse(): void
$this->assertArrayNotHasKey('doctrine.middleware', $abstractMiddlewareDefTags);
}

public function testLoggingMiddlewarePerConnectionWithLoggerPresent(): void
{
$container = $this->getContainer();
// Register a dummy logger service to enable logging middleware registration
$container->setDefinition('logger', (new Definition('\stdClass'))->setPublic(true));

$extension = new DoctrineExtension();

$config = BundleConfigurationBuilder::createBuilder()
->addConnection([
'connections' => [
'conn1' => [
'password' => 'foo',
'logging' => true,
'profiling' => false,
],
'conn2' => [
'password' => 'bar',
'logging' => true,
'profiling' => false,
],
],
])
->build();

$extension->load([$config], $container);

// Abstract definition should be present and tagged per connection
$this->assertTrue($container->hasDefinition('doctrine.dbal.logging_middleware'));
$abstractTags = $container->getDefinition('doctrine.dbal.logging_middleware')->getTags();
$this->assertArrayHasKey('doctrine.middleware', $abstractTags);
$this->assertContains(['connection' => 'conn1', 'priority' => 10], $abstractTags['doctrine.middleware']);
$this->assertContains(['connection' => 'conn2', 'priority' => 10], $abstractTags['doctrine.middleware']);

// Child services should be created per connection with proper tags
$this->assertTrue($container->hasDefinition('doctrine.dbal.logging_middleware.conn1'));
$this->assertTrue($container->hasDefinition('doctrine.dbal.logging_middleware.conn2'));

$child1Tags = $container->getDefinition('doctrine.dbal.logging_middleware.conn1')->getTags();
$child2Tags = $container->getDefinition('doctrine.dbal.logging_middleware.conn2')->getTags();

$this->assertArrayHasKey('doctrine.middleware', $child1Tags);
$this->assertContains(['connection' => 'conn1', 'priority' => 10], $child1Tags['doctrine.middleware']);
$this->assertArrayNotHasKey('monolog.logger', $child1Tags);

$this->assertArrayHasKey('doctrine.middleware', $child2Tags);
$this->assertContains(['connection' => 'conn2', 'priority' => 10], $child2Tags['doctrine.middleware']);
$this->assertArrayNotHasKey('monolog.logger', $child2Tags);
}

public function testLoggingMiddlewareNotRegisteredWithoutLogger(): void
{
$container = $this->getContainer();
// No logger service defined here

$extension = new DoctrineExtension();

$config = BundleConfigurationBuilder::createBuilder()
->addConnection([
'connections' => [
'conn1' => [
'password' => 'foo',
'logging' => true,
'profiling' => false,
],
],
])
->build();

$extension->load([$config], $container);

// Abstract definition exists by default, but should not be tagged nor should child definitions exist
$this->assertTrue($container->hasDefinition('doctrine.dbal.logging_middleware'));
$abstractTags = $container->getDefinition('doctrine.dbal.logging_middleware')->getTags();
$this->assertArrayNotHasKey('doctrine.middleware', $abstractTags);
$this->assertFalse($container->hasDefinition('doctrine.dbal.logging_middleware.conn1'));
}

#[RequiresMethod(Driver::class, '__construct')]
public function testDefinitionsIdleConnection(): void
{
Expand Down