Skip to content

Commit 650f171

Browse files
committed
minor symfony#61460 [Messenger] use non-deprecated DBAL-API when available (xabbuh)
This PR was merged into the 7.3 branch. Discussion ---------- [Messenger] use non-deprecated DBAL-API when available | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | MIT Commits ------- 995b0e1 use non-deprecated DBAL-API when available
2 parents 2ba5492 + 995b0e1 commit 650f171

File tree

3 files changed

+25
-3
lines changed

3 files changed

+25
-3
lines changed

src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
use Doctrine\DBAL\Query\QueryBuilder;
3030
use Doctrine\DBAL\Result;
3131
use Doctrine\DBAL\Schema\AbstractSchemaManager;
32+
use Doctrine\DBAL\Schema\NamedObject;
3233
use Doctrine\DBAL\Schema\Schema;
3334
use Doctrine\DBAL\Schema\SchemaConfig;
3435
use PHPUnit\Framework\MockObject\MockObject;
@@ -876,7 +877,14 @@ public function testConfigureSchemaOracleSequenceNameSuffixed()
876877
$sequences = $schema->getSequences();
877878
$this->assertCount(1, $sequences);
878879
$sequence = array_pop($sequences);
879-
$sequenceNameSuffix = substr($sequence->getName(), -\strlen($expectedSuffix));
880+
if ($sequence instanceof NamedObject) {
881+
// DBAL 4.4+
882+
$sequenceName = $sequence->getObjectName()->toString();
883+
} else {
884+
// DBAL < 4.4
885+
$sequenceName = $sequence->getName();
886+
}
887+
$sequenceNameSuffix = substr($sequenceName, -\strlen($expectedSuffix));
880888
$this->assertSame($expectedSuffix, $sequenceNameSuffix);
881889
}
882890
}

src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrinePostgreSqlFilterIntegrationTest.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Doctrine\DBAL\DriverManager;
1717
use Doctrine\DBAL\Schema\Column;
1818
use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
19+
use Doctrine\DBAL\Schema\NamedObject;
1920
use Doctrine\DBAL\Schema\Sequence;
2021
use Doctrine\DBAL\Schema\Table;
2122
use Doctrine\DBAL\Tools\DsnParser;
@@ -109,7 +110,15 @@ private function hasSequence(string $name): bool
109110

110111
$sequences = $schemaManager->listSequences();
111112
foreach ($sequences as $sequence) {
112-
if ($sequence->getName() === $name) {
113+
if ($sequence instanceof NamedObject) {
114+
// DBAL 4.4+
115+
$sequenceName = $sequence->getObjectName()->toString();
116+
} else {
117+
// DBAL < 4.4
118+
$sequenceName = $sequence->getName();
119+
}
120+
121+
if ($sequenceName === $name) {
113122
return true;
114123
}
115124
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
use Doctrine\DBAL\Schema\AbstractAsset;
2626
use Doctrine\DBAL\Schema\Name\Identifier;
2727
use Doctrine\DBAL\Schema\Name\UnqualifiedName;
28+
use Doctrine\DBAL\Schema\NamedObject;
2829
use Doctrine\DBAL\Schema\PrimaryKeyConstraint;
2930
use Doctrine\DBAL\Schema\AbstractSchemaManager;
3031
use Doctrine\DBAL\Schema\Comparator;
@@ -325,7 +326,11 @@ public function setup(): void
325326
$configuration = $this->driverConnection->getConfiguration();
326327
$assetFilter = $configuration->getSchemaAssetsFilter();
327328
$configuration->setSchemaAssetsFilter(function ($tableName) {
328-
if ($tableName instanceof AbstractAsset) {
329+
if ($tableName instanceof NamedObject) {
330+
// DBAL 4.4+
331+
$tableName = $tableName->getObjectName()->toString();
332+
} elseif ($tableName instanceof AbstractAsset) {
333+
// DBAL < 4.4
329334
$tableName = $tableName->getName();
330335
}
331336

0 commit comments

Comments
 (0)