Merge pull request #23764 from nextcloud/3rdparty/doctrine/dbal/2.12.0

[3rdparty] Bump doctrine/dbal to 2.12.0

2 files changed, 21 insertions, 5 deletions

diff --git a/lib/public/DB/QueryBuilder/IQueryBuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php
index 174ab1cc90c..1cffaafaf96 100644
--- a/lib/public/DB/QueryBuilder/IQueryBuilder.php
+++ b/lib/public/DB/QueryBuilder/IQueryBuilder.php
@@ -278,7 +278,7 @@ interface IQueryBuilder {
 	 * Gets the maximum number of results the query object was set to retrieve (the "limit").
 	 * Returns NULL if {@link setMaxResults} was not applied to this query builder.
 	 *
-	 * @return integer The maximum number of results.
+	 * @return int|null The maximum number of results.
 	 * @since 8.2.0
 	 */
 	public function getMaxResults();
diff --git a/lib/public/IDBConnection.php b/lib/public/IDBConnection.php
index 68d0048433c..8e20b5503ba 100644
--- a/lib/public/IDBConnection.php
+++ b/lib/public/IDBConnection.php
@@ -77,13 +77,13 @@ interface IDBConnection {
 	 * If the query is parameterized, a prepared statement is used.
 	 * If an SQLLogger is configured, the execution is logged.
 	 *
-	 * @param string $query The SQL query to execute.
+	 * @param string $sql The SQL query to execute.
 	 * @param string[] $params The parameters to bind to the query, if any.
 	 * @param array $types The types the previous parameters are in.
 	 * @return \Doctrine\DBAL\Driver\Statement The executed statement.
 	 * @since 8.0.0
 	 */
-	public function executeQuery($query, array $params = [], $types = []);
+	public function executeQuery($sql, array $params = [], $types = []);
 
 	/**
 	 * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
@@ -91,13 +91,29 @@ interface IDBConnection {
 	 *
 	 * This method supports PDO binding types as well as DBAL mapping types.
 	 *
-	 * @param string $query The SQL query.
+	 * @param string $sql The SQL query.
 	 * @param array $params The query parameters.
 	 * @param array $types The parameter types.
 	 * @return integer The number of affected rows.
 	 * @since 8.0.0
+	 *
+	 * @deprecated 21.0.0 use executeStatement
+	 */
+	public function executeUpdate($sql, array $params = [], array $types = []);
+
+	/**
+	 * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
+	 * and returns the number of affected rows.
+	 *
+	 * This method supports PDO binding types as well as DBAL mapping types.
+	 *
+	 * @param string $sql The SQL query.
+	 * @param array $params The query parameters.
+	 * @param array $types The parameter types.
+	 * @return integer The number of affected rows.
+	 * @since 21.0.0
 	 */
-	public function executeUpdate($query, array $params = [], array $types = []);
+	public function executeStatement($sql, array $params = [], array $types = []);
 
 	/**
 	 * Used to get the id of the just inserted element