[DI] deferred exceptions in ResolveParameterPlaceHoldersPass

fu22ybear · fu22ybear · commit 6b80750c5610 · 2019-12-30T22:56:00.000+03:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -52,7 +52,7 @@ public function __construct()
             new ValidateEnvPlaceholdersPass(),
             new ResolveChildDefinitionsPass(),
             new RegisterServiceSubscribersPass(),
-            new ResolveParameterPlaceHoldersPass(false),
+            new ResolveParameterPlaceHoldersPass(false, false),
             new ResolveFactoryClassPass(),
             new ResolveNamedArgumentsPass(),
             new AutowireRequiredMethodsPass(),
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
@@ -24,10 +24,12 @@ class ResolveParameterPlaceHoldersPass extends AbstractRecursivePass
 {
     private $bag;
     private $resolveArrays;
+    private $throwOnResolveException;
 
-    public function __construct(bool $resolveArrays = true)
+    public function __construct(bool $resolveArrays = true, bool $throwOnResolveException = true)
     {
         $this->resolveArrays = $resolveArrays;
+        $this->throwOnResolveException = $throwOnResolveException;
     }
 
     /**
@@ -61,7 +63,16 @@ public function process(ContainerBuilder $container)
     protected function processValue($value, bool $isRoot = false)
     {
         if (\is_string($value)) {
-            $v = $this->bag->resolveValue($value);
+            try {
+                $v = $this->bag->resolveValue($value);
+            } catch (ParameterNotFoundException $e) {
+                if ($this->throwOnResolveException) {
+                    throw $e;
+                }
+
+                $v = null;
+                $this->container->getDefinition($this->currentId)->addError($e->getMessage());
+            }
 
             return $this->resolveArrays || !$v || !\is_array($v) ? $v : $value;
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Compiler\ResolveParameterPlaceHoldersPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
 
 class ResolveParameterPlaceHoldersPassTest extends TestCase
 {
@@ -71,6 +72,31 @@ public function testBindingsShouldBeResolved()
         $this->assertSame($this->container->getParameterBag()->resolveValue('%env(BAZ)%'), $boundValue);
     }
 
+    public function testParameterNotFoundExceptionsIsThrown()
+    {
+        $this->expectException(ParameterNotFoundException::class);
+        $this->expectExceptionMessage('The service "baz_service_id" has a dependency on a non-existent parameter "non_existent_param".');
+
+        $containerBuilder = new ContainerBuilder();
+        $definition = $containerBuilder->register('baz_service_id');
+        $definition->setArgument(0, '%non_existent_param%');
+
+        $pass = new ResolveParameterPlaceHoldersPass();
+        $pass->process($containerBuilder);
+    }
+
+    public function testParameterNotFoundExceptionsIsNotThrown()
+    {
+        $containerBuilder = new ContainerBuilder();
+        $definition = $containerBuilder->register('baz_service_id');
+        $definition->setArgument(0, '%non_existent_param%');
+
+        $pass = new ResolveParameterPlaceHoldersPass(true, false);
+        $pass->process($containerBuilder);
+
+        $this->assertCount(1, $definition->getErrors());
+    }
+
     private function createContainerBuilder(): ContainerBuilder
     {
         $containerBuilder = new ContainerBuilder();

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,12 @@ class ResolveParameterPlaceHoldersPass extends AbstractRecursivePass`
`24`	`24`	`{`
`25`	`25`	`private $bag;`
`26`	`26`	`private $resolveArrays;`
	`27`	`+ private $throwOnResolveException;`
`27`	`28`
`28`		`- public function __construct(bool $resolveArrays = true)`
	`29`	`+ public function __construct(bool $resolveArrays = true, bool $throwOnResolveException = true)`
`29`	`30`	`{`
`30`	`31`	`$this->resolveArrays = $resolveArrays;`
	`32`	`+ $this->throwOnResolveException = $throwOnResolveException;`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`/**`
`@@ -61,7 +63,16 @@ public function process(ContainerBuilder $container)`
`61`	`63`	`protected function processValue($value, bool $isRoot = false)`
`62`	`64`	`{`
`63`	`65`	`if (\is_string($value)) {`
`64`		`- $v = $this->bag->resolveValue($value);`
	`66`	`+ try {`
	`67`	`+ $v = $this->bag->resolveValue($value);`
	`68`	`+ } catch (ParameterNotFoundException $e) {`
	`69`	`+ if ($this->throwOnResolveException) {`
	`70`	`+ throw $e;`
	`71`	`+ }`
	`72`	`+`
	`73`	`+ $v = null;`
	`74`	`+ $this->container->getDefinition($this->currentId)->addError($e->getMessage());`
	`75`	`+ }`
`65`	`76`
`66`	`77`	`return $this->resolveArrays \|\| !$v \|\| !\is_array($v) ? $v : $value;`
`67`	`78`	`}`