updated-packages

vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOConnection.php

@@ -2,18 +2,31 @@
 
 namespace Doctrine\DBAL\Driver;
 
+use Doctrine\DBAL\Driver\Connection as ConnectionInterface;
+use Doctrine\DBAL\Driver\PDO\Exception;
+use Doctrine\DBAL\Driver\PDO\Statement;
 use Doctrine\DBAL\ParameterType;
+use Doctrine\Deprecations\Deprecation;
 use PDO;
-use function count;
-use function func_get_args;
+use PDOException;
+use PDOStatement;
+use ReturnTypeWillChange;
+
+use function assert;
 
 /**
  * PDO implementation of the Connection interface.
  * Used by all PDO-based drivers.
+ *
+ * @deprecated Use {@link Connection} instead
  */
-class PDOConnection extends PDO implements Connection, ServerInfoAwareConnection
+class PDOConnection extends PDO implements ConnectionInterface, ServerInfoAwareConnection
 {
+    use PDOQueryImplementation;
+
     /**
+     * @internal The connection can be only instantiated by its driver.
+     *
      * @param string       $dsn
      * @param string|null  $user
      * @param string|null  $password
@@ -24,23 +37,27 @@ class PDOConnection extends PDO implements Connection, ServerInfoAwareConnection
     public function __construct($dsn, $user = null, $password = null, ?array $options = null)
     {
         try {
-            parent::__construct($dsn, $user, $password, $options);
-            $this->setAttribute(PDO::ATTR_STATEMENT_CLASS, [PDOStatement::class, []]);
+            parent::__construct($dsn, (string) $user, (string) $password, (array) $options);
+            $this->setAttribute(PDO::ATTR_STATEMENT_CLASS, [Statement::class, []]);
             $this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        } catch (\PDOException $exception) {
-            throw new PDOException($exception);
+        } catch (PDOException $exception) {
+            throw Exception::new($exception);
         }
     }
 
     /**
      * {@inheritdoc}
      */
-    public function exec($statement)
+    #[ReturnTypeWillChange]
+    public function exec($sql)
     {
         try {
-            return parent::exec($statement);
-        } catch (\PDOException $exception) {
-            throw new PDOException($exception);
+            $result = parent::exec($sql);
+            assert($result !== false);
+
+            return $result;
+        } catch (PDOException $exception) {
+            throw Exception::new($exception);
         }
     }
 
@@ -53,61 +70,51 @@ class PDOConnection extends PDO implements Connection, ServerInfoAwareConnection
     }
 
     /**
-     * {@inheritdoc}
+     * @param string          $sql
+     * @param array<int, int> $driverOptions
+     *
+     * @return PDOStatement
      */
-    public function prepare($prepareString, $driverOptions = [])
+    #[ReturnTypeWillChange]
+    public function prepare($sql, $driverOptions = [])
     {
         try {
-            return parent::prepare($prepareString, $driverOptions);
-        } catch (\PDOException $exception) {
-            throw new PDOException($exception);
+            $statement = parent::prepare($sql, $driverOptions);
+            assert($statement instanceof PDOStatement);
+
+            return $statement;
+        } catch (PDOException $exception) {
+            throw Exception::new($exception);
         }
     }
 
     /**
      * {@inheritdoc}
      */
-    public function query()
+    #[ReturnTypeWillChange]
+    public function quote($value, $type = ParameterType::STRING)
     {
-        $args      = func_get_args();
-        $argsCount = count($args);
-
-        try {
-            if ($argsCount === 4) {
-                return parent::query($args[0], $args[1], $args[2], $args[3]);
-            }
-
-            if ($argsCount === 3) {
-                return parent::query($args[0], $args[1], $args[2]);
-            }
-
-            if ($argsCount === 2) {
-                return parent::query($args[0], $args[1]);
-            }
-
-            return parent::query($args[0]);
-        } catch (\PDOException $exception) {
-            throw new PDOException($exception);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function quote($input, $type = ParameterType::STRING)
-    {
-        return parent::quote($input, $type);
+        return parent::quote($value, $type);
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @param string|null $name
+     *
+     * @return string|int|false
      */
+    #[ReturnTypeWillChange]
     public function lastInsertId($name = null)
     {
         try {
+            if ($name === null) {
+                return parent::lastInsertId();
+            }
+
             return parent::lastInsertId($name);
-        } catch (\PDOException $exception) {
-            throw new PDOException($exception);
+        } catch (PDOException $exception) {
+            throw Exception::new($exception);
         }
     }
 
@@ -116,6 +123,28 @@ class PDOConnection extends PDO implements Connection, ServerInfoAwareConnection
      */
     public function requiresQueryForServerVersion()
     {
+        Deprecation::triggerIfCalledFromOutside(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/pull/4114',
+            'ServerInfoAwareConnection::requiresQueryForServerVersion() is deprecated and removed in DBAL 3.'
+        );
+
         return false;
     }
+
+    /**
+     * @param mixed ...$args
+     */
+    private function doQuery(...$args): PDOStatement
+    {
+        try {
+            $stmt = parent::query(...$args);
+        } catch (PDOException $exception) {
+            throw Exception::new($exception);
+        }
+
+        assert($stmt instanceof PDOStatement);
+
+        return $stmt;
+    }
 }