Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Switch to built in PDO driver

Browse Source 
[MAILPOET-3658]
This commit is contained in:
Rostislav Wolny
2021-06-16 16:21:29 +02:00
committed by Veljko V
parent c9603b76dc
commit 8af9b412ad
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Config/DatabaseInitializer.php
View File

@@ -17,6 +17,6 @@ class DatabaseInitializer {
// pass the same PDO connection to legacy Database object // pass the same PDO connection to legacy Database object
$database = new Database(); $database = new Database();
$database->init($connection->getWrappedConnection()->getConnection()); $database->init($connection->getWrappedConnection());
} }
} }

2
lib/Doctrine/ConnectionFactory.php
View File

@@ -3,13 +3,13 @@
namespace MailPoet\Doctrine; namespace MailPoet\Doctrine;
use MailPoet\Config\Env; use MailPoet\Config\Env;
use MailPoet\Doctrine\Driver\Driver;
use MailPoet\Doctrine\Types\BigIntType; use MailPoet\Doctrine\Types\BigIntType;
use MailPoet\Doctrine\Types\JsonOrSerializedType; use MailPoet\Doctrine\Types\JsonOrSerializedType;
use MailPoet\Doctrine\Types\JsonType; use MailPoet\Doctrine\Types\JsonType;
use MailPoet\Doctrine\Types\SerializedArrayType; use MailPoet\Doctrine\Types\SerializedArrayType;
use MailPoet\Doctrine\Types\DateTimeTzToStringType; use MailPoet\Doctrine\Types\DateTimeTzToStringType;
use MailPoetVendor\Doctrine\DBAL\DriverManager; use MailPoetVendor\Doctrine\DBAL\DriverManager;
use MailPoetVendor\Doctrine\DBAL\Driver\PDO\MySQL\Driver;
use MailPoetVendor\Doctrine\DBAL\Platforms\MySqlPlatform; use MailPoetVendor\Doctrine\DBAL\Platforms\MySqlPlatform;
use MailPoetVendor\Doctrine\DBAL\Types\Type; use MailPoetVendor\Doctrine\DBAL\Types\Type;
use PDO; use PDO;

2
tests/integration/Config/DatabaseTest.php
View File

@@ -30,7 +30,7 @@ class DatabaseTest extends \MailPoetTest {
public function testItSetsDBDriverOptions() { public function testItSetsDBDriverOptions() {
$connection = $this->diContainer->get(Connection::class); $connection = $this->diContainer->get(Connection::class);
$this->database->init($connection->getWrappedConnection()->getConnection()); $this->database->init($connection->getWrappedConnection());
$result = ORM::for_table("") $result = ORM::for_table("")
->raw_query( ->raw_query(
'SELECT ' . 'SELECT ' .

4
tests/integration/Doctrine/ConnectionFactoryTest.php
View File

@@ -29,7 +29,7 @@ class ConnectionFactoryTest extends \MailPoetTest {
$connection = $connectionFactory->createConnection(); $connection = $connectionFactory->createConnection();
expect($connection)->isInstanceOf(SerializableConnection::class); 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->getDriver())->isInstanceOf(PDOMySql\Driver::class);
expect($connection->getDatabasePlatform())->isInstanceOf(MySqlPlatform::class); expect($connection->getDatabasePlatform())->isInstanceOf(MySqlPlatform::class);
expect($connection->getHost())->equals(Env::$dbHost); expect($connection->getHost())->equals(Env::$dbHost);
@@ -91,7 +91,7 @@ class ConnectionFactoryTest extends \MailPoetTest {
Env::$dbHost = '::ffff:' . gethostbyname($this->envBackup['db_host']); Env::$dbHost = '::ffff:' . gethostbyname($this->envBackup['db_host']);
$connectionFactory = new ConnectionFactory(); $connectionFactory = new ConnectionFactory();
$connection = $connectionFactory->createConnection(); $connection = $connectionFactory->createConnection();
expect($connection->getWrappedConnection()->getConnection())->isInstanceOf(PDO::class); expect($connection->getWrappedConnection())->isInstanceOf(PDO::class);
expect($connection->executeQuery('SELECT 1')->fetchColumn())->same('1'); expect($connection->executeQuery('SELECT 1')->fetchColumn())->same('1');
} }