From 2f834f2489d50d48fe10bbd8032e9fab251df422 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Thu, 14 Jul 2022 17:22:22 +0200 Subject: [PATCH] [Messenger] Fix calls to deprecated DBAL methods --- .../Transport/Doctrine/Connection.php | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php index c00e8f86d3b1..83434752d91e 100644 --- a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php +++ b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php @@ -25,6 +25,7 @@ use Doctrine\DBAL\Schema\AbstractSchemaManager; use Doctrine\DBAL\Schema\Comparator; use Doctrine\DBAL\Schema\Schema; +use Doctrine\DBAL\Schema\SchemaDiff; use Doctrine\DBAL\Schema\Synchronizer\SchemaSynchronizer; use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Types; @@ -453,8 +454,9 @@ private function updateSchema(): void return; } - $comparator = new Comparator(); - $schemaDiff = $comparator->compare($this->createSchemaManager()->createSchema(), $this->getSchema()); + $schemaManager = $this->createSchemaManager(); + $comparator = $this->createComparator($schemaManager); + $schemaDiff = $this->compareSchemas($comparator, $schemaManager->createSchema(), $this->getSchema()); foreach ($schemaDiff->toSaveSql($this->driverConnection->getDatabasePlatform()) as $sql) { if (method_exists($this->driverConnection, 'executeStatement')) { @@ -471,4 +473,18 @@ private function createSchemaManager(): AbstractSchemaManager ? $this->driverConnection->createSchemaManager() : $this->driverConnection->getSchemaManager(); } + + private function createComparator(AbstractSchemaManager $schemaManager): Comparator + { + return method_exists($schemaManager, 'createComparator') + ? $schemaManager->createComparator() + : new Comparator(); + } + + private function compareSchemas(Comparator $comparator, Schema $from, Schema $to): SchemaDiff + { + return method_exists($comparator, 'compareSchemas') + ? $comparator->compareSchemas($from, $to) + : $comparator->compare($from, $to); + } }