[DependencyInjection] Avoid generating call_user_func in more cases

realityking · realityking · commit 9db2a9cc0c52 · 2016-04-30T15:56:01.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -542,6 +542,10 @@ private function addServiceConfigurator($id, $definition, $variableName = 'insta
                 return sprintf("        %s::%s(\$%s);\n", $this->dumpLiteralClass($class), $callable[1], $variableName);
             }
 
+            if (strpos($class, 'new') === 0) {
+                return sprintf("        (%s)->%s(\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
+            }
+
             return sprintf("        call_user_func(array(%s, '%s'), \$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
         }
 
@@ -723,6 +727,10 @@ private function addNewInstance(Definition $definition, $return, $instantiation,
                     return sprintf("        $return{$instantiation}%s::%s(%s);\n", $this->dumpLiteralClass($class), $callable[1], $arguments ? implode(', ', $arguments) : '');
                 }
 
+                if (strpos($class, 'new') === 0) {
+                    return sprintf("        $return{$instantiation}(%s)->%s(%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '');
+                }
+
                 return sprintf("        $return{$instantiation}call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? ', '.implode(', ', $arguments) : '');
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
@@ -40,7 +40,7 @@ public function __construct()
      */
     protected function getServiceFromAnonymousFactoryService()
     {
-        return $this->services['service_from_anonymous_factory'] = call_user_func(array(new \Bar\FooClass(), 'getInstance'));
+        return $this->services['service_from_anonymous_factory'] = (new \Bar\FooClass())->getInstance();
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -128,7 +128,7 @@ protected function getConfiguredServiceSimpleService()
     {
         $this->services['configured_service_simple'] = $instance = new \stdClass();
 
-        call_user_func(array(new \ConfClass('bar'), 'configureStdClass'), $instance);
+        (new \ConfClass('bar'))->configureStdClass($instance);
 
         return $instance;
     }
@@ -199,7 +199,7 @@ protected function getFactoryServiceService()
      */
     protected function getFactoryServiceSimpleService()
     {
-        return $this->services['factory_service_simple'] = call_user_func(array(new \SimpleFactoryClass('foo'), 'getInstance'));
+        return $this->services['factory_service_simple'] = (new \SimpleFactoryClass('foo'))->getInstance();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -542,6 +542,10 @@ private function addServiceConfigurator($id, $definition, $variableName = 'insta`
`542`	`542`	`return sprintf(" %s::%s(\$%s);\n", $this->dumpLiteralClass($class), $callable[1], $variableName);`
`543`	`543`	`}`
`544`	`544`
	`545`	`+ if (strpos($class, 'new') === 0) {`
	`546`	`+ return sprintf(" (%s)->%s(\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);`
	`547`	`+ }`
	`548`	`+`
`545`	`549`	`return sprintf(" call_user_func(array(%s, '%s'), \$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);`
`546`	`550`	`}`
`547`	`551`
`@@ -723,6 +727,10 @@ private function addNewInstance(Definition $definition, $return, $instantiation,`
`723`	`727`	`return sprintf(" $return{$instantiation}%s::%s(%s);\n", $this->dumpLiteralClass($class), $callable[1], $arguments ? implode(', ', $arguments) : '');`
`724`	`728`	`}`
`725`	`729`
	`730`	`+ if (strpos($class, 'new') === 0) {`
	`731`	`+ return sprintf(" $return{$instantiation}(%s)->%s(%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '');`
	`732`	`+ }`
	`733`	`+`
`726`	`734`	`return sprintf(" $return{$instantiation}call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? ', '.implode(', ', $arguments) : '');`
`727`	`735`	`}`
`728`	`736`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function __construct()`
`40`	`40`	`*/`
`41`	`41`	`protected function getServiceFromAnonymousFactoryService()`
`42`	`42`	`{`
`43`		`- return $this->services['service_from_anonymous_factory'] = call_user_func(array(new \Bar\FooClass(), 'getInstance'));`
	`43`	`+ return $this->services['service_from_anonymous_factory'] = (new \Bar\FooClass())->getInstance();`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ protected function getConfiguredServiceSimpleService()`
`128`	`128`	`{`
`129`	`129`	`$this->services['configured_service_simple'] = $instance = new \stdClass();`
`130`	`130`
`131`		`- call_user_func(array(new \ConfClass('bar'), 'configureStdClass'), $instance);`
	`131`	`+ (new \ConfClass('bar'))->configureStdClass($instance);`
`132`	`132`
`133`	`133`	`return $instance;`
`134`	`134`	`}`
`@@ -199,7 +199,7 @@ protected function getFactoryServiceService()`
`199`	`199`	`*/`
`200`	`200`	`protected function getFactoryServiceSimpleService()`
`201`	`201`	`{`
`202`		`- return $this->services['factory_service_simple'] = call_user_func(array(new \SimpleFactoryClass('foo'), 'getInstance'));`
	`202`	`+ return $this->services['factory_service_simple'] = (new \SimpleFactoryClass('foo'))->getInstance();`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`/**`