Merge branch 'develop' into replace-hooks-with-eventdispatcher

diff --cc mod/photos.php
index 25eac8c5331f3f005afd55ae1872664a8ec756ed,1294406761810572d411f79d9e99582d67741d55..82b5e43960d68a3708a2c4329072b53876d02cb8
--- 1/mod/photos.php
--- 2/mod/photos.php
+++ b/mod/photos.php
@@@ -11,7 -11,7 +11,6 @@@ use Friendica\Content\Nav
  use Friendica\Content\Pager;
  use Friendica\Content\Text\BBCode;
  use Friendica\Core\ACL;
- use Friendica\Core\Addon;
 -use Friendica\Core\Hook;
  use Friendica\Core\Renderer;
  use Friendica\Core\System;
  use Friendica\Database\DBA;

diff --cc src/App/Router.php
index 5490f07e19a52d6457317607e32fd2d12df0e074,c5abd56c5c394c7f52d6b1d5767f3484abf1f4b9..439b0a743bfe5ed11c720841feb41446bb71a97d
--- 1/src/App/Router.php
--- 2/src/App/Router.php
+++ b/src/App/Router.php
@@@ -86,8 -84,8 +86,10 @@@ class Route
        /** @var LoggerInterface */
        private $logger;
  
 +      private EventDispatcherInterface $eventDispatcher;
 +
+       private AddonHelper $addonHelper;
+ 
        /** @var bool */
        private $isLocalUser;
  
@@@ -112,7 -110,7 +114,7 @@@
         * @param IHandleUserSessions $userSession
         * @param RouteCollector|null $routeCollector
         */
-       public function __construct(array $server, string $baseRoutesFilepath, L10n $l10n, ICanCache $cache, ICanLock $lock, IManageConfigValues $config, Arguments $args, LoggerInterface $logger, EventDispatcherInterface $eventDispatcher, IHandleUserSessions $userSession, RouteCollector $routeCollector = null)
 -      public function __construct(array $server, string $baseRoutesFilepath, L10n $l10n, ICanCache $cache, ICanLock $lock, IManageConfigValues $config, Arguments $args, LoggerInterface $logger, AddonHelper $addonHelper, IHandleUserSessions $userSession, RouteCollector $routeCollector = null)
++      public function __construct(array $server, string $baseRoutesFilepath, L10n $l10n, ICanCache $cache, ICanLock $lock, IManageConfigValues $config, Arguments $args, LoggerInterface $logger, EventDispatcherInterface $eventDispatcher, AddonHelper $addonHelper, IHandleUserSessions $userSession, RouteCollector $routeCollector = null)
        {
                $this->baseRoutesFilepath = $baseRoutesFilepath;
                $this->l10n               = $l10n;
@@@ -122,7 -120,7 +124,8 @@@
                $this->config             = $config;
                $this->server             = $server;
                $this->logger             = $logger;
 +              $this->eventDispatcher    = $eventDispatcher;
+               $this->addonHelper        = $addonHelper;
                $this->isLocalUser        = !empty($userSession->getLocalUserId());
  
                $this->routeCollector = $routeCollector ?? new RouteCollector(new Std(), new GroupCountBased());