minor #27813 [Doctrine Bridge] Fixed usage of wrong variable when tagged subscriber is invalid (stloyd)

fabpot · fabpot · commit 7f3aae010baa · 2018-07-03T12:50:43.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [Doctrine Bridge] Fixed usage of wrong variable when tagged subscriber is invalid | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #27811 | License | MIT This change prevents error when invalid subscriber is being used. Expected result: ``` The Doctrine connection "root" referenced in service "stof_doctrine_extensions.listener.sluggable" does not exist. Available connections names: default ``` Actual error: ``` Notice: Array to string conversion ``` Commits ------- cf1bc66 [Doctrine Bridge] Fixed usage of wrong variable when tagged subscriber is invalid
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -75,7 +75,7 @@ private function addTaggedSubscribers(ContainerBuilder $container)
             $connections = isset($tag['connection']) ? array($tag['connection']) : array_keys($this->connections);
             foreach ($connections as $con) {
                 if (!isset($this->connections[$con])) {
-                    throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s', $con, $taggedSubscriber, implode(', ', array_keys($this->connections))));
+                    throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s', $con, $id, implode(', ', array_keys($this->connections))));
                 }
 
                 $this->getEventManagerDef($container, $con)->addMethodCall('addEventSubscriber', array(new Reference($id)));

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ private function addTaggedSubscribers(ContainerBuilder $container)`
`75`	`75`	`$connections = isset($tag['connection']) ? array($tag['connection']) : array_keys($this->connections);`
`76`	`76`	`foreach ($connections as $con) {`
`77`	`77`	`if (!isset($this->connections[$con])) {`
`78`		`- throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s', $con, $taggedSubscriber, implode(', ', array_keys($this->connections))));`
	`78`	`+ throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s', $con, $id, implode(', ', array_keys($this->connections))));`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`$this->getEventManagerDef($container, $con)->addMethodCall('addEventSubscriber', array(new Reference($id)));`