feature #19892 [DI] Add corresponding service id in some exception messages (nicolas-grekas)

fabpot · fabpot · commit c69b89a26b96 · 2016-09-14T12:02:36.000-07:00
This PR was merged into the 3.2-dev branch. Discussion ---------- [DI] Add corresponding service id in some exception messages | Q | A | ------------- | --- | Branch? | master | New feature? | yes | Tests pass? | yes | License | MIT This already helped me figure out where was my mistake :) Commits ------- d739f8d [DI] Add corresponding service id in some exception messages
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
@@ -14,6 +14,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\ExceptionInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /**
@@ -95,9 +96,22 @@ private function resolveArguments(ContainerBuilder $container, array $arguments,
      * @throws \RuntimeException When the definition is invalid
      */
     private function resolveDefinition(ContainerBuilder $container, DefinitionDecorator $definition)
+    {
+        try {
+            return $this->doResolveDefinition($container, $definition);
+        } catch (ExceptionInterface $e) {
+            $r = new \ReflectionProperty($e, 'message');
+            $r->setAccessible(true);
+            $r->setValue($e, sprintf('Service "%s": %s', $this->currentId, $e->getMessage()));
+
+            throw $e;
+        }
+    }
+
+    private function doResolveDefinition(ContainerBuilder $container, DefinitionDecorator $definition)
     {
         if (!$container->has($parent = $definition->getParent())) {
-            throw new RuntimeException(sprintf('The parent definition "%s" defined for definition "%s" does not exist.', $parent, $this->currentId));
+            throw new RuntimeException(sprintf('Parent definition "%s" does not exist.', $parent));
         }
 
         $parentDef = $container->findDefinition($parent);
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -93,7 +93,7 @@ public function getFactory()
     public function setDecoratedService($id, $renamedId = null, $priority = 0)
     {
         if ($renamedId && $id == $renamedId) {
-            throw new \InvalidArgumentException(sprintf('The decorated service inner name for "%s" must be different than the service name itself.', $id));
+            throw new InvalidArgumentException(sprintf('The decorated service inner name for "%s" must be different than the service name itself.', $id));
         }
 
         if (null === $id) {

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function getFactory()`
`93`	`93`	`public function setDecoratedService($id, $renamedId = null, $priority = 0)`
`94`	`94`	`{`
`95`	`95`	`if ($renamedId && $id == $renamedId) {`
`96`		`- throw new \InvalidArgumentException(sprintf('The decorated service inner name for "%s" must be different than the service name itself.', $id));`
	`96`	`+ throw new InvalidArgumentException(sprintf('The decorated service inner name for "%s" must be different than the service name itself.', $id));`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if (null === $id) {`