minor #21615 [DI][FrameworkBundle] ServiceLocator: fix XmlDescriptor to use dashes (ogizanagi)

fabpot · fabpot · commit a70ee67a8827 · 2017-02-16T04:32:11.000-08:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [DI][FrameworkBundle] ServiceLocator: fix XmlDescriptor to use dashes | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21600 (comment) | License | MIT | Doc PR | N/A As reported by @stof, I should have used dashes, not underscores. My bad... Commits ------- 1417f11 [DI][FrameworkBundle] ServiceLocator: fix XML descriptor to use dashes
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -437,7 +437,7 @@ private function getArgumentNodes(array $arguments, \DOMDocument $dom)
                     $argumentXML->appendChild($childArgumentXML);
                 }
             } elseif ($argument instanceof ServiceLocatorArgument) {
-                $argumentXML->setAttribute('type', 'service_locator');
+                $argumentXML->setAttribute('type', 'service-locator');
 
                 foreach ($this->getArgumentNodes($argument->getValues(), $dom) as $childArgumentXML) {
                     $argumentXML->appendChild($childArgumentXML);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.xml
@@ -24,7 +24,7 @@
       <argument type="service" id="definition_2"/>
     </argument>
     <argument type="closure-proxy" id="definition1" method="get"/>
-    <argument type="service_locator">
+    <argument type="service-locator">
       <argument key="def1" type="service" id="definition_1"/>
       <argument key="def2" type="service" id="definition_2"/>
     </argument>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_1.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_1.xml
@@ -21,7 +21,7 @@
     <argument type="service" id="definition_2"/>
   </argument>
   <argument type="closure-proxy" id="definition1" method="get"/>
-  <argument type="service_locator">
+  <argument type="service-locator">
     <argument key="def1" type="service" id="definition_1"/>
     <argument key="def2" type="service" id="definition_2"/>
   </argument>

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ private function getArgumentNodes(array $arguments, \DOMDocument $dom)`
`437`	`437`	`$argumentXML->appendChild($childArgumentXML);`
`438`	`438`	`}`
`439`	`439`	`} elseif ($argument instanceof ServiceLocatorArgument) {`
`440`		`- $argumentXML->setAttribute('type', 'service_locator');`
	`440`	`+ $argumentXML->setAttribute('type', 'service-locator');`
`441`	`441`
`442`	`442`	`foreach ($this->getArgumentNodes($argument->getValues(), $dom) as $childArgumentXML) {`
443	`443`	`$argumentXML->appendChild($childArgumentXML);`