Skip to content

Commit b2b3286

Browse files
committed
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>
1 parent ca747b9 commit b2b3286

16 files changed

Lines changed: 589 additions & 856 deletions

File tree

core/Application.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
use OC\DB\MissingPrimaryKeyInformation;
5050
use OC\DB\SchemaWrapper;
5151
use OC\Metadata\FileEventListener;
52+
use OC\TagManager;
5253
use OCP\AppFramework\App;
5354
use OCP\EventDispatcher\IEventDispatcher;
5455
use OCP\Files\Events\Node\NodeDeletedEvent;
@@ -78,7 +79,7 @@ public function __construct() {
7879

7980
$server = $container->getServer();
8081
/** @var IEventDispatcher $eventDispatcher */
81-
$eventDispatcher = $server->query(IEventDispatcher::class);
82+
$eventDispatcher = $server->get(IEventDispatcher::class);
8283

8384
$notificationManager = $server->getNotificationManager();
8485
$notificationManager->registerNotifierService(CoreNotifier::class);
@@ -325,10 +326,15 @@ function (GenericEvent $event) use ($container) {
325326
/** @var IConfig $config */
326327
$config = $container->get(IConfig::class);
327328
if ($config->getSystemValueBool('enable_file_metadata', true)) {
328-
$eventDispatcher = \OC::$server->get(IEventDispatcher::class);
329+
/** @@psalm-suppress InvalidArgument */
329330
$eventDispatcher->addServiceListener(NodeDeletedEvent::class, FileEventListener::class);
331+
/** @@psalm-suppress InvalidArgument */
330332
$eventDispatcher->addServiceListener(NodeRemovedFromCache::class, FileEventListener::class);
333+
/** @@psalm-suppress InvalidArgument */
331334
$eventDispatcher->addServiceListener(NodeWrittenEvent::class, FileEventListener::class);
332335
}
336+
337+
// Tags
338+
$eventDispatcher->addServiceListener(UserDeletedEvent::class, TagManager::class);
333339
}
334340
}

lib/composer/composer/autoload_classmap.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,8 +1590,6 @@
15901590
'OC\\User\\User' => $baseDir . '/lib/private/User/User.php',
15911591
'OC_API' => $baseDir . '/lib/private/legacy/OC_API.php',
15921592
'OC_App' => $baseDir . '/lib/private/legacy/OC_App.php',
1593-
'OC_DB' => $baseDir . '/lib/private/legacy/OC_DB.php',
1594-
'OC_DB_StatementWrapper' => $baseDir . '/lib/private/legacy/OC_DB_StatementWrapper.php',
15951593
'OC_Defaults' => $baseDir . '/lib/private/legacy/OC_Defaults.php',
15961594
'OC_EventSource' => $baseDir . '/lib/private/legacy/OC_EventSource.php',
15971595
'OC_FileChunking' => $baseDir . '/lib/private/legacy/OC_FileChunking.php',

lib/composer/composer/autoload_static.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,8 +1623,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
16231623
'OC\\User\\User' => __DIR__ . '/../../..' . '/lib/private/User/User.php',
16241624
'OC_API' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_API.php',
16251625
'OC_App' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_App.php',
1626-
'OC_DB' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_DB.php',
1627-
'OC_DB_StatementWrapper' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_DB_StatementWrapper.php',
16281626
'OC_Defaults' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Defaults.php',
16291627
'OC_EventSource' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_EventSource.php',
16301628
'OC_FileChunking' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_FileChunking.php',

lib/private/Accounts/Hooks.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
use OCP\User\Events\UserChangedEvent;
3333
use Psr\Log\LoggerInterface;
3434

35+
/**
36+
* @template-implements IEventListener<UserChangedEvent>
37+
*/
3538
class Hooks implements IEventListener {
3639

3740
/** @var IAccountManager */

lib/private/Files/View.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
use OC\Files\Mount\MoveableMount;
5151
use OC\Files\Storage\Storage;
5252
use OC\User\LazyUser;
53+
use OC\Share\Share;
54+
use OC\User\User;
5355
use OCA\Files_Sharing\SharedMount;
5456
use OCP\Constants;
5557
use OCP\Files\Cache\ICacheEntry;
@@ -1800,10 +1802,10 @@ private function targetIsNotShared(IStorage $targetStorage, string $targetIntern
18001802
}
18011803

18021804
// check if any of the parents were shared by the current owner (include collections)
1803-
$shares = \OCP\Share::getItemShared(
1805+
$shares = Share::getItemShared(
18041806
'folder',
18051807
$fileId,
1806-
\OCP\Share::FORMAT_NONE,
1808+
\OC\Share\Constants::FORMAT_NONE,
18071809
null,
18081810
true
18091811
);

lib/private/Metadata/FileEventListener.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@
3333
use OCP\Files\FileInfo;
3434
use Psr\Log\LoggerInterface;
3535

36+
/**
37+
* @template-implements IEventListener<NodeRemovedFromCache>
38+
* @template-implements IEventListener<NodeDeletedEvent>
39+
* @template-implements IEventListener<NodeWrittenEvent>
40+
*/
3641
class FileEventListener implements IEventListener {
3742
private IMetadataManager $manager;
3843
private LoggerInterface $logger;

0 commit comments

Comments
 (0)