Symfony Serializer's transport is enabled by default

sroze · sroze · commit 3c41fb9fdfd8 · 2018-04-16T14:28:44.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1012,7 +1012,7 @@ function ($a) {
                             ->addDefaultsIfNotSet()
                             ->children()
                                 ->arrayNode('serializer')
-                                    ->{!class_exists(FullStack::class) && class_exists(Serializer::class) ? 'canBeDisabled' : 'canBeEnabled'}()
+                                    ->canBeDisabled()
                                     ->addDefaultsIfNotSet()
                                     ->children()
                                         ->scalarNode('format')->defaultValue('json')->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -370,6 +370,7 @@
             <xsd:element name="context" type="metadata" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="format" type="xsd:string" />
+        <xsd:attribute name="enabled" type="xsd:boolean" />
     </xsd:complexType>
 
     <xsd:complexType name="messenger_routing">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -262,7 +262,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
                 'adapters' => array(),
                 'transport' => array(
                     'serializer' => array(
-                        'enabled' => !class_exists(FullStack::class) && class_exists(Serializer::class),
+                        'enabled' => true,
                         'format' => 'json',
                         'context' => array(),
                     ),
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_adapter.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_adapter.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', array(
+    'serializer' => true,
     'messenger' => array(
         'adapters' => array(
             'default' => 'amqp://localhost/%2f/messages',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transport_no_serializer.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transport_no_serializer.php
@@ -5,6 +5,11 @@
         'enabled' => false,
     ),
     'messenger' => array(
+        'transport' => array(
+            'serializer' => array(
+                'enabled' => true,
+            ),
+        ),
         'adapters' => array(
             'default' => 'amqp://localhost/%2f/messages',
         ),
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_adapter.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_adapter.xml
@@ -6,6 +6,7 @@
         http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
     <framework:config>
+        <framework:serializer enabled="true" />
         <framework:messenger>
             <framework:adapter name="default" dsn="amqp://localhost/%2f/messages" />
             <framework:adapter name="customised" dsn="amqp://localhost/%2f/messages?exchange_name=exchange_name">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport_no_serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport_no_serializer.xml
@@ -8,6 +8,9 @@
     <framework:config>
         <framework:serializer enabled="false" />
         <framework:messenger>
+            <framework:transport>
+                <framework:serializer enabled="true" />
+            </framework:transport>
             <framework:adapter name="default" dsn="amqp://localhost/%2f/messages" />
         </framework:messenger>
     </framework:config>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_adapter.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_adapter.yml
@@ -1,4 +1,5 @@
 framework:
+    serializer: true
     messenger:
         adapters:
             default: 'amqp://localhost/%2f/messages'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transport_no_serializer.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transport_no_serializer.yml
@@ -2,5 +2,8 @@ framework:
     serializer:
         enabled: false
     messenger:
+        transport:
+            serializer:
+                enabled: true
         adapters:
             default: 'amqp://localhost/%2f/messages'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`framework:`
	`2`	`+ serializer: true`
`2`	`3`	`messenger:`
`3`	`4`	`adapters:`
`4`	`5`	`default: 'amqp://localhost/%2f/messages'`