From 8bbfd862e45b41afb40ff93eb26c52a01f8f83ba Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Fri, 28 Aug 2020 16:28:17 +0300 Subject: [PATCH] cs fix --- .../Database/DBAL/Driver/Mysqli/Driver.php | 18 ++++++++++++++---- .../Database/DBAL/Driver/PDOMySql/Driver.php | 18 ++++++++++++++---- .../Database/DBAL/Platforms/MySqlPlatform.php | 1 + 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/application/Espo/Core/Utils/Database/DBAL/Driver/Mysqli/Driver.php b/application/Espo/Core/Utils/Database/DBAL/Driver/Mysqli/Driver.php index e9aa62e99a..170d2c9f36 100644 --- a/application/Espo/Core/Utils/Database/DBAL/Driver/Mysqli/Driver.php +++ b/application/Espo/Core/Utils/Database/DBAL/Driver/Mysqli/Driver.php @@ -29,15 +29,25 @@ namespace Espo\Core\Utils\Database\DBAL\Driver\Mysqli; -class Driver extends \Doctrine\DBAL\Driver\Mysqli\Driver +use Espo\Core\Utils\Database\DBAL\{ + Platforms\MySqlPlatform, + Schema\MySqlSchemaManager, +}; + +use Doctrine\DBAL\{ + Connection, + Driver\Mysqli\Driver as OriginalDriver, +}; + +class Driver extends OriginalDriver { public function getDatabasePlatform() { - return new \Espo\Core\Utils\Database\DBAL\Platforms\MySqlPlatform(); + return new MySqlPlatform(); } - public function getSchemaManager(\Doctrine\DBAL\Connection $conn) + public function getSchemaManager(Connection $conn) { - return new \Espo\Core\Utils\Database\DBAL\Schema\MySqlSchemaManager($conn); + return new MySqlSchemaManager($conn); } } diff --git a/application/Espo/Core/Utils/Database/DBAL/Driver/PDOMySql/Driver.php b/application/Espo/Core/Utils/Database/DBAL/Driver/PDOMySql/Driver.php index af91c7ac10..f5a8f19c02 100644 --- a/application/Espo/Core/Utils/Database/DBAL/Driver/PDOMySql/Driver.php +++ b/application/Espo/Core/Utils/Database/DBAL/Driver/PDOMySql/Driver.php @@ -29,15 +29,25 @@ namespace Espo\Core\Utils\Database\DBAL\Driver\PDOMySql; -class Driver extends \Doctrine\DBAL\Driver\PDOMySql\Driver +use Espo\Core\Utils\Database\DBAL\{ + Platforms\MySqlPlatform, + Schema\MySqlSchemaManager, +}; + +use Doctrine\DBAL\{ + Connection, + Driver\PDOMySql\Driver as OriginalDriver, +}; + +class Driver extends OriginalDriver { public function getDatabasePlatform() { - return new \Espo\Core\Utils\Database\DBAL\Platforms\MySqlPlatform(); + return new MySqlPlatform(); } - public function getSchemaManager(\Doctrine\DBAL\Connection $conn) + public function getSchemaManager(Connection $conn) { - return new \Espo\Core\Utils\Database\DBAL\Schema\MySqlSchemaManager($conn); + return new MySqlSchemaManager($conn); } } \ No newline at end of file diff --git a/application/Espo/Core/Utils/Database/DBAL/Platforms/MySqlPlatform.php b/application/Espo/Core/Utils/Database/DBAL/Platforms/MySqlPlatform.php index 2100b860cb..6241672c90 100644 --- a/application/Espo/Core/Utils/Database/DBAL/Platforms/MySqlPlatform.php +++ b/application/Espo/Core/Utils/Database/DBAL/Platforms/MySqlPlatform.php @@ -28,6 +28,7 @@ ************************************************************************/ namespace Espo\Core\Utils\Database\DBAL\Platforms; + use Doctrine\DBAL\Schema\TableDiff; use Doctrine\DBAL\Schema\Index; use Doctrine\DBAL\Schema\Table;