bug #27834 [DI] Don't show internal service id on binding errors (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 19ab889ed62d · 2018-07-04T17:42:48.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [DI] Don't show internal service id on binding errors | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Will throw Unused binding "$variableName" in service "App\Twig\AppExtension". instead of the current Unused binding "$variableName" in service ".abstract.instanceof.App\Twig\AppExtension". Commits ------- 61f005a [DI] Don't show internal service id on binding errors
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
@@ -117,9 +117,11 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
                 }
             }
 
+            $definition->setBindings($bindings);
+
             // reset fields with "merge" behavior
             $abstract
-                ->setBindings($bindings)
+                ->setBindings(array())
                 ->setArguments(array())
                 ->setMethodCalls(array())
                 ->setDecoratedService(null)
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\BoundArgument;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\ResolveInstanceofConditionalsPass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass;
@@ -250,4 +251,18 @@ public function testMergeReset()
         $this->assertEmpty($abstract->getTags());
         $this->assertTrue($abstract->isAbstract());
     }
+
+    public function testBindings()
+    {
+        $container = new ContainerBuilder();
+        $def = $container->register('foo', self::class)->setBindings(array('$toto' => 123));
+        $def->setInstanceofConditionals(array(parent::class => new ChildDefinition('')));
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+
+        $bindings = $container->getDefinition('foo')->getBindings();
+        $this->assertSame(array('$toto'), array_keys($bindings));
+        $this->assertInstanceOf(BoundArgument::class, $bindings['$toto']);
+        $this->assertSame(123, $bindings['$toto']->getValues()[0]);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -117,9 +117,11 @@ private function processDefinition(ContainerBuilder $container, $id, Definition`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
	`120`	`+ $definition->setBindings($bindings);`
	`121`	`+`
`120`	`122`	`// reset fields with "merge" behavior`
`121`	`123`	`$abstract`
`122`		`- ->setBindings($bindings)`
	`124`	`+ ->setBindings(array())`
`123`	`125`	`->setArguments(array())`
`124`	`126`	`->setMethodCalls(array())`
`125`	`127`	`->setDecoratedService(null)`