minor symfony#25383 [DI] Force root-namespace for function calls in the dumper container (nicolas-grekas)

fabpot · fabpot · commit 6129ae221e54 · 2017-12-07T18:41:42.000-08:00
This PR was merged into the 3.4 branch. Discussion ---------- [DI] Force root-namespace for function calls in the dumper container | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Was not needed before 3.4, but now that the dumped container is namespaced, it is required. Commits ------- f87380c [DI] Force root-namespace for function calls in the dumper container
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -695,7 +695,7 @@ private function addServiceConfigurator(Definition $definition, $variableName =
                 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);
+            return sprintf("        \\call_user_func(array(%s, '%s'), \$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
         }
 
         return sprintf("        %s(\$%s);\n", $callable, $variableName);
@@ -895,7 +895,7 @@ private function addNewInstance(Definition $definition, $return, $instantiation,
                     return $return.sprintf("(%s)->%s(%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '');
                 }
 
-                return $return.sprintf("call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? ', '.implode(', ', $arguments) : '');
+                return $return.sprintf("\\call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? ', '.implode(', ', $arguments) : '');
             }
 
             return $return.sprintf("%s(%s);\n", $this->dumpLiteralClass($this->dumpValue($callable)), $arguments ? implode(', ', $arguments) : '');
@@ -948,11 +948,11 @@ public function __construct()
 
 EOF;
         if (null !== $this->targetDirRegex) {
-            $dir = $this->asFiles ? '$this->targetDirs[0] = dirname(__DIR__)' : '__DIR__';
+            $dir = $this->asFiles ? '$this->targetDirs[0] = \\dirname(__DIR__)' : '__DIR__';
             $code .= <<<EOF
         \$dir = {$dir};
         for (\$i = 1; \$i <= {$this->targetDirMaxMatches}; ++\$i) {
-            \$this->targetDirs[\$i] = \$dir = dirname(\$dir);
+            \$this->targetDirs[\$i] = \$dir = \\dirname(\$dir);
         }
 
 EOF;
@@ -1722,7 +1722,7 @@ private function dumpValue($value, $interpolate = true)
                     }
 
                     if ($factory[0] instanceof Definition) {
-                        return sprintf("call_user_func(array(%s, '%s')%s)", $this->dumpValue($factory[0]), $factory[1], count($arguments) > 0 ? ', '.implode(', ', $arguments) : '');
+                        return sprintf("\\call_user_func(array(%s, '%s')%s)", $this->dumpValue($factory[0]), $factory[1], count($arguments) > 0 ? ', '.implode(', ', $arguments) : '');
                     }
 
                     if ($factory[0] instanceof Reference) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
@@ -23,7 +23,7 @@ public function __construct()
     {
         $dir = __DIR__;
         for ($i = 1; $i <= 5; ++$i) {
-            $this->targetDirs[$i] = $dir = dirname($dir);
+            $this->targetDirs[$i] = $dir = \dirname($dir);
         }
         $this->parameters = $this->getDefaultParameters();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
@@ -23,7 +23,7 @@ public function __construct()
     {
         $dir = __DIR__;
         for ($i = 1; $i <= 5; ++$i) {
-            $this->targetDirs[$i] = $dir = dirname($dir);
+            $this->targetDirs[$i] = $dir = \dirname($dir);
         }
         $this->parameters = $this->getDefaultParameters();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
@@ -223,9 +223,9 @@ protected function getFooService()
      */
     protected function getFoo_BazService()
     {
-        $this->services['foo.baz'] = $instance = call_user_func(array($this->getParameter('baz_class'), 'getInstance'));
+        $this->services['foo.baz'] = $instance = \call_user_func(array($this->getParameter('baz_class'), 'getInstance'));
 
-        call_user_func(array($this->getParameter('baz_class'), 'configureStatic1'), $instance);
+        \call_user_func(array($this->getParameter('baz_class'), 'configureStatic1'), $instance);
 
         return $instance;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -281,9 +281,9 @@ class ProjectServiceContainer extends Container
 
     public function __construct()
     {
-        $dir = $this->targetDirs[0] = dirname(__DIR__);
+        $dir = $this->targetDirs[0] = \dirname(__DIR__);
         for ($i = 1; $i <= 5; ++$i) {
-            $this->targetDirs[$i] = $dir = dirname($dir);
+            $this->targetDirs[$i] = $dir = \dirname($dir);
         }
         $this->parameters = $this->getDefaultParameters();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
@@ -23,7 +23,7 @@ public function __construct()
     {
         $dir = __DIR__;
         for ($i = 1; $i <= 5; ++$i) {
-            $this->targetDirs[$i] = $dir = dirname($dir);
+            $this->targetDirs[$i] = $dir = \dirname($dir);
         }
         $this->parameters = $this->getDefaultParameters();
 
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
@@ -23,7 +23,7 @@ public function __construct()
     {
         $dir = __DIR__;
         for ($i = 1; $i <= 5; ++$i) {
-            $this->targetDirs[$i] = $dir = dirname($dir);
+            $this->targetDirs[$i] = $dir = \dirname($dir);
         }
         $this->parameters = $this->getDefaultParameters();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php
@@ -23,7 +23,7 @@ public function __construct()
     {
         $dir = __DIR__;
         for ($i = 1; $i <= 5; ++$i) {
-            $this->targetDirs[$i] = $dir = dirname($dir);
+            $this->targetDirs[$i] = $dir = \dirname($dir);
         }
         $this->services = array();
         $this->methodMap = array(

Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ private function addServiceConfigurator(Definition $definition, $variableName =`
`695`	`695`	`return sprintf(" (%s)->%s(\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);`
`696`	`696`	`}`
`697`	`697`
`698`		`- return sprintf(" call_user_func(array(%s, '%s'), \$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);`
	`698`	`+ return sprintf(" \\call_user_func(array(%s, '%s'), \$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);`
`699`	`699`	`}`
`700`	`700`
`701`	`701`	`return sprintf(" %s(\$%s);\n", $callable, $variableName);`
`@@ -895,7 +895,7 @@ private function addNewInstance(Definition $definition, $return, $instantiation,`
`895`	`895`	`return $return.sprintf("(%s)->%s(%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '');`
`896`	`896`	`}`
`897`	`897`
`898`		`- return $return.sprintf("call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? ', '.implode(', ', $arguments) : '');`
	`898`	`+ return $return.sprintf("\\call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? ', '.implode(', ', $arguments) : '');`
`899`	`899`	`}`
`900`	`900`
`901`	`901`	`return $return.sprintf("%s(%s);\n", $this->dumpLiteralClass($this->dumpValue($callable)), $arguments ? implode(', ', $arguments) : '');`
`@@ -948,11 +948,11 @@ public function __construct()`
`948`	`948`
`949`	`949`	`EOF;`
`950`	`950`	`if (null !== $this->targetDirRegex) {`
`951`		`- $dir = $this->asFiles ? '$this->targetDirs[0] = dirname(__DIR__)' : '__DIR__';`
	`951`	`+ $dir = $this->asFiles ? '$this->targetDirs[0] = \\dirname(__DIR__)' : '__DIR__';`
`952`	`952`	`$code .= <<<EOF`
`953`	`953`	`\$dir = {$dir};`
`954`	`954`	`for (\$i = 1; \$i <= {$this->targetDirMaxMatches}; ++\$i) {`
`955`		`- \$this->targetDirs[\$i] = \$dir = dirname(\$dir);`
	`955`	`+ \$this->targetDirs[\$i] = \$dir = \\dirname(\$dir);`
`956`	`956`	`}`
`957`	`957`
`958`	`958`	`EOF;`
`@@ -1722,7 +1722,7 @@ private function dumpValue($value, $interpolate = true)`
`1722`	`1722`	`}`
`1723`	`1723`
`1724`	`1724`	`if ($factory[0] instanceof Definition) {`
`1725`		`- return sprintf("call_user_func(array(%s, '%s')%s)", $this->dumpValue($factory[0]), $factory[1], count($arguments) > 0 ? ', '.implode(', ', $arguments) : '');`
	`1725`	`+ return sprintf("\\call_user_func(array(%s, '%s')%s)", $this->dumpValue($factory[0]), $factory[1], count($arguments) > 0 ? ', '.implode(', ', $arguments) : '');`
`1726`	`1726`	`}`
`1727`	`1727`
`1728`	`1728`	`if ($factory[0] instanceof Reference) {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public function __construct()`
`23`	`23`	`{`
`24`	`24`	`$dir = __DIR__;`
`25`	`25`	`for ($i = 1; $i <= 5; ++$i) {`
`26`		`- $this->targetDirs[$i] = $dir = dirname($dir);`
	`26`	`+ $this->targetDirs[$i] = $dir = \dirname($dir);`
`27`	`27`	`}`
`28`	`28`	`$this->parameters = $this->getDefaultParameters();`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -223,9 +223,9 @@ protected function getFooService()`
`223`	`223`	`*/`
`224`	`224`	`protected function getFoo_BazService()`
`225`	`225`	`{`
`226`		`- $this->services['foo.baz'] = $instance = call_user_func(array($this->getParameter('baz_class'), 'getInstance'));`
	`226`	`+ $this->services['foo.baz'] = $instance = \call_user_func(array($this->getParameter('baz_class'), 'getInstance'));`
`227`	`227`
`228`		`- call_user_func(array($this->getParameter('baz_class'), 'configureStatic1'), $instance);`
	`228`	`+ \call_user_func(array($this->getParameter('baz_class'), 'configureStatic1'), $instance);`
`229`	`229`
`230`	`230`	`return $instance;`
`231`	`231`	`}`
Original file line number	Diff line number	Diff line change
`@@ -281,9 +281,9 @@ class ProjectServiceContainer extends Container`
`281`	`281`
`282`	`282`	`public function __construct()`
`283`	`283`	`{`
`284`		`- $dir = $this->targetDirs[0] = dirname(__DIR__);`
	`284`	`+ $dir = $this->targetDirs[0] = \dirname(__DIR__);`
`285`	`285`	`for ($i = 1; $i <= 5; ++$i) {`
`286`		`- $this->targetDirs[$i] = $dir = dirname($dir);`
	`286`	`+ $this->targetDirs[$i] = $dir = \dirname($dir);`
`287`	`287`	`}`
`288`	`288`	`$this->parameters = $this->getDefaultParameters();`
`289`	`289`