From e12e2ae8a3dc6905632a1719dd425d4df5c53b42 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 22 Mar 2021 20:09:25 +0100 Subject: [PATCH] Make psalm happy Signed-off-by: Roeland Jago Douma --- lib/private/DB/QueryBuilder/QueryBuilder.php | 5 +++-- lib/public/DB/QueryBuilder/IQueryBuilder.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php index fb28fa2864..352829a56a 100644 --- a/lib/private/DB/QueryBuilder/QueryBuilder.php +++ b/lib/private/DB/QueryBuilder/QueryBuilder.php @@ -48,6 +48,7 @@ use OC\DB\QueryBuilder\FunctionBuilder\SqliteFunctionBuilder; use OC\DB\ResultAdapter; use OC\SystemConfig; use OCP\DB\IResult; +use OCP\DB\QueryBuilder\ICompositeExpression; use OCP\DB\QueryBuilder\ILiteral; use OCP\DB\QueryBuilder\IParameter; use OCP\DB\QueryBuilder\IQueryBuilder; @@ -282,7 +283,7 @@ class QueryBuilder implements IQueryBuilder { 'app' => 'core', ]); } - + $result = $this->queryBuilder->execute(); if (is_int($result)) { return $result; @@ -720,7 +721,7 @@ class QueryBuilder implements IQueryBuilder { * @param string $fromAlias The alias that points to a from clause. * @param string $join The table name to join. * @param string $alias The alias of the join table. - * @param string $condition The condition for the join. + * @param string|null|ICompositeExpression $condition The condition for the join. * * @return $this This QueryBuilder instance. */ diff --git a/lib/public/DB/QueryBuilder/IQueryBuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php index 24de7b4ce6..269203ce15 100644 --- a/lib/public/DB/QueryBuilder/IQueryBuilder.php +++ b/lib/public/DB/QueryBuilder/IQueryBuilder.php @@ -492,7 +492,7 @@ interface IQueryBuilder { * @param string $fromAlias The alias that points to a from clause. * @param string $join The table name to join. * @param string $alias The alias of the join table. - * @param string $condition The condition for the join. + * @param string|null|ICompositeExpression $condition The condition for the join. * * @return $this This QueryBuilder instance. * @since 8.2.0