Type-hint Connection methods

doctrine · Oct 31, 2018 · 5da6be5 · 5da6be5
1 parent 6050d05
commit 5da6be5
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 21 deletions.
diff --git a/lib/Doctrine/DBAL/Connection.php b/lib/Doctrine/DBAL/Connection.php
@@ -814,12 +814,12 @@ public function quoteIdentifier($str)
     /**
      * Quotes a given input parameter.
      *
-     * @param mixed    $input The parameter to be quoted.
-     * @param int|null $type  The type of the parameter.
+     * @param mixed $input The parameter to be quoted.
+     * @param int   $type  The type of the parameter.
      *
      * @return string The quoted parameter.
      */
-    public function quote($input, $type = null)
+    public function quote($input, $type = ParameterType::STRING) : string
     {
         $this->connect();
 
@@ -1110,7 +1110,7 @@ public function errorInfo()
      *
      * @return string A string representation of the last inserted ID.
      */
-    public function lastInsertId($seqName = null)
+    public function lastInsertId(string $seqName = null) : string
     {
         $this->connect();
 

diff --git a/lib/Doctrine/DBAL/Driver/Connection.php b/lib/Doctrine/DBAL/Driver/Connection.php
@@ -28,12 +28,14 @@ public function query(string $sql) : ResultStatement;
     /**
      * Quotes a string for use in a query.
      *
+     * If the driver does not support quoting, an exception is thrown.
+     *
      * @param mixed $input
      * @param int   $type
      *
-     * @return mixed
+     * @return string
      */
-    public function quote($input, $type = ParameterType::STRING);
+    public function quote($input, $type = ParameterType::STRING) : string;
 
     /**
      * Executes an SQL statement and return the number of affected rows.
@@ -49,7 +51,7 @@ public function exec(string $statement) : int;
      *
      * @return string
      */
-    public function lastInsertId($name = null);
+    public function lastInsertId(string $name = null) : string;
 
     /**
      * Initiates a transaction.

diff --git a/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php
@@ -98,7 +98,7 @@ public function query(string $sql) : ResultStatement
     /**
      * {@inheritdoc}
      */
-    public function quote($input, $type = ParameterType::STRING)
+    public function quote($input, $type = ParameterType::STRING) : string
     {
         $input = db2_escape_string($input);
 
@@ -126,7 +126,7 @@ public function exec(string $statement) : int
     /**
      * {@inheritdoc}
      */
-    public function lastInsertId($name = null)
+    public function lastInsertId(string $name = null) : string
     {
         return db2_last_insert_id($this->conn);
     }

diff --git a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php b/lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
@@ -146,7 +146,7 @@ public function query(string $sql) : ResultStatement
     /**
      * {@inheritdoc}
      */
-    public function quote($input, $type = ParameterType::STRING)
+    public function quote($input, $type = ParameterType::STRING) : string
     {
         return "'" . $this->conn->escape_string($input) . "'";
     }
@@ -166,7 +166,7 @@ public function exec(string $statement) : int
     /**
      * {@inheritdoc}
      */
-    public function lastInsertId($name = null)
+    public function lastInsertId(string $name = null) : string
     {
         return $this->conn->insert_id;
     }

diff --git a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php
@@ -115,7 +115,7 @@ public function query(string $sql) : ResultStatement
     /**
      * {@inheritdoc}
      */
-    public function quote($value, $type = ParameterType::STRING)
+    public function quote($value, $type = ParameterType::STRING) : string
     {
         if (is_int($value) || is_float($value)) {
             return $value;
@@ -139,7 +139,7 @@ public function exec(string $statement) : int
     /**
      * {@inheritdoc}
      */
-    public function lastInsertId($name = null)
+    public function lastInsertId(string $name = null) : string
     {
         if ($name === null) {
             return false;

diff --git a/lib/Doctrine/DBAL/Driver/PDOConnection.php b/lib/Doctrine/DBAL/Driver/PDOConnection.php
@@ -84,15 +84,15 @@ public function query(string $sql) : ResultStatement
     /**
      * {@inheritdoc}
      */
-    public function quote($input, $type = ParameterType::STRING)
+    public function quote($input, $type = ParameterType::STRING) : string
     {
         return $this->connection->quote($input, $type);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function lastInsertId($name = null)
+    public function lastInsertId(string $name = null) : string
     {
         return $this->connection->lastInsertId($name);
     }

diff --git a/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php b/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php
@@ -16,7 +16,7 @@ class Connection extends PDOConnection implements \Doctrine\DBAL\Driver\Connecti
     /**
      * {@inheritDoc}
      */
-    public function lastInsertId($name = null)
+    public function lastInsertId(string $name = null) : string
     {
         if ($name === null) {
             return parent::lastInsertId($name);
@@ -31,7 +31,7 @@ public function lastInsertId($name = null)
     /**
      * {@inheritDoc}
      */
-    public function quote($value, $type = ParameterType::STRING)
+    public function quote($value, $type = ParameterType::STRING) : string
     {
         $val = parent::quote($value, $type);
 

diff --git a/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereConnection.php b/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereConnection.php
@@ -133,7 +133,7 @@ public function getServerVersion()
     /**
      * {@inheritdoc}
      */
-    public function lastInsertId($name = null)
+    public function lastInsertId(string $name = null) : string
     {
         if ($name === null) {
             return sasql_insert_id($this->connection);
@@ -164,7 +164,7 @@ public function query(string $sql) : ResultStatement
     /**
      * {@inheritdoc}
      */
-    public function quote($input, $type = ParameterType::STRING)
+    public function quote($input, $type = ParameterType::STRING) : string
     {
         if (is_int($input) || is_float($input)) {
             return $input;

diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php b/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php
@@ -92,7 +92,7 @@ public function query(string $sql) : ResultStatement
     /**
      * {@inheritDoc}
      */
-    public function quote($value, $type = ParameterType::STRING)
+    public function quote($value, $type = ParameterType::STRING) : string
     {
         if (is_int($value)) {
             return $value;
@@ -120,7 +120,7 @@ public function exec(string $statement) : int
     /**
      * {@inheritDoc}
      */
-    public function lastInsertId($name = null)
+    public function lastInsertId(string $name = null) : string
     {
         if ($name !== null) {
             $stmt = $this->prepare('SELECT CONVERT(VARCHAR(MAX), current_value) FROM sys.sequences WHERE name = ?');