[MonologBundle] Some code reorganisation

src/Symfony/Bundle/MonologBundle/DependencyInjection/Configuration.php

@@ -49,11 +49,11 @@ class Configuration
                             ->then(function($v) { return strtolower($v); })
                         ->end()
                     ->end()
-                    ->scalarNode('action_level')->end()
                     ->scalarNode('level')->defaultValue('INFO')->end()
-                    ->scalarNode('path')->end()
                     ->booleanNode('bubble')->defaultFalse()->end()
-                    ->scalarNode('buffer_size')->end()
+                    ->scalarNode('path')->end() // stream specific
+                    ->scalarNode('action_level')->end() // fingerscrossed specific
+                    ->scalarNode('buffer_size')->end() // fingerscrossed specific
                     ->arrayNode('handler')
                         ->performNoDeepMerging()
                         ->scalarNode('type')
@@ -64,7 +64,8 @@ class Configuration
                             ->end()
                         ->end()
                         ->scalarNode('level')->defaultValue('DEBUG')->end()
-                        ->scalarNode('path')->end()
+                        ->booleanNode('bubble')->defaultFalse()->end()
+                        ->scalarNode('path')->end() // stream specific
                     ->end()
                     ->validate()
                         ->ifTrue(function($v) { return 'fingerscrossed' === $v['type'] && !isset($v['handler']); })

src/Symfony/Bundle/MonologBundle/Resources/config/schema/monolog-1.0.xsd

@@ -23,7 +23,6 @@
         </xsd:all>
         <xsd:attributeGroup ref="handler_attributes" />
         <xsd:attribute name="name" type="xsd:string" use="required">
-        <xsd:attribute name="bubble" type="xsd:boolean" />
         <xsd:attribute name="action-level" type="level" />
         <xsd:attribute name="buffer-size" type="xsd:integer" />
     </xsd:complexType>
@@ -45,6 +44,7 @@
     <xsd:attributeGroup name="handler_attributes">
         <xsd:attribute name="type" type="xsd:string" use="required" />
         <xsd:attribute name="level" type="level" />
+        <xsd:attribute name="bubble" type="xsd:boolean" />
         <xsd:attribute name="path" type="xsd:string" />
     </xsd:attributeGroup>
 </xsd:schema>