From b3780bcedd9d1fd8f92e7a3f3348ebe47f27aa04 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Tue, 17 Mar 2020 15:23:59 +0100
Subject: [PATCH] Annotate $additionalScopes so the IDE knows what type
$scopeCandidate is.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---
apps/workflowengine/lib/Manager.php | 4 ++++
apps/workflowengine/lib/Service/RuleMatcher.php | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/apps/workflowengine/lib/Manager.php b/apps/workflowengine/lib/Manager.php
index 2818238081e..1829bee300f 100644
--- a/apps/workflowengine/lib/Manager.php
+++ b/apps/workflowengine/lib/Manager.php
@@ -163,6 +163,10 @@ class Manager implements IManager {
return $operations;
}
+ /**
+ * @param string $operationClass
+ * @return ScopeContext[]
+ */
public function getAllConfiguredScopesForOperation(string $operationClass): array {
static $scopesByOperation = [];
if (isset($scopesByOperation[$operationClass])) {
diff --git a/apps/workflowengine/lib/Service/RuleMatcher.php b/apps/workflowengine/lib/Service/RuleMatcher.php
index 99a5db8a9d0..70c40e1251a 100644
--- a/apps/workflowengine/lib/Service/RuleMatcher.php
+++ b/apps/workflowengine/lib/Service/RuleMatcher.php
@@ -134,9 +134,9 @@ class RuleMatcher implements IRuleMatcher {
}
if($this->entity instanceof IEntity) {
+ /** @var ScopeContext[] $additionalScopes */
$additionalScopes = $this->manager->getAllConfiguredScopesForOperation($class);
foreach ($additionalScopes as $hash => $scopeCandidate) {
- /** @var ScopeContext $scopeCandidate */
if ($scopeCandidate->getScope() !== IManager::SCOPE_USER || in_array($scopeCandidate, $scopes)) {
continue;
}
--
GitLab