Skip to content

Commit 8061a39

Browse files
Merge branch '4.1'
* 4.1: (27 commits) Added the Code of Conduct file do not override custom access decision configs [Security] Do not deauthenticate user when the first refreshed user has changed fix a return type hint invalidate stale commits for PRs too add missing cache prefix seed attribute to XSD fix command description Fix class documentation [Validator] Add a missing translation [FrameworkBundle] Fix 3.4 tests [DI] fix dumping inline services again Rename consumer to receiver Register messenger before the profiler Fix phpdocs [EventDispatcher] Remove template method in test case Added LB translation for #27993 (UUID validator message translation) Replace deprecated validateValue with validate [FWBundle] Automatically enable PropertyInfo when using Flex [Process] fix locking of pipe files on Windows Correct PHPDoc type for float ttl ...
2 parents 3fce1fd + fa37b99 commit 8061a39

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,13 @@ public function load(array $configs, ContainerBuilder $container)
253253
$this->registerTemplatingConfiguration($config['templating'], $container, $loader);
254254
}
255255

256+
if ($this->messengerConfigEnabled = $this->isConfigEnabled($container, $config['messenger'])) {
257+
$this->registerMessengerConfiguration($config['messenger'], $container, $loader, $config['serializer'], $config['validation']);
258+
} else {
259+
$container->removeDefinition('console.command.messenger_consume_messages');
260+
$container->removeDefinition('console.command.messenger_debug');
261+
}
262+
256263
$this->registerValidationConfiguration($config['validation'], $container, $loader);
257264
$this->registerEsiConfiguration($config['esi'], $container, $loader);
258265
$this->registerSsiConfiguration($config['ssi'], $container, $loader);
@@ -282,13 +289,6 @@ public function load(array $configs, ContainerBuilder $container)
282289
$this->registerLockConfiguration($config['lock'], $container, $loader);
283290
}
284291

285-
if ($this->messengerConfigEnabled = $this->isConfigEnabled($container, $config['messenger'])) {
286-
$this->registerMessengerConfiguration($config['messenger'], $container, $loader, $config['serializer'], $config['validation']);
287-
} else {
288-
$container->removeDefinition('console.command.messenger_consume_messages');
289-
$container->removeDefinition('console.command.messenger_debug');
290-
}
291-
292292
if ($this->isConfigEnabled($container, $config['web_link'])) {
293293
if (!class_exists(HttpHeaderSerializer::class)) {
294294
throw new LogicException('WebLink support cannot be enabled as the WebLink component is not installed.');

Resources/config/schema/symfony-1.0.xsd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,8 @@
260260
<xsd:element name="default-memcached-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
261261
<xsd:element name="pool" type="cache_pool" minOccurs="0" maxOccurs="unbounded" />
262262
</xsd:sequence>
263+
264+
<xsd:attribute name="prefix-seed" type="xsd:string" />
263265
</xsd:complexType>
264266

265267
<xsd:complexType name="cache_pool">

0 commit comments

Comments
 (0)