fixed typo

[2.6] Fix HTML escaping of to-source links
ExceptionHandler: More Encoding
2026-03-25 17:52:07 +01:00 · 2015-05-20 15:09:45 +02:00 · 2015-05-19 17:48:49 -07:00 · 2015-05-19 17:33:46 -07:00 · 2015-05-15 15:32:45 +02:00 · 2015-05-15 15:28:34 +02:00
2 changed files with 6 additions and 6 deletions
--- a/ExceptionHandler.php
+++ b/ExceptionHandler.php
@@ -380,7 +380,7 @@ EOF;
        $file = preg_match('#[^/\\\\]*$#', $path, $file) ? $file[0] : $path;

        if ($linkFormat = $this->fileLinkFormat) {
-            $link = str_replace(array('%f', '%l'), array($path, $line), $linkFormat);
+            $link = strtr($this->escapeHtml($linkFormat), array('%f' => $path, '%l' => (int) $line));

            return sprintf(' in <a href="%s" title="Go to source">%s line %d</a>', $link, $file, $line);
        }
@@ -422,7 +422,7 @@ EOF;
    }

    /**
-     * Returns an UTF-8 and HTML encoded string
+     * Returns an UTF-8 and HTML encoded string.
     */
    protected static function utf8Htmlize($str)
    {
@@ -441,7 +441,7 @@ EOF;
    }

    /**
-     * HTML-encodes a string
+     * HTML-encodes a string.
     */
    private function escapeHtml($str)
    {
--- a/Tests/Exception/FlattenExceptionTest.php
+++ b/Tests/Exception/FlattenExceptionTest.php
@@ -189,9 +189,9 @@ class FlattenExceptionTest extends \PHPUnit_Framework_TestCase
    public function testTooBigArray()
    {
        $a = array();
-        for ($i = 0; $i < 20; $i++) {
-            for ($j = 0; $j < 50; $j++) {
-                for ($k = 0; $k < 10; $k++) {
+        for ($i = 0; $i < 20; ++$i) {
+            for ($j = 0; $j < 50; ++$j) {
+                for ($k = 0; $k < 10; ++$k) {
                    $a[$i][$j][$k] = 'value';
                }
            }
Author	SHA1	Message	Date
Fabien Potencier	4851a041c4	fixed typo	2015-05-20 15:09:45 +02:00
Nicolas Grekas	366f3fe9ea	[2.6] Fix HTML escaping of to-source links	2015-05-19 17:48:49 -07:00
Alexander Menk	d59aecf5f4	ExceptionHandler: More Encoding	2015-05-19 17:33:46 -07:00
Fabien Potencier	c214e92851	Merge branch '2.3' into 2.6 * 2.3: Fix tests in HHVM CS: Pre incrementation/decrementation should be used if possible Conflicts: src/Symfony/Bundle/TwigBundle/Command/LintCommand.php src/Symfony/Component/Console/Helper/TableHelper.php src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php src/Symfony/Component/Security/Acl/Dbal/AclProvider.php src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php	2015-05-15 15:32:45 +02:00
Fabien Potencier	dfe71c73cf	minor #14121 CS: Pre incrementation/decrementation should be used if possible (gharlan) This PR was merged into the 2.3 branch. Discussion ---------- CS: Pre incrementation/decrementation should be used if possible \| Q \| A \| ------------- \| --- \| Bug fix? \| no \| New feature? \| no \| BC breaks? \| no \| Deprecations? \| no \| Tests pass? \| yes \| Fixed tickets \| n/a \| License \| MIT \| Doc PR \| n/a Fixes provided by new fixer: https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/1113 If this pr is merged I would change the level of the fixer to `symfony`. Commits ------- c5123d6 CS: Pre incrementation/decrementation should be used if possible	2015-05-15 15:28:34 +02:00
Nicolas Grekas	8bc9390ba3	[Debug 2.3] Fix test for PHP7	2015-05-06 12:13:27 +02:00
Gregor Harlan	01c8bc9bac	CS: Pre incrementation/decrementation should be used if possible	2015-04-07 19:54:22 +02:00