[DI] Reduce memory overhead of id normalization

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -938,17 +938,16 @@ EOF;
      */
     private function addNormalizedIds()
     {
-        if (!$normalizedIds = $this->container->getNormalizedIds()) {
+        $code = '';
-            return '';
+        $normalizedIds = $this->container->getNormalizedIds();
-        }
-
-        $code = "        \$this->normalizedIds = array(\n";
         ksort($normalizedIds);
         foreach ($normalizedIds as $id => $normalizedId) {
-            $code .= '            '.$this->export($id).' => '.$this->export($normalizedId).",\n";
+            if ($this->container->has($normalizedId)) {
+                $code .= '            '.$this->export($id).' => '.$this->export($normalizedId).",\n";
+            }
         }
 
-        return $code."        );\n";
+        return $code ? "        \$this->normalizedIds = array(\n".$code."        );\n" : '';
     }
 
     /**

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php

@@ -28,10 +28,6 @@ class Container extends AbstractContainer
     public function __construct()
     {
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
 
         $this->aliases = array();
     }

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php

@@ -27,10 +27,6 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
 
         $this->aliases = array();
     }

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php

@@ -29,10 +29,6 @@ class ProjectServiceContainer extends Container
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
         $this->methodMap = array(
             'test' => 'getTestService',
         );

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php

@@ -33,10 +33,6 @@ class ProjectServiceContainer extends Container
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
         $this->methodMap = array(
             'test' => 'getTestService',
         );

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php

@@ -27,10 +27,6 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
         $this->methodMap = array(
             'bar' => 'getBarService',
         );

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php

@@ -27,10 +27,6 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
         $this->methodMap = array(
             'service_from_anonymous_factory' => 'getServiceFromAnonymousFactoryService',
             'service_with_method_call_and_factory' => 'getServiceWithMethodCallAndFactoryService',

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php

@@ -27,10 +27,6 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
         $this->methodMap = array(
             'foo' => 'getFooService',
         );

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php

@@ -29,10 +29,6 @@ class ProjectServiceContainer extends Container
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
         $this->methodMap = array(
             'test' => 'getTestService',
         );

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php

@@ -27,10 +27,6 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
         $this->methodMap = array(
             'bar' => 'getBarService',
             'foo' => 'getFooService',

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services32.php

@@ -27,10 +27,6 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
         $this->methodMap = array(
             'bar' => 'getBarService',
             'foo' => 'getFooService',

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php

@@ -28,8 +28,6 @@ class ProjectServiceContainer extends Container
     {
         $this->services = array();
         $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
             'symfony\\component\\dependencyinjection\\tests\\fixtures\\container33\\foo' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\Container33\\Foo',
         );
         $this->methodMap = array(

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php

@@ -29,10 +29,6 @@ class ProjectServiceContainer extends Container
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
 
         $this->aliases = array();
     }

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php

@@ -29,10 +29,6 @@ class ProjectServiceContainer extends Container
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
         $this->methodMap = array(
             'bar' => 'getBarService',
             'baz' => 'getBazService',

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_dump_proxy_with_void_return_type.php

@@ -27,10 +27,6 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
         $this->methodMap = array(
             'bar' => 'getBarService',
             'foo' => 'getFooService',

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php

@@ -27,10 +27,6 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
         $this->methodMap = array(
             'bar_service' => 'getBarServiceService',
             'baz_service' => 'getBazServiceService',

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php

@@ -27,10 +27,6 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $this->services = array();
-        $this->normalizedIds = array(
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-        );
         $this->methodMap = array(
             'bar_service' => 'getBarServiceService',
             'baz_service' => 'getBazServiceService',

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php

@@ -29,9 +29,6 @@ class ProjectServiceContainer extends Container
         $this->services = array();
         $this->normalizedIds = array(
             'autowired.symfony\\component\\dependencyinjection\\tests\\fixtures\\customdefinition' => 'autowired.Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition',
-            'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
-            'symfony\\component\\dependencyinjection\\tests\\fixtures\\customdefinition' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition',
             'symfony\\component\\dependencyinjection\\tests\\fixtures\\testservicesubscriber' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber',
         );
         $this->methodMap = array(