From 1949e0b987f03b75346c1597862c3594823ce5f3 Mon Sep 17 00:00:00 2001 From: Hugo Sales Date: Mon, 19 Oct 2020 18:22:59 +0000 Subject: [PATCH] [EVENT] Rename event names to camel case to make finding handlers easier --- src/Controller/UserPanel.php | 4 ++-- src/Core/Controller.php | 4 ++-- src/Core/ModuleManager.php | 2 +- src/Core/Router/RouteLoader.php | 2 +- src/Entity/Note.php | 2 +- src/Twig/Runtime.php | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Controller/UserPanel.php b/src/Controller/UserPanel.php index ce936ceea7..f302dcb36c 100644 --- a/src/Controller/UserPanel.php +++ b/src/Controller/UserPanel.php @@ -154,7 +154,7 @@ class UserPanel extends AbstractController if ($old_file != null) { @unlink($old_file); } - Event::handle('delete_cached_avatar', [$user->getNickname()]); + Event::handle('DeleteCachedAvatar', [$user->getNickname()]); } return ['_template' => 'settings/avatar.html.twig', 'avatar' => $form->createView()]; @@ -205,7 +205,7 @@ class UserPanel extends AbstractController } } - Event::handle('add_notification_transport', [&$form_defs]); + Event::handle('AddNotificationTransport', [&$form_defs]); unset($form_defs['placeholder']); $tabbed_forms = []; diff --git a/src/Core/Controller.php b/src/Core/Controller.php index d1169a49b8..c73ee8d98c 100644 --- a/src/Core/Controller.php +++ b/src/Core/Controller.php @@ -63,7 +63,7 @@ class Controller extends AbstractController implements EventSubscriberInterface $request = $event->getRequest(); $this->vars = ['controler' => $controller, 'request' => $request, 'have_user' => Common::user() !== null]; - Event::handle('start_twig_populate_vars', [&$this->vars]); + Event::handle('StartTwigPopulateVars', [&$this->vars]); $event->stopPropagation(); return $event; @@ -78,7 +78,7 @@ class Controller extends AbstractController implements EventSubscriberInterface } $this->vars = array_merge_recursive($this->vars, $response); - Event::handle('end_twig_populate_vars', [&$this->vars]); + Event::handle('EndTwigPopulateVars', [&$this->vars]); $template = $this->vars['_template']; unset($this->vars['_template'], $this->vars['request']); diff --git a/src/Core/ModuleManager.php b/src/Core/ModuleManager.php index 294b471410..800b4d5cd8 100644 --- a/src/Core/ModuleManager.php +++ b/src/Core/ModuleManager.php @@ -75,7 +75,7 @@ class ModuleManager F\map(F\select(get_class_methods($obj), F\ary(F\partial_right('App\Util\Formatting::startsWith', 'on'), 1)), function (string $m) use ($obj) { - $ev = Formatting::camelCaseToSnakeCase(substr($m, 2)); + $ev = substr($m, 2); $this->events[$ev] = $this->events[$ev] ?? []; $this->events[$ev][] = [$obj, $m]; } diff --git a/src/Core/Router/RouteLoader.php b/src/Core/Router/RouteLoader.php index a636037bd2..04a9fb5571 100644 --- a/src/Core/Router/RouteLoader.php +++ b/src/Core/Router/RouteLoader.php @@ -62,7 +62,7 @@ class RouteLoader extends Loader $ns::load($this); } - Event::handle('add_route', [&$this]); + Event::handle('AddRoute', [&$this]); return $this->rc; } diff --git a/src/Entity/Note.php b/src/Entity/Note.php index 182fd0da56..9df4e94115 100644 --- a/src/Entity/Note.php +++ b/src/Entity/Note.php @@ -197,7 +197,7 @@ class Note extends Entity public function getAvatarUrl() { $url = null; - Event::handle('get_avatar_url', [$this->getActorNickname(), &$url]); + Event::handle('GetAvatarUrl', [$this->getActorNickname(), &$url]); return $url; } diff --git a/src/Twig/Runtime.php b/src/Twig/Runtime.php index 601e305179..9edb93b991 100644 --- a/src/Twig/Runtime.php +++ b/src/Twig/Runtime.php @@ -63,7 +63,7 @@ class Runtime implements RuntimeExtensionInterface, EventSubscriberInterface public function getNoteActions(Note $note) { $actions = []; - Event::handle('add_note_actions', [$this->request, $note, &$actions]); + Event::handle('AddNoteActions', [$this->request, $note, &$actions]); return $actions; }