Fix bad merge

nicolas-grekas · nicolas-grekas · commit a8dce3faff77 · 2024-01-09T09:44:53.000+01:00
diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
@@ -100,7 +100,7 @@ public function formatArgs(array $args): string
             } elseif (preg_match('/[^\x07-\x0D\x1B\x20-\xFF]/', $item[1])) {
                 $formattedValue = '<em>binary string</em>';
             } else {
-                $formattedValue = str_replace("\n", '', $this->escape(var_export($item[1], true)));
+                $formattedValue = str_replace("\n", '', htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset));
             }
 
             $result[] = \is_int($key) ? $formattedValue : sprintf("'%s' => %s", htmlspecialchars($key, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset), $formattedValue);

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function formatArgs(array $args): string`
`100`	`100`	`} elseif (preg_match('/[^\x07-\x0D\x1B\x20-\xFF]/', $item[1])) {`
`101`	`101`	`$formattedValue = '<em>binary string</em>';`
`102`	`102`	`} else {`
`103`		`- $formattedValue = str_replace("\n", '', $this->escape(var_export($item[1], true)));`
	`103`	`+ $formattedValue = str_replace("\n", '', htmlspecialchars(var_export($item[1], true), \ENT_COMPAT \| \ENT_SUBSTITUTE, $this->charset));`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`$result[] = \is_int($key) ? $formattedValue : sprintf("'%s' => %s", htmlspecialchars($key, \ENT_COMPAT \| \ENT_SUBSTITUTE, $this->charset), $formattedValue);`