Merge pull request #7071 from nupplaphil/task/mod_bookmarklet

Move mod/bookmarklet to src/Module/BookMarklet

diff --combined src/App/Router.php
index f4d5d6dfe39a9150323bf05c723cb4895a22bbf4,db40599dd295278930e71009a502ff511e823d10..83cdf425542c5c3a2df8fa59f46498879eef5f31
--- 1/src/App/Router.php
--- 2/src/App/Router.php
+++ b/src/App/Router.php
@@@ -40,54 -40,19 +40,55 @@@ class Route
         */
        public function collectRoutes()
        {
 -              $this->routeCollector->addRoute(['GET', 'POST'], '/itemsource[/{guid}]', Module\Itemsource::class);
 -              $this->routeCollector->addRoute(['GET'],         '/amcd',                Module\AccountManagementControlDocument::class);
                $this->routeCollector->addGroup('/.well-known', function (RouteCollector $collector) {
                        $collector->addRoute(['GET'], '/host-meta'       , Module\WellKnown\HostMeta::class);
                        $collector->addRoute(['GET'], '/nodeinfo[/1.0]'  , Module\NodeInfo::class);
                        $collector->addRoute(['GET'], '/webfinger'       , Module\Xrd::class);
                        $collector->addRoute(['GET'], '/x-social-relay'  , Module\WellKnown\XSocialRelay::class);
                });
 +              $this->routeCollector->addGroup('/admin', function (RouteCollector $collector) {
 +                      $collector->addRoute(['GET']        , '[/]'                     , Module\Admin\Summary::class);
 +
 +                      $collector->addRoute(['GET', 'POST'], '/addons'                 , Module\Admin\Addons\Index::class);
 +                      $collector->addRoute(['GET', 'POST'], '/addons/{addon}'         , Module\Admin\Addons\Details::class);
 +
 +                      $collector->addRoute(['GET', 'POST'], '/blocklist/contact'      , Module\Admin\Blocklist\Contact::class);
 +                      $collector->addRoute(['GET', 'POST'], '/blocklist/server'       , Module\Admin\Blocklist\Server::class);
 +
 +                      $collector->addRoute(['GET']        , '/dbsync[/check]'         , Module\Admin\DBSync::class);
 +                      $collector->addRoute(['GET']        , '/dbsync/{update:\d+}'    , Module\Admin\DBSync::class);
 +                      $collector->addRoute(['GET']        , '/dbsync/mark/{update:\d+}', Module\Admin\DBSync::class);
 +
 +                      $collector->addRoute(['GET', 'POST'], '/features'               , Module\Admin\Features::class);
 +                      $collector->addRoute(['GET']        , '/federation'             , Module\Admin\Federation::class);
 +
 +                      $collector->addRoute(['GET', 'POST'], '/item/delete'            , Module\Admin\Item\Delete::class);
 +                      $collector->addRoute(['GET', 'POST'], '/item/source[/{guid}]'   , Module\Admin\Item\Source::class);
 +
 +                      $collector->addRoute(['GET']        , '/logs/view'              , Module\Admin\Logs\View::class);
 +                      $collector->addRoute(['GET', 'POST'], '/logs'                   , Module\Admin\Logs\Settings::class);
 +
 +                      $collector->addRoute(['GET']        , '/phpinfo'                , Module\Admin\PhpInfo::class);
 +
 +                      $collector->addRoute(['GET']        , '/queue[/deferred]'       , Module\Admin\Queue::class);
 +
 +                      $collector->addRoute(['GET', 'POST'], '/site'                   , Module\Admin\Site::class);
 +
 +                      $collector->addRoute(['GET', 'POST'], '/themes'                 , Module\Admin\Themes\Index::class);
 +                      $collector->addRoute(['GET', 'POST'], '/themes/{theme}'         , Module\Admin\Themes\Details::class);
 +                      $collector->addRoute(['GET', 'POST'], '/themes/{theme}/embed'   , Module\Admin\Themes\Embed::class);
 +
 +                      $collector->addRoute(['GET', 'POST'], '/tos'                    , Module\Admin\Tos::class);
 +
 +                      $collector->addRoute(['GET', 'POST'], '/users[/{action}/{uid}]' , Module\Admin\Users::class);
 +              });
 +              $this->routeCollector->addRoute(['GET'],         '/amcd',                Module\AccountManagementControlDocument::class);
                $this->routeCollector->addRoute(['GET'],         '/acctlink',            Module\Acctlink::class);
 +              $this->routeCollector->addRoute(['GET'],         '/allfriends/{id:\d+}', Module\AllFriends::class);
                $this->routeCollector->addRoute(['GET'],         '/apps',                Module\Apps::class);
                $this->routeCollector->addRoute(['GET'],         '/attach/{item:\d+}',   Module\Attach::class);
                $this->routeCollector->addRoute(['GET'],         '/babel',               Module\Babel::class);
+               $this->routeCollector->addRoute(['GET'],         '/bookmarklet',         Module\BookMarklet::class);
                $this->routeCollector->addGroup('/contact', function (RouteCollector $collector) {
                        $collector->addRoute(['GET'], '[/]',                                 Module\Contact::class);
                        $collector->addRoute(['GET'], '/{id:\d+}[/posts|conversations]',     Module\Contact::class);
@@@ -100,7 -65,6 +101,7 @@@
                        $collector->addRoute(['GET'], '/{nickname}/replies',                 Module\Feed::class);
                        $collector->addRoute(['GET'], '/{nickname}/activity',                Module\Feed::class);
                });
 +              $this->routeCollector->addRoute(['GET'],         '/directory',           Module\Directory::class);
                $this->routeCollector->addRoute(['GET'],         '/feedtest',            Module\Feedtest::class);
                $this->routeCollector->addRoute(['GET'],         '/filer[/{id:\d+}]',    Module\Filer::class);
                $this->routeCollector->addRoute(['GET'],         '/followers/{owner}',   Module\Followers::class);
@@@ -122,7 -86,6 +123,7 @@@
                        $collector->addRoute(['GET', 'POST'], '[/]',                         Module\Install::class);
                        $collector->addRoute(['GET'],         '/testrewrite',                Module\Install::class);
                });
 +              $this->routeCollector->addRoute(['GET', 'POST'], '/itemsource[/{guid}]', Module\Itemsource::class);
                $this->routeCollector->addRoute(['GET', 'POST'], '/localtime',           Module\Localtime::class);
                $this->routeCollector->addRoute(['GET', 'POST'], '/login',               Module\Login::class);
                $this->routeCollector->addRoute(['GET'],         '/magic',               Module\Magic::class);
@@@ -155,6 -118,43 +156,6 @@@
                $this->routeCollector->addRoute(['GET'],         '/tos',                 Module\Tos::class);
                $this->routeCollector->addRoute(['GET'],         '/webfinger',           Module\WebFinger::class);
                $this->routeCollector->addRoute(['GET'],         '/xrd',                 Module\Xrd::class);
 -
 -              $this->routeCollector->addGroup('/admin', function (RouteCollector $collector) {
 -                      $collector->addRoute(['GET']        , '[/]'                     , Module\Admin\Summary::class);
 -
 -                      $collector->addRoute(['GET', 'POST'], '/addons'                 , Module\Admin\Addons\Index::class);
 -                      $collector->addRoute(['GET', 'POST'], '/addons/{addon}'         , Module\Admin\Addons\Details::class);
 -
 -                      $collector->addRoute(['GET', 'POST'], '/blocklist/contact'      , Module\Admin\Blocklist\Contact::class);
 -                      $collector->addRoute(['GET', 'POST'], '/blocklist/server'       , Module\Admin\Blocklist\Server::class);
 -
 -                      $collector->addRoute(['GET']        , '/dbsync[/check]'         , Module\Admin\DBSync::class);
 -                      $collector->addRoute(['GET']        , '/dbsync/{update:\d+}'    , Module\Admin\DBSync::class);
 -                      $collector->addRoute(['GET']        , '/dbsync/mark/{update:\d+}', Module\Admin\DBSync::class);
 -
 -                      $collector->addRoute(['GET', 'POST'], '/features'               , Module\Admin\Features::class);
 -                      $collector->addRoute(['GET']        , '/federation'             , Module\Admin\Federation::class);
 -
 -                      $collector->addRoute(['GET', 'POST'], '/item/delete'            , Module\Admin\Item\Delete::class);
 -                      $collector->addRoute(['GET', 'POST'], '/item/source[/{guid}]'   , Module\Admin\Item\Source::class);
 -
 -                      $collector->addRoute(['GET']        , '/logs/view'              , Module\Admin\Logs\View::class);
 -                      $collector->addRoute(['GET', 'POST'], '/logs'                   , Module\Admin\Logs\Settings::class);
 -
 -                      $collector->addRoute(['GET']        , '/phpinfo'                , Module\Admin\PhpInfo::class);
 -
 -                      $collector->addRoute(['GET']        , '/queue[/deferred]'       , Module\Admin\Queue::class);
 -
 -                      $collector->addRoute(['GET', 'POST'], '/site'                   , Module\Admin\Site::class);
 -
 -                      $collector->addRoute(['GET', 'POST'], '/themes'                 , Module\Admin\Themes\Index::class);
 -                      $collector->addRoute(['GET', 'POST'], '/themes/{theme}'         , Module\Admin\Themes\Details::class);
 -                      $collector->addRoute(['GET', 'POST'], '/themes/{theme}/embed'   , Module\Admin\Themes\Embed::class);
 -
 -                      $collector->addRoute(['GET', 'POST'], '/tos'                    , Module\Admin\Tos::class);
 -
 -                      $collector->addRoute(['GET', 'POST'], '/users[/{action}/{uid}]' , Module\Admin\Users::class);
 -              });
        }
  
        public function __construct(RouteCollector $routeCollector = null)