From 94774ca5c3d362d8725be3538a1f3d6179ad721a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Thu, 9 Apr 2026 17:04:52 +0200 Subject: [PATCH 1/2] chore: Remove long-time deprecated things from workflowengine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- apps/workflowengine/lib/Service/RuleMatcher.php | 8 ++------ apps/workflowengine/lib/Settings/ASettings.php | 5 ----- lib/public/WorkflowEngine/IRuleMatcher.php | 10 ---------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/apps/workflowengine/lib/Service/RuleMatcher.php b/apps/workflowengine/lib/Service/RuleMatcher.php index 01394cc8e5536..3353875ba1d67 100644 --- a/apps/workflowengine/lib/Service/RuleMatcher.php +++ b/apps/workflowengine/lib/Service/RuleMatcher.php @@ -88,11 +88,8 @@ public function getFlows(bool $returnFirstMatchingOperationOnly = true): array { if (!$this->operation) { throw new RuntimeException('Operation is not set'); } - return $this->getMatchingOperations(get_class($this->operation), $returnFirstMatchingOperationOnly); - } - - public function getMatchingOperations(string $class, bool $returnFirstMatchingOperationOnly = true): array { - $scopes[] = new ScopeContext(IManager::SCOPE_ADMIN); + $class = get_class($this->operation); + $scopes = [new ScopeContext(IManager::SCOPE_ADMIN)]; $user = $this->session->getUser(); if ($user !== null && $this->manager->isUserScopeEnabled()) { $scopes[] = new ScopeContext(IManager::SCOPE_USER, $user->getUID()); @@ -111,7 +108,6 @@ public function getMatchingOperations(string $class, bool $returnFirstMatchingOp } if ($this->entity instanceof IEntity) { - /** @var ScopeContext[] $additionalScopes */ $additionalScopes = $this->manager->getAllConfiguredScopesForOperation($class); foreach ($additionalScopes as $hash => $scopeCandidate) { if ($scopeCandidate->getScope() !== IManager::SCOPE_USER || in_array($scopeCandidate, $scopes)) { diff --git a/apps/workflowengine/lib/Settings/ASettings.php b/apps/workflowengine/lib/Settings/ASettings.php index 354e05b5f6e5b..763f04a690f34 100644 --- a/apps/workflowengine/lib/Settings/ASettings.php +++ b/apps/workflowengine/lib/Settings/ASettings.php @@ -37,11 +37,6 @@ public function __construct( abstract public function getScope(): int; public function getForm(): TemplateResponse { - // @deprecated in 20.0.0: retire this one in favor of the typed event - $this->eventDispatcher->dispatch( - 'OCP\WorkflowEngine::loadAdditionalSettingScripts', - new LoadSettingsScriptsEvent() - ); $this->eventDispatcher->dispatchTyped(new LoadSettingsScriptsEvent()); $entities = $this->manager->getEntitiesList(); diff --git a/lib/public/WorkflowEngine/IRuleMatcher.php b/lib/public/WorkflowEngine/IRuleMatcher.php index 48a0eeea6c13b..323c579e6a340 100644 --- a/lib/public/WorkflowEngine/IRuleMatcher.php +++ b/lib/public/WorkflowEngine/IRuleMatcher.php @@ -17,16 +17,6 @@ * @since 18.0.0 */ interface IRuleMatcher extends IFileCheck { - /** - * This method is left for backwards compatibility and easier porting of - * apps. Please use 'getFlows' instead (and setOperation if you implement - * an IComplexOperation). - * - * @since 18.0.0 - * @deprecated 18.0.0 - */ - public function getMatchingOperations(string $class, bool $returnFirstMatchingOperationOnly = true): array; - /** * @throws RuntimeException * @since 18.0.0 From f445c14b7690dfdecf48160acc46af3aef9db772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Thu, 9 Apr 2026 18:03:18 +0200 Subject: [PATCH 2/2] chore: Update psalm baseline MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- build/psalm-baseline.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 4b115a7e3555f..3a6e76c2f7628 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -2657,11 +2657,6 @@ - - - - -