minor #35044 [DoctrineBridge] Cleanup 3.4 legacy (ro0NL)

nicolas-grekas · nicolas-grekas · commit 94ab844014a9 · 2019-12-19T16:41:34.000+01:00
This PR was merged into the 5.0 branch. Discussion ---------- [DoctrineBridge] Cleanup 3.4 legacy | Q | A | ------------- | --- | Branch? | 5.0 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #...  | License | MIT | Doc PR | symfony/symfony-docs#...   Commits ------- 6041be7 [DoctrineBridge] Cleanup 3.4 legacy
diff --git a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
@@ -54,17 +54,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];
                 }
                 if (isset($this->fileMap[$name])) {
                     $wrappedInstance = $this->load($this->fileMap[$name]);
                 } else {
-                    $method = $this->methodMap[$name] ?? 'get'.strtr($name, $this->underscoreMap).'Service'; // BC with DI v3.4
-                    $wrappedInstance = $this->{$method}(false);
+                    $wrappedInstance = $this->{$this->methodMap[$name]}(false);
                 }
 
                 $manager->setProxyInitializer(null);

Original file line number	Diff line number	Diff line change
`@@ -54,17 +54,13 @@ protected function resetService($name)`
`54`	`54`	`}`
`55`	`55`	`$manager->setProxyInitializer(\Closure::bind(`
`56`	`56`	`function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {`
`57`		`- if (isset($this->normalizedIds[$normalizedId = strtolower($name)])) { // BC with DI v3.4`
`58`		`- $name = $this->normalizedIds[$normalizedId];`
`59`		`- }`
`60`	`57`	`if (isset($this->aliases[$name])) {`
`61`	`58`	`$name = $this->aliases[$name];`
`62`	`59`	`}`
`63`	`60`	`if (isset($this->fileMap[$name])) {`
`64`	`61`	`$wrappedInstance = $this->load($this->fileMap[$name]);`
`65`	`62`	`} else {`
`66`		`- $method = $this->methodMap[$name] ?? 'get'.strtr($name, $this->underscoreMap).'Service'; // BC with DI v3.4`
`67`		`- $wrappedInstance = $this->{$method}(false);`
	`63`	`+ $wrappedInstance = $this->{$this->methodMap[$name]}(false);`
`68`	`64`	`}`
`69`	`65`
`70`	`66`	`$manager->setProxyInitializer(null);`