Skip to content

chore: Remove long-time deprecated things from workflowengine #59543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarlSchwan merged 2 commits into from
Apr 10, 2026
+2 −26
Merged

chore: Remove long-time deprecated things from workflowengine #59543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94774ca
chore: Remove long-time deprecated things from workflowengine
come-nc Apr 9, 2026
f445c14
chore: Update psalm baseline
come-nc Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions apps/workflowengine/lib/Service/RuleMatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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)) {
Expand Down
5 changes: 0 additions & 5 deletions apps/workflowengine/lib/Settings/ASettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
5 changes: 0 additions & 5 deletions build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2657,11 +2657,6 @@
<code><![CDATA[getSubject]]></code>
</DeprecatedMethod>
</file>
<file src="apps/workflowengine/lib/Settings/ASettings.php">
<DeprecatedMethod>
<code><![CDATA[dispatch]]></code>
</DeprecatedMethod>
</file>
<file src="core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php">
<DeprecatedClass>
<code><![CDATA[Files::rmdirr($dir)]]></code>
Expand Down
10 changes: 0 additions & 10 deletions lib/public/WorkflowEngine/IRuleMatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading