From 8af9b412ad2e9a9ce84b5a78d4ff9edefe9fb3b8 Mon Sep 17 00:00:00 2001
From: Rostislav Wolny <rosta.wolny@automattic.com>
Date: Wed, 16 Jun 2021 16:21:29 +0200
Subject: [PATCH] Switch to built in PDO driver

[MAILPOET-3658]
---
 lib/Config/DatabaseInitializer.php                   | 2 +-
 lib/Doctrine/ConnectionFactory.php                   | 2 +-
 tests/integration/Config/DatabaseTest.php            | 2 +-
 tests/integration/Doctrine/ConnectionFactoryTest.php | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Config/DatabaseInitializer.php b/lib/Config/DatabaseInitializer.php
index 3f8b68a50b..8dd9f8bb18 100644
--- a/lib/Config/DatabaseInitializer.php
+++ b/lib/Config/DatabaseInitializer.php
@@ -17,6 +17,6 @@ class DatabaseInitializer {
 
     // pass the same PDO connection to legacy Database object
     $database = new Database();
-    $database->init($connection->getWrappedConnection()->getConnection());
+    $database->init($connection->getWrappedConnection());
   }
 }
diff --git a/lib/Doctrine/ConnectionFactory.php b/lib/Doctrine/ConnectionFactory.php
index de02a233e1..f6e4c86467 100644
--- a/lib/Doctrine/ConnectionFactory.php
+++ b/lib/Doctrine/ConnectionFactory.php
@@ -3,13 +3,13 @@
 namespace MailPoet\Doctrine;
 
 use MailPoet\Config\Env;
-use MailPoet\Doctrine\Driver\Driver;
 use MailPoet\Doctrine\Types\BigIntType;
 use MailPoet\Doctrine\Types\JsonOrSerializedType;
 use MailPoet\Doctrine\Types\JsonType;
 use MailPoet\Doctrine\Types\SerializedArrayType;
 use MailPoet\Doctrine\Types\DateTimeTzToStringType;
 use MailPoetVendor\Doctrine\DBAL\DriverManager;
+use MailPoetVendor\Doctrine\DBAL\Driver\PDO\MySQL\Driver;
 use MailPoetVendor\Doctrine\DBAL\Platforms\MySqlPlatform;
 use MailPoetVendor\Doctrine\DBAL\Types\Type;
 use PDO;
diff --git a/tests/integration/Config/DatabaseTest.php b/tests/integration/Config/DatabaseTest.php
index b80968c931..b950a59747 100644
--- a/tests/integration/Config/DatabaseTest.php
+++ b/tests/integration/Config/DatabaseTest.php
@@ -30,7 +30,7 @@ class DatabaseTest extends \MailPoetTest {
 
   public function testItSetsDBDriverOptions() {
     $connection = $this->diContainer->get(Connection::class);
-    $this->database->init($connection->getWrappedConnection()->getConnection());
+    $this->database->init($connection->getWrappedConnection());
     $result = ORM::for_table("")
       ->raw_query(
         'SELECT ' .
diff --git a/tests/integration/Doctrine/ConnectionFactoryTest.php b/tests/integration/Doctrine/ConnectionFactoryTest.php
index 6a8b21b0f2..307abb8e6a 100644
--- a/tests/integration/Doctrine/ConnectionFactoryTest.php
+++ b/tests/integration/Doctrine/ConnectionFactoryTest.php
@@ -29,7 +29,7 @@ class ConnectionFactoryTest extends \MailPoetTest {
     $connection = $connectionFactory->createConnection();
 
     expect($connection)->isInstanceOf(SerializableConnection::class);
-    expect($connection->getWrappedConnection()->getConnection())->isInstanceOf(PDO::class);
+    expect($connection->getWrappedConnection())->isInstanceOf(PDO::class);
     expect($connection->getDriver())->isInstanceOf(PDOMySql\Driver::class);
     expect($connection->getDatabasePlatform())->isInstanceOf(MySqlPlatform::class);
     expect($connection->getHost())->equals(Env::$dbHost);
@@ -91,7 +91,7 @@ class ConnectionFactoryTest extends \MailPoetTest {
     Env::$dbHost = '::ffff:' . gethostbyname($this->envBackup['db_host']);
     $connectionFactory = new ConnectionFactory();
     $connection = $connectionFactory->createConnection();
-    expect($connection->getWrappedConnection()->getConnection())->isInstanceOf(PDO::class);
+    expect($connection->getWrappedConnection())->isInstanceOf(PDO::class);
     expect($connection->executeQuery('SELECT 1')->fetchColumn())->same('1');
   }