Fix argument type declaration

By either defining their types or renaming to match parent class (or interface).
doctrine · Jan 2, 2020 · fd89091 · fd89091
1 parent 52f47b1
commit fd89091
Show file tree

Hide file tree

Showing 28 changed files with 198 additions and 575 deletions.
diff --git a/lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php b/lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php
@@ -120,7 +120,9 @@ public function isConnectedToMaster()
     }
 
     /**
-     * {@inheritDoc}
+     * @param string|null $connectionName
+     *
+     * @return bool
      */
     public function connect($connectionName = null)
     {
@@ -259,11 +261,11 @@ public function rollBack()
     /**
      * {@inheritDoc}
      */
-    public function delete($tableName, array $identifier, array $types = [])
+    public function delete($tableExpression, array $identifier, array $types = [])
     {
         $this->connect('master');
 
-        return parent::delete($tableName, $identifier, $types);
+        return parent::delete($tableExpression, $identifier, $types);
     }
 
     /**
@@ -282,21 +284,21 @@ public function close()
     /**
      * {@inheritDoc}
      */
-    public function update($tableName, array $data, array $identifier, array $types = [])
+    public function update($tableExpression, array $data, array $identifier, array $types = [])
     {
         $this->connect('master');
 
-        return parent::update($tableName, $data, $identifier, $types);
+        return parent::update($tableExpression, $data, $identifier, $types);
     }
 
     /**
      * {@inheritDoc}
      */
-    public function insert($tableName, array $data, array $types = [])
+    public function insert($tableExpression, array $data, array $types = [])
     {
         $this->connect('master');
 
-        return parent::insert($tableName, $data, $types);
+        return parent::insert($tableExpression, $data, $types);
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/DBALException.php b/lib/Doctrine/DBAL/DBALException.php
@@ -157,7 +157,7 @@ public static function driverException(Driver $driver, Throwable $driverEx)
     /**
      * @return self
      */
-    private static function wrapException(Driver $driver, Throwable $driverEx, $msg)
+    private static function wrapException(Driver $driver, Throwable $driverEx, string $msg)
     {
         if ($driverEx instanceof DriverException) {
             return $driverEx;

diff --git a/lib/Doctrine/DBAL/Driver/DrizzlePDOMySql/Connection.php b/lib/Doctrine/DBAL/Driver/DrizzlePDOMySql/Connection.php
@@ -10,12 +10,12 @@ class Connection extends PDOConnection
     /**
      * {@inheritdoc}
      */
-    public function quote($value, $type = ParameterType::STRING)
+    public function quote($input, $type = ParameterType::STRING)
     {
         if ($type === ParameterType::BOOLEAN) {
-            return $value ? 'true' : 'false';
+            return $input ? 'true' : 'false';
         }
 
-        return parent::quote($value, $type);
+        return parent::quote($input, $type);
     }
 }
diff --git a/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php
@@ -76,9 +76,9 @@ public function requiresQueryForServerVersion()
     /**
      * {@inheritdoc}
      */
-    public function prepare($sql)
+    public function prepare($prepareString)
     {
-        $stmt = @db2_prepare($this->conn, $sql);
+        $stmt = @db2_prepare($this->conn, $prepareString);
         if (! $stmt) {
             throw new DB2Exception(db2_stmt_errormsg());
         }

diff --git a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php b/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
@@ -213,6 +213,8 @@ private function bindTypedParameters() : void
         $types   = $this->types;
 
         foreach ($this->_bindedValues as $parameter => $value) {
+            assert(is_int($parameter));
+
             if (! isset($types[$parameter - 1])) {
                 $types[$parameter - 1] = static::$_paramTypeMap[ParameterType::STRING];
             }
@@ -243,9 +245,11 @@ private function bindTypedParameters() : void
     /**
      * Handle $this->_longData after regular query parameters have been bound
      *
+     * @param array<int, resource> $streams
+     *
      * @throws MysqliException
      */
-    private function sendLongData($streams) : void
+    private function sendLongData(array $streams) : void
     {
         foreach ($streams as $paramNr => $stream) {
             while (! feof($stream)) {

diff --git a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php
@@ -125,14 +125,14 @@ public function query()
     /**
      * {@inheritdoc}
      */
-    public function quote($value, $type = ParameterType::STRING)
+    public function quote($input, $type = ParameterType::STRING)
     {
-        if (is_int($value) || is_float($value)) {
-            return $value;
+        if (is_int($input) || is_float($input)) {
+            return $input;
         }
-        $value = str_replace("'", "''", $value);
+        $input = str_replace("'", "''", $input);
 
-        return "'" . addcslashes($value, "\000\n\r\\\032") . "'";
+        return "'" . addcslashes($input, "\000\n\r\\\032") . "'";
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php
@@ -276,14 +276,14 @@ public function bindValue($param, $value, $type = ParameterType::STRING)
     /**
      * {@inheritdoc}
      */
-    public function bindParam($param, &$variable, $type = ParameterType::STRING, $length = null)
+    public function bindParam($column, &$variable, $type = ParameterType::STRING, $length = null)
     {
-        if (is_int($param)) {
-            if (! isset($this->_paramMap[$param])) {
-                throw new OCI8Exception(sprintf('Could not find variable mapping with index %d, in the SQL statement', $param));
+        if (is_int($column)) {
+            if (! isset($this->_paramMap[$column])) {
+                throw new OCI8Exception(sprintf('Could not find variable mapping with index %d, in the SQL statement', $column));
             }
 
-            $param = $this->_paramMap[$param];
+            $column = $this->_paramMap[$column];
         }
 
         if ($type === ParameterType::LARGE_OBJECT) {
@@ -297,11 +297,11 @@ public function bindParam($param, &$variable, $type = ParameterType::STRING, $le
             $variable =& $lob;
         }
 
-        $this->boundValues[$param] =& $variable;
+        $this->boundValues[$column] =& $variable;
 
         return oci_bind_by_name(
             $this->_sth,
-            $param,
+            $column,
             $variable,
             $length ?? -1,
             $this->convertParameterType($type)

diff --git a/lib/Doctrine/DBAL/Driver/PDOConnection.php b/lib/Doctrine/DBAL/Driver/PDOConnection.php
@@ -53,7 +53,10 @@ public function getServerVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @param string          $prepareString
+     * @param array<int, int> $driverOptions
+     *
+     * @return Statement
      */
     public function prepare($prepareString, $driverOptions = [])
     {

diff --git a/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php b/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php
@@ -40,9 +40,9 @@ public function lastInsertId($name = null)
     /**
      * {@inheritDoc}
      */
-    public function quote($value, $type = ParameterType::STRING)
+    public function quote($input, $type = ParameterType::STRING)
     {
-        $val = parent::quote($value, $type);
+        $val = parent::quote($input, $type);
 
         // Fix for a driver version terminating all values with null byte
         if (strpos($val, "\0") !== false) {

diff --git a/lib/Doctrine/DBAL/Driver/PDOStatement.php b/lib/Doctrine/DBAL/Driver/PDOStatement.php
@@ -85,7 +85,13 @@ public function bindValue($param, $value, $type = ParameterType::STRING)
     }
 
     /**
-     * {@inheritdoc}
+     * @param mixed    $column
+     * @param mixed    $variable
+     * @param int      $type
+     * @param int|null $length
+     * @param mixed    $driverOptions
+     *
+     * @return bool
      */
     public function bindParam($column, &$variable, $type = ParameterType::STRING, $length = null, $driverOptions = null)
     {

diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php b/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php
@@ -75,9 +75,9 @@ public function requiresQueryForServerVersion()
     /**
      * {@inheritDoc}
      */
-    public function prepare($sql)
+    public function prepare($prepareString)
     {
-        return new SQLSrvStatement($this->conn, $sql, $this->lastInsertId);
+        return new SQLSrvStatement($this->conn, $prepareString, $this->lastInsertId);
     }
 
     /**
@@ -96,17 +96,17 @@ public function query()
     /**
      * {@inheritDoc}
      */
-    public function quote($value, $type = ParameterType::STRING)
+    public function quote($input, $type = ParameterType::STRING)
     {
-        if (is_int($value)) {
-            return $value;
+        if (is_int($input)) {
+            return $input;
         }
 
-        if (is_float($value)) {
-            return sprintf('%F', $value);
+        if (is_float($input)) {
+            return sprintf('%F', $input);
         }
 
-        return "'" . str_replace("'", "''", $value) . "'";
+        return "'" . str_replace("'", "''", $input) . "'";
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Platforms/DrizzlePlatform.php b/lib/Doctrine/DBAL/Platforms/DrizzlePlatform.php
@@ -71,17 +71,17 @@ public function getDateDiffExpression($date1, $date2)
     /**
      * {@inheritDoc}
      */
-    public function getBooleanTypeDeclarationSQL(array $field)
+    public function getBooleanTypeDeclarationSQL(array $columnDef)
     {
         return 'BOOLEAN';
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getIntegerTypeDeclarationSQL(array $field)
+    public function getIntegerTypeDeclarationSQL(array $columnDef)
     {
-        return 'INT' . $this->_getCommonIntegerTypeDeclarationSQL($field);
+        return 'INT' . $this->_getCommonIntegerTypeDeclarationSQL($columnDef);
     }
 
     /**
@@ -100,17 +100,17 @@ protected function _getCommonIntegerTypeDeclarationSQL(array $columnDef)
     /**
      * {@inheritDoc}
      */
-    public function getBigIntTypeDeclarationSQL(array $field)
+    public function getBigIntTypeDeclarationSQL(array $columnDef)
     {
-        return 'BIGINT' . $this->_getCommonIntegerTypeDeclarationSQL($field);
+        return 'BIGINT' . $this->_getCommonIntegerTypeDeclarationSQL($columnDef);
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getSmallIntTypeDeclarationSQL(array $field)
+    public function getSmallIntTypeDeclarationSQL(array $columnDef)
     {
-        return 'INT' . $this->_getCommonIntegerTypeDeclarationSQL($field);
+        return 'INT' . $this->_getCommonIntegerTypeDeclarationSQL($columnDef);
     }
 
     /**
@@ -170,17 +170,17 @@ public function getBlobTypeDeclarationSQL(array $field)
     /**
      * {@inheritDoc}
      */
-    public function getCreateDatabaseSQL($name)
+    public function getCreateDatabaseSQL($database)
     {
-        return 'CREATE DATABASE ' . $name;
+        return 'CREATE DATABASE ' . $database;
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getDropDatabaseSQL($name)
+    public function getDropDatabaseSQL($database)
     {
-        return 'DROP DATABASE ' . $name;
+        return 'DROP DATABASE ' . $database;
     }
 
     /**
@@ -335,7 +335,10 @@ public function getListTableColumnsSQL($table, $database = null)
     }
 
     /**
-     * {@inheritDoc}
+     * @param string      $table
+     * @param string|null $database
+     *
+     * @return string
      */
     public function getListTableForeignKeysSQL($table, $database = null)
     {
@@ -353,10 +356,10 @@ public function getListTableForeignKeysSQL($table, $database = null)
     /**
      * {@inheritDoc}
      */
-    public function getListTableIndexesSQL($table, $database = null)
+    public function getListTableIndexesSQL($table, $currentDatabase = null)
     {
-        if ($database) {
-            $databaseSQL = $this->quoteStringLiteral($database);
+        if ($currentDatabase) {
+            $databaseSQL = $this->quoteStringLiteral($currentDatabase);
         } else {
             $databaseSQL = 'DATABASE()';
         }
@@ -435,6 +438,7 @@ public function getDropIndexSQL($index, $table = null)
     }
 
     /**
+     * @param string $table
      *
      * @return string
      */