Skip to content

Commit af6d70c

Browse files
Merge branch '5.3' into 5.4
* 5.3: CS fix Missing translations from traits Fix SkippedTestSuite [Console] Fix type annotation on InputInterface::hasArgument() Revert "minor #41949 [Console] fix type annotations on InputInterface (nicolas-grekas)" [EventDispatcher] Correct the called event listener method case [Serializer] Need to clear cache when updating Annotation Groups on Entities Add missing translations for Japanese. Revert "bug #41952 [Console] fix handling positional arguments (nicolas-grekas)" Fix test [Security] Don't skip UserPasswordValidatorTest [DI] CS fix [Console] fix handling positional arguments [Validator] add translation for Vietnamese Add Bulgarian translation for the validator fix backport [Console] fix type annotations on InputInterface
2 parents 173b7f7 + 3dcbd3c commit af6d70c

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

DependencyInjection/RegisterListenersPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function process(ContainerBuilder $container)
110110

111111
if (!isset($event['method'])) {
112112
$event['method'] = 'on'.preg_replace_callback([
113-
'/(?<=\b)[a-z]/i',
113+
'/(?<=\b|_)[a-z]/i',
114114
'/[^a-z0-9]/i',
115115
], function ($matches) { return strtoupper($matches[0]); }, $event['event']);
116116
$event['method'] = preg_replace('/[^a-z0-9]/i', '', $event['method']);

Tests/DependencyInjection/RegisterListenersPassTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ public function testInvokableEventListener()
203203
$container->register('foo', \stdClass::class)->addTag('kernel.event_listener', ['event' => 'foo.bar']);
204204
$container->register('bar', InvokableListenerService::class)->addTag('kernel.event_listener', ['event' => 'foo.bar']);
205205
$container->register('baz', InvokableListenerService::class)->addTag('kernel.event_listener', ['event' => 'event']);
206+
$container->register('zar', \stdClass::class)->addTag('kernel.event_listener', ['event' => 'foo.bar_zar']);
206207
$container->register('event_dispatcher', \stdClass::class);
207208

208209
$registerListenersPass = new RegisterListenersPass();
@@ -234,6 +235,14 @@ public function testInvokableEventListener()
234235
0,
235236
],
236237
],
238+
[
239+
'addListener',
240+
[
241+
'foo.bar_zar',
242+
[new ServiceClosureArgument(new Reference('zar')), 'onFooBarZar'],
243+
0,
244+
],
245+
],
237246
];
238247
$this->assertEquals($expectedCalls, $definition->getMethodCalls());
239248
}

0 commit comments

Comments
 (0)