From: Art4 <art4@wlabs.de>
Date: Tue, 11 Feb 2025 09:59:13 +0000 (+0000)
Subject: Merge branch 'develop' into replace-hooks-with-eventdispatcher
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dd6f479401c6c0cc5a70ba4132648d8667f0b140;p=friendica.git

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

dd6f479401c6c0cc5a70ba4132648d8667f0b140
diff --cc mod/photos.php
index 25eac8c533,1294406761..82b5e43960
--- a/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 5490f07e19,c5abd56c5c..439b0a743b
--- a/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());