bug #16733 [Console] do not encode backslashes in console default description (Tobion)

fabpot · fabpot · commit 0239d4ae7ed7 · 2015-11-29T11:50:28.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Console] do not encode backslashes in console default description | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #16420 | License | MIT | Doc PR | - Commits ------- 873a541 [Console] do not encode backslashes in console default description
diff --git a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
@@ -187,10 +187,10 @@ protected function describeApplication(Application $application, array $options
     private function formatDefaultValue($default)
     {
         if (PHP_VERSION_ID < 50400) {
-            return str_replace('\/', '/', json_encode($default));
+            return str_replace(array('\/', '\\\\'), array('/', '\\'), json_encode($default));
         }
 
-        return json_encode($default, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+        return str_replace('\\\\', '\\', json_encode($default, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -187,10 +187,10 @@ protected function describeApplication(Application $application, array $options`
`187`	`187`	`private function formatDefaultValue($default)`
`188`	`188`	`{`
`189`	`189`	`if (PHP_VERSION_ID < 50400) {`
`190`		`- return str_replace('\/', '/', json_encode($default));`
	`190`	`+ return str_replace(array('\/', '\\\\'), array('/', '\\'), json_encode($default));`
`191`	`191`	`}`
`192`	`192`
`193`		`- return json_encode($default, JSON_UNESCAPED_SLASHES \| JSON_UNESCAPED_UNICODE);`
	`193`	`+ return str_replace('\\\\', '\\', json_encode($default, JSON_UNESCAPED_SLASHES \| JSON_UNESCAPED_UNICODE));`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`/**`