[DI] Add force parameters escape option to dumpers

fancyweb · fancyweb · commit aec766c73c49 · 2019-11-23T11:25:44.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
@@ -29,7 +29,9 @@ public function process(ContainerBuilder $container)
     {
         $cache = new ConfigCache($container->getParameter('debug.container.dump'), true);
         if (!$cache->isFresh()) {
-            $cache->write((new XmlDumper($container))->dump(), $container->getResources());
+            $cache->write((new XmlDumper($container))->dump([
+                'force_parameters_escape' => true,
+            ]), $container->getResources());
         }
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -20,7 +20,7 @@
         "ext-xml": "*",
         "symfony/cache": "~3.4.31|^4.3.4",
         "symfony/class-loader": "~3.2",
-        "symfony/dependency-injection": "^3.4.24|^4.2.5",
+        "symfony/dependency-injection": "^3.4.36|^4.2.13",
         "symfony/config": "^3.4.31|^4.3.4",
         "symfony/debug": "~2.8|~3.0|~4.0",
         "symfony/event-dispatcher": "~3.4|~4.0",
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -49,7 +49,7 @@ public function dump(array $options = [])
         $container->setAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
         $container->setAttribute('xsi:schemaLocation', 'http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd');
 
-        $this->addParameters($container);
+        $this->addParameters($container, isset($options['force_parameters_escape']) ? $options['force_parameters_escape'] : false);
         $this->addServices($container);
 
         $this->document->appendChild($container);
@@ -59,14 +59,17 @@ public function dump(array $options = [])
         return $this->container->resolveEnvPlaceholders($xml);
     }
 
-    private function addParameters(\DOMElement $parent)
+    /**
+     * @param bool $forceEscape
+     */
+    private function addParameters(\DOMElement $parent, $forceEscape)
     {
         $data = $this->container->getParameterBag()->all();
         if (!$data) {
             return;
         }
 
-        if ($this->container->isCompiled()) {
+        if ($this->container->isCompiled() || $forceEscape) {
             $data = $this->escape($data);
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -51,7 +51,7 @@ public function dump(array $options = [])
             $this->dumper = new YmlDumper();
         }
 
-        return $this->container->resolveEnvPlaceholders($this->addParameters()."\n".$this->addServices());
+        return $this->container->resolveEnvPlaceholders($this->addParameters(isset($options['force_parameters_escape']) ? $options['force_parameters_escape'] : false)."\n".$this->addServices());
     }
 
     /**
@@ -212,15 +212,17 @@ private function addServices()
     /**
      * Adds parameters.
      *
+     * @param bool $forceEscape
+     *
      * @return string
      */
-    private function addParameters()
+    private function addParameters($forceEscape)
     {
         if (!$this->container->getParameterBag()->all()) {
             return '';
         }
 
-        $parameters = $this->prepareParameters($this->container->getParameterBag()->all(), $this->container->isCompiled());
+        $parameters = $this->prepareParameters($this->container->getParameterBag()->all(), $this->container->isCompiled() || $forceEscape);
 
         return $this->dumper->dump(['parameters' => $parameters], 2);
     }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,9 @@ public function process(ContainerBuilder $container)`
`29`	`29`	`{`
`30`	`30`	`$cache = new ConfigCache($container->getParameter('debug.container.dump'), true);`
`31`	`31`	`if (!$cache->isFresh()) {`
`32`		`- $cache->write((new XmlDumper($container))->dump(), $container->getResources());`
	`32`	`+ $cache->write((new XmlDumper($container))->dump([`
	`33`	`+ 'force_parameters_escape' => true,`
	`34`	`+ ]), $container->getResources());`
`33`	`35`	`}`
`34`	`36`	`}`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function dump(array $options = [])`
`49`	`49`	`$container->setAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');`
`50`	`50`	`$container->setAttribute('xsi:schemaLocation', 'http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd');`
`51`	`51`
`52`		`- $this->addParameters($container);`
	`52`	`+ $this->addParameters($container, isset($options['force_parameters_escape']) ? $options['force_parameters_escape'] : false);`
`53`	`53`	`$this->addServices($container);`
`54`	`54`
`55`	`55`	`$this->document->appendChild($container);`
`@@ -59,14 +59,17 @@ public function dump(array $options = [])`
`59`	`59`	`return $this->container->resolveEnvPlaceholders($xml);`
`60`	`60`	`}`
`61`	`61`
`62`		`- private function addParameters(\DOMElement $parent)`
	`62`	`+ /**`
	`63`	`+ * @param bool $forceEscape`
	`64`	`+ */`
	`65`	`+ private function addParameters(\DOMElement $parent, $forceEscape)`
`63`	`66`	`{`
`64`	`67`	`$data = $this->container->getParameterBag()->all();`
`65`	`68`	`if (!$data) {`
`66`	`69`	`return;`
`67`	`70`	`}`
`68`	`71`
`69`		`- if ($this->container->isCompiled()) {`
	`72`	`+ if ($this->container->isCompiled() \|\| $forceEscape) {`
`70`	`73`	`$data = $this->escape($data);`
`71`	`74`	`}`
`72`	`75`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function dump(array $options = [])`
`51`	`51`	`$this->dumper = new YmlDumper();`
`52`	`52`	`}`
`53`	`53`
`54`		`- return $this->container->resolveEnvPlaceholders($this->addParameters()."\n".$this->addServices());`
	`54`	`+ return $this->container->resolveEnvPlaceholders($this->addParameters(isset($options['force_parameters_escape']) ? $options['force_parameters_escape'] : false)."\n".$this->addServices());`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`
`@@ -212,15 +212,17 @@ private function addServices()`
`212`	`212`	`/**`
`213`	`213`	`* Adds parameters.`
`214`	`214`	`*`
	`215`	`+ * @param bool $forceEscape`
	`216`	`+ *`
`215`	`217`	`* @return string`
`216`	`218`	`*/`
`217`		`- private function addParameters()`
	`219`	`+ private function addParameters($forceEscape)`
`218`	`220`	`{`
`219`	`221`	`if (!$this->container->getParameterBag()->all()) {`
`220`	`222`	`return '';`
`221`	`223`	`}`
`222`	`224`
`223`		`- $parameters = $this->prepareParameters($this->container->getParameterBag()->all(), $this->container->isCompiled());`
	`225`	`+ $parameters = $this->prepareParameters($this->container->getParameterBag()->all(), $this->container->isCompiled() \|\| $forceEscape);`
`224`	`226`
`225`	`227`	`return $this->dumper->dump(['parameters' => $parameters], 2);`
`226`	`228`	`}`