bug #23856 [DI] Fix dumping abstract with YamlDumper (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 1b9619c6bace · 2017-08-10T16:40:16.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [DI] Fix dumping abstract with YamlDumper | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- c396e8c [DI] Fix dumping abstract with YamlDumper
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -104,6 +104,10 @@ private function addService($id, $definition)
             $code .= sprintf("        factory_class: %s\n", $this->dumper->dump($definition->getFactoryClass(false)));
         }
 
+        if ($definition->isAbstract()) {
+            $code .= "        abstract: true\n";
+        }
+
         if ($definition->isLazy()) {
             $code .= "        lazy: true\n";
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
@@ -12,8 +12,10 @@
 namespace Symfony\Component\DependencyInjection\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\YamlDumper;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\Yaml\Yaml;
 
 class YamlDumperTest extends TestCase
@@ -77,6 +79,16 @@ public function testAddService()
         }
     }
 
+    public function testDumpLoad()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_dump_load.yml');
+
+        $dumper = new YamlDumper($container);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/yaml/services_dump_load.yml', $dumper->dump());
+    }
+
     private function assertEqualYamlStructure($yaml, $expected, $message = '')
     {
         $this->assertEquals(Yaml::parse($expected), Yaml::parse($yaml), $message);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_dump_load.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_dump_load.yml
@@ -0,0 +1,4 @@
+
+services:
+    foo:
+        abstract: true

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,10 @@ private function addService($id, $definition)`
`104`	`104`	`$code .= sprintf(" factory_class: %s\n", $this->dumper->dump($definition->getFactoryClass(false)));`
`105`	`105`	`}`
`106`	`106`
	`107`	`+ if ($definition->isAbstract()) {`
	`108`	`+ $code .= " abstract: true\n";`
	`109`	`+ }`
	`110`	`+`
`107`	`111`	`if ($definition->isLazy()) {`
`108`	`112`	`$code .= " lazy: true\n";`
`109`	`113`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +services:
 +    foo:
 +        abstract: true