Skip to content

Commit 86887ef

Browse files
committed
bug symfony#26896 Messenger: fix for interface_exists (weaverryan, sroze)
This PR was merged into the 4.1-dev branch. Discussion ---------- Messenger: fix for interface_exists | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no-> | Tests pass? | yes | Fixed tickets | none | License | MIT | Doc PR | not needed 2 unrelated bugs! But, very minor :). Commits ------- d60425c Allow the logger to be null (as per every other bits in the FrameworkBundle) 3c4be3c Update the tests to also use `interface_exists` 2405eae Fixing bad class_exists vs interface_exists
2 parents aa04d06 + d60425c commit 86887ef

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ private function addMessengerSection(ArrayNodeDefinition $rootNode)
970970
->children()
971971
->arrayNode('messenger')
972972
->info('Messenger configuration')
973-
->{!class_exists(FullStack::class) && class_exists(MessageBusInterface::class) ? 'canBeDisabled' : 'canBeEnabled'}()
973+
->{!class_exists(FullStack::class) && interface_exists(MessageBusInterface::class) ? 'canBeDisabled' : 'canBeEnabled'}()
974974
->fixXmlConfig('adapter')
975975
->children()
976976
->arrayNode('routing')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
<!-- Logging & Debug -->
5454
<service id="messenger.middleware.debug.logging" class="Symfony\Component\Messenger\Debug\LoggingMiddleware">
55-
<argument type="service" id="logger" />
55+
<argument type="service" id="logger" on-invalid="null" />
5656

5757
<tag name="messenger.bus_middleware" priority="10" />
5858
<tag name="monolog.logger" channel="messenger" />

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
251251
),
252252
),
253253
'messenger' => array(
254-
'enabled' => !class_exists(FullStack::class) && class_exists(MessageBusInterface::class),
254+
'enabled' => !class_exists(FullStack::class) && interface_exists(MessageBusInterface::class),
255255
'routing' => array(),
256256
'middlewares' => array(
257257
'validation' => array(

src/Symfony/Component/Messenger/Debug/LoggingMiddleware.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class LoggingMiddleware implements MiddlewareInterface
2121
{
2222
private $logger;
2323

24-
public function __construct(LoggerInterface $logger)
24+
public function __construct(LoggerInterface $logger = null)
2525
{
2626
$this->logger = $logger;
2727
}
@@ -31,6 +31,10 @@ public function __construct(LoggerInterface $logger)
3131
*/
3232
public function handle($message, callable $next)
3333
{
34+
if (null === $this->logger) {
35+
return $next($message);
36+
}
37+
3438
$this->logger->debug('Starting handling message {class}', array(
3539
'message' => $message,
3640
'class' => get_class($message),

0 commit comments

Comments
 (0)