[DependencyInjection] Fix duplication of placeholders

mickadoo · fabpot · commit 124f30d4c68f · 2016-10-11T08:16:23.000-07:00
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -30,7 +30,9 @@ public function get($name)
             $env = substr($name, 4, -1);
 
             if (isset($this->envPlaceholders[$env])) {
-                return $this->envPlaceholders[$env][0];
+                foreach ($this->envPlaceholders[$env] as $placeholder) {
+                    return $placeholder; // return first result
+                }
             }
             if (preg_match('/\W/', $env)) {
                 throw new InvalidArgumentException(sprintf('Invalid %s name: only "word" characters are allowed.', $name));
@@ -44,7 +46,11 @@ public function get($name)
                 }
             }
 
-            return $this->envPlaceholders[$env][] = sprintf('env_%s_%s', $env, md5($name.uniqid(mt_rand(), true)));
+            $uniqueName = md5($name.uniqid(mt_rand(), true));
+            $placeholder = sprintf('env_%s_%s', $env, $uniqueName);
+            $this->envPlaceholders[$env][$placeholder] = $placeholder;
+
+            return $placeholder;
         }
 
         return parent::get($name);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
@@ -23,4 +23,19 @@ public function testGetThrowsInvalidArgumentExceptionIfEnvNameContainsNonWordCha
         $bag = new EnvPlaceholderParameterBag();
         $bag->get('env(%foo%)');
     }
+
+    public function testMergeWillNotDuplicateIdenticalParameters()
+    {
+        $originalPlaceholders = array('database_host' => array('localhost'));
+        $firstBag = new EnvPlaceholderParameterBag($originalPlaceholders);
+
+        // initialize placeholders
+        $firstBag->get('env(database_host)');
+        $secondBag = clone $firstBag;
+
+        $firstBag->mergeEnvPlaceholders($secondBag);
+        $mergedPlaceholders = $firstBag->getEnvPlaceholders();
+
+        $this->assertCount(1, $mergedPlaceholders['database_host']);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@ public function get($name)`
`30`	`30`	`$env = substr($name, 4, -1);`
`31`	`31`
`32`	`32`	`if (isset($this->envPlaceholders[$env])) {`
`33`		`- return $this->envPlaceholders[$env][0];`
	`33`	`+ foreach ($this->envPlaceholders[$env] as $placeholder) {`
	`34`	`+ return $placeholder; // return first result`
	`35`	`+ }`
`34`	`36`	`}`
`35`	`37`	`if (preg_match('/\W/', $env)) {`
`36`	`38`	`throw new InvalidArgumentException(sprintf('Invalid %s name: only "word" characters are allowed.', $name));`
`@@ -44,7 +46,11 @@ public function get($name)`
`44`	`46`	`}`
`45`	`47`	`}`
`46`	`48`
`47`		`- return $this->envPlaceholders[$env][] = sprintf('env_%s_%s', $env, md5($name.uniqid(mt_rand(), true)));`
	`49`	`+ $uniqueName = md5($name.uniqid(mt_rand(), true));`
	`50`	`+ $placeholder = sprintf('env_%s_%s', $env, $uniqueName);`
	`51`	`+ $this->envPlaceholders[$env][$placeholder] = $placeholder;`
	`52`	`+`
	`53`	`+ return $placeholder;`
`48`	`54`	`}`
`49`	`55`
`50`	`56`	`return parent::get($name);`