From 2f73fb2696cf99dbe32b81c7aa4fb37f959810d1 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Tue, 15 Sep 2026 23:53:54 +0200 Subject: [PATCH] chore(files_versions): drop the deprecated \OCP\Versions rollback hook The listener only bridged VersionRestoredEvent to the legacy hook, was deprecated in 32.0.0 as "removed in the next version", and has no listeners left. The typed event keeps its consumers. Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Ferdinand Thiessen --- .../composer/composer/autoload_classmap.php | 1 - .../composer/composer/autoload_static.php | 1 - .../lib/AppInfo/Application.php | 3 -- .../lib/Listener/LegacyRollbackListener.php | 37 ------------------- build/psalm-baseline.xml | 5 --- 5 files changed, 47 deletions(-) delete mode 100644 apps/files_versions/lib/Listener/LegacyRollbackListener.php diff --git a/apps/files_versions/composer/composer/autoload_classmap.php b/apps/files_versions/composer/composer/autoload_classmap.php index c66020648df81..10a5c50a108ca 100644 --- a/apps/files_versions/composer/composer/autoload_classmap.php +++ b/apps/files_versions/composer/composer/autoload_classmap.php @@ -23,7 +23,6 @@ 'OCA\\Files_Versions\\Expiration' => $baseDir . '/../lib/Expiration.php', 'OCA\\Files_Versions\\Listener\\CreateVersionListenerForWorkflow' => $baseDir . '/../lib/Listener/CreateVersionListenerForWorkflow.php', 'OCA\\Files_Versions\\Listener\\FileEventsListener' => $baseDir . '/../lib/Listener/FileEventsListener.php', - 'OCA\\Files_Versions\\Listener\\LegacyRollbackListener' => $baseDir . '/../lib/Listener/LegacyRollbackListener.php', 'OCA\\Files_Versions\\Listener\\LoadAdditionalListener' => $baseDir . '/../lib/Listener/LoadAdditionalListener.php', 'OCA\\Files_Versions\\Listener\\LoadSidebarListener' => $baseDir . '/../lib/Listener/LoadSidebarListener.php', 'OCA\\Files_Versions\\Listener\\RegisterWorkflowIntegrationListener' => $baseDir . '/../lib/Listener/RegisterWorkflowIntegrationListener.php', diff --git a/apps/files_versions/composer/composer/autoload_static.php b/apps/files_versions/composer/composer/autoload_static.php index 0d2673c4fcf8d..d24a924ed9689 100644 --- a/apps/files_versions/composer/composer/autoload_static.php +++ b/apps/files_versions/composer/composer/autoload_static.php @@ -38,7 +38,6 @@ class ComposerStaticInitFiles_Versions 'OCA\\Files_Versions\\Expiration' => __DIR__ . '/..' . '/../lib/Expiration.php', 'OCA\\Files_Versions\\Listener\\CreateVersionListenerForWorkflow' => __DIR__ . '/..' . '/../lib/Listener/CreateVersionListenerForWorkflow.php', 'OCA\\Files_Versions\\Listener\\FileEventsListener' => __DIR__ . '/..' . '/../lib/Listener/FileEventsListener.php', - 'OCA\\Files_Versions\\Listener\\LegacyRollbackListener' => __DIR__ . '/..' . '/../lib/Listener/LegacyRollbackListener.php', 'OCA\\Files_Versions\\Listener\\LoadAdditionalListener' => __DIR__ . '/..' . '/../lib/Listener/LoadAdditionalListener.php', 'OCA\\Files_Versions\\Listener\\LoadSidebarListener' => __DIR__ . '/..' . '/../lib/Listener/LoadSidebarListener.php', 'OCA\\Files_Versions\\Listener\\RegisterWorkflowIntegrationListener' => __DIR__ . '/..' . '/../lib/Listener/RegisterWorkflowIntegrationListener.php', diff --git a/apps/files_versions/lib/AppInfo/Application.php b/apps/files_versions/lib/AppInfo/Application.php index f542f8b770d1e..da0ee7cbdc801 100644 --- a/apps/files_versions/lib/AppInfo/Application.php +++ b/apps/files_versions/lib/AppInfo/Application.php @@ -13,10 +13,8 @@ use OCA\Files\Event\LoadSidebar; use OCA\Files_Versions\Capabilities; use OCA\Files_Versions\Events\CreateVersionEvent; -use OCA\Files_Versions\Events\VersionRestoredEvent; use OCA\Files_Versions\Listener\CreateVersionListenerForWorkflow; use OCA\Files_Versions\Listener\FileEventsListener; -use OCA\Files_Versions\Listener\LegacyRollbackListener; use OCA\Files_Versions\Listener\LoadAdditionalListener; use OCA\Files_Versions\Listener\LoadSidebarListener; use OCA\Files_Versions\Listener\RegisterWorkflowIntegrationListener; @@ -91,7 +89,6 @@ public function register(IRegistrationContext $context): void { // we add the version author listener with lower priority to make sure new versions already are created by FileEventsListener $context->registerEventListener(NodeWrittenEvent::class, VersionAuthorListener::class, -1); - $context->registerEventListener(VersionRestoredEvent::class, LegacyRollbackListener::class); // WFE integration $context->registerEventListener(RegisterOperationsEvent::class, RegisterWorkflowIntegrationListener::class); diff --git a/apps/files_versions/lib/Listener/LegacyRollbackListener.php b/apps/files_versions/lib/Listener/LegacyRollbackListener.php deleted file mode 100644 index 7aaa9c0839225..0000000000000 --- a/apps/files_versions/lib/Listener/LegacyRollbackListener.php +++ /dev/null @@ -1,37 +0,0 @@ - - */ -class LegacyRollbackListener implements IEventListener { - #[\Override] - public function handle(Event $event): void { - if (!($event instanceof VersionRestoredEvent)) { - return; - } - $version = $event->getVersion(); - \OC_Hook::emit('\OCP\Versions', 'rollback', [ - 'path' => $version->getVersionPath(), - 'revision' => $version->getRevisionId(), - 'node' => $version->getSourceFile(), - ]); - } -} diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 22bd5d5cb7a1d..55c028de770d0 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -1977,11 +1977,6 @@ - - - - -