Merge pull request #5883 from derrabus/sa/pdo

Make sure only PDO parameter types are passed to PDO methods

Author: derrabus

src/Driver/PDO/Connection.php

@@ -80,7 +80,7 @@ public function query(string $sql): ResultInterface
      */
     public function quote($value, $type = ParameterType::STRING)
     {
-        return $this->connection->quote($value, $type);
+        return $this->connection->quote($value, ParameterTypeMap::convertParamType($type));
     }
 
     /**

src/Driver/PDO/ParameterTypeMap.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Driver\PDO;
+
+use Doctrine\DBAL\Driver\Exception\UnknownParameterType;
+use Doctrine\DBAL\ParameterType;
+use PDO;
+
+/** @internal */
+final class ParameterTypeMap
+{
+    private const PARAM_TYPE_MAP = [
+        ParameterType::NULL => PDO::PARAM_NULL,
+        ParameterType::INTEGER => PDO::PARAM_INT,
+        ParameterType::STRING => PDO::PARAM_STR,
+        ParameterType::ASCII => PDO::PARAM_STR,
+        ParameterType::BINARY => PDO::PARAM_LOB,
+        ParameterType::LARGE_OBJECT => PDO::PARAM_LOB,
+        ParameterType::BOOLEAN => PDO::PARAM_BOOL,
+    ];
+
+    /**
+     * Converts DBAL parameter type to PDO parameter type
+     *
+     * @psalm-return PDO::PARAM_*
+     *
+     * @throws UnknownParameterType
+     */
+    public static function convertParamType(int $type): int
+    {
+        if (! isset(self::PARAM_TYPE_MAP[$type])) {
+            throw UnknownParameterType::new($type);
+        }
+
+        return self::PARAM_TYPE_MAP[$type];
+    }
+
+    private function __construct()
+    {
+    }
+
+    private function __clone()
+    {
+    }
+}

src/Driver/PDO/Result.php

@@ -91,7 +91,9 @@ public function free(): void
     }
 
     /**
-     * @return mixed|false
+     * @psalm-param PDO::FETCH_* $mode
+     *
+     * @return mixed
      *
      * @throws Exception
      */
@@ -105,6 +107,8 @@ private function fetch(int $mode)
     }
 
     /**
+     * @psalm-param PDO::FETCH_* $mode
+     *
      * @return list<mixed>
      *
      * @throws Exception

src/Driver/PDO/Statement.php

@@ -2,13 +2,10 @@
 
 namespace Doctrine\DBAL\Driver\PDO;
 
-use Doctrine\DBAL\Driver\Exception as ExceptionInterface;
-use Doctrine\DBAL\Driver\Exception\UnknownParameterType;
 use Doctrine\DBAL\Driver\Result as ResultInterface;
 use Doctrine\DBAL\Driver\Statement as StatementInterface;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\Deprecations\Deprecation;
-use PDO;
 use PDOException;
 use PDOStatement;
 
@@ -18,16 +15,6 @@
 
 final class Statement implements StatementInterface
 {
-    private const PARAM_TYPE_MAP = [
-        ParameterType::NULL => PDO::PARAM_NULL,
-        ParameterType::INTEGER => PDO::PARAM_INT,
-        ParameterType::STRING => PDO::PARAM_STR,
-        ParameterType::ASCII => PDO::PARAM_STR,
-        ParameterType::BINARY => PDO::PARAM_LOB,
-        ParameterType::LARGE_OBJECT => PDO::PARAM_LOB,
-        ParameterType::BOOLEAN => PDO::PARAM_BOOL,
-    ];
-
     private PDOStatement $stmt;
 
     /** @internal The statement can be only instantiated by its driver connection. */
@@ -50,10 +37,10 @@ public function bindValue($param, $value, $type = ParameterType::STRING)
             );
         }
 
-        $type = $this->convertParamType($type);
+        $pdoType = ParameterTypeMap::convertParamType($type);
 
         try {
-            return $this->stmt->bindValue($param, $value, $type);
+            return $this->stmt->bindValue($param, $value, $pdoType);
         } catch (PDOException $exception) {
             throw Exception::new($exception);
         }
@@ -101,13 +88,13 @@ public function bindParam(
             );
         }
 
-        $type = $this->convertParamType($type);
+        $pdoType = ParameterTypeMap::convertParamType($type);
 
         try {
             return $this->stmt->bindParam(
                 $param,
                 $variable,
-                $type,
+                $pdoType,
                 $length ?? 0,
                 ...array_slice(func_get_args(), 4),
             );
@@ -138,20 +125,4 @@ public function execute($params = null): ResultInterface
 
         return new Result($this->stmt);
     }
-
-    /**
-     * Converts DBAL parameter type to PDO parameter type
-     *
-     * @param int $type Parameter type
-     *
-     * @throws ExceptionInterface
-     */
-    private function convertParamType(int $type): int
-    {
-        if (! isset(self::PARAM_TYPE_MAP[$type])) {
-            throw UnknownParameterType::new($type);
-        }
-
-        return self::PARAM_TYPE_MAP[$type];
-    }
 }