Skip to content

Commit b8e7347

Browse files
srozesroze
committed
Remove one nesting level (i.e. the transport one) in the configuration
1 parent 8c7d696 commit b8e7347

File tree

10 files changed

+42
-63
lines changed

10 files changed

+42
-63
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,26 +1008,21 @@ function ($a) {
10081008
->end()
10091009
->end()
10101010
->end()
1011-
->arrayNode('transport')
1011+
->arrayNode('serializer')
1012+
->canBeDisabled()
10121013
->addDefaultsIfNotSet()
10131014
->children()
1014-
->arrayNode('serializer')
1015-
->canBeDisabled()
1016-
->addDefaultsIfNotSet()
1017-
->children()
1018-
->scalarNode('format')->defaultValue('json')->end()
1019-
->arrayNode('context')
1020-
->normalizeKeys(false)
1021-
->useAttributeAsKey('name')
1022-
->defaultValue(array())
1023-
->prototype('variable')->end()
1024-
->end()
1025-
->end()
1015+
->scalarNode('format')->defaultValue('json')->end()
1016+
->arrayNode('context')
1017+
->normalizeKeys(false)
1018+
->useAttributeAsKey('name')
1019+
->defaultValue(array())
1020+
->prototype('variable')->end()
10261021
->end()
1027-
->scalarNode('encoder')->defaultValue('messenger.transport.serializer')->end()
1028-
->scalarNode('decoder')->defaultValue('messenger.transport.serializer')->end()
10291022
->end()
10301023
->end()
1024+
->scalarNode('encoder')->defaultValue('messenger.transport.serializer')->end()
1025+
->scalarNode('decoder')->defaultValue('messenger.transport.serializer')->end()
10311026
->arrayNode('middlewares')
10321027
->addDefaultsIfNotSet()
10331028
->children()

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,20 +1446,20 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
14461446

14471447
$loader->load('messenger.xml');
14481448

1449-
if ($this->isConfigEnabled($container, $config['transport']['serializer'])) {
1449+
if ($this->isConfigEnabled($container, $config['serializer'])) {
14501450
if (count($config['adapters']) > 0 && !$this->isConfigEnabled($container, $serializerConfig)) {
14511451
throw new LogicException('Using the default encoder/decoder, Symfony Messenger requires the Serializer. Enable it or install it by running "composer require symfony/serializer-pack".');
14521452
}
14531453

14541454
$container->getDefinition('messenger.transport.serializer')
1455-
->replaceArgument(1, $config['transport']['serializer']['format'])
1456-
->replaceArgument(2, $config['transport']['serializer']['context']);
1455+
->replaceArgument(1, $config['serializer']['format'])
1456+
->replaceArgument(2, $config['serializer']['context']);
14571457
} else {
14581458
$container->removeDefinition('messenger.transport.serializer');
14591459
}
14601460

1461-
$container->setAlias('messenger.transport.encoder', $config['transport']['encoder']);
1462-
$container->setAlias('messenger.transport.decoder', $config['transport']['decoder']);
1461+
$container->setAlias('messenger.transport.encoder', $config['encoder']);
1462+
$container->setAlias('messenger.transport.decoder', $config['decoder']);
14631463

14641464
$messageToSenderIdsMapping = array();
14651465
foreach ($config['routing'] as $message => $messageConfiguration) {

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -352,20 +352,16 @@
352352

353353
<xsd:complexType name="messenger">
354354
<xsd:sequence>
355-
<xsd:element name="transport" type="messenger_transport" minOccurs="0" />
355+
<xsd:element name="serializer" type="messenger_serializer" minOccurs="0" />
356+
<xsd:element name="encoder" type="xsd:string" minOccurs="0" />
357+
<xsd:element name="decoder" type="xsd:string" minOccurs="0" />
356358
<xsd:element name="routing" type="messenger_routing" minOccurs="0" maxOccurs="unbounded" />
357359
<xsd:element name="middlewares" type="messenger_middleware" minOccurs="0" maxOccurs="unbounded" />
358360
<xsd:element name="adapter" type="messenger_adapter" minOccurs="0" maxOccurs="unbounded" />
359361
</xsd:sequence>
360362
</xsd:complexType>
361363

362-
<xsd:complexType name="messenger_transport">
363-
<xsd:sequence>
364-
<xsd:element name="serializer" type="messenger_transport_serializer" minOccurs="0" />
365-
</xsd:sequence>
366-
</xsd:complexType>
367-
368-
<xsd:complexType name="messenger_transport_serializer">
364+
<xsd:complexType name="messenger_serializer">
369365
<xsd:sequence>
370366
<xsd:element name="context" type="metadata" minOccurs="0" maxOccurs="unbounded" />
371367
</xsd:sequence>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -260,15 +260,13 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
260260
),
261261
),
262262
'adapters' => array(),
263-
'transport' => array(
264-
'serializer' => array(
265-
'enabled' => true,
266-
'format' => 'json',
267-
'context' => array(),
268-
),
269-
'encoder' => 'messenger.transport.serializer',
270-
'decoder' => 'messenger.transport.serializer',
263+
'serializer' => array(
264+
'enabled' => true,
265+
'format' => 'json',
266+
'context' => array(),
271267
),
268+
'encoder' => 'messenger.transport.serializer',
269+
'decoder' => 'messenger.transport.serializer',
272270
),
273271
);
274272
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transport.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
$container->loadFromExtension('framework', array(
44
'messenger' => array(
5-
'transport' => array(
6-
'serializer' => array(
7-
'format' => 'csv',
8-
'context' => array('enable_max_depth' => true),
9-
),
5+
'serializer' => array(
6+
'format' => 'csv',
7+
'context' => array('enable_max_depth' => true),
108
),
119
),
1210
));

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transport_no_serializer.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
'enabled' => false,
66
),
77
'messenger' => array(
8-
'transport' => array(
9-
'serializer' => array(
10-
'enabled' => true,
11-
),
8+
'serializer' => array(
9+
'enabled' => true,
1210
),
1311
'adapters' => array(
1412
'default' => 'amqp://localhost/%2f/messages',

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77

88
<framework:config>
99
<framework:messenger>
10-
<framework:transport>
11-
<framework:serializer format="csv">
12-
<framework:context>
13-
<framework:enable_max_depth>true</framework:enable_max_depth>
14-
</framework:context>
15-
</framework:serializer>
16-
</framework:transport>
10+
<framework:serializer format="csv">
11+
<framework:context>
12+
<framework:enable_max_depth>true</framework:enable_max_depth>
13+
</framework:context>
14+
</framework:serializer>
1715
</framework:messenger>
1816
</framework:config>
1917
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport_no_serializer.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
<framework:config>
99
<framework:serializer enabled="false" />
1010
<framework:messenger>
11-
<framework:transport>
12-
<framework:serializer enabled="true" />
13-
</framework:transport>
11+
<framework:serializer enabled="true" />
1412
<framework:adapter name="default" dsn="amqp://localhost/%2f/messages" />
1513
</framework:messenger>
1614
</framework:config>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transport.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
framework:
22
messenger:
3-
transport:
4-
serializer:
5-
format: csv
6-
context:
7-
enable_max_depth: true
3+
serializer:
4+
format: csv
5+
context:
6+
enable_max_depth: true

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transport_no_serializer.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ framework:
22
serializer:
33
enabled: false
44
messenger:
5-
transport:
6-
serializer:
7-
enabled: true
5+
serializer:
6+
enabled: true
87
adapters:
98
default: 'amqp://localhost/%2f/messages'

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy