Merge pull request #8 from pamil/escaped-parameters

Support escaped values in parameter bag

src/ContainerBasedContainerAccessor.php

@@ -41,13 +41,17 @@ public function getService($id)
      */
     public function getParameters()
     {
+        $parameterBag = $this->container->getParameterBag();
         if (!$this->container->isFrozen()) {
-            $parameterBag = clone $this->container->getParameterBag();
+            $parameterBag = clone $parameterBag;
             $parameterBag->resolve();
 
-            return $parameterBag->all();
+            // Values are automatically unescaped during resolving, need to revert it
+            $parameterBag->add(array_map(function ($unescapedValue) use ($parameterBag) {
+                return $parameterBag->escapeValue($unescapedValue);
+            }, $parameterBag->all()));
         }
 
-        return $this->container->getParameterBag()->all();
+        return $parameterBag->all();
     }
 }

tests/CrossContainerProcessorTest.php

@@ -147,6 +147,22 @@ public function it_resolves_cross_container_parameters_in_service_definition_arr
         static::assertSame(['parameter' => '42'], $baseContainer->get('array_object')->getArrayCopy());
     }
 
+    /**
+     * @test
+     */
+    public function it_resolves_cross_container_escaped_parameters()
+    {
+        $externalContainer = new ContainerBuilder();
+        $externalContainer->setParameter('parameter', '%%s?%%s');
+
+        $baseContainer = new ContainerBuilder();
+        $baseContainer->setParameter('parameter', '%__external__.parameter%');
+
+        $this->buildContainerWithDependencies($baseContainer, ['external' => $externalContainer]);
+
+        static::assertSame('%s?%s', $baseContainer->getParameter('parameter'));
+    }
+
     /**
      * @param ContainerBuilder $baseContainer
      * @param ContainerBuilder[] $externalContainers