geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-08-24 18:06:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve escape deprecation message

Browse Source
This commit is contained in:
Ruud Kamphuis
2024-09-26 13:06:37 +02:00
committed by Fabien Potencier
parent be308bc5ac
commit 7256713c86
2 changed files with 63 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Lexer.php
+2 -2
View File
@@ -418,7 +418,7 @@ class Lexer
$result .= $nextChar;
} elseif ("'" === $nextChar || '"' === $nextChar) {
if ($nextChar !== $quoteType) {
trigger_deprecation('twig/twig', '3.12', 'Character "%s" at position %d should not be escaped; the "\" character is ignored in Twig v3 but will not be in v4. Please remove the extra "\" character.', $nextChar, $i + 1);
trigger_deprecation('twig/twig', '3.12', 'Character "%s" at position %d in string on line %d should not be escaped; the "\" character is ignored in Twig v3 but will not be in v4. Please remove the extra "\" character.', $nextChar, $i + 1, $this->lineno);
}
$result .= $nextChar;
} elseif ('#' === $nextChar && $i + 1 < $length && '{' === $str[$i + 1]) {
@@ -437,7 +437,7 @@ class Lexer
}
$result .= \chr(octdec($octal));
} else {
trigger_deprecation('twig/twig', '3.12', 'Character "%s" at position %d should not be escaped; the "\" character is ignored in Twig v3 but will not be in v4. Please remove the extra "\" character.', $nextChar, $i + 1);
trigger_deprecation('twig/twig', '3.12', 'Character "%s" at position %d in string on line %d should not be escaped; the "\" character is ignored in Twig v3 but will not be in v4. Please remove the extra "\" character.', $nextChar, $i + 1, $this->lineno);
$result .= $nextChar;
}
tests/LexerTest.php
+61 -27
View File
@@ -195,38 +195,64 @@ class LexerTest extends TestCase
public static function getStringWithEscapedDelimiter()
{
yield '{{ \'\x6\' }} => \x6' => [
'{{ \'\x6\' }}',
yield [
<<<'EOF'
{{ '\x6' }}
EOF,
"\x6",
];
yield '{{ \'\065\x64\' }} => \065\x64' => [
'{{ \'\065\x64\' }}',
yield [
<<<'EOF'
{{ '\065\x64' }}
EOF,
"\065\x64",
];
yield '{{ \'App\\\\Test\' }} => App\Test' => [
'{{ \'App\\\\Test\' }}',
yield [
<<<'EOF'
{{ 'App\\Test' }}
EOF,
'App\\Test',
];
yield '{{ "App\#{var}" }} => App#{var}' => [
'{{ "App\#{var}" }}',
yield [
<<<'EOF'
{{ "App\#{var}" }}
EOF,
'App#{var}',
];
yield '{{ \'foo \\\' bar\' }} => foo \' bar' => [
'{{ \'foo \\\' bar\' }}',
'foo \' bar',
yield [
<<<'EOF'
{{ 'foo \' bar' }}
EOF,
<<<'EOF'
foo ' bar
EOF,
];
yield '{{ "foo \" bar" }} => foo " bar' => [
'{{ "foo \\" bar" }}',
yield [
<<<'EOF'
{{ "foo \" bar" }}
EOF,
'foo " bar',
];
yield '{{ \'\f\n\r\t\v\' }} => \f\n\r\t\v' => [
'{{ \'\\f\\n\\r\\t\\v\' }}',
yield [
<<<'EOF'
{{ '\f\n\r\t\v' }}
EOF,
"\f\n\r\t\v",
];
yield '{{ \'\\\\f\\\\n\\\\r\\\\t\\\\v\' }} => \\f\\n\\r\\t\\v' => [
'{{ \'\\\\f\\\\n\\\\r\\\\t\\\\v\' }}',
yield [
<<<'EOF'
{{ '\\f\\n\\r\\t\\v' }}
EOF,
'\\f\\n\\r\\t\\v',
];
yield [
<<<'EOF'
{{ 'Ymd\\THis' }}
EOF,
<<<'EOF'
Ymd\THis
EOF,
];
}
/**
@@ -250,20 +276,28 @@ class LexerTest extends TestCase
public static function getStringWithEscapedDelimiterProducingDeprecation()
{
yield '{{ \'App\Test\' }} => AppTest' => [
'{{ \'App\\Test\' }}',
yield [
<<<'EOF'
{{ 'App\Test' }}
EOF,
'AppTest',
'Since twig/twig 3.12: Character "T" at position 5 should not be escaped; the "\" character is ignored in Twig v3 but will not be in v4. Please remove the extra "\" character.',
'Since twig/twig 3.12: Character "T" at position 5 in string on line 1 should not be escaped; the "\" character is ignored in Twig v3 but will not be in v4. Please remove the extra "\" character.',
];
yield '{{ "foo \\\' bar" }} => foo \' bar' => [
'{{ "foo \\\' bar" }}',
'foo \' bar',
'Since twig/twig 3.12: Character "\'" at position 6 should not be escaped; the "\" character is ignored in Twig v3 but will not be in v4. Please remove the extra "\" character.',
yield [
<<<'EOF'
{{ "foo \' bar" }}
EOF,
<<<'EOF'
foo ' bar
EOF,
'Since twig/twig 3.12: Character "\'" at position 6 in string on line 1 should not be escaped; the "\" character is ignored in Twig v3 but will not be in v4. Please remove the extra "\" character.',
];
yield '{{ \'foo \" bar\' }} => foo " bar' => [
'{{ \'foo \\" bar\' }}',
yield [
<<<'EOF'
{{ 'foo \" bar' }}
EOF,
'foo " bar',
'Since twig/twig 3.12: Character """ at position 6 should not be escaped; the "\" character is ignored in Twig v3 but will not be in v4. Please remove the extra "\" character.',
'Since twig/twig 3.12: Character """ at position 6 in string on line 1 should not be escaped; the "\" character is ignored in Twig v3 but will not be in v4. Please remove the extra "\" character.',
];
}