fix(workflowengine): use andWhere() not second where()

- an unconditional where() condition is added right before
- fixes also wrongly named methods in the Exception message

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

diff --git a/apps/workflowengine/lib/Manager.php b/apps/workflowengine/lib/Manager.php
index 28bc4417bb92a7bbc5b8a05ae9a12b2f7f4da0c0..d8be5e4f8df32da2787b057ba33a61e7e37bcac5 100644 (file)
--- a/apps/workflowengine/lib/Manager.php
+++ b/apps/workflowengine/lib/Manager.php
@@ -333,7 +333,7 @@ class Manager implements IManager {
                        ->where($qb->expr()->eq('s.type', $qb->createParameter('scope')));
 
                if ($scopeContext->getScope() !== IManager::SCOPE_ADMIN) {
-                       $qb->where($qb->expr()->eq('s.value', $qb->createParameter('scopeId')));
+                       $qb->andWhere($qb->expr()->eq('s.value', $qb->createParameter('scopeId')));
                }
 
                $qb->setParameters(['scope' => $scopeContext->getScope(), 'scopeId' => $scopeContext->getScopeId()]);

diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php
index 30dc02b0c162d76ff76787f42f3809ab790004b2..c2818911ccf8897cd6dbe164259947c1a4255894 100644 (file)
--- a/lib/private/DB/QueryBuilder/QueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/QueryBuilder.php
@@ -866,7 +866,7 @@ class QueryBuilder implements IQueryBuilder {
        public function where(...$predicates) {
                if ($this->getQueryPart('where') !== null && $this->systemConfig->getValue('debug', false)) {
                        // Only logging a warning, not throwing for now.
-                       $e = new QueryException('Using where() on non-empty WHERE part, please verify it is intentional to not call whereAnd() or whereOr() instead. Otherwise consider creating a new query builder object or call resetQueryPart(\'where\') first.');
+                       $e = new QueryException('Using where() on non-empty WHERE part, please verify it is intentional to not call andWhere() or orWhere() instead. Otherwise consider creating a new query builder object or call resetQueryPart(\'where\') first.');
                        $this->logger->warning($e->getMessage(), ['exception' => $e]);
                }