bug #22901 Fix missing abstract key in XmlDumper (weaverryan)

fabpot · fabpot · commit 966f3877e7cf · 2017-05-25T15:55:11.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- Fix missing abstract key in XmlDumper | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | none | License | MIT | Doc PR | n/a Unless I'm missing something, the abstract key was missing in the XmlDumper. I noticed it when using `debug:container some_abstract_service` and was seeing "no" for abstract. When this merges to 3.3, the `services-abstract.xml` will need to change to this: ```xml <?xml version="1.0" encoding="utf-8"?> <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> <services> <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" synthetic="true"/> <service id="foo" class="Foo" abstract="true"/> <service id="Psr\Container\ContainerInterface" alias="service_container" public="false"/> <service id="Symfony\Component\DependencyInjection\ContainerInterface" alias="service_container" public="false"/> </services> </container> ``` Commits ------- 40f60ec Fixing missing abstract attribute in XmlDumper
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -191,6 +191,10 @@ private function addService($definition, $id, \DOMElement $parent)
             $service->appendChild($factory);
         }
 
+        if ($definition->isAbstract()) {
+            $service->setAttribute('abstract', 'true');
+        }
+
         if ($callable = $definition->getConfigurator()) {
             $configurator = $this->document->createElement('configurator');
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
@@ -184,4 +184,12 @@ public function testDumpInlinedServices()
 
         $this->assertEquals(file_get_contents(self::$fixturesPath.'/xml/services21.xml'), $dumper->dump());
     }
+
+    public function testDumpAbstractServices()
+    {
+        $container = include self::$fixturesPath.'/containers/container_abstract.php';
+        $dumper = new XmlDumper($container);
+
+        $this->assertEquals(file_get_contents(self::$fixturesPath.'/xml/services_abstract.xml'), $dumper->dump());
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_abstract.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_abstract.php
@@ -0,0 +1,12 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+$container = new ContainerBuilder();
+
+$container
+    ->register('foo', 'Foo')
+    ->setAbstract(true)
+;
+
+return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_abstract.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_abstract.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="foo" class="Foo" abstract="true"/>
+  </services>
+</container>

Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,10 @@ private function addService($definition, $id, \DOMElement $parent)`
`191`	`191`	`$service->appendChild($factory);`
`192`	`192`	`}`
`193`	`193`
	`194`	`+ if ($definition->isAbstract()) {`
	`195`	`+ $service->setAttribute('abstract', 'true');`
	`196`	`+ }`
	`197`	`+`
`194`	`198`	`if ($callable = $definition->getConfigurator()) {`
`195`	`199`	`$configurator = $this->document->createElement('configurator');`
`196`	`200`
Original file line number	Diff line number	Diff line change
`@@ -184,4 +184,12 @@ public function testDumpInlinedServices()`
`184`	`184`
`185`	`185`	`$this->assertEquals(file_get_contents(self::$fixturesPath.'/xml/services21.xml'), $dumper->dump());`
`186`	`186`	`}`
	`187`	`+`
	`188`	`+ public function testDumpAbstractServices()`
	`189`	`+ {`
	`190`	`+ $container = include self::$fixturesPath.'/containers/container_abstract.php';`
	`191`	`+ $dumper = new XmlDumper($container);`
	`192`	`+`
	`193`	`+ $this->assertEquals(file_get_contents(self::$fixturesPath.'/xml/services_abstract.xml'), $dumper->dump());`
	`194`	`+ }`
`187`	`195`	`}`