[DI] Handle root namespace in service definitions

ro0NL · nicolas-grekas · commit 05170c84a21c · 2017-07-12T13:53:12.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -377,15 +377,9 @@ private function addServiceReturn($id, $definition)
      */
     private function addServiceInstance($id, Definition $definition)
     {
-        $class = $definition->getClass();
-
-        if ('\\' === substr($class, 0, 1)) {
-            $class = substr($class, 1);
-        }
-
-        $class = $this->dumpValue($class);
+        $class = $this->dumpValue($definition->getClass());
 
-        if (0 === strpos($class, "'") && !preg_match('/^\'[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\\\{2}[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)*\'$/', $class)) {
+        if (0 === strpos($class, "'") && !preg_match('/^\'(?:\\\{2})?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(?:\\\{2}[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)*\'$/', $class)) {
             throw new InvalidArgumentException(sprintf('"%s" is not a valid class name for the "%s" service.', $class, $id));
         }
 
@@ -1440,11 +1434,13 @@ private function dumpLiteralClass($class)
         if (false !== strpos($class, '$')) {
             throw new RuntimeException('Cannot dump definitions which have a variable class name.');
         }
-        if (0 !== strpos($class, "'") || !preg_match('/^\'[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\\\{2}[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)*\'$/', $class)) {
+        if (0 !== strpos($class, "'") || !preg_match('/^\'(?:\\\{2})?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(?:\\\{2}[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)*\'$/', $class)) {
             throw new RuntimeException(sprintf('Cannot dump definition because of invalid class name (%s)', $class ?: 'n/a'));
         }
 
-        return '\\'.substr(str_replace('\\\\', '\\', $class), 1, -1);
+        $class = substr(str_replace('\\\\', '\\', $class), 1, -1);
+
+        return 0 === strpos($class, '\\') ? $class : '\\'.$class;
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -339,4 +339,17 @@ public function testCircularReferenceAllowanceForInlinedDefinitionsForLazyServic
 
         $this->addToAssertionCount(1);
     }
+
+    public function testDumpHandlesLiteralClassWithRootNamespace()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', '\\stdClass');
+
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Literal_Class_With_Root_Namespace')));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Literal_Class_With_Root_Namespace();
+
+        $this->assertInstanceOf('stdClass', $container->get('foo'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -377,15 +377,9 @@ private function addServiceReturn($id, $definition)`
`377`	`377`	`*/`
`378`	`378`	`private function addServiceInstance($id, Definition $definition)`
`379`	`379`	`{`
`380`		`- $class = $definition->getClass();`
`381`		`-`
`382`		`- if ('\\' === substr($class, 0, 1)) {`
`383`		`- $class = substr($class, 1);`
`384`		`- }`
`385`		`-`
`386`		`- $class = $this->dumpValue($class);`
	`380`	`+ $class = $this->dumpValue($definition->getClass());`
`387`	`381`
`388`		`- if (0 === strpos($class, "'") && !preg_match('/^\'[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff](\\\{2}[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff])*\'$/', $class)) {`
	`382`	`+ if (0 === strpos($class, "'") && !preg_match('/^\'(?:\\\{2})?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff](?:\\\{2}[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff])*\'$/', $class)) {`
`389`	`383`	`throw new InvalidArgumentException(sprintf('"%s" is not a valid class name for the "%s" service.', $class, $id));`
`390`	`384`	`}`
`391`	`385`
`@@ -1440,11 +1434,13 @@ private function dumpLiteralClass($class)`
`1440`	`1434`	`if (false !== strpos($class, '$')) {`
`1441`	`1435`	`throw new RuntimeException('Cannot dump definitions which have a variable class name.');`
`1442`	`1436`	`}`
`1443`		`- if (0 !== strpos($class, "'") \|\| !preg_match('/^\'[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff](\\\{2}[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff])*\'$/', $class)) {`
	`1437`	`+ if (0 !== strpos($class, "'") \|\| !preg_match('/^\'(?:\\\{2})?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff](?:\\\{2}[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff])*\'$/', $class)) {`
`1444`	`1438`	`throw new RuntimeException(sprintf('Cannot dump definition because of invalid class name (%s)', $class ?: 'n/a'));`
`1445`	`1439`	`}`
`1446`	`1440`
`1447`		`- return '\\'.substr(str_replace('\\\\', '\\', $class), 1, -1);`
	`1441`	`+ $class = substr(str_replace('\\\\', '\\', $class), 1, -1);`
	`1442`	`+`
	`1443`	`+ return 0 === strpos($class, '\\') ? $class : '\\'.$class;`
`1448`	`1444`	`}`
`1449`	`1445`
`1450`	`1446`	`/**`