[DoctrineBridge] Use normalizedIds for resetting entity manager services

chalasr · chalasr · commit 9737bcc02442 · 2017-07-04T14:04:47.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
@@ -53,7 +53,10 @@ protected function resetService($name)
         }
         $manager->setProxyInitializer(\Closure::bind(
             function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {
-                if (isset($this->aliases[$name = strtolower($name)])) {
+                if (isset($this->normalizedIds[$normalizedId = strtolower($name)])) {
+                    $name = $this->normalizedIds[$normalizedId];
+                }
+                if (isset($this->aliases[$name])) {
                     $name = $this->aliases[$name];
                 }
                 $method = !isset($this->methodMap[$name]) ? 'get'.strtr($name, $this->underscoreMap).'Service' : $this->methodMap[$name];

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,10 @@ protected function resetService($name)`
`53`	`53`	`}`
`54`	`54`	`$manager->setProxyInitializer(\Closure::bind(`
`55`	`55`	`function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {`
`56`		`- if (isset($this->aliases[$name = strtolower($name)])) {`
	`56`	`+ if (isset($this->normalizedIds[$normalizedId = strtolower($name)])) {`
	`57`	`+ $name = $this->normalizedIds[$normalizedId];`
	`58`	`+ }`
	`59`	`+ if (isset($this->aliases[$name])) {`
`57`	`60`	`$name = $this->aliases[$name];`
`58`	`61`	`}`
`59`	`62`	`$method = !isset($this->methodMap[$name]) ? 'get'.strtr($name, $this->underscoreMap).'Service' : $this->methodMap[$name];`