From: Côme Chilliet <come.chilliet@nextcloud.com>
Date: Thu, 21 Oct 2021 10:41:01 +0000 (+0200)
Subject: Fix default value for $type in OC\DB\QueryBuilder\ExpressionBuilder\ExpressionBuilder... 
X-Git-Tag: v24.0.0beta1~641^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=18a91f02fadf108bfa1a60f258ebacd2f802224b;p=nextcloud-server.git

Fix default value for $type in OC\DB\QueryBuilder\ExpressionBuilder\ExpressionBuilder::literal

This fixes PHP errors about passing null to PDO::quote second parameter.
We may want to change IExpressionBuilder as well?

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---

diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php
index c35afd0870b..77a4a02128a 100644
--- a/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php
+++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php
@@ -414,11 +414,11 @@ class ExpressionBuilder implements IExpressionBuilder {
 	 * Quotes a given input parameter.
 	 *
 	 * @param mixed $input The parameter to be quoted.
-	 * @param mixed|null $type One of the IQueryBuilder::PARAM_* constants
+	 * @param int $type One of the IQueryBuilder::PARAM_* constants
 	 *
 	 * @return ILiteral
 	 */
-	public function literal($input, $type = null): ILiteral {
+	public function literal($input, $type = IQueryBuilder::PARAM_STR): ILiteral {
 		return new Literal($this->expressionBuilder->literal($input, $type));
 	}
 
diff --git a/lib/public/DB/QueryBuilder/IExpressionBuilder.php b/lib/public/DB/QueryBuilder/IExpressionBuilder.php
index 77701240d51..4758fd06208 100644
--- a/lib/public/DB/QueryBuilder/IExpressionBuilder.php
+++ b/lib/public/DB/QueryBuilder/IExpressionBuilder.php
@@ -418,7 +418,7 @@ interface IExpressionBuilder {
 	 * Quotes a given input parameter.
 	 *
 	 * @param mixed $input The parameter to be quoted.
-	 * @param mixed|null $type One of the IQueryBuilder::PARAM_* constants
+	 * @param int $type One of the IQueryBuilder::PARAM_* constants
 	 *
 	 * @return ILiteral
 	 * @since 8.2.0
@@ -426,7 +426,7 @@ interface IExpressionBuilder {
 	 * @psalm-taint-sink sql $input
 	 * @psalm-taint-sink sql $type
 	 */
-	public function literal($input, $type = null): ILiteral;
+	public function literal($input, $type = IQueryBuilder::PARAM_STR): ILiteral;
 
 	/**
 	 * Returns a IQueryFunction that casts the column to the given type