minor #23300 [DI] Remove an unused property (dunglas)

fabpot · fabpot · commit 06e21f759748 · 2017-07-04T08:21:27.000+03:00
This PR was merged into the 4.0-dev branch. Discussion ---------- [DI] Remove an unused property | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? |no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- e5bb2bc [DI][DoctrineBridge] Remove unused underscoreMap properties
diff --git a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
@@ -52,7 +52,7 @@ function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {
                 if (isset($this->aliases[$name = strtolower($name)])) {
                     $name = $this->aliases[$name];
                 }
-                $method = !isset($this->methodMap[$name]) ? 'get'.strtr($name, $this->underscoreMap).'Service' : $this->methodMap[$name];
+                $method = $this->methodMap[$name] ?? 'get'.$name.'Service';
                 $wrappedInstance = $this->{$method}(false);
 
                 $manager->setProxyInitializer(null);
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -75,7 +75,6 @@ class Container implements ResettableContainerInterface
      */
     protected $normalizedIds = array();
 
-    private $underscoreMap = array('_' => '', '.' => '_', '\\' => '_');
     private $envCache = array();
     private $compiled = false;
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {`
`52`	`52`	`if (isset($this->aliases[$name = strtolower($name)])) {`
`53`	`53`	`$name = $this->aliases[$name];`
`54`	`54`	`}`
`55`		`- $method = !isset($this->methodMap[$name]) ? 'get'.strtr($name, $this->underscoreMap).'Service' : $this->methodMap[$name];`
	`55`	`+ $method = $this->methodMap[$name] ?? 'get'.$name.'Service';`
`56`	`56`	`$wrappedInstance = $this->{$method}(false);`
`57`	`57`
`58`	`58`	`$manager->setProxyInitializer(null);`