8000 Merge branch '4.4' into 5.4 · symfony/symfony@d72da69 · GitHub
[go: up one dir, main page]

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d72da69

Browse files
committed
Merge branch '4.4' into 5.4
* 4.4: [Messenger] Fix calls to deprecated DBAL methods
2 parents e113442 + 43126b1 commit d72da69

File tree

1 file changed

+18
-2
lines changed
  • src/Symfony/Component/Messenger/Bridge/Doctrine/Transport

1 file changed

+18
-2
lines changed

src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
use Doctrine\DBAL\Schema\AbstractSchemaManager;
2525
use Doctrine\DBAL\Schema\Comparator;
2626
use Doctrine\DBAL\Schema\Schema;
27+
use Doctrine\DBAL\Schema\SchemaDiff;
2728
use Doctrine\DBAL\Schema\Synchronizer\SchemaSynchronizer;
2829
use Doctrine\DBAL\Schema\Table;
2930
use Doctrine\DBAL\Types\Types;
@@ -467,8 +468,9 @@ private function updateSchema(): void
467468
return;
468469
}
469470

470-
$comparator = new Comparator();
471-
$schemaDiff = $comparator->compare($this->createSchemaManager()->createSchema(), $this->getSchema());
471+
$schemaManager = $this->createSchemaManager();
472+
$comparator = $this->createComparator($schemaManager);
473+
$schemaDiff = $this->compareSchemas($comparator, $schemaManager->createSchema(), $this->getSchema());
472474

473475
foreach ($schemaDiff->toSaveSql($this->driverConnection->getDatabasePlatform()) as $sql) {
474476
if (method_exists($this->driverConnection, 'executeStatement')) {
@@ -485,6 +487,20 @@ private function createSchemaManager(): AbstractSchemaManager
485487
? $this->driverConnection->createSchemaManager()
486488
: $this->driverConnection->getSchemaManager();
487489
}
490+
491+
private function createComparator(AbstractSchemaManager $schemaManager): Comparator
492+
{
493+
return method_exists($schemaManager, 'createComparator')
494+
? $schemaManager->createComparator()
495+
: new Comparator();
496+
}
497+
498+
private function compareSchemas(Comparator $comparator, Schema $from, Schema $to): SchemaDiff
499+
{
500+
return method_exists($comparator, 'compareSchemas')
501+
? $comparator->compareSchemas($from, $to)
502+
: $comparator->compare($from, $to);
503+
}
488504
}
489505

490506
if (!class_exists(\Symfony\Component\Messenger\Transport\Doctrine\Connection::class, false)) {

0 commit comments

Comments
 (0)
0