3 files changed, 13 insertions, 47 deletions

diff --git a/lib/private/SystemTag/ManagerFactory.php b/lib/private/SystemTag/ManagerFactory.php
index ca0508fe19b..6670922407e 100644
--- a/lib/private/SystemTag/ManagerFactory.php
+++ b/lib/private/SystemTag/ManagerFactory.php
@@ -26,6 +26,7 @@ declare(strict_types=1);
  */
 namespace OC\SystemTag;
 
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IServerContainer;
 use OCP\SystemTag\ISystemTagManager;
 use OCP\SystemTag\ISystemTagManagerFactory;
@@ -64,7 +65,7 @@ class ManagerFactory implements ISystemTagManagerFactory {
 		return new SystemTagManager(
 			$this->serverContainer->getDatabaseConnection(),
 			$this->serverContainer->getGroupManager(),
-			$this->serverContainer->getEventDispatcher()
+			$this->serverContainer->get(IEventDispatcher::class),
 		);
 	}
 
@@ -79,7 +80,7 @@ class ManagerFactory implements ISystemTagManagerFactory {
 		return new SystemTagObjectMapper(
 			$this->serverContainer->getDatabaseConnection(),
 			$this->getManager(),
-			$this->serverContainer->getEventDispatcher()
+			$this->serverContainer->get(IEventDispatcher::class),
 		);
 	}
 }
diff --git a/lib/private/SystemTag/SystemTagManager.php b/lib/private/SystemTag/SystemTagManager.php
index 65046ebf000..a2285752361 100644
--- a/lib/private/SystemTag/SystemTagManager.php
+++ b/lib/private/SystemTag/SystemTagManager.php
@@ -31,6 +31,7 @@ namespace OC\SystemTag;
 
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IUser;
@@ -39,7 +40,6 @@ use OCP\SystemTag\ISystemTagManager;
 use OCP\SystemTag\ManagerEvent;
 use OCP\SystemTag\TagAlreadyExistsException;
 use OCP\SystemTag\TagNotFoundException;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Manager class for system tags
@@ -48,15 +48,6 @@ class SystemTagManager implements ISystemTagManager {
 	public const TAG_TABLE = 'systemtag';
 	public const TAG_GROUP_TABLE = 'systemtag_group';
 
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var EventDispatcherInterface */
-	protected $dispatcher;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
 	/**
 	 * Prepared query for selecting tags directly
 	 *
@@ -64,22 +55,11 @@ class SystemTagManager implements ISystemTagManager {
 	 */
 	private $selectTagQuery;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param IDBConnection $connection database connection
-	 * @param IGroupManager $groupManager
-	 * @param EventDispatcherInterface $dispatcher
-	 */
 	public function __construct(
-		IDBConnection $connection,
-		IGroupManager $groupManager,
-		EventDispatcherInterface $dispatcher
+		protected IDBConnection $connection,
+		protected IGroupManager $groupManager,
+		protected IEventDispatcher $dispatcher,
 	) {
-		$this->connection = $connection;
-		$this->groupManager = $groupManager;
-		$this->dispatcher = $dispatcher;
-
 		$query = $this->connection->getQueryBuilder();
 		$this->selectTagQuery = $query->select('*')
 			->from(self::TAG_TABLE)
diff --git a/lib/private/SystemTag/SystemTagObjectMapper.php b/lib/private/SystemTag/SystemTagObjectMapper.php
index 864ba3e91a8..66a21e58609 100644
--- a/lib/private/SystemTag/SystemTagObjectMapper.php
+++ b/lib/private/SystemTag/SystemTagObjectMapper.php
@@ -29,37 +29,22 @@ namespace OC\SystemTag;
 
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IDBConnection;
 use OCP\SystemTag\ISystemTag;
 use OCP\SystemTag\ISystemTagManager;
 use OCP\SystemTag\ISystemTagObjectMapper;
 use OCP\SystemTag\MapperEvent;
 use OCP\SystemTag\TagNotFoundException;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class SystemTagObjectMapper implements ISystemTagObjectMapper {
 	public const RELATION_TABLE = 'systemtag_object_mapping';
 
-	/** @var ISystemTagManager */
-	protected $tagManager;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var EventDispatcherInterface */
-	protected $dispatcher;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param IDBConnection $connection database connection
-	 * @param ISystemTagManager $tagManager system tag manager
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(IDBConnection $connection, ISystemTagManager $tagManager, EventDispatcherInterface $dispatcher) {
-		$this->connection = $connection;
-		$this->tagManager = $tagManager;
-		$this->dispatcher = $dispatcher;
+	public function __construct(
+		protected IDBConnection $connection,
+		protected ISystemTagManager $tagManager,
+		protected IEventDispatcher $dispatcher,
+	) {
 	}
 
 	/**