symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
+5-4Lines changed: 5 additions & 4 deletions b/‎src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
+5-4Lines changed: 5 additions & 4 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
+11-6Lines changed: 11 additions & 6 deletions b/‎src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
+11-6Lines changed: 11 additions & 6 deletions
@@ -13,6 +13,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\EnvVariable;
 
 /**
  * Resolves all parameter placeholders "%somevalue%" to their real values.
@@ -34,9 +35,9 @@ public function process(ContainerBuilder $container)
 
         foreach ($container->getDefinitions() as $id => $definition) {
             try {
-                $definition->setClass($parameterBag->resolveValue($definition->getClass()));
+                $definition->setClass($parameterBag->resolveValue($definition->getClass(), array(), true));
                 $definition->setFile($parameterBag->resolveValue($definition->getFile()));
-                $definition->setArguments($parameterBag->resolveValue($definition->getArguments()));
+                $definition->setArguments($parameterBag->resolveValue($definition->getArguments(), array(), true));
                 if ($definition->getFactoryClass(false)) {
                     $definition->setFactoryClass($parameterBag->resolveValue($definition->getFactoryClass(false)));
                 }
@@ -50,11 +51,11 @@ public function process(ContainerBuilder $container)
 
                 $calls = array();
                 foreach ($definition->getMethodCalls() as $name => $arguments) {
-                    $calls[$parameterBag->resolveValue($name)] = $parameterBag->resolveValue($arguments);
+                    $calls[$parameterBag->resolveValue($name)] = $parameterBag->resolveValue($arguments, array(), true);
                 }
                 $definition->setMethodCalls($calls);
 
-                $definition->setProperties($parameterBag->resolveValue($definition->getProperties()));
+                $definition->setProperties($parameterBag->resolveValue($definition->getProperties(), array(), true));
             } catch (ParameterNotFoundException $e) {
                 $e->setSourceId($id);
 
 
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\ParameterBag;
 
+use Symfony\Component\DependencyInjection\EnvVariable;
 use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
 use Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
@@ -167,12 +168,12 @@ public function resolve()
      * @throws ParameterCircularReferenceException if a circular reference if detected
      * @throws RuntimeException                    when a given parameter has a type problem.
      */
-    public function resolveValue($value, array $resolving = array())
+    public function resolveValue($value, array $resolving = array(), $protectEnvVariables = false)
     {
         if (is_array($value)) {
             $args = array();
             foreach ($value as $k => $v) {
-                $args[$this->resolveValue($k, $resolving)] = $this->resolveValue($v, $resolving);
+                $args[$this->resolveValue($k, $resolving, $protectEnvVariables)] = $this->resolveValue($v, $resolving, $protectEnvVariables);
             }
 
             return $args;
@@ -182,7 +183,7 @@ public function resolveValue($value, array $resolving = array())
             return $value;
         }
 
-        return $this->resolveString($value, $resolving);
+        return $this->resolveString($value, $resolving, $protectEnvVariables);
     }
 
     /**
@@ -197,7 +198,7 @@ public function resolveValue($value, array $resolving = array())
      * @throws ParameterCircularReferenceException if a circular reference if detected
      * @throws RuntimeException                    when a given parameter has a type problem.
      */
-    public function resolveString($value, array $resolving = array())
+    public function resolveString($value, array $resolving = array(), $protectEnvVariables = false)
     {
         // we do this to deal with non string values (Boolean, integer, ...)
         // as the preg_replace_callback throw an exception when trying
@@ -211,10 +212,14 @@ public function resolveString($value, array $resolving = array())
 
             $resolving[$key] = true;
 
-            return $this->resolved ? $this->get($key) : $this->resolveValue($this->get($key), $resolving);
+            return $this->resolved ? $this->get($key) : $this->resolveValue($this->get($key), $resolving, $protectEnvVariables);
         }
 
         if (preg_match('/^\$([^\$\s]+)\$$/', $value, $match)) {
+            if ($protectEnvVariables) {
+                return new EnvVariable($match[1]);
+            }
+
             return getenv($match[1]);
         }
 
@@ -240,7 +245,7 @@ public function resolveString($value, array $resolving = array())
             $resolved = (string) $resolved;
             $resolving[$key] = true;
 
-            return $self->isResolved() ? $resolved : $self->resolveString($resolved, $resolving);
+            return $self->isResolved() ? $resolved : $self->resolveString($resolved, $resolving, $protectEnvVariables);
         }, $value);
     }