From a1ce0ed08602917d76810dbc2471dc25e28bda48 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Fri, 29 Nov 2019 15:40:35 +0100
Subject: [PATCH] fix dumping number-like string parameters

---
 .../DependencyInjection/Dumper/XmlDumper.php          |  5 +++++
 .../Tests/Fixtures/containers/container8.php          | 11 +++++++++++
 .../Tests/Fixtures/php/services8.php                  | 11 +++++++++++
 .../Tests/Fixtures/xml/services8.xml                  | 11 +++++++++++
 .../Tests/Fixtures/yaml/services8.yml                 | 11 +++++++++++
 5 files changed, 49 insertions(+)

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
index cfc932843937..eff421ec4e71 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -304,6 +304,11 @@ private function convertParameters(array $parameters, $type, \DOMElement $parent
                 if (\in_array($value, ['null', 'true', 'false'], true)) {
                     $element->setAttribute('type', 'string');
                 }
+
+                if (\is_string($value) && (is_numeric($value) || preg_match('/^0b[01]*$/', $value) || preg_match('/^0x[0-9a-f]++$/i', $value))) {
+                    $element->setAttribute('type', 'string');
+                }
+
                 $text = $this->document->createTextNode(self::phpToXml($value));
                 $element->appendChild($text);
             }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container8.php
index 5b3c01c23cd5..edcd045eaabb 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container8.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container8.php
@@ -9,6 +9,17 @@
     'bar' => 'foo is %%foo bar',
     'escape' => '@escapeme',
     'values' => [true, false, null, 0, 1000.3, 'true', 'false', 'null'],
+    'null string' => 'null',
+    'string of digits' => '123',
+    'string of digits prefixed with minus character' => '-123',
+    'true string' => 'true',
+    'false string' => 'false',
+    'binary number string' => '0b0110',
+    'numeric string' => '-1.2E2',
+    'hexadecimal number string' => '0xFF',
+    'float string' => '10100.1',
+    'positive float string' => '+10100.1',
+    'negative float string' => '-10100.1',
 ]));
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
index ce4815ef8197..e7a0214a10f5 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
@@ -151,6 +151,17 @@ protected function getDefaultParameters()
                 6 => 'false',
                 7 => 'null',
             ],
+            'null string' => 'null',
+            'string of digits' => '123',
+            'string of digits prefixed with minus character' => '-123',
+            'true string' => 'true',
+            'false string' => 'false',
+            'binary number string' => '0b0110',
+            'numeric string' => '-1.2E2',
+            'hexadecimal number string' => '0xFF',
+            'float string' => '10100.1',
+            'positive float string' => '+10100.1',
+            'negative float string' => '-10100.1',
         ];
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services8.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services8.xml
index d0f9015c5a54..4b07bbb7da50 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services8.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services8.xml
@@ -18,6 +18,17 @@
       <parameter type="string">false</parameter>
       <parameter type="string">null</parameter>
     </parameter>
+    <parameter key="null string" type="string">null</parameter>
+    <parameter key="string of digits" type="string">123</parameter>
+    <parameter key="string of digits prefixed with minus character" type="string">-123</parameter>
+    <parameter key="true string" type="string">true</parameter>
+    <parameter key="false string" type="string">false</parameter>
+    <parameter key="binary number string" type="string">0b0110</parameter>
+    <parameter key="numeric string" type="string">-1.2E2</parameter>
+    <parameter key="hexadecimal number string" type="string">0xFF</parameter>
+    <parameter key="float string" type="string">10100.1</parameter>
+    <parameter key="positive float string" type="string">+10100.1</parameter>
+    <parameter key="negative float string" type="string">-10100.1</parameter>
   </parameters>
   <services>
     <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true"/>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml
index 4e37bc9315c9..002b1d4bcd3a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml
@@ -4,6 +4,17 @@ parameters:
     bar: 'foo is %%foo bar'
     escape: '@@escapeme'
     values: [true, false, null, 0, 1000.3, 'true', 'false', 'null']
+    null string: 'null'
+    string of digits: '123'
+    string of digits prefixed with minus character: '-123'
+    true string: 'true'
+    false string: 'false'
+    binary number string: '0b0110'
+    numeric string: '-1.2E2'
+    hexadecimal number string: '0xFF'
+    float string: '10100.1'
+    positive float string: '+10100.1'
+    negative float string: '-10100.1'
 
 services:
     service_container:

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/34716.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/34716.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/34716.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/34716.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>