mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20003 from nextcloud/enh/19989/type-additional-scoes 

Annotate $additionalScopes so the IDE knows what type $scopeCandidate is
This commit is contained in:
Joas Schilling 2020-03-18 15:32:39 +01:00 committed by GitHub
parent ca54813cbb b3780bcedd
commit 570f3c7798
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/workflowengine/lib/Manager.php
View File

@ -163,6 +163,10 @@ class Manager implements IManager {
return $operations; return $operations;
} }
/**
* @param string $operationClass
* @return ScopeContext[]
*/
public function getAllConfiguredScopesForOperation(string $operationClass): array { public function getAllConfiguredScopesForOperation(string $operationClass): array {
static $scopesByOperation = []; static $scopesByOperation = [];
if (isset($scopesByOperation[$operationClass])) { if (isset($scopesByOperation[$operationClass])) {

2
apps/workflowengine/lib/Service/RuleMatcher.php
View File

@ -134,9 +134,9 @@ class RuleMatcher implements IRuleMatcher {
} }
if($this->entity instanceof IEntity) { if($this->entity instanceof IEntity) {
/** @var ScopeContext[] $additionalScopes */
$additionalScopes = $this->manager->getAllConfiguredScopesForOperation($class); $additionalScopes = $this->manager->getAllConfiguredScopesForOperation($class);
foreach ($additionalScopes as $hash => $scopeCandidate) { foreach ($additionalScopes as $hash => $scopeCandidate) {
/** @var ScopeContext $scopeCandidate */
if ($scopeCandidate->getScope() !== IManager::SCOPE_USER || in_array($scopeCandidate, $scopes)) { if ($scopeCandidate->getScope() !== IManager::SCOPE_USER || in_array($scopeCandidate, $scopes)) {
continue; continue;
} }