Bump doctrine/dbal from 2.12.0 to 3.0.0

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

1 files changed, 25 insertions, 17 deletions

diff --git a/lib/private/legacy/OC_DB_StatementWrapper.php b/lib/private/legacy/OC_DB_StatementWrapper.php
index 667c2de9678..cc2320015a3 100644
--- a/lib/private/legacy/OC_DB_StatementWrapper.php
+++ b/lib/private/legacy/OC_DB_StatementWrapper.php
@@ -28,6 +28,8 @@
  *
  */
 
+use OCP\DB\IPreparedStatement;
+
 /**
  * small wrapper around \Doctrine\DBAL\Driver\Statement to make it behave, more like an MDB2 Statement
  *
@@ -38,17 +40,20 @@
  * @method array fetchAll(integer $fetchMode = null);
  */
 class OC_DB_StatementWrapper {
-	/**
-	 * @var \Doctrine\DBAL\Driver\Statement
-	 */
+	/** @var IPreparedStatement */
 	private $statement = null;
+
+	/** @var bool */
 	private $isManipulation = false;
+
+	/** @var array */
 	private $lastArguments = [];
 
 	/**
+	 * @param IPreparedStatement $statement
 	 * @param boolean $isManipulation
 	 */
-	public function __construct($statement, $isManipulation) {
+	public function __construct(IPreparedStatement $statement, $isManipulation) {
 		$this->statement = $statement;
 		$this->isManipulation = $isManipulation;
 	}
@@ -63,31 +68,34 @@ class OC_DB_StatementWrapper {
 	/**
 	 * make execute return the result instead of a bool
 	 *
-	 * @param array $input
+	 * @param mixed[] $input
 	 * @return \OC_DB_StatementWrapper|int|bool
+	 * @deprecated
 	 */
 	public function execute($input = []) {
 		$this->lastArguments = $input;
-		if (count($input) > 0) {
-			$result = $this->statement->execute($input);
-		} else {
-			$result = $this->statement->execute();
-		}
-
-		if ($result === false) {
+		try {
+			if (count($input) > 0) {
+				$result = $this->statement->execute($input);
+			} else {
+				$result = $this->statement->execute();
+			}
+		} catch (\Doctrine\DBAL\Exception $e) {
 			return false;
 		}
+
 		if ($this->isManipulation) {
 			return $this->statement->rowCount();
-		} else {
-			return $this;
 		}
+
+		return $this;
 	}
 
 	/**
 	 * provide an alias for fetch
 	 *
 	 * @return mixed
+	 * @deprecated
 	 */
 	public function fetchRow() {
 		return $this->statement->fetch();
@@ -97,11 +105,11 @@ class OC_DB_StatementWrapper {
 	 * Provide a simple fetchOne.
 	 *
 	 * fetch single column from the next row
-	 * @param int $column the column number to fetch
 	 * @return string
+	 * @deprecated
 	 */
-	public function fetchOne($column = 0) {
-		return $this->statement->fetchColumn($column);
+	public function fetchOne() {
+		return $this->statement->fetchOne();
 	}
 
 	/**