Skip to content

Commit b839335

Browse files
Merge pull request #60797 from nextcloud/chore/cache/remove-deprecated-events
chore(Cache): Remove deprecated insert and update events
2 parents eeecb3e + b1724db commit b839335

5 files changed

Lines changed: 0 additions & 43 deletions

File tree

lib/composer/composer/autoload_classmap.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,6 @@
417417
'OCP\\Files\\Cache\\CacheEntryInsertedEvent' => $baseDir . '/lib/public/Files/Cache/CacheEntryInsertedEvent.php',
418418
'OCP\\Files\\Cache\\CacheEntryRemovedEvent' => $baseDir . '/lib/public/Files/Cache/CacheEntryRemovedEvent.php',
419419
'OCP\\Files\\Cache\\CacheEntryUpdatedEvent' => $baseDir . '/lib/public/Files/Cache/CacheEntryUpdatedEvent.php',
420-
'OCP\\Files\\Cache\\CacheInsertEvent' => $baseDir . '/lib/public/Files/Cache/CacheInsertEvent.php',
421-
'OCP\\Files\\Cache\\CacheUpdateEvent' => $baseDir . '/lib/public/Files/Cache/CacheUpdateEvent.php',
422420
'OCP\\Files\\Cache\\ICache' => $baseDir . '/lib/public/Files/Cache/ICache.php',
423421
'OCP\\Files\\Cache\\ICacheEntry' => $baseDir . '/lib/public/Files/Cache/ICacheEntry.php',
424422
'OCP\\Files\\Cache\\ICacheEvent' => $baseDir . '/lib/public/Files/Cache/ICacheEvent.php',

lib/composer/composer/autoload_static.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,8 +458,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
458458
'OCP\\Files\\Cache\\CacheEntryInsertedEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/CacheEntryInsertedEvent.php',
459459
'OCP\\Files\\Cache\\CacheEntryRemovedEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/CacheEntryRemovedEvent.php',
460460
'OCP\\Files\\Cache\\CacheEntryUpdatedEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/CacheEntryUpdatedEvent.php',
461-
'OCP\\Files\\Cache\\CacheInsertEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/CacheInsertEvent.php',
462-
'OCP\\Files\\Cache\\CacheUpdateEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/CacheUpdateEvent.php',
463461
'OCP\\Files\\Cache\\ICache' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/ICache.php',
464462
'OCP\\Files\\Cache\\ICacheEntry' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/ICacheEntry.php',
465463
'OCP\\Files\\Cache\\ICacheEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/ICacheEvent.php',

lib/private/Files/Cache/Cache.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,6 @@ public function update($id, array $data) {
434434
// path can still be null if the file doesn't exist
435435
if ($path !== null) {
436436
$event = new CacheEntryUpdatedEvent($this->storage, $path, $id, $this->getNumericStorageId());
437-
$this->eventDispatcher->dispatch(CacheEntryUpdatedEvent::class, $event);
438437
$this->eventDispatcher->dispatchTyped($event);
439438
}
440439
}
@@ -848,11 +847,9 @@ public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
848847
$this->eventDispatcher->dispatchTyped(new CacheEntriesRemovedEvent([$event]));
849848

850849
$event = new CacheEntryInsertedEvent($this->storage, $targetPath, $sourceId, $this->getNumericStorageId());
851-
$this->eventDispatcher->dispatch(CacheEntryInsertedEvent::class, $event);
852850
$this->eventDispatcher->dispatchTyped($event);
853851
} else {
854852
$event = new CacheEntryUpdatedEvent($this->storage, $targetPath, $sourceId, $this->getNumericStorageId());
855-
$this->eventDispatcher->dispatch(CacheEntryUpdatedEvent::class, $event);
856853
$this->eventDispatcher->dispatchTyped($event);
857854
}
858855
} else {

lib/public/Files/Cache/CacheInsertEvent.php

Lines changed: 0 additions & 18 deletions
This file was deleted.

lib/public/Files/Cache/CacheUpdateEvent.php

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)