makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/controller] Don't allow a kernel listener to be added with no method

Browse source 
PHPBB3-10864
This commit is contained in:
David King 2012-10-20 17:16:14 -04:00
parent 067a770730
commit 5c86a1660d
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/event/kernel_compiler_pass.php
View file

@ -44,10 +44,7 @@ class phpbb_event_kernel_compiler_pass implements CompilerPassInterface
if (!isset($event['method'])) if (!isset($event['method']))
{ {
$event['method'] = 'on'.preg_replace(array( throw new InvalidArgumentException($user->lang('NO_METHOD_ATTRIBUTE', $id));
'/(?<=\b)[a-z]/ie',
'/[^a-z0-9]/i'
), array('strtoupper("\\0")', ''), $event['event']);
} }
$definition->addMethodCall('addListenerService', array($event['event'], array($id, $event['method']), $priority)); $definition->addMethodCall('addListenerService', array($event['event'], array($id, $event['method']), $priority));

1
phpBB/language/en/app.php
View file

@ -49,6 +49,7 @@ $lang = array_merge($lang, array(
// Event Listener/Subscriber error messages // Event Listener/Subscriber error messages
'NO_EVENT_ATTRIBUTE' => 'Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.', 'NO_EVENT_ATTRIBUTE' => 'Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.',
'NO_METHOD_ATTRIBUTE' => 'Service "%1$s" must define the "method" attribute on "kernel.event_listener" tags.',
'SUBSCRIBER_WRONG_TYPE' => 'Service "%1$s" must implement interface "%2$s".', 'SUBSCRIBER_WRONG_TYPE' => 'Service "%1$s" must implement interface "%2$s".',
// Core error controller messages // Core error controller messages