Cleanup tags and Share component

- Port to LoggerInterface - Use IDBConnection and IQueryBuilder instead of raw SQL and OC_DB - Use IEventListener instead of hooks - Remove the now unused OC_DB and OC_DB_StatementWrapper legacy utils Signed-off-by: Carl Schwan <carl@carlschwan.eu>
nextcloud · Sep 19, 2022 · 960b90f · 960b90f
1 parent ca747b9
commit 960b90f
Show file tree

Hide file tree

Showing 16 changed files with 589 additions and 856 deletions.
diff --git a/core/Application.php b/core/Application.php
@@ -49,6 +49,7 @@
 use OC\DB\MissingPrimaryKeyInformation;
 use OC\DB\SchemaWrapper;
 use OC\Metadata\FileEventListener;
+use OC\TagManager;
 use OCP\AppFramework\App;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Events\Node\NodeDeletedEvent;
@@ -78,7 +79,7 @@ public function __construct() {
 
 		$server = $container->getServer();
 		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $server->query(IEventDispatcher::class);
+		$eventDispatcher = $server->get(IEventDispatcher::class);
 
 		$notificationManager = $server->getNotificationManager();
 		$notificationManager->registerNotifierService(CoreNotifier::class);
@@ -325,10 +326,15 @@ function (GenericEvent $event) use ($container) {
 		/** @var IConfig $config */
 		$config = $container->get(IConfig::class);
 		if ($config->getSystemValueBool('enable_file_metadata', true)) {
-			$eventDispatcher = \OC::$server->get(IEventDispatcher::class);
+			/** @psalm-suppress InvalidArgument */
 			$eventDispatcher->addServiceListener(NodeDeletedEvent::class, FileEventListener::class);
+			/** @psalm-suppress InvalidArgument */
 			$eventDispatcher->addServiceListener(NodeRemovedFromCache::class, FileEventListener::class);
+			/** @psalm-suppress InvalidArgument */
 			$eventDispatcher->addServiceListener(NodeWrittenEvent::class, FileEventListener::class);
 		}
+
+		// Tags
+		$eventDispatcher->addServiceListener(UserDeletedEvent::class, TagManager::class);
 	}
 }
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
@@ -1590,8 +1590,6 @@
     'OC\\User\\User' => $baseDir . '/lib/private/User/User.php',
     'OC_API' => $baseDir . '/lib/private/legacy/OC_API.php',
     'OC_App' => $baseDir . '/lib/private/legacy/OC_App.php',
-    'OC_DB' => $baseDir . '/lib/private/legacy/OC_DB.php',
-    'OC_DB_StatementWrapper' => $baseDir . '/lib/private/legacy/OC_DB_StatementWrapper.php',
     'OC_Defaults' => $baseDir . '/lib/private/legacy/OC_Defaults.php',
     'OC_EventSource' => $baseDir . '/lib/private/legacy/OC_EventSource.php',
     'OC_FileChunking' => $baseDir . '/lib/private/legacy/OC_FileChunking.php',

diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
@@ -1623,8 +1623,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\User\\User' => __DIR__ . '/../../..' . '/lib/private/User/User.php',
         'OC_API' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_API.php',
         'OC_App' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_App.php',
-        'OC_DB' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_DB.php',
-        'OC_DB_StatementWrapper' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_DB_StatementWrapper.php',
         'OC_Defaults' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Defaults.php',
         'OC_EventSource' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_EventSource.php',
         'OC_FileChunking' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_FileChunking.php',

diff --git a/lib/private/Accounts/Hooks.php b/lib/private/Accounts/Hooks.php
@@ -32,6 +32,9 @@
 use OCP\User\Events\UserChangedEvent;
 use Psr\Log\LoggerInterface;
 
+/**
+ * @template-implements IEventListener<UserChangedEvent>
+ */
 class Hooks implements IEventListener {
 
 	/** @var IAccountManager */

diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
@@ -50,6 +50,8 @@
 use OC\Files\Mount\MoveableMount;
 use OC\Files\Storage\Storage;
 use OC\User\LazyUser;
+use OC\Share\Share;
+use OC\User\User;
 use OCA\Files_Sharing\SharedMount;
 use OCP\Constants;
 use OCP\Files\Cache\ICacheEntry;
@@ -1800,10 +1802,10 @@ private function targetIsNotShared(IStorage $targetStorage, string $targetIntern
 		}
 
 		// check if any of the parents were shared by the current owner (include collections)
-		$shares = \OCP\Share::getItemShared(
+		$shares = Share::getItemShared(
 			'folder',
 			$fileId,
-			\OCP\Share::FORMAT_NONE,
+			\OC\Share\Constants::FORMAT_NONE,
 			null,
 			true
 		);

diff --git a/lib/private/Metadata/FileEventListener.php b/lib/private/Metadata/FileEventListener.php
@@ -33,6 +33,11 @@
 use OCP\Files\FileInfo;
 use Psr\Log\LoggerInterface;
 
+/**
+ * @template-implements IEventListener<NodeRemovedFromCache>
+ * @template-implements IEventListener<NodeDeletedEvent>
+ * @template-implements IEventListener<NodeWrittenEvent>
+ */
 class FileEventListener implements IEventListener {
 	private IMetadataManager $manager;
 	private LoggerInterface $logger;