[DI] Fix using private services in expressions

nicolas-grekas · nicolas-grekas · commit 68744e64d6a6 · 2017-07-24T22:54:10.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1597,7 +1597,15 @@ private function getExpressionLanguage()
                 throw new RuntimeException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
             }
             $providers = $this->container->getExpressionLanguageProviders();
-            $this->expressionLanguage = new ExpressionLanguage(null, $providers);
+            $this->expressionLanguage = new ExpressionLanguage(null, $providers, function ($arg) {
+                $id = '""' === substr_replace($arg, '', 1, -1) ? stripcslashes(substr($arg, 1, -1)) : null;
+
+                if (null !== $id && ($this->container->hasAlias($id) || $this->container->hasDefinition($id))) {
+                    return $this->getServiceCall($id);
+                }
+
+                return sprintf('$this->get(%s)', $arg);
+            });
 
             if ($this->container->isTrackingResources()) {
                 foreach ($providers as $provider) {
diff --git a/src/Symfony/Component/DependencyInjection/ExpressionLanguage.php b/src/Symfony/Component/DependencyInjection/ExpressionLanguage.php
@@ -25,10 +25,10 @@ class ExpressionLanguage extends BaseExpressionLanguage
     /**
      * {@inheritdoc}
      */
-    public function __construct($cache = null, array $providers = array())
+    public function __construct($cache = null, array $providers = array(), callable $serviceCompiler = null)
     {
         // prepend the default provider to let users override it easily
-        array_unshift($providers, new ExpressionLanguageProvider());
+        array_unshift($providers, new ExpressionLanguageProvider($serviceCompiler));
 
         parent::__construct($cache, $providers);
     }
diff --git a/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php b/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php
@@ -24,10 +24,17 @@
  */
 class ExpressionLanguageProvider implements ExpressionFunctionProviderInterface
 {
+    private $serviceCompiler;
+
+    public function __construct(callable $serviceCompiler = null)
+    {
+        $this->serviceCompiler = $serviceCompiler;
+    }
+
     public function getFunctions()
     {
         return array(
-            new ExpressionFunction('service', function ($arg) {
+            new ExpressionFunction('service', $this->serviceCompiler ?: function ($arg) {
                 return sprintf('$this->get(%s)', $arg);
             }, function (array $variables, $value) {
                 return $variables['container']->get($value);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
@@ -306,7 +306,7 @@ protected function getMethodCall1Service()
         if ($this->has('foobaz')) {
             $instance->setBar($this->get('foobaz', ContainerInterface::NULL_ON_INVALID_REFERENCE));
         }
-        $instance->setBar(($this->get("foo")->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));
+        $instance->setBar(($this->get('foo')->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));
 
         return $instance;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -299,7 +299,7 @@ protected function getMethodCall1Service()
 
         $instance->setBar($this->get('foo'));
         $instance->setBar(NULL);
-        $instance->setBar(($this->get("foo")->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));
+        $instance->setBar(($this->get('foo')->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));
 
         return $instance;
     }

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,10 @@ class ExpressionLanguage extends BaseExpressionLanguage`
`25`	`25`	`/**`
`26`	`26`	`* {@inheritdoc}`
`27`	`27`	`*/`
`28`		`- public function __construct($cache = null, array $providers = array())`
	`28`	`+ public function __construct($cache = null, array $providers = array(), callable $serviceCompiler = null)`
`29`	`29`	`{`
`30`	`30`	`// prepend the default provider to let users override it easily`
`31`		`- array_unshift($providers, new ExpressionLanguageProvider());`
	`31`	`+ array_unshift($providers, new ExpressionLanguageProvider($serviceCompiler));`
`32`	`32`
`33`	`33`	`parent::__construct($cache, $providers);`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ protected function getMethodCall1Service()`
`306`	`306`	`if ($this->has('foobaz')) {`
`307`	`307`	`$instance->setBar($this->get('foobaz', ContainerInterface::NULL_ON_INVALID_REFERENCE));`
`308`	`308`	`}`
`309`		`- $instance->setBar(($this->get("foo")->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));`
	`309`	`+ $instance->setBar(($this->get('foo')->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));`
`310`	`310`
`311`	`311`	`return $instance;`
`312`	`312`	`}`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ protected function getMethodCall1Service()`
`299`	`299`
`300`	`300`	`$instance->setBar($this->get('foo'));`
`301`	`301`	`$instance->setBar(NULL);`
`302`		`- $instance->setBar(($this->get("foo")->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));`
	`302`	`+ $instance->setBar(($this->get('foo')->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));`
`303`	`303`
`304`	`304`	`return $instance;`
`305`	`305`	`}`