]> git.mxchange.org Git - friendica.git/commitdiff
Fix code style
authorArt4 <art4@wlabs.de>
Mon, 24 Feb 2025 08:42:54 +0000 (08:42 +0000)
committerArt4 <art4@wlabs.de>
Mon, 24 Feb 2025 08:42:54 +0000 (08:42 +0000)
src/Content/Widget/ContactBlock.php
src/Core/ACL.php
src/Core/Hooks/HookEventBridge.php
tests/Unit/Core/Hooks/HookEventBridgeTest.php

index 2a9d14db3eda891bd073d7fbd5bb8298190adbe7..aa11a258b27e3b2901d66d8c45aaa8646759a4e2 100644 (file)
@@ -92,7 +92,7 @@ class ContactBlock
 
                                if (DBA::isResult($contacts_stmt)) {
                                        $contacts_title = DI::l10n()->tt('%d Contact', '%d Contacts', $total);
-                                       $micropro = [];
+                                       $micropro       = [];
 
                                        while ($contact = DBA::fetch($contacts_stmt)) {
                                                $contacts[] = $contact;
@@ -105,11 +105,11 @@ class ContactBlock
                }
 
                $tpl = Renderer::getMarkupTemplate('widget/contacts.tpl');
-               $o = Renderer::replaceMacros($tpl, [
-                       '$contacts' => $contacts_title,
-                       '$nickname' => $profile['nickname'],
+               $o   = Renderer::replaceMacros($tpl, [
+                       '$contacts'     => $contacts_title,
+                       '$nickname'     => $profile['nickname'],
                        '$viewcontacts' => DI::l10n()->t('View Contacts'),
-                       '$micropro' => $micropro,
+                       '$micropro'     => $micropro,
                ]);
 
                $eventDispatcher = DI::eventDispatcher();
index 46d66b9a20f40ffbc72b0c32a81f979c1a41372c..b383591d30400749a679978d0d25877f04310d68 100644 (file)
@@ -53,7 +53,7 @@ class ACL
                $contacts = self::getValidMessageRecipientsForUser(DI::userSession()->getLocalUserId());
 
                $tpl = Renderer::getMarkupTemplate('acl/message_recipient.tpl');
-               $o = Renderer::replaceMacros($tpl, [
+               $o   = Renderer::replaceMacros($tpl, [
                        '$contacts'      => $contacts,
                        '$contacts_json' => json_encode($contacts),
                        '$selected'      => $selected,
@@ -96,9 +96,9 @@ class ACL
                $selfPublicContactId = Contact::getPublicIdByUserId($localUserId);
 
                $tpl = Renderer::getMarkupTemplate('acl/self_only.tpl');
-               $o = Renderer::replaceMacros($tpl, [
+               $o   = Renderer::replaceMacros($tpl, [
                        '$selfPublicContactId' => $selfPublicContactId,
-                       '$explanation' => $explanation,
+                       '$explanation'         => $explanation,
                ]);
 
                return $o;
@@ -118,8 +118,8 @@ class ACL
                return [
                        'allow_cid' => Contact::pruneUnavailable($aclFormatter->expand($user['allow_cid'] ?? '')),
                        'allow_gid' => $aclFormatter->expand($user['allow_gid'] ?? ''),
-                       'deny_cid'  => $aclFormatter->expand($user['deny_cid']  ?? ''),
-                       'deny_gid'  => $aclFormatter->expand($user['deny_gid']  ?? ''),
+                       'deny_cid'  => $aclFormatter->expand($user['deny_cid'] ?? ''),
+                       'deny_gid'  => $aclFormatter->expand($user['deny_gid'] ?? ''),
                ];
        }
 
@@ -133,31 +133,33 @@ class ACL
         */
        public static function getContactListByUserId(int $user_id, array $condition = [])
        {
-               $fields = ['id', 'name', 'addr', 'micro'];
-               $params = ['order' => ['name']];
+               $fields       = ['id', 'name', 'addr', 'micro'];
+               $params       = ['order' => ['name']];
                $acl_contacts = Contact::selectToArray(
                        $fields,
                        array_merge([
-                               'uid' => $user_id,
-                               'self' => false,
+                               'uid'     => $user_id,
+                               'self'    => false,
                                'blocked' => false,
                                'archive' => false,
                                'deleted' => false,
                                'pending' => false,
                                'network' => Protocol::FEDERATED,
-                               'rel' => [Contact::FOLLOWER, Contact::FRIEND]
+                               'rel'     => [Contact::FOLLOWER, Contact::FRIEND]
                        ], $condition),
                        $params
                );
 
-               $acl_yourself = Contact::selectFirst($fields, ['uid' => $user_id, 'self' => true]);
+               $acl_yourself         = Contact::selectFirst($fields, ['uid' => $user_id, 'self' => true]);
                $acl_yourself['name'] = DI::l10n()->t('Yourself');
 
                $acl_contacts[] = $acl_yourself;
 
-               $acl_groups = Contact::selectToArray($fields,
-                       ['uid' => $user_id, 'self' => false, 'blocked' => false, 'archive' => false, 'deleted' => false,
-                       'network' => Protocol::FEDERATED, 'pending' => false, 'contact-type' => Contact::TYPE_COMMUNITY], $params
+               $acl_groups = Contact::selectToArray(
+                       $fields,
+                       ['uid'     => $user_id, 'self' => false, 'blocked' => false, 'archive' => false, 'deleted' => false,
+                               'network' => Protocol::FEDERATED, 'pending' => false, 'contact-type' => Contact::TYPE_COMMUNITY],
+                       $params
                );
 
                $acl_contacts = array_merge($acl_groups, $acl_contacts);
@@ -179,27 +181,27 @@ class ACL
        {
                $acl_circles = [
                        [
-                               'id' => Circle::FOLLOWERS,
-                               'name' => DI::l10n()->t('Followers'),
-                               'addr' => '',
+                               'id'    => Circle::FOLLOWERS,
+                               'name'  => DI::l10n()->t('Followers'),
+                               'addr'  => '',
                                'micro' => 'images/twopeople.png',
-                               'type' => 'circle',
+                               'type'  => 'circle',
                        ],
                        [
-                               'id' => Circle::MUTUALS,
-                               'name' => DI::l10n()->t('Mutuals'),
-                               'addr' => '',
+                               'id'    => Circle::MUTUALS,
+                               'name'  => DI::l10n()->t('Mutuals'),
+                               'addr'  => '',
                                'micro' => 'images/twopeople.png',
-                               'type' => 'circle',
+                               'type'  => 'circle',
                        ]
                ];
                foreach (Circle::getByUserId($user_id) as $circle) {
                        $acl_circles[] = [
-                               'id' => $circle['id'],
-                               'name' => $circle['name'],
-                               'addr' => '',
+                               'id'    => $circle['id'],
+                               'name'  => $circle['name'],
+                               'addr'  => '',
                                'micro' => 'images/twopeople.png',
-                               'type' => 'circle',
+                               'type'  => 'circle',
                        ];
                }
 
@@ -276,7 +278,7 @@ class ACL
                                $mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', $user['uid']]);
                                if (DBA::isResult($mailacct)) {
                                        $jotnets_fields[] = [
-                                               'type' => 'checkbox',
+                                               'type'  => 'checkbox',
                                                'field' => [
                                                        'pubmail_enable',
                                                        DI::l10n()->t('Post to Email'),
@@ -310,28 +312,28 @@ class ACL
                ];
 
                $tpl = Renderer::getMarkupTemplate('acl/full_selector.tpl');
-               $o = Renderer::replaceMacros($tpl, [
-                       '$public_title'   => DI::l10n()->t('Public'),
-                       '$public_desc'    => DI::l10n()->t('This content will be shown to all your followers and can be seen in the community pages and by anyone with its link.'),
-                       '$custom_title'   => DI::l10n()->t('Limited/Private'),
-                       '$custom_desc'    => DI::l10n()->t('This content will be shown only to the people in the first box, to the exception of the people mentioned in the second box. It won\'t appear anywhere public.') . DI::l10n()->t('Start typing the name of a contact or a circle to show a filtered list. You can also mention the special circles "Followers" and "Mutuals".'),
-                       '$allow_label'    => DI::l10n()->t('Show to:'),
-                       '$deny_label'     => DI::l10n()->t('Except to:'),
-                       '$emailcc'        => DI::l10n()->t('CC: email addresses'),
-                       '$emtitle'        => DI::l10n()->t('Example: bob@example.com, mary@example.com'),
+               $o   = Renderer::replaceMacros($tpl, [
+                       '$public_title'    => DI::l10n()->t('Public'),
+                       '$public_desc'     => DI::l10n()->t('This content will be shown to all your followers and can be seen in the community pages and by anyone with its link.'),
+                       '$custom_title'    => DI::l10n()->t('Limited/Private'),
+                       '$custom_desc'     => DI::l10n()->t('This content will be shown only to the people in the first box, to the exception of the people mentioned in the second box. It won\'t appear anywhere public.') . DI::l10n()->t('Start typing the name of a contact or a circle to show a filtered list. You can also mention the special circles "Followers" and "Mutuals".'),
+                       '$allow_label'     => DI::l10n()->t('Show to:'),
+                       '$deny_label'      => DI::l10n()->t('Except to:'),
+                       '$emailcc'         => DI::l10n()->t('CC: email addresses'),
+                       '$emtitle'         => DI::l10n()->t('Example: bob@example.com, mary@example.com'),
                        '$jotnets_summary' => DI::l10n()->t('Connectors'),
-                       '$visibility'     => $visibility,
-                       '$acl_contacts'   => json_encode($acl_contacts),
-                       '$acl_circles'    => json_encode($acl_circles),
-                       '$acl_list'       => json_encode($acl_list),
-                       '$contact_allow'  => implode(',', $default_permissions['allow_cid']),
-                       '$circle_allow'   => implode(',', $default_permissions['allow_gid']),
-                       '$contact_deny'   => implode(',', $default_permissions['deny_cid']),
-                       '$circle_deny'    => implode(',', $default_permissions['deny_gid']),
-                       '$for_federation' => $for_federation,
-                       '$jotnets_fields' => $jotnets_fields,
-                       '$input_names'    => $input_names,
-                       '$input_group_id' => $input_group_id,
+                       '$visibility'      => $visibility,
+                       '$acl_contacts'    => json_encode($acl_contacts),
+                       '$acl_circles'     => json_encode($acl_circles),
+                       '$acl_list'        => json_encode($acl_list),
+                       '$contact_allow'   => implode(',', $default_permissions['allow_cid']),
+                       '$circle_allow'    => implode(',', $default_permissions['allow_gid']),
+                       '$contact_deny'    => implode(',', $default_permissions['deny_cid']),
+                       '$circle_deny'     => implode(',', $default_permissions['deny_gid']),
+                       '$for_federation'  => $for_federation,
+                       '$jotnets_fields'  => $jotnets_fields,
+                       '$input_names'     => $input_names,
+                       '$input_group_id'  => $input_group_id,
                ]);
 
                return $o;
index bf2289e071351d412fb082f04b06761dd52fb8e2..2f1e51a297731e38b9ebd433b67a7ee33644aa18 100644 (file)
@@ -35,40 +35,40 @@ final class HookEventBridge
         * This maps the new event names to the legacy Hook names.
         */
        private static array $eventMapper = [
-               Event::INIT                              => 'init_1',
-               Event::HOME_INIT                         => 'home_init',
-               ConfigLoadedEvent::CONFIG_LOADED         => 'load_config',
-               CollectRoutesEvent::COLLECT_ROUTES       => 'route_collection',
-               ArrayFilterEvent::APP_MENU               => 'app_menu',
-               ArrayFilterEvent::NAV_INFO               => 'nav_info',
-               ArrayFilterEvent::FEATURE_ENABLED        => 'isEnabled',
-               ArrayFilterEvent::FEATURE_GET            => 'get',
-               ArrayFilterEvent::POST_LOCAL_START       => 'post_local_start',
-               ArrayFilterEvent::POST_LOCAL             => 'post_local',
-               ArrayFilterEvent::POST_LOCAL_END         => 'post_local_end',
-               ArrayFilterEvent::PHOTO_UPLOAD_FORM      => 'photo_upload_form',
-               ArrayFilterEvent::NETWORK_TO_NAME        => 'network_to_name',
-               ArrayFilterEvent::CONVERSATION_START     => 'conversation_start',
-               ArrayFilterEvent::DISPLAY_ITEM           => 'display_item',
-               ArrayFilterEvent::RENDER_LOCATION        => 'render_location',
-               ArrayFilterEvent::ITEM_PHOTO_MENU        => 'item_photo_menu',
-               ArrayFilterEvent::OEMBED_FETCH_END       => 'oembed_fetch_url',
-               ArrayFilterEvent::PAGE_INFO              => 'page_info_data',
-               ArrayFilterEvent::SMILEY_LIST            => 'smilie',
-               ArrayFilterEvent::BBCODE_TO_HTML_START   => 'bbcode',
-               ArrayFilterEvent::HTML_TO_BBCODE_END     => 'html2bbcode',
-               ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'bb2diaspora',
-               ArrayFilterEvent::JOT_NETWORKS           => 'jot_networks',
-               ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW => 'support_follow',
+               Event::INIT                                       => 'init_1',
+               Event::HOME_INIT                                  => 'home_init',
+               ConfigLoadedEvent::CONFIG_LOADED                  => 'load_config',
+               CollectRoutesEvent::COLLECT_ROUTES                => 'route_collection',
+               ArrayFilterEvent::APP_MENU                        => 'app_menu',
+               ArrayFilterEvent::NAV_INFO                        => 'nav_info',
+               ArrayFilterEvent::FEATURE_ENABLED                 => 'isEnabled',
+               ArrayFilterEvent::FEATURE_GET                     => 'get',
+               ArrayFilterEvent::POST_LOCAL_START                => 'post_local_start',
+               ArrayFilterEvent::POST_LOCAL                      => 'post_local',
+               ArrayFilterEvent::POST_LOCAL_END                  => 'post_local_end',
+               ArrayFilterEvent::PHOTO_UPLOAD_FORM               => 'photo_upload_form',
+               ArrayFilterEvent::NETWORK_TO_NAME                 => 'network_to_name',
+               ArrayFilterEvent::CONVERSATION_START              => 'conversation_start',
+               ArrayFilterEvent::DISPLAY_ITEM                    => 'display_item',
+               ArrayFilterEvent::RENDER_LOCATION                 => 'render_location',
+               ArrayFilterEvent::ITEM_PHOTO_MENU                 => 'item_photo_menu',
+               ArrayFilterEvent::OEMBED_FETCH_END                => 'oembed_fetch_url',
+               ArrayFilterEvent::PAGE_INFO                       => 'page_info_data',
+               ArrayFilterEvent::SMILEY_LIST                     => 'smilie',
+               ArrayFilterEvent::BBCODE_TO_HTML_START            => 'bbcode',
+               ArrayFilterEvent::HTML_TO_BBCODE_END              => 'html2bbcode',
+               ArrayFilterEvent::BBCODE_TO_MARKDOWN_END          => 'bb2diaspora',
+               ArrayFilterEvent::JOT_NETWORKS                    => 'jot_networks',
+               ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW        => 'support_follow',
                ArrayFilterEvent::PROTOCOL_SUPPORTS_REVOKE_FOLLOW => 'support_revoke_follow',
-               ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE => 'support_probe',
-               HtmlFilterEvent::HEAD                    => 'head',
-               HtmlFilterEvent::FOOTER                  => 'footer',
-               HtmlFilterEvent::PAGE_HEADER             => 'page_header',
-               HtmlFilterEvent::PAGE_CONTENT_TOP        => 'page_content_top',
-               HtmlFilterEvent::PAGE_END                => 'page_end',
-               HtmlFilterEvent::JOT_TOOL                => 'jot_tool',
-               HtmlFilterEvent::CONTACT_BLOCK_END       => 'contact_block_end',
+               ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE         => 'support_probe',
+               HtmlFilterEvent::HEAD                             => 'head',
+               HtmlFilterEvent::FOOTER                           => 'footer',
+               HtmlFilterEvent::PAGE_HEADER                      => 'page_header',
+               HtmlFilterEvent::PAGE_CONTENT_TOP                 => 'page_content_top',
+               HtmlFilterEvent::PAGE_END                         => 'page_end',
+               HtmlFilterEvent::JOT_TOOL                         => 'jot_tool',
+               HtmlFilterEvent::CONTACT_BLOCK_END                => 'contact_block_end',
        ];
 
        /**
@@ -77,40 +77,40 @@ final class HookEventBridge
        public static function getStaticSubscribedEvents(): array
        {
                return [
-                       Event::INIT                              => 'onNamedEvent',
-                       Event::HOME_INIT                         => 'onNamedEvent',
-                       ConfigLoadedEvent::CONFIG_LOADED         => 'onConfigLoadedEvent',
-                       CollectRoutesEvent::COLLECT_ROUTES       => 'onCollectRoutesEvent',
-                       ArrayFilterEvent::APP_MENU               => 'onArrayFilterEvent',
-                       ArrayFilterEvent::NAV_INFO               => 'onArrayFilterEvent',
-                       ArrayFilterEvent::FEATURE_ENABLED        => 'onArrayFilterEvent',
-                       ArrayFilterEvent::FEATURE_GET            => 'onArrayFilterEvent',
-                       ArrayFilterEvent::POST_LOCAL_START       => 'onArrayFilterEvent',
-                       ArrayFilterEvent::POST_LOCAL             => 'onArrayFilterEvent',
-                       ArrayFilterEvent::POST_LOCAL_END         => 'onArrayFilterEvent',
-                       ArrayFilterEvent::PHOTO_UPLOAD_FORM      => 'onArrayFilterEvent',
-                       ArrayFilterEvent::NETWORK_TO_NAME        => 'onArrayFilterEvent',
-                       ArrayFilterEvent::CONVERSATION_START     => 'onArrayFilterEvent',
-                       ArrayFilterEvent::DISPLAY_ITEM           => 'onArrayFilterEvent',
-                       ArrayFilterEvent::RENDER_LOCATION        => 'onArrayFilterEvent',
-                       ArrayFilterEvent::ITEM_PHOTO_MENU        => 'onArrayFilterEvent',
-                       ArrayFilterEvent::OEMBED_FETCH_END       => 'onOembedFetchEndEvent',
-                       ArrayFilterEvent::PAGE_INFO              => 'onArrayFilterEvent',
-                       ArrayFilterEvent::SMILEY_LIST            => 'onArrayFilterEvent',
-                       ArrayFilterEvent::BBCODE_TO_HTML_START   => 'onBbcodeToHtmlEvent',
-                       ArrayFilterEvent::HTML_TO_BBCODE_END     => 'onHtmlToBbcodeEvent',
-                       ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
-                       ArrayFilterEvent::JOT_NETWORKS           => 'onArrayFilterEvent',
-                       ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW => 'onArrayFilterEvent',
+                       Event::INIT                                       => 'onNamedEvent',
+                       Event::HOME_INIT                                  => 'onNamedEvent',
+                       ConfigLoadedEvent::CONFIG_LOADED                  => 'onConfigLoadedEvent',
+                       CollectRoutesEvent::COLLECT_ROUTES                => 'onCollectRoutesEvent',
+                       ArrayFilterEvent::APP_MENU                        => 'onArrayFilterEvent',
+                       ArrayFilterEvent::NAV_INFO                        => 'onArrayFilterEvent',
+                       ArrayFilterEvent::FEATURE_ENABLED                 => 'onArrayFilterEvent',
+                       ArrayFilterEvent::FEATURE_GET                     => 'onArrayFilterEvent',
+                       ArrayFilterEvent::POST_LOCAL_START                => 'onArrayFilterEvent',
+                       ArrayFilterEvent::POST_LOCAL                      => 'onArrayFilterEvent',
+                       ArrayFilterEvent::POST_LOCAL_END                  => 'onArrayFilterEvent',
+                       ArrayFilterEvent::PHOTO_UPLOAD_FORM               => 'onArrayFilterEvent',
+                       ArrayFilterEvent::NETWORK_TO_NAME                 => 'onArrayFilterEvent',
+                       ArrayFilterEvent::CONVERSATION_START              => 'onArrayFilterEvent',
+                       ArrayFilterEvent::DISPLAY_ITEM                    => 'onArrayFilterEvent',
+                       ArrayFilterEvent::RENDER_LOCATION                 => 'onArrayFilterEvent',
+                       ArrayFilterEvent::ITEM_PHOTO_MENU                 => 'onArrayFilterEvent',
+                       ArrayFilterEvent::OEMBED_FETCH_END                => 'onOembedFetchEndEvent',
+                       ArrayFilterEvent::PAGE_INFO                       => 'onArrayFilterEvent',
+                       ArrayFilterEvent::SMILEY_LIST                     => 'onArrayFilterEvent',
+                       ArrayFilterEvent::BBCODE_TO_HTML_START            => 'onBbcodeToHtmlEvent',
+                       ArrayFilterEvent::HTML_TO_BBCODE_END              => 'onHtmlToBbcodeEvent',
+                       ArrayFilterEvent::BBCODE_TO_MARKDOWN_END          => 'onBbcodeToMarkdownEvent',
+                       ArrayFilterEvent::JOT_NETWORKS                    => 'onArrayFilterEvent',
+                       ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW        => 'onArrayFilterEvent',
                        ArrayFilterEvent::PROTOCOL_SUPPORTS_REVOKE_FOLLOW => 'onArrayFilterEvent',
-                       ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE => 'onArrayFilterEvent',
-                       HtmlFilterEvent::HEAD                    => 'onHtmlFilterEvent',
-                       HtmlFilterEvent::FOOTER                  => 'onHtmlFilterEvent',
-                       HtmlFilterEvent::PAGE_HEADER             => 'onHtmlFilterEvent',
-                       HtmlFilterEvent::PAGE_CONTENT_TOP        => 'onHtmlFilterEvent',
-                       HtmlFilterEvent::PAGE_END                => 'onHtmlFilterEvent',
-                       HtmlFilterEvent::JOT_TOOL                => 'onHtmlFilterEvent',
-                       HtmlFilterEvent::CONTACT_BLOCK_END       => 'onHtmlFilterEvent',
+                       ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE         => 'onArrayFilterEvent',
+                       HtmlFilterEvent::HEAD                             => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::FOOTER                           => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::PAGE_HEADER                      => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::PAGE_CONTENT_TOP                 => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::PAGE_END                         => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::JOT_TOOL                         => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::CONTACT_BLOCK_END                => 'onHtmlFilterEvent',
                ];
        }
 
index 075204160402f6dbdedf48e63b4d691e5259dd7c..cdd3e0d61b2c8a79f363283d659573a703e73cc1 100644 (file)
@@ -24,40 +24,40 @@ class HookEventBridgeTest extends TestCase
        public function testGetStaticSubscribedEventsReturnsStaticMethods(): void
        {
                $expected = [
-                       Event::INIT                              => 'onNamedEvent',
-                       Event::HOME_INIT                         => 'onNamedEvent',
-                       ConfigLoadedEvent::CONFIG_LOADED         => 'onConfigLoadedEvent',
-                       CollectRoutesEvent::COLLECT_ROUTES       => 'onCollectRoutesEvent',
-                       ArrayFilterEvent::APP_MENU               => 'onArrayFilterEvent',
-                       ArrayFilterEvent::NAV_INFO               => 'onArrayFilterEvent',
-                       ArrayFilterEvent::FEATURE_ENABLED        => 'onArrayFilterEvent',
-                       ArrayFilterEvent::FEATURE_GET            => 'onArrayFilterEvent',
-                       ArrayFilterEvent::POST_LOCAL_START       => 'onArrayFilterEvent',
-                       ArrayFilterEvent::POST_LOCAL             => 'onArrayFilterEvent',
-                       ArrayFilterEvent::POST_LOCAL_END         => 'onArrayFilterEvent',
-                       ArrayFilterEvent::PHOTO_UPLOAD_FORM      => 'onArrayFilterEvent',
-                       ArrayFilterEvent::NETWORK_TO_NAME        => 'onArrayFilterEvent',
-                       ArrayFilterEvent::CONVERSATION_START     => 'onArrayFilterEvent',
-                       ArrayFilterEvent::DISPLAY_ITEM           => 'onArrayFilterEvent',
-                       ArrayFilterEvent::RENDER_LOCATION        => 'onArrayFilterEvent',
-                       ArrayFilterEvent::ITEM_PHOTO_MENU        => 'onArrayFilterEvent',
-                       ArrayFilterEvent::OEMBED_FETCH_END       => 'onOembedFetchEndEvent',
-                       ArrayFilterEvent::PAGE_INFO              => 'onArrayFilterEvent',
-                       ArrayFilterEvent::SMILEY_LIST            => 'onArrayFilterEvent',
-                       ArrayFilterEvent::BBCODE_TO_HTML_START   => 'onBbcodeToHtmlEvent',
-                       ArrayFilterEvent::HTML_TO_BBCODE_END     => 'onHtmlToBbcodeEvent',
-                       ArrayFilterEvent::BBCODE_TO_MARKDOWN_END => 'onBbcodeToMarkdownEvent',
-                       ArrayFilterEvent::JOT_NETWORKS           => 'onArrayFilterEvent',
-                       ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW => 'onArrayFilterEvent',
+                       Event::INIT                                       => 'onNamedEvent',
+                       Event::HOME_INIT                                  => 'onNamedEvent',
+                       ConfigLoadedEvent::CONFIG_LOADED                  => 'onConfigLoadedEvent',
+                       CollectRoutesEvent::COLLECT_ROUTES                => 'onCollectRoutesEvent',
+                       ArrayFilterEvent::APP_MENU                        => 'onArrayFilterEvent',
+                       ArrayFilterEvent::NAV_INFO                        => 'onArrayFilterEvent',
+                       ArrayFilterEvent::FEATURE_ENABLED                 => 'onArrayFilterEvent',
+                       ArrayFilterEvent::FEATURE_GET                     => 'onArrayFilterEvent',
+                       ArrayFilterEvent::POST_LOCAL_START                => 'onArrayFilterEvent',
+                       ArrayFilterEvent::POST_LOCAL                      => 'onArrayFilterEvent',
+                       ArrayFilterEvent::POST_LOCAL_END                  => 'onArrayFilterEvent',
+                       ArrayFilterEvent::PHOTO_UPLOAD_FORM               => 'onArrayFilterEvent',
+                       ArrayFilterEvent::NETWORK_TO_NAME                 => 'onArrayFilterEvent',
+                       ArrayFilterEvent::CONVERSATION_START              => 'onArrayFilterEvent',
+                       ArrayFilterEvent::DISPLAY_ITEM                    => 'onArrayFilterEvent',
+                       ArrayFilterEvent::RENDER_LOCATION                 => 'onArrayFilterEvent',
+                       ArrayFilterEvent::ITEM_PHOTO_MENU                 => 'onArrayFilterEvent',
+                       ArrayFilterEvent::OEMBED_FETCH_END                => 'onOembedFetchEndEvent',
+                       ArrayFilterEvent::PAGE_INFO                       => 'onArrayFilterEvent',
+                       ArrayFilterEvent::SMILEY_LIST                     => 'onArrayFilterEvent',
+                       ArrayFilterEvent::BBCODE_TO_HTML_START            => 'onBbcodeToHtmlEvent',
+                       ArrayFilterEvent::HTML_TO_BBCODE_END              => 'onHtmlToBbcodeEvent',
+                       ArrayFilterEvent::BBCODE_TO_MARKDOWN_END          => 'onBbcodeToMarkdownEvent',
+                       ArrayFilterEvent::JOT_NETWORKS                    => 'onArrayFilterEvent',
+                       ArrayFilterEvent::PROTOCOL_SUPPORTS_FOLLOW        => 'onArrayFilterEvent',
                        ArrayFilterEvent::PROTOCOL_SUPPORTS_REVOKE_FOLLOW => 'onArrayFilterEvent',
-                       ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE => 'onArrayFilterEvent',
-                       HtmlFilterEvent::HEAD                    => 'onHtmlFilterEvent',
-                       HtmlFilterEvent::FOOTER                  => 'onHtmlFilterEvent',
-                       HtmlFilterEvent::PAGE_HEADER             => 'onHtmlFilterEvent',
-                       HtmlFilterEvent::PAGE_CONTENT_TOP        => 'onHtmlFilterEvent',
-                       HtmlFilterEvent::PAGE_END                => 'onHtmlFilterEvent',
-                       HtmlFilterEvent::JOT_TOOL                => 'onHtmlFilterEvent',
-                       HtmlFilterEvent::CONTACT_BLOCK_END       => 'onHtmlFilterEvent',
+                       ArrayFilterEvent::PROTOCOL_SUPPORTS_PROBE         => 'onArrayFilterEvent',
+                       HtmlFilterEvent::HEAD                             => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::FOOTER                           => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::PAGE_HEADER                      => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::PAGE_CONTENT_TOP                 => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::PAGE_END                         => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::JOT_TOOL                         => 'onHtmlFilterEvent',
+                       HtmlFilterEvent::CONTACT_BLOCK_END                => 'onHtmlFilterEvent',
                ];
 
                $this->assertSame(