[Debug] HTML-escape array key

c960657 · c960657 · commit 5584e990d1bf · 2017-07-26T15:46:15.000+02:00
diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -94,7 +94,7 @@ public function setHandler($handler)
      *
      * @param string $format The format for links to source files
      *
-     * @return string The previous file link format.
+     * @return string the previous file link format
      */
     public function setFileLinkFormat($format)
     {
@@ -418,7 +418,7 @@ private function formatArgs(array $args)
                 $formattedValue = str_replace("\n", '', var_export($this->escapeHtml((string) $item[1]), true));
             }
 
-            $result[] = is_int($key) ? $formattedValue : sprintf("'%s' => %s", $key, $formattedValue);
+            $result[] = is_int($key) ? $formattedValue : sprintf("'%s' => %s", $this->escapeHtml($key), $formattedValue);
         }
 
         return implode(', ', $result);

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function setHandler($handler)`
`94`	`94`	`*`
`95`	`95`	`* @param string $format The format for links to source files`
`96`	`96`	`*`
`97`		`- * @return string The previous file link format.`
	`97`	`+ * @return string the previous file link format`
`98`	`98`	`*/`
`99`	`99`	`public function setFileLinkFormat($format)`
`100`	`100`	`{`
`@@ -418,7 +418,7 @@ private function formatArgs(array $args)`
`418`	`418`	`$formattedValue = str_replace("\n", '', var_export($this->escapeHtml((string) $item[1]), true));`
`419`	`419`	`}`
`420`	`420`
`421`		`- $result[] = is_int($key) ? $formattedValue : sprintf("'%s' => %s", $key, $formattedValue);`
	`421`	`+ $result[] = is_int($key) ? $formattedValue : sprintf("'%s' => %s", $this->escapeHtml($key), $formattedValue);`
`422`	`422`	`}`
`423`	`423`
`424`	`424`	`return implode(', ', $result);`