diff --git a/core/Controller/UpdateController.php b/core/Controller/UpdateController.php index fee14e00dc7fc..14308c12d51f5 100644 --- a/core/Controller/UpdateController.php +++ b/core/Controller/UpdateController.php @@ -25,6 +25,7 @@ use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\Attribute\PublicPage; use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\OCSController; use OCP\EventDispatcher\IEventDispatcher; use OCP\IConfig; use OCP\IEventSourceFactory; @@ -34,7 +35,7 @@ use Psr\Log\LoggerInterface; #[OpenAPI(scope: OpenApi::SCOPE_IGNORE)] -class UpdateController extends \OCP\AppFramework\OCSController { +class UpdateController extends OCSController { public function __construct( string $appName, IRequest $request, diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index cee84b9c8c6b0..8d79e9dd5b5d7 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -24,8 +24,6 @@ use OCP\Files\Cache\CacheEntryInsertedEvent; use OCP\Files\Cache\CacheEntryRemovedEvent; use OCP\Files\Cache\CacheEntryUpdatedEvent; -use OCP\Files\Cache\CacheInsertEvent; -use OCP\Files\Cache\CacheUpdateEvent; use OCP\Files\Cache\ICache; use OCP\Files\Cache\ICacheEntry; use OCP\Files\Config\IUserMountCache; @@ -333,7 +331,7 @@ public function insert($file, array $data) { } $event = new CacheEntryInsertedEvent($this->storage, $file, $fileId, $storageId); - $this->eventDispatcher->dispatch(CacheInsertEvent::class, $event); + $this->eventDispatcher->dispatch(CacheEntryInsertedEvent::class, $event); $this->eventDispatcher->dispatchTyped($event); return $fileId; } @@ -437,7 +435,7 @@ public function update($id, array $data) { // path can still be null if the file doesn't exist if ($path !== null) { $event = new CacheEntryUpdatedEvent($this->storage, $path, $id, $this->getNumericStorageId()); - $this->eventDispatcher->dispatch(CacheUpdateEvent::class, $event); + $this->eventDispatcher->dispatch(CacheEntryUpdatedEvent::class, $event); $this->eventDispatcher->dispatchTyped($event); } } @@ -851,11 +849,11 @@ public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) { $this->eventDispatcher->dispatchTyped(new CacheEntriesRemovedEvent([$event])); $event = new CacheEntryInsertedEvent($this->storage, $targetPath, $sourceId, $this->getNumericStorageId()); - $this->eventDispatcher->dispatch(CacheInsertEvent::class, $event); + $this->eventDispatcher->dispatch(CacheEntryInsertedEvent::class, $event); $this->eventDispatcher->dispatchTyped($event); } else { $event = new CacheEntryUpdatedEvent($this->storage, $targetPath, $sourceId, $this->getNumericStorageId()); - $this->eventDispatcher->dispatch(CacheUpdateEvent::class, $event); + $this->eventDispatcher->dispatch(CacheEntryUpdatedEvent::class, $event); $this->eventDispatcher->dispatchTyped($event); } } else {