[Bridge\Doctrine] Fix BC with DI v3.4

nicolas-grekas · nicolas-grekas · commit b03f0bdb0632 · 2017-07-19T17:20:22.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
@@ -49,10 +49,13 @@ protected function resetService($name)
         }
         $manager->setProxyInitializer(\Closure::bind(
             function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {
+                if (isset($this->normalizedIds[$normalizedId = strtolower($name)])) { // BC with DI v3.4
+                    $name = $this->normalizedIds[$normalizedId];
+                }
                 if (isset($this->aliases[$name])) {
                     $name = $this->aliases[$name];
                 }
-                $method = $this->methodMap[$name] ?? 'get'.$name.'Service';
+                $method = $this->methodMap[$name] ?? 'get'.strtr($name, $this->underscoreMap).'Service'; // BC with DI v3.4
                 $wrappedInstance = $this->{$method}(false);
 
                 $manager->setProxyInitializer(null);

Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,13 @@ protected function resetService($name)`
`49`	`49`	`}`
`50`	`50`	`$manager->setProxyInitializer(\Closure::bind(`
`51`	`51`	`function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {`
	`52`	`+ if (isset($this->normalizedIds[$normalizedId = strtolower($name)])) { // BC with DI v3.4`
	`53`	`+ $name = $this->normalizedIds[$normalizedId];`
	`54`	`+ }`
`52`	`55`	`if (isset($this->aliases[$name])) {`
`53`	`56`	`$name = $this->aliases[$name];`
`54`	`57`	`}`
`55`		`- $method = $this->methodMap[$name] ?? 'get'.$name.'Service';`
	`58`	`+ $method = $this->methodMap[$name] ?? 'get'.strtr($name, $this->underscoreMap).'Service'; // BC with DI v3.4`
`56`	`59`	`$wrappedInstance = $this->{$method}(false);`
`57`	`60`
`58`	`61`	`$manager->setProxyInitializer(null);`