bug #12555 [Debug] fix ENT_SUBSTITUTE usage (nicolas-grekas)

fabpot · fabpot · commit 7fd45f7d084f · 2014-11-23T21:33:43.000+01:00
This PR was merged into the 2.6 branch. Discussion ---------- [Debug] fix ENT_SUBSTITUTE usage | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 58476e1 [Debug] fix ENT_SUBSTITUTE usage
diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -384,11 +384,6 @@ private function formatPath($path, $line)
      */
     private function formatArgs(array $args)
     {
-        if (PHP_VERSION_ID >= 50400) {
-            $flags = ENT_QUOTES | ENT_SUBSTITUTE;
-        } else {
-            $flags = ENT_QUOTES;
-        }
         $result = array();
         foreach ($args as $key => $item) {
             if ('object' === $item[0]) {
@@ -429,7 +424,7 @@ protected static function utf8Htmlize($str)
             $str = iconv($charset, 'UTF-8', $str);
         }
 
-        return htmlspecialchars($str, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+        return htmlspecialchars($str, ENT_QUOTES | (PHP_VERSION_ID >= 50400 ? ENT_SUBSTITUTE : 0), 'UTF-8');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -384,11 +384,6 @@ private function formatPath($path, $line)`
`384`	`384`	`*/`
`385`	`385`	`private function formatArgs(array $args)`
`386`	`386`	`{`
`387`		`- if (PHP_VERSION_ID >= 50400) {`
`388`		`- $flags = ENT_QUOTES \| ENT_SUBSTITUTE;`
`389`		`- } else {`
`390`		`- $flags = ENT_QUOTES;`
`391`		`- }`
`392`	`387`	`$result = array();`
`393`	`388`	`foreach ($args as $key => $item) {`
`394`	`389`	`if ('object' === $item[0]) {`
`@@ -429,7 +424,7 @@ protected static function utf8Htmlize($str)`
`429`	`424`	`$str = iconv($charset, 'UTF-8', $str);`
`430`	`425`	`}`
`431`	`426`
`432`		`- return htmlspecialchars($str, ENT_QUOTES \| ENT_SUBSTITUTE, 'UTF-8');`
	`427`	`+ return htmlspecialchars($str, ENT_QUOTES \| (PHP_VERSION_ID >= 50400 ? ENT_SUBSTITUTE : 0), 'UTF-8');`
`433`	`428`	`}`
`434`	`429`
`435`	`430`	`/**`