bug #9812 [DependencyInjection] fix a regression introduced in #9807 (realityking)

fabpot · fabpot · commit 8b088884e1e2 · 2013-12-18T16:27:04.000+01:00
This PR was merged into the 2.5-dev branch. Discussion ---------- [DependencyInjection] fix a regression introduced in #9807 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - As @stof pointed out in #9807 we always need to dump the fully qualified class name, to support dumping containers in a namespace. Commits ------- 0d78776 [DependencyInjection] fix a regression introduced in #9807
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -490,7 +490,7 @@ private function addServiceConfigurator($id, $definition, $variableName = 'insta
             $class = $this->dumpValue($callable[0]);
             // If the class is a string we can optimize call_user_func away
             if (strpos($class, "'") === 0) {
-                return sprintf("        %s::%s(\$%s);\n", substr($class, 1, -1), $callable[1], $variableName);
+                return sprintf("        \%s::%s(\$%s);\n", substr($class, 1, -1), $callable[1], $variableName);
             }
 
             return sprintf("        call_user_func(array(%s, '%s'), \$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
@@ -701,7 +701,7 @@ private function addNewInstance($id, Definition $definition, $return, $instantia
 
                 // If the class is a string we can optimize call_user_func away
                 if (strpos($class, "'") === 0) {
-                    return sprintf("        $return{$instantiation}%s::%s(%s);\n", substr($class, 1, -1), $definition->getFactoryMethod(), $arguments ? implode(', ', $arguments) : '');
+                    return sprintf("        $return{$instantiation}\%s::%s(%s);\n", substr($class, 1, -1), $definition->getFactoryMethod(), $arguments ? implode(', ', $arguments) : '');
                 }
 
                 return sprintf("        $return{$instantiation}call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($definition->getFactoryClass()), $definition->getFactoryMethod(), $arguments ? ', '.implode(', ', $arguments) : '');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
@@ -138,7 +138,7 @@ protected function getFooService()
     {
         $a = $this->get('foo.baz');
 
-        $this->services['foo'] = $instance = FooClass::getInstance('foo', $a, array($this->getParameter('foo') => 'foo is '.$this->getParameter('foo').'', 'foobar' => $this->getParameter('foo')), true, $this);
+        $this->services['foo'] = $instance = \FooClass::getInstance('foo', $a, array($this->getParameter('foo') => 'foo is '.$this->getParameter('foo').'', 'foobar' => $this->getParameter('foo')), true, $this);
 
         $instance->setBar($this->get('bar'));
         $instance->initialize();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -148,7 +148,7 @@ protected function getFooService()
     {
         $a = $this->get('foo.baz');
 
-        $this->services['foo'] = $instance = FooClass::getInstance('foo', $a, array('bar' => 'foo is bar', 'foobar' => 'bar'), true, $this);
+        $this->services['foo'] = $instance = \FooClass::getInstance('foo', $a, array('bar' => 'foo is bar', 'foobar' => 'bar'), true, $this);
 
         $instance->setBar($this->get('bar'));
         $instance->initialize();
@@ -169,9 +169,9 @@ protected function getFooService()
      */
     protected function getFoo_BazService()
     {
-        $this->services['foo.baz'] = $instance = BazClass::getInstance();
+        $this->services['foo.baz'] = $instance = \BazClass::getInstance();
 
-        BazClass::configureStatic1($instance);
+        \BazClass::configureStatic1($instance);
 
         return $instance;
     }

Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,7 @@ private function addServiceConfigurator($id, $definition, $variableName = 'insta`
`490`	`490`	`$class = $this->dumpValue($callable[0]);`
`491`	`491`	`// If the class is a string we can optimize call_user_func away`
`492`	`492`	`if (strpos($class, "'") === 0) {`
`493`		`- return sprintf(" %s::%s(\$%s);\n", substr($class, 1, -1), $callable[1], $variableName);`
	`493`	`+ return sprintf(" \%s::%s(\$%s);\n", substr($class, 1, -1), $callable[1], $variableName);`
`494`	`494`	`}`
`495`	`495`
`496`	`496`	`return sprintf(" call_user_func(array(%s, '%s'), \$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);`
`@@ -701,7 +701,7 @@ private function addNewInstance($id, Definition $definition, $return, $instantia`
`701`	`701`
`702`	`702`	`// If the class is a string we can optimize call_user_func away`
`703`	`703`	`if (strpos($class, "'") === 0) {`
`704`		`- return sprintf(" $return{$instantiation}%s::%s(%s);\n", substr($class, 1, -1), $definition->getFactoryMethod(), $arguments ? implode(', ', $arguments) : '');`
	`704`	`+ return sprintf(" $return{$instantiation}\%s::%s(%s);\n", substr($class, 1, -1), $definition->getFactoryMethod(), $arguments ? implode(', ', $arguments) : '');`
`705`	`705`	`}`
`706`	`706`
`707`	`707`	`return sprintf(" $return{$instantiation}call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($definition->getFactoryClass()), $definition->getFactoryMethod(), $arguments ? ', '.implode(', ', $arguments) : '');`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ protected function getFooService()`
`138`	`138`	`{`
`139`	`139`	`$a = $this->get('foo.baz');`
`140`	`140`
`141`		`- $this->services['foo'] = $instance = FooClass::getInstance('foo', $a, array($this->getParameter('foo') => 'foo is '.$this->getParameter('foo').'', 'foobar' => $this->getParameter('foo')), true, $this);`
	`141`	`+ $this->services['foo'] = $instance = \FooClass::getInstance('foo', $a, array($this->getParameter('foo') => 'foo is '.$this->getParameter('foo').'', 'foobar' => $this->getParameter('foo')), true, $this);`
`142`	`142`
`143`	`143`	`$instance->setBar($this->get('bar'));`
`144`	`144`	`$instance->initialize();`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ protected function getFooService()`
`148`	`148`	`{`
`149`	`149`	`$a = $this->get('foo.baz');`
`150`	`150`
`151`		`- $this->services['foo'] = $instance = FooClass::getInstance('foo', $a, array('bar' => 'foo is bar', 'foobar' => 'bar'), true, $this);`
	`151`	`+ $this->services['foo'] = $instance = \FooClass::getInstance('foo', $a, array('bar' => 'foo is bar', 'foobar' => 'bar'), true, $this);`
`152`	`152`
`153`	`153`	`$instance->setBar($this->get('bar'));`
`154`	`154`	`$instance->initialize();`
`@@ -169,9 +169,9 @@ protected function getFooService()`
`169`	`169`	`*/`
`170`	`170`	`protected function getFoo_BazService()`
`171`	`171`	`{`
`172`		`- $this->services['foo.baz'] = $instance = BazClass::getInstance();`
	`172`	`+ $this->services['foo.baz'] = $instance = \BazClass::getInstance();`
`173`	`173`
`174`		`- BazClass::configureStatic1($instance);`
	`174`	`+ \BazClass::configureStatic1($instance);`
`175`	`175`
`176`	`176`	`return $instance;`
`177`	`177`	`}`