feature #28315 [DI] Trigger exception when using '@id' name in parent option (Seb33300)

fabpot · fabpot · commit 68a910f52888 · 2018-09-04T08:40:05.000+02:00
This PR was squashed before being merged into the 4.2-dev branch (closes #28315). Discussion ---------- [DI] Trigger exception when using '@id' name in parent option Same exception [already triggered](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php#L505) on the `decorates` option. | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Note sure if I should submit this change for master or previous branches... Commits ------- 1f67db6 [DI] Trigger exception when using '@id' name in parent option
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -378,6 +378,10 @@ private function parseDefinition($id, $service, $file, array $defaults)
                 }
             }
 
+            if ('' !== $service['parent'] && '@' === $service['parent'][0]) {
+                throw new InvalidArgumentException(sprintf('The value of the "parent" option for the "%s" service must be the id of the service without the "@" prefix (replace "%s" with "%s").', $id, $service['parent'], substr($service['parent'], 1)));
+            }
+
             $definition = new ChildDefinition($service['parent']);
         } else {
             $definition = new Definition();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/bad_parent.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/bad_parent.yml
@@ -0,0 +1,6 @@
+services:
+    foo:
+        class: stdClass
+    bar:
+        class: stdClass
+        parent: "@foo"
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -511,6 +511,16 @@ public function testDefaultsAndChildDefinitionNotAllowed()
         $container->compile();
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @expectedExceptionMessage The value of the "parent" option for the "bar" service must be the id of the service without the "@" prefix (replace "@foo" with "foo").
+     */
+    public function testChildDefinitionWithWrongSyntaxThrowsException()
+    {
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('bad_parent.yml');
+    }
+
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
      * @expectedExceptionMessage The value of the "decorates" option for the "bar" service must be the id of the service without the "@" prefix (replace "@foo" with "foo").

Original file line number	Diff line number	Diff line change
`@@ -378,6 +378,10 @@ private function parseDefinition($id, $service, $file, array $defaults)`
`378`	`378`	`}`
`379`	`379`	`}`
`380`	`380`
	`381`	`+ if ('' !== $service['parent'] && '@' === $service['parent'][0]) {`
	`382`	`+ throw new InvalidArgumentException(sprintf('The value of the "parent" option for the "%s" service must be the id of the service without the "@" prefix (replace "%s" with "%s").', $id, $service['parent'], substr($service['parent'], 1)));`
	`383`	`+ }`
	`384`	`+`
`381`	`385`	`$definition = new ChildDefinition($service['parent']);`
`382`	`386`	`} else {`
`383`	`387`	`$definition = new Definition();`