[DependencyInjection] Unescape class arguments

avorobiev · avorobiev · commit 08fe2167afdf · 2012-06-26T21:33:57.000+04:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -732,7 +732,7 @@ private function createService(Definition $definition, $id)
             require_once $this->getParameterBag()->resolveValue($definition->getFile());
         }
 
-        $arguments = $this->resolveServices($this->getParameterBag()->resolveValue($definition->getArguments()));
+        $arguments = $this->resolveServices($this->getParameterBag()->resolveAndUnescapeValue($definition->getArguments()));
 
         if (null !== $definition->getFactoryMethod()) {
             if (null !== $definition->getFactoryClass()) {
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
@@ -291,4 +291,14 @@ private function unescapeValue($value)
 
         return $value;
     }
+
+    /**
+     * Resolves parameters inside a string and unescape result
+     *
+     * @see resolveValue, unescapeValue
+     */
+    public function resolveAndUnescapeValue($value, array $resolving = array())
+    {
+        return $this->unescapeValue($this->resolveValue($value, $resolving));
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
@@ -103,4 +103,15 @@ function resolveValue($value);
      * @return mixed
      */
     function escapeValue($value);
+
+    /**
+     * Replaces parameter placeholders (%name%) by their values and unescape (%%) result.
+     *
+     * @param mixed $value A value
+     *
+     * @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
+     * @throws ParameterCircularReferenceException if a circular reference if detected
+     * @throws RuntimeException when a given parameter has a type problem.
+     */
+    function resolveAndUnescapeValue($value);
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -251,9 +251,9 @@ public function testCreateServiceArguments()
     {
         $builder = new ContainerBuilder();
         $builder->register('bar', 'stdClass');
-        $builder->register('foo1', 'FooClass')->addArgument(array('foo' => '%value%', '%value%' => 'foo', new Reference('bar')));
+        $builder->register('foo1', 'FooClass')->addArgument(array('foo' => '%value%', '%value%' => 'foo', new Reference('bar'), '%%unescape_it%%'));
         $builder->setParameter('value', 'bar');
-        $this->assertEquals(array('foo' => 'bar', 'bar' => 'foo', $builder->get('bar')), $builder->get('foo1')->arguments, '->createService() replaces parameters and service references in the arguments provided by the service definition');
+        $this->assertEquals(array('foo' => 'bar', 'bar' => 'foo', $builder->get('bar'), '%unescape_it%'), $builder->get('foo1')->arguments, '->createService() replaces parameters and service references in the arguments provided by the service definition');
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php
@@ -241,4 +241,14 @@ public function stringsWithSpacesProvider()
             array('50% is less than 100%', '50% is less than 100%', 'Text between % signs is allowed, if there are spaces.'),
         );
     }
+
+    /**
+     * @covers Symfony\Component\DependencyInjection\ParameterBag\ParameterBag::resolveAndUnescapeValue
+     */
+    public function testResolveAndUnescapeValue()
+    {
+        $bag = new ParameterBag();
+        $this->assertEquals('foo', $bag->resolveAndUnescapeValue('foo'), 'There is nothing to unescape.');
+        $this->assertEquals('%foo%', $bag->resolveAndUnescapeValue('%%foo%%'), 'String should be unescaped.');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -732,7 +732,7 @@ private function createService(Definition $definition, $id)`
`732`	`732`	`require_once $this->getParameterBag()->resolveValue($definition->getFile());`
`733`	`733`	`}`
`734`	`734`
`735`		`- $arguments = $this->resolveServices($this->getParameterBag()->resolveValue($definition->getArguments()));`
	`735`	`+ $arguments = $this->resolveServices($this->getParameterBag()->resolveAndUnescapeValue($definition->getArguments()));`
`736`	`736`
`737`	`737`	`if (null !== $definition->getFactoryMethod()) {`
`738`	`738`	`if (null !== $definition->getFactoryClass()) {`
Original file line number	Diff line number	Diff line change
`@@ -291,4 +291,14 @@ private function unescapeValue($value)`
`291`	`291`
`292`	`292`	`return $value;`
`293`	`293`	`}`
	`294`	`+`
	`295`	`+ /**`
	`296`	`+ * Resolves parameters inside a string and unescape result`
	`297`	`+ *`
	`298`	`+ * @see resolveValue, unescapeValue`
	`299`	`+ */`
	`300`	`+ public function resolveAndUnescapeValue($value, array $resolving = array())`
	`301`	`+ {`
	`302`	`+ return $this->unescapeValue($this->resolveValue($value, $resolving));`
	`303`	`+ }`
`294`	`304`	`}`
Original file line number	Diff line number	Diff line change
`@@ -251,9 +251,9 @@ public function testCreateServiceArguments()`
`251`	`251`	`{`
`252`	`252`	`$builder = new ContainerBuilder();`
`253`	`253`	`$builder->register('bar', 'stdClass');`
`254`		`- $builder->register('foo1', 'FooClass')->addArgument(array('foo' => '%value%', '%value%' => 'foo', new Reference('bar')));`
	`254`	`+ $builder->register('foo1', 'FooClass')->addArgument(array('foo' => '%value%', '%value%' => 'foo', new Reference('bar'), '%%unescape_it%%'));`
`255`	`255`	`$builder->setParameter('value', 'bar');`
`256`		`- $this->assertEquals(array('foo' => 'bar', 'bar' => 'foo', $builder->get('bar')), $builder->get('foo1')->arguments, '->createService() replaces parameters and service references in the arguments provided by the service definition');`
	`256`	`+ $this->assertEquals(array('foo' => 'bar', 'bar' => 'foo', $builder->get('bar'), '%unescape_it%'), $builder->get('foo1')->arguments, '->createService() replaces parameters and service references in the arguments provided by the service definition');`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`/**`