security #cve-2019-10910 [DI] Check service IDs are valid (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 4c80c3444854 · 2019-04-16T13:21:55.000+02:00
This PR was merged into the 4.1 branch. Discussion ---------- [DI] Check service IDs are valid Based on #87 Commits ------- c86d27181a [DI] Check service IDs are valid
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -54,7 +54,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =
         $instantiation = 'return';
 
         if ($definition->isShared()) {
-            $instantiation .= sprintf(' $this->%s[\'%s\'] =', \method_exists(ContainerBuilder::class, 'addClassResource') || ($definition->isPublic() && !$definition->isPrivate()) ? 'services' : 'privates', $id);
+            $instantiation .= sprintf(' $this->%s[%s] =', \method_exists(ContainerBuilder::class, 'addClassResource') || ($definition->isPublic() && !$definition->isPrivate()) ? 'services' : 'privates', var_export($id, true));
         }
 
         if (null === $factoryCode) {
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -824,6 +824,10 @@ public function setAlias($alias, $id)
     {
         $alias = (string) $alias;
 
+        if ('' === $alias || '\\' === $alias[-1] || \strlen($alias) !== strcspn($alias, "\0\r\n'")) {
+            throw new InvalidArgumentException(sprintf('Invalid alias id: "%s"', $alias));
+        }
+
         if (\is_string($id)) {
             $id = new Alias($id);
         } elseif (!$id instanceof Alias) {
@@ -977,6 +981,10 @@ public function setDefinition($id, Definition $definition)
 
         $id = (string) $id;
 
+        if ('' === $id || '\\' === $id[-1] || \strlen($id) !== strcspn($id, "\0\r\n'")) {
+            throw new InvalidArgumentException(sprintf('Invalid service id: "%s"', $id));
+        }
+
         unset($this->aliasDefinitions[$id], $this->removedIds[$id]);
 
         return $this->definitions[$id] = $definition;
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -476,7 +476,7 @@ private function addServiceInstance(string $id, Definition $definition, bool $is
         $instantiation = '';
 
         if (!$isProxyCandidate && $definition->isShared()) {
-            $instantiation = sprintf('$this->%s[\'%s\'] = %s', $this->container->getDefinition($id)->isPublic() ? 'services' : 'privates', $id, $isSimpleInstance ? '' : '$instance');
+            $instantiation = sprintf('$this->%s[%s] = %s', $this->container->getDefinition($id)->isPublic() ? 'services' : 'privates', $this->doExport($id), $isSimpleInstance ? '' : '$instance');
         } elseif (!$isSimpleInstance) {
             $instantiation = '$instance';
         }
@@ -639,6 +639,9 @@ private function addService(string $id, Definition $definition, string &$file =
      * Gets the $public '$id'$shared$autowired service.
      *
      * $return
+EOF;
+            $code = str_replace('*/', ' ', $code).<<<EOF
+
      */
     protected function {$methodName}($lazyInitialization)
     {
@@ -659,7 +662,7 @@ protected function {$methodName}($lazyInitialization)
 
         if ($this->getProxyDumper()->isProxyCandidate($definition)) {
             $factoryCode = $asFile ? "\$this->load('%s.php', false)" : '$this->%s(false)';
-            $code .= $this->getProxyDumper()->getProxyFactoryCode($definition, $id, sprintf($factoryCode, $methodName));
+            $code .= $this->getProxyDumper()->getProxyFactoryCode($definition, $id, sprintf($factoryCode, $methodName, $this->doExport($id)));
         }
 
         if ($definition->isDeprecated()) {
@@ -733,14 +736,14 @@ private function addInlineReference(string $id, Definition $definition, string $
 
         $code .= sprintf(<<<'EOTXT'
 
-        if (isset($this->%s['%s'])) {
-            return $this->%1$s['%2$s'];
+        if (isset($this->%s[%s])) {
+            return $this->%1$s[%2$s];
         }
 
 EOTXT
             ,
             $this->container->getDefinition($id)->isPublic() ? 'services' : 'privates',
-            $id
+            $this->doExport($id)
         );
 
         return $code;
@@ -830,7 +833,7 @@ private function generateServiceFiles()
                         $code = ["\n", $code];
                     }
                     $code[1] = implode("\n", array_map(function ($line) { return $line ? '    '.$line : $line; }, explode("\n", $code[1])));
-                    $factory = sprintf('$this->factories%s[\'%s\']', $definition->isPublic() ? '' : "['service_container']", $id);
+                    $factory = sprintf('$this->factories%s[%s]', $definition->isPublic() ? '' : "['service_container']", $this->doExport($id));
                     $code[1] = sprintf("%s = function () {\n%s};\n\nreturn %1\$s();\n", $factory, $code[1]);
                     $code = $code[0].$code[1];
                 }
@@ -1341,14 +1344,14 @@ private function getServiceConditionals($value): string
             if (!$this->container->hasDefinition($service)) {
                 return 'false';
             }
-            $conditions[] = sprintf("isset(\$this->%s['%s'])", $this->container->getDefinition($service)->isPublic() ? 'services' : 'privates', $service);
+            $conditions[] = sprintf("isset(\$this->%s[%s])", $this->container->getDefinition($service)->isPublic() ? 'services' : 'privates', $this->doExport($service));
         }
         foreach (ContainerBuilder::getServiceConditionals($value) as $service) {
             if ($this->container->hasDefinition($service) && !$this->container->getDefinition($service)->isPublic()) {
                 continue;
             }
 
-            $conditions[] = sprintf("\$this->has('%s')", $service);
+            $conditions[] = sprintf("\$this->has(%s)", $this->doExport($service));
         }
 
         if (!$conditions) {
@@ -1579,11 +1582,11 @@ private function dumpParameter(string $name): string
             }
 
             if (!preg_match("/\\\$this->(?:getEnv\('(?:\w++:)*+\w++'\)|targetDirs\[\d++\])/", $dumpedValue)) {
-                return sprintf("\$this->parameters['%s']", $name);
+                return sprintf('$this->parameters[%s]', $this->doExport($name));
             }
         }
 
-        return sprintf("\$this->getParameter('%s')", $name);
+        return sprintf('$this->getParameter(%s)', $this->doExport($name));
     }
 
     private function getServiceCall(string $id, Reference $reference = null): string
@@ -1598,7 +1601,7 @@ private function getServiceCall(string $id, Reference $reference = null): string
 
         if ($this->container->hasDefinition($id) && $definition = $this->container->getDefinition($id)) {
             if ($definition->isSynthetic()) {
-                $code = sprintf('$this->get(\'%s\'%s)', $id, null !== $reference ? ', '.$reference->getInvalidBehavior() : '');
+                $code = sprintf('$this->get(%s%s)', $this->doExport($id), null !== $reference ? ', '.$reference->getInvalidBehavior() : '');
             } elseif (null !== $reference && ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $reference->getInvalidBehavior()) {
                 $code = 'null';
                 if (!$definition->isShared()) {
@@ -1607,20 +1610,20 @@ private function getServiceCall(string $id, Reference $reference = null): string
             } elseif ($this->isTrivialInstance($definition)) {
                 $code = substr($this->addNewInstance($definition, '', '', $id), 8, -2);
                 if ($definition->isShared()) {
-                    $code = sprintf('$this->%s[\'%s\'] = %s', $definition->isPublic() ? 'services' : 'privates', $id, $code);
+                    $code = sprintf('$this->%s[%s] = %s', $definition->isPublic() ? 'services' : 'privates', $this->doExport($id), $code);
                 }
                 $code = "($code)";
             } elseif ($this->asFiles && !$this->isHotPath($definition)) {
                 $code = sprintf("\$this->load('%s.php')", $this->generateMethodName($id));
                 if (!$definition->isShared()) {
-                    $factory = sprintf('$this->factories%s[\'%s\']', $definition->isPublic() ? '' : "['service_container']", $id);
+                    $factory = sprintf('$this->factories%s[%s]', $definition->isPublic() ? '' : "['service_container']", $this->doExport($id));
                     $code = sprintf('(isset(%s) ? %1$s() : %s)', $factory, $code);
                 }
             } else {
                 $code = sprintf('$this->%s()', $this->generateMethodName($id));
             }
             if ($definition->isShared()) {
-                $code = sprintf('($this->%s[\'%s\'] ?? %s)', $definition->isPublic() ? 'services' : 'privates', $id, $code);
+                $code = sprintf('($this->%s[%s] ?? %s)', $definition->isPublic() ? 'services' : 'privates', $this->doExport($id), $code);
             }
 
             return $code;
@@ -1629,12 +1632,12 @@ private function getServiceCall(string $id, Reference $reference = null): string
             return 'null';
         }
         if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE < $reference->getInvalidBehavior()) {
-            $code = sprintf('$this->get(\'%s\', /* ContainerInterface::NULL_ON_INVALID_REFERENCE */ %d)', $id, ContainerInterface::NULL_ON_INVALID_REFERENCE);
+            $code = sprintf('$this->get(%s, /* ContainerInterface::NULL_ON_INVALID_REFERENCE */ %d)', $this->doExport($id), ContainerInterface::NULL_ON_INVALID_REFERENCE);
         } else {
-            $code = sprintf('$this->get(\'%s\')', $id);
+            $code = sprintf('$this->get(%s)', $this->doExport($id));
         }
 
-        return sprintf('($this->services[\'%s\'] ?? %s)', $id, $code);
+        return sprintf('($this->services[%s] ?? %s)', $this->doExport($id), $code);
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -195,6 +195,38 @@ public function testNonSharedServicesReturnsDifferentInstances()
         $this->assertNotSame($builder->get('bar'), $builder->get('bar'));
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @dataProvider provideBadId
+     */
+    public function testBadAliasId($id)
+    {
+        $builder = new ContainerBuilder();
+        $builder->setAlias($id, 'foo');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @dataProvider provideBadId
+     */
+    public function testBadDefinitionId($id)
+    {
+        $builder = new ContainerBuilder();
+        $builder->setDefinition($id, new Definition('Foo'));
+    }
+
+    public function provideBadId()
+    {
+        return [
+            [''],
+            ["\0"],
+            ["\r"],
+            ["\n"],
+            ["'"],
+            ['ab\\'],
+        ];
+    }
+
     /**
      * @expectedException        \Symfony\Component\DependencyInjection\Exception\RuntimeException
      * @expectedExceptionMessage You have requested a synthetic service ("foo"). The DIC does not know how to construct this service.
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -236,12 +236,18 @@ public function testAddServiceIdWithUnsupportedCharacters()
     {
         $class = 'Symfony_DI_PhpDumper_Test_Unsupported_Characters';
         $container = new ContainerBuilder();
+        $container->setParameter("'", 'oh-no');
+        $container->register("foo*/oh-no", 'FooClass')->setPublic(true);
         $container->register('bar$', 'FooClass')->setPublic(true);
         $container->register('bar$!', 'FooClass')->setPublic(true);
         $container->compile();
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump(['class' => $class]));
 
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_unsupported_characters.php', $dumper->dump(['class' => $class]));
+
+        require_once self::$fixturesPath.'/php/services_unsupported_characters.php';
+
+        $this->assertTrue(method_exists($class, 'getFooOhNoService'));
         $this->assertTrue(method_exists($class, 'getBarService'));
         $this->assertTrue(method_exists($class, 'getBar2Service'));
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
@@ -66,7 +66,7 @@ public function getRemovedIds()
      */
     protected function getFooService()
     {
-        return $this->services['Bar\Foo'] = new \Bar\Foo();
+        return $this->services['Bar\\Foo'] = new \Bar\Foo();
     }
 
     /**
@@ -76,6 +76,6 @@ protected function getFooService()
      */
     protected function getFoo2Service()
     {
-        return $this->services['Foo\Foo'] = new \Foo\Foo();
+        return $this->services['Foo\\Foo'] = new \Foo\Foo();
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php
@@ -71,11 +71,11 @@ public function getRemovedIds()
      */
     protected function getBusService()
     {
-        $a = ($this->services['App\Db'] ?? $this->getDbService());
+        $a = ($this->services['App\\Db'] ?? $this->getDbService());
 
-        $this->services['App\Bus'] = $instance = new \App\Bus($a);
+        $this->services['App\\Bus'] = $instance = new \App\Bus($a);
 
-        $b = ($this->privates['App\Schema'] ?? $this->getSchemaService());
+        $b = ($this->privates['App\\Schema'] ?? $this->getSchemaService());
         $c = new \App\Registry();
         $c->processor = [0 => $a, 1 => $instance];
 
@@ -94,9 +94,9 @@ protected function getBusService()
      */
     protected function getDbService()
     {
-        $this->services['App\Db'] = $instance = new \App\Db();
+        $this->services['App\\Db'] = $instance = new \App\Db();
 
-        $instance->schema = ($this->privates['App\Schema'] ?? $this->getSchemaService());
+        $instance->schema = ($this->privates['App\\Schema'] ?? $this->getSchemaService());
 
         return $instance;
     }
@@ -108,12 +108,12 @@ protected function getDbService()
      */
     protected function getSchemaService()
     {
-        $a = ($this->services['App\Db'] ?? $this->getDbService());
+        $a = ($this->services['App\\Db'] ?? $this->getDbService());
 
-        if (isset($this->privates['App\Schema'])) {
-            return $this->privates['App\Schema'];
+        if (isset($this->privates['App\\Schema'])) {
+            return $this->privates['App\\Schema'];
         }
 
-        return $this->privates['App\Schema'] = new \App\Schema($a);
+        return $this->privates['App\\Schema'] = new \App\Schema($a);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
@@ -81,7 +81,7 @@ public function getRemovedIds()
      */
     protected function getParentNotExistsService()
     {
-        return $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists();
+        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\ParentNotExists'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists();
     }
 
     /**
@@ -91,7 +91,7 @@ protected function getParentNotExistsService()
      */
     protected function getC1Service()
     {
-        return $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C1();
+        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C1();
     }
 
     /**
@@ -104,7 +104,7 @@ protected function getC2Service()
         include_once $this->targetDirs[1].'/includes/HotPath/C2.php';
         include_once $this->targetDirs[1].'/includes/HotPath/C3.php';
 
-        return $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2(new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3());
+        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C2'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2(new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3());
     }
 
     public function getParameter($name)
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_self_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_self_ref.php
@@ -70,7 +70,7 @@ protected function getFooService()
         $b = new \App\Baz($a);
         $b->bar = $a;
 
-        $this->services['App\Foo'] = $instance = new \App\Foo($b);
+        $this->services['App\\Foo'] = $instance = new \App\Foo($b);
 
         $a->foo = $instance;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
@@ -68,7 +68,7 @@ public function getRemovedIds()
      */
     protected function getRot13EnvVarProcessorService()
     {
-        return $this->services['Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor();
+        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor();
     }
 
     /**
@@ -79,7 +79,7 @@ protected function getRot13EnvVarProcessorService()
     protected function getContainer_EnvVarProcessorsLocatorService()
     {
         return $this->services['container.env_var_processors_locator'] = new \Symfony\Component\DependencyInjection\ServiceLocator(['rot13' => function () {
-            return ($this->services['Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor'] ?? ($this->services['Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor()));
+            return ($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor'] ?? ($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor()));
         }]);
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =`
`54`	`54`	`$instantiation = 'return';`
`55`	`55`
`56`	`56`	`if ($definition->isShared()) {`
`57`		`- $instantiation .= sprintf(' $this->%s[\'%s\'] =', \method_exists(ContainerBuilder::class, 'addClassResource') \|\| ($definition->isPublic() && !$definition->isPrivate()) ? 'services' : 'privates', $id);`
	`57`	`+ $instantiation .= sprintf(' $this->%s[%s] =', \method_exists(ContainerBuilder::class, 'addClassResource') \|\| ($definition->isPublic() && !$definition->isPrivate()) ? 'services' : 'privates', var_export($id, true));`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`if (null === $factoryCode) {`
Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ private function addServiceInstance(string $id, Definition $definition, bool $is`
`476`	`476`	`$instantiation = '';`
`477`	`477`
`478`	`478`	`if (!$isProxyCandidate && $definition->isShared()) {`
`479`		`- $instantiation = sprintf('$this->%s[\'%s\'] = %s', $this->container->getDefinition($id)->isPublic() ? 'services' : 'privates', $id, $isSimpleInstance ? '' : '$instance');`
	`479`	`+ $instantiation = sprintf('$this->%s[%s] = %s', $this->container->getDefinition($id)->isPublic() ? 'services' : 'privates', $this->doExport($id), $isSimpleInstance ? '' : '$instance');`
`480`	`480`	`} elseif (!$isSimpleInstance) {`
`481`	`481`	`$instantiation = '$instance';`
`482`	`482`	`}`
`@@ -639,6 +639,9 @@ private function addService(string $id, Definition $definition, string &$file =`
`639`	`639`	`* Gets the $public '$id'$shared$autowired service.`
`640`	`640`	`*`
`641`	`641`	`* $return`
	`642`	`+EOF;`
	`643`	`+ $code = str_replace('*/', ' ', $code).<<<EOF`
	`644`	`+`
`642`	`645`	`*/`
`643`	`646`	`protected function {$methodName}($lazyInitialization)`
`644`	`647`	`{`
`@@ -659,7 +662,7 @@ protected function {$methodName}($lazyInitialization)`
`659`	`662`
`660`	`663`	`if ($this->getProxyDumper()->isProxyCandidate($definition)) {`
`661`	`664`	`$factoryCode = $asFile ? "\$this->load('%s.php', false)" : '$this->%s(false)';`
`662`		`- $code .= $this->getProxyDumper()->getProxyFactoryCode($definition, $id, sprintf($factoryCode, $methodName));`
	`665`	`+ $code .= $this->getProxyDumper()->getProxyFactoryCode($definition, $id, sprintf($factoryCode, $methodName, $this->doExport($id)));`
`663`	`666`	`}`
`664`	`667`
`665`	`668`	`if ($definition->isDeprecated()) {`
`@@ -733,14 +736,14 @@ private function addInlineReference(string $id, Definition $definition, string $`
`733`	`736`
`734`	`737`	`$code .= sprintf(<<<'EOTXT'`
`735`	`738`
`736`		`- if (isset($this->%s['%s'])) {`
`737`		`- return $this->%1$s['%2$s'];`
	`739`	`+ if (isset($this->%s[%s])) {`
	`740`	`+ return $this->%1$s[%2$s];`
`738`	`741`	`}`
`739`	`742`
`740`	`743`	`EOTXT`
`741`	`744`	`,`
`742`	`745`	`$this->container->getDefinition($id)->isPublic() ? 'services' : 'privates',`
`743`		`- $id`
	`746`	`+ $this->doExport($id)`
`744`	`747`	`);`
`745`	`748`
`746`	`749`	`return $code;`
`@@ -830,7 +833,7 @@ private function generateServiceFiles()`
`830`	`833`	`$code = ["\n", $code];`
`831`	`834`	`}`
`832`	`835`	`$code[1] = implode("\n", array_map(function ($line) { return $line ? ' '.$line : $line; }, explode("\n", $code[1])));`
`833`		`- $factory = sprintf('$this->factories%s[\'%s\']', $definition->isPublic() ? '' : "['service_container']", $id);`
	`836`	`+ $factory = sprintf('$this->factories%s[%s]', $definition->isPublic() ? '' : "['service_container']", $this->doExport($id));`
`834`	`837`	`$code[1] = sprintf("%s = function () {\n%s};\n\nreturn %1\$s();\n", $factory, $code[1]);`
`835`	`838`	`$code = $code[0].$code[1];`
`836`	`839`	`}`
`@@ -1341,14 +1344,14 @@ private function getServiceConditionals($value): string`
`1341`	`1344`	`if (!$this->container->hasDefinition($service)) {`
`1342`	`1345`	`return 'false';`
`1343`	`1346`	`}`
`1344`		`- $conditions[] = sprintf("isset(\$this->%s['%s'])", $this->container->getDefinition($service)->isPublic() ? 'services' : 'privates', $service);`
	`1347`	`+ $conditions[] = sprintf("isset(\$this->%s[%s])", $this->container->getDefinition($service)->isPublic() ? 'services' : 'privates', $this->doExport($service));`
`1345`	`1348`	`}`
`1346`	`1349`	`foreach (ContainerBuilder::getServiceConditionals($value) as $service) {`
`1347`	`1350`	`if ($this->container->hasDefinition($service) && !$this->container->getDefinition($service)->isPublic()) {`
`1348`	`1351`	`continue;`
`1349`	`1352`	`}`
`1350`	`1353`
`1351`		`- $conditions[] = sprintf("\$this->has('%s')", $service);`
	`1354`	`+ $conditions[] = sprintf("\$this->has(%s)", $this->doExport($service));`
`1352`	`1355`	`}`
`1353`	`1356`
`1354`	`1357`	`if (!$conditions) {`
`@@ -1579,11 +1582,11 @@ private function dumpParameter(string $name): string`
`1579`	`1582`	`}`
`1580`	`1583`
`1581`	`1584`	`if (!preg_match("/\\\$this->(?:getEnv\('(?:\w++:)*+\w++'\)\|targetDirs\[\d++\])/", $dumpedValue)) {`
`1582`		`- return sprintf("\$this->parameters['%s']", $name);`
	`1585`	`+ return sprintf('$this->parameters[%s]', $this->doExport($name));`
`1583`	`1586`	`}`
`1584`	`1587`	`}`
`1585`	`1588`
`1586`		`- return sprintf("\$this->getParameter('%s')", $name);`
	`1589`	`+ return sprintf('$this->getParameter(%s)', $this->doExport($name));`
`1587`	`1590`	`}`
`1588`	`1591`
`1589`	`1592`	`private function getServiceCall(string $id, Reference $reference = null): string`
`@@ -1598,7 +1601,7 @@ private function getServiceCall(string $id, Reference $reference = null): string`
`1598`	`1601`
`1599`	`1602`	`if ($this->container->hasDefinition($id) && $definition = $this->container->getDefinition($id)) {`
`1600`	`1603`	`if ($definition->isSynthetic()) {`
`1601`		`- $code = sprintf('$this->get(\'%s\'%s)', $id, null !== $reference ? ', '.$reference->getInvalidBehavior() : '');`
	`1604`	`+ $code = sprintf('$this->get(%s%s)', $this->doExport($id), null !== $reference ? ', '.$reference->getInvalidBehavior() : '');`
`1602`	`1605`	`} elseif (null !== $reference && ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $reference->getInvalidBehavior()) {`
`1603`	`1606`	`$code = 'null';`
`1604`	`1607`	`if (!$definition->isShared()) {`
`@@ -1607,20 +1610,20 @@ private function getServiceCall(string $id, Reference $reference = null): string`
`1607`	`1610`	`} elseif ($this->isTrivialInstance($definition)) {`
`1608`	`1611`	`$code = substr($this->addNewInstance($definition, '', '', $id), 8, -2);`
`1609`	`1612`	`if ($definition->isShared()) {`
`1610`		`- $code = sprintf('$this->%s[\'%s\'] = %s', $definition->isPublic() ? 'services' : 'privates', $id, $code);`
	`1613`	`+ $code = sprintf('$this->%s[%s] = %s', $definition->isPublic() ? 'services' : 'privates', $this->doExport($id), $code);`
`1611`	`1614`	`}`
`1612`	`1615`	`$code = "($code)";`
`1613`	`1616`	`} elseif ($this->asFiles && !$this->isHotPath($definition)) {`
`1614`	`1617`	`$code = sprintf("\$this->load('%s.php')", $this->generateMethodName($id));`
`1615`	`1618`	`if (!$definition->isShared()) {`
`1616`		`- $factory = sprintf('$this->factories%s[\'%s\']', $definition->isPublic() ? '' : "['service_container']", $id);`
	`1619`	`+ $factory = sprintf('$this->factories%s[%s]', $definition->isPublic() ? '' : "['service_container']", $this->doExport($id));`
`1617`	`1620`	`$code = sprintf('(isset(%s) ? %1$s() : %s)', $factory, $code);`
`1618`	`1621`	`}`
`1619`	`1622`	`} else {`
`1620`	`1623`	`$code = sprintf('$this->%s()', $this->generateMethodName($id));`
`1621`	`1624`	`}`
`1622`	`1625`	`if ($definition->isShared()) {`
`1623`		`- $code = sprintf('($this->%s[\'%s\'] ?? %s)', $definition->isPublic() ? 'services' : 'privates', $id, $code);`
	`1626`	`+ $code = sprintf('($this->%s[%s] ?? %s)', $definition->isPublic() ? 'services' : 'privates', $this->doExport($id), $code);`
`1624`	`1627`	`}`
`1625`	`1628`
`1626`	`1629`	`return $code;`
`@@ -1629,12 +1632,12 @@ private function getServiceCall(string $id, Reference $reference = null): string`
`1629`	`1632`	`return 'null';`
`1630`	`1633`	`}`
`1631`	`1634`	`if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE < $reference->getInvalidBehavior()) {`
`1632`		`- $code = sprintf('$this->get(\'%s\', /* ContainerInterface::NULL_ON_INVALID_REFERENCE */ %d)', $id, ContainerInterface::NULL_ON_INVALID_REFERENCE);`
	`1635`	`+ $code = sprintf('$this->get(%s, /* ContainerInterface::NULL_ON_INVALID_REFERENCE */ %d)', $this->doExport($id), ContainerInterface::NULL_ON_INVALID_REFERENCE);`
`1633`	`1636`	`} else {`
`1634`		`- $code = sprintf('$this->get(\'%s\')', $id);`
	`1637`	`+ $code = sprintf('$this->get(%s)', $this->doExport($id));`
`1635`	`1638`	`}`
`1636`	`1639`
`1637`		`- return sprintf('($this->services[\'%s\'] ?? %s)', $id, $code);`
	`1640`	`+ return sprintf('($this->services[%s] ?? %s)', $this->doExport($id), $code);`
`1638`	`1641`	`}`
`1639`	`1642`
`1640`	`1643`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function getRemovedIds()`
`66`	`66`	`*/`
`67`	`67`	`protected function getFooService()`
`68`	`68`	`{`
`69`		`- return $this->services['Bar\Foo'] = new \Bar\Foo();`
	`69`	`+ return $this->services['Bar\\Foo'] = new \Bar\Foo();`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/**`
`@@ -76,6 +76,6 @@ protected function getFooService()`
`76`	`76`	`*/`
`77`	`77`	`protected function getFoo2Service()`
`78`	`78`	`{`
`79`		`- return $this->services['Foo\Foo'] = new \Foo\Foo();`
	`79`	`+ return $this->services['Foo\\Foo'] = new \Foo\Foo();`
`80`	`80`	`}`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,11 @@ public function getRemovedIds()`
`71`	`71`	`*/`
`72`	`72`	`protected function getBusService()`
`73`	`73`	`{`
`74`		`- $a = ($this->services['App\Db'] ?? $this->getDbService());`
	`74`	`+ $a = ($this->services['App\\Db'] ?? $this->getDbService());`
`75`	`75`
`76`		`- $this->services['App\Bus'] = $instance = new \App\Bus($a);`
	`76`	`+ $this->services['App\\Bus'] = $instance = new \App\Bus($a);`
`77`	`77`
`78`		`- $b = ($this->privates['App\Schema'] ?? $this->getSchemaService());`
	`78`	`+ $b = ($this->privates['App\\Schema'] ?? $this->getSchemaService());`
`79`	`79`	`$c = new \App\Registry();`
`80`	`80`	`$c->processor = [0 => $a, 1 => $instance];`
`81`	`81`
`@@ -94,9 +94,9 @@ protected function getBusService()`
`94`	`94`	`*/`
`95`	`95`	`protected function getDbService()`
`96`	`96`	`{`
`97`		`- $this->services['App\Db'] = $instance = new \App\Db();`
	`97`	`+ $this->services['App\\Db'] = $instance = new \App\Db();`
`98`	`98`
`99`		`- $instance->schema = ($this->privates['App\Schema'] ?? $this->getSchemaService());`
	`99`	`+ $instance->schema = ($this->privates['App\\Schema'] ?? $this->getSchemaService());`
`100`	`100`
`101`	`101`	`return $instance;`
`102`	`102`	`}`
`@@ -108,12 +108,12 @@ protected function getDbService()`
`108`	`108`	`*/`
`109`	`109`	`protected function getSchemaService()`
`110`	`110`	`{`
`111`		`- $a = ($this->services['App\Db'] ?? $this->getDbService());`
	`111`	`+ $a = ($this->services['App\\Db'] ?? $this->getDbService());`
`112`	`112`
`113`		`- if (isset($this->privates['App\Schema'])) {`
`114`		`- return $this->privates['App\Schema'];`
	`113`	`+ if (isset($this->privates['App\\Schema'])) {`
	`114`	`+ return $this->privates['App\\Schema'];`
`115`	`115`	`}`
`116`	`116`
`117`		`- return $this->privates['App\Schema'] = new \App\Schema($a);`
	`117`	`+ return $this->privates['App\\Schema'] = new \App\Schema($a);`
`118`	`118`	`}`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function getRemovedIds()`
`81`	`81`	`*/`
`82`	`82`	`protected function getParentNotExistsService()`
`83`	`83`	`{`
`84`		`- return $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists();`
	`84`	`+ return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\ParentNotExists'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists();`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/**`
`@@ -91,7 +91,7 @@ protected function getParentNotExistsService()`
`91`	`91`	`*/`
`92`	`92`	`protected function getC1Service()`
`93`	`93`	`{`
`94`		`- return $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C1();`
	`94`	`+ return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C1();`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`/**`
`@@ -104,7 +104,7 @@ protected function getC2Service()`
`104`	`104`	`include_once $this->targetDirs[1].'/includes/HotPath/C2.php';`
`105`	`105`	`include_once $this->targetDirs[1].'/includes/HotPath/C3.php';`
`106`	`106`
`107`		`- return $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2(new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3());`
	`107`	`+ return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C2'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2(new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3());`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`public function getParameter($name)`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function getRemovedIds()`
`68`	`68`	`*/`
`69`	`69`	`protected function getRot13EnvVarProcessorService()`
`70`	`70`	`{`
`71`		`- return $this->services['Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor();`
	`71`	`+ return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor();`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
`@@ -79,7 +79,7 @@ protected function getRot13EnvVarProcessorService()`
`79`	`79`	`protected function getContainer_EnvVarProcessorsLocatorService()`
`80`	`80`	`{`
`81`	`81`	`return $this->services['container.env_var_processors_locator'] = new \Symfony\Component\DependencyInjection\ServiceLocator(['rot13' => function () {`
`82`		`- return ($this->services['Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor'] ?? ($this->services['Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor()));`
	`82`	`+ return ($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor'] ?? ($this->services['Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor()));`
`83`	`83`	`}]);`
`84`	`84`	`}`
`85`	`85`