Skip to content

Commit c08b380

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: use the outermost wrapping DBAL connection [Console] Fix deprecation when description is null [Console] Escape % in command name & description from getDefault*() [FrameworkBundle] Fix XML cache config
2 parents 6679529 + 1065c9d commit c08b380

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,14 @@
291291
<xsd:element name="default-pdo-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
292292
<xsd:element name="pool" type="cache_pool" minOccurs="0" maxOccurs="unbounded" />
293293
</xsd:sequence>
294-
294+
<xsd:attribute name="app" type="xsd:string" />
295+
<xsd:attribute name="system" type="xsd:string" />
296+
<xsd:attribute name="directory" type="xsd:string" />
297+
<xsd:attribute name="default-doctrine-provider" type="xsd:string" />
298+
<xsd:attribute name="default-psr6-provider" type="xsd:string" />
299+
<xsd:attribute name="default-redis-provider" type="xsd:string" />
300+
<xsd:attribute name="default-memcached-provider" type="xsd:string" />
301+
<xsd:attribute name="default-pdo-provider" type="xsd:string" />
295302
<xsd:attribute name="prefix-seed" type="xsd:string" />
296303
</xsd:complexType>
297304

src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function process(ContainerBuilder $container)
107107
if (!$r->isSubclassOf(Command::class)) {
108108
throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, 'console.command', Command::class));
109109
}
110-
$description = str_replace('%', '%%', $class::getDefaultDescription());
110+
$description = str_replace('%', '%%', $class::getDefaultDescription() ?? '');
111111
}
112112

113113
if ($description) {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Messenger\Bridge\Doctrine\Transport;
1313

14-
use Doctrine\DBAL\Driver\PDO\Connection as DoctrinePdoConnection;
1514
use Doctrine\DBAL\Schema\Table;
1615

1716
/**
@@ -73,8 +72,8 @@ public function get(): ?array
7372
if (method_exists($this->driverConnection, 'getNativeConnection')) {
7473
$wrappedConnection = $this->driverConnection->getNativeConnection();
7574
} else {
76-
$wrappedConnection = $this->driverConnection->getWrappedConnection();
77-
if (!$wrappedConnection instanceof \PDO && $wrappedConnection instanceof DoctrinePdoConnection) {
75+
$wrappedConnection = $this->driverConnection;
76+
while (method_exists($wrappedConnection, 'getWrappedConnection')) {
7877
$wrappedConnection = $wrappedConnection->getWrappedConnection();
7978
}
8079
}

0 commit comments

Comments
 (0)