geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-12 18:36:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.x' into 2.x

Browse Source 
* 1.x:
  fixed EscaperNodeVisitor
  fixed CS
This commit is contained in:
Fabien Potencier
2019-04-16 19:10:25 +02:00
parent ee6ef99d7b bcb367fc07
commit 3d13c582ee
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1 -1
View File
@@ -207,7 +207,7 @@
* 1.39.1 (2019-XX-XX)
* n/a
* fixed EscaperNodeVisitor
* 1.39.0 (2019-04-16)
src/NodeVisitor/EscaperNodeVisitor.php
+1 -1
View File
@@ -107,7 +107,7 @@ final class EscaperNodeVisitor extends AbstractNodeVisitor
$expr2 = $this->escapeInlinePrintNode(new InlinePrint($expr2, $expr2->getTemplateLine()), $env, $type);
}
$expr3 = $expression->getNode('expr3');
if ($expr3 instanceof ConditionalExpression && $this->shouldUnwrapConditional($expr2, $env, $type)) {
if ($expr3 instanceof ConditionalExpression && $this->shouldUnwrapConditional($expr3, $env, $type)) {
$expr3 = $this->unwrapConditional($expr3, $env, $type);
} else {
$expr3 = $this->escapeInlinePrintNode(new InlinePrint($expr3, $expr3->getTemplateLine()), $env, $type);
test/Twig/Tests/Fixtures/tags/autoescape/literal.test
+8
View File
@@ -23,12 +23,16 @@
{{ true ? (false ? "<br />" : someVar) : "\n" }}
{{ true ? (true ? someVar : "<br />") : "\n" }}
{{ true ? (false ? someVar : "<br />") : "\n" }}
{{ false ? "\n" : (true ? someVar : "<br />") }}
{{ false ? "\n" : (false ? someVar : "<br />") }}
6. Nested conditionals with a variable marked safe
{{ true ? (true ? "<br />" : someVar|raw) : "\n" }}
{{ true ? (false ? "<br />" : someVar|raw) : "\n" }}
{{ true ? (true ? someVar|raw : "<br />") : "\n" }}
{{ true ? (false ? someVar|raw : "<br />") : "\n" }}
{{ false ? "\n" : (true ? someVar|raw : "<br />") }}
{{ false ? "\n" : (false ? someVar|raw : "<br />") }}
7. Without then clause
{{ "<br />" ?: someVar }}
@@ -63,12 +67,16 @@ return ['someVar' => '<br />', 'someFalseVar' => false]
&lt;br /&gt;
&lt;br /&gt;
<br />
&lt;br /&gt;
<br />
6. Nested conditionals with a variable marked safe
<br />
<br />
<br />
<br />
<br />
<br />
7. Without then clause
<br />