From b3a2173c8ec04bbd205be21a4eb38298708ec350 Mon Sep 17 00:00:00 2001
From: Islam93 <israfilov93@gmail.com>
Date: Mon, 30 Dec 2019 22:53:00 +0300
Subject: [PATCH] [DI] deferred exceptions in ResolveParameterPlaceHoldersPass

---
 .../Compiler/PassConfig.php                   |  2 +-
 .../ResolveParameterPlaceHoldersPass.php      | 15 +++++++++--
 .../ResolveParameterPlaceHoldersPassTest.php  | 26 +++++++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
index 323faad57f..bf8d75e6df 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -53,7 +53,7 @@ class PassConfig
             new ServiceLocatorTagPass(),
             new RegisterServiceSubscribersPass(),
             new DecoratorServicePass(),
-            new ResolveParameterPlaceHoldersPass(false),
+            new ResolveParameterPlaceHoldersPass(false, false),
             new ResolveFactoryClassPass(),
             new FactoryReturnTypePass($resolveClassPass),
             new CheckDefinitionValidityPass(),
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
index 8c942b524e..32eb6a3a76 100644
--- 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($resolveArrays = true)
+    public function __construct($resolveArrays = true, $throwOnResolveException = true)
     {
         $this->resolveArrays = $resolveArrays;
+        $this->throwOnResolveException = $throwOnResolveException;
     }
 
     /**
@@ -61,7 +63,16 @@ class ResolveParameterPlaceHoldersPass extends AbstractRecursivePass
     protected function processValue($value, $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
index 5aa6471751..0639961439 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
@@ -14,6 +14,7 @@ namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 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 @@ class ResolveParameterPlaceHoldersPassTest extends TestCase
         $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 = new ContainerBuilder();