Merge branch 'twigphp:3.x' into 3.x

Author: rhukster

doc/filters/escape.rst

@@ -53,8 +53,9 @@ documents:
 * ``url``: escapes a string for the **URI or parameter** contexts. This should
   not be used to escape an entire URI; only a subcomponent being inserted.
 
-* ``html_attr``: escapes a string for the **HTML attribute** context,
-  **without quotes** around HTML attribute values.
+* ``html_attr``: escapes a string when used as an **HTML attribute** name, and
+  also when used as the value of an HTML attribute **without quotes**
+  (e.g. ``data-attribute={{ some_value }}``).
 
 Note that doing contextual escaping in HTML documents is hard and choosing the
 right escaping strategy depends on a lot of factors. Please, read related
@@ -96,23 +97,22 @@ to learn more about this topic.
 
 .. tip::
 
-    The ``html_attr`` escaping strategy can be useful when you need to 
-    escape a **dynamic HTML attribute name**:
+    The ``html_attr`` escaping strategy can be useful when you need to escape a
+    **dynamic HTML attribute name**:
 
     .. code-block:: html+twig
 
         <p {{ your_html_attr|e('html_attr') }}="attribute value">
 
-    It can also be used for escaping a **dynamic HTML attribute value** 
-    if it is not quoted, but this is **less performant**. 
-    Instead, it is recommended to quote the HTML attribute value and use 
-    the ``html`` escaping strategy:
+    It can also be used for escaping a **dynamic HTML attribute value** if it is
+    not quoted, but this is **less performant**. Instead, it is recommended to
+    quote the HTML attribute value and use the ``html`` escaping strategy:
 
     .. code-block:: html+twig
 
         <p data-content="{{ content|e('html') }}">
 
-        {# is equivalent to, but is less performant #}
+        {# this is equivalent, but less performant #}
         <p data-content={{ content|e('html_attr') }}>
 
 Custom Escapers

doc/filters/inky_to_html.rst

@@ -2,7 +2,7 @@
 ================
 
 The ``inky_to_html`` filter processes an `inky email template
-<https://github.com/zurb/inky>`_:
+<https://github.com/foundation/inky>`_:
 
 .. code-block:: html+twig
 

doc/filters/replace.rst

@@ -6,6 +6,8 @@ format is free-form):
 
 .. code-block:: twig
 
+    {% set fruit = 'apples' %}
+
     {{ "I like %this% and %that%."|replace({'%this%': fruit, '%that%': "oranges"}) }}
     {# if the "fruit" variable is set to "apples", #}
     {# it outputs "I like apples and oranges" #}

src/Node/EmbedNode.php

@@ -41,7 +41,7 @@ protected function addGetTemplate(Compiler $compiler, string $template = ''): vo
             ->raw(', ')
             ->repr($this->getTemplateLine())
             ->raw(', ')
-            ->string($this->getAttribute('index'))
+            ->repr($this->getAttribute('index'))
             ->raw(')')
         ;
         if ($this->getAttribute('ignore_missing')) {

tests/Node/EmbedTest.php

@@ -0,0 +1,91 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\Tests\Node;
+
+use Twig\Node\EmbedNode;
+use Twig\Node\Expression\ArrayExpression;
+use Twig\Node\Expression\ConstantExpression;
+use Twig\Test\NodeTestCase;
+
+class EmbedTest extends NodeTestCase
+{
+    public function testConstructor()
+    {
+        $node = new EmbedNode('foo.twig', 0, null, false, false, 1);
+
+        $this->assertFalse($node->hasNode('variables'));
+        $this->assertEquals('foo.twig', $node->getAttribute('name'));
+        $this->assertEquals(0, $node->getAttribute('index'));
+        $this->assertFalse($node->getAttribute('only'));
+        $this->assertFalse($node->getAttribute('ignore_missing'));
+
+        $vars = new ArrayExpression([new ConstantExpression('foo', 1), new ConstantExpression(true, 1)], 1);
+        $node = new EmbedNode('bar.twig', 1, $vars, true, false, 1);
+        $this->assertEquals($vars, $node->getNode('variables'));
+        $this->assertTrue($node->getAttribute('only'));
+        $this->assertEquals('bar.twig', $node->getAttribute('name'));
+        $this->assertEquals(1, $node->getAttribute('index'));
+    }
+
+    public static function provideTests(): iterable
+    {
+        $tests = [];
+
+        $node = new EmbedNode('foo.twig', 0, null, false, false, 1);
+        $tests[] = [$node, <<<'EOF'
+// line 1
+yield from $this->load("foo.twig", 1, 0)->unwrap()->yield($context);
+EOF
+        ];
+
+        $node = new EmbedNode('foo.twig', 1, null, false, false, 1);
+        $tests[] = [$node, <<<'EOF'
+// line 1
+yield from $this->load("foo.twig", 1, 1)->unwrap()->yield($context);
+EOF
+        ];
+
+        $vars = new ArrayExpression([new ConstantExpression('foo', 1), new ConstantExpression(true, 1)], 1);
+        $node = new EmbedNode('foo.twig', 0, $vars, false, false, 1);
+        $tests[] = [$node, <<<'EOF'
+// line 1
+yield from $this->load("foo.twig", 1, 0)->unwrap()->yield(CoreExtension::merge($context, ["foo" => true]));
+EOF
+        ];
+
+        $node = new EmbedNode('foo.twig', 0, $vars, true, false, 1);
+        $tests[] = [$node, <<<'EOF'
+// line 1
+yield from $this->load("foo.twig", 1, 0)->unwrap()->yield(CoreExtension::toArray(["foo" => true]));
+EOF
+        ];
+
+        $node = new EmbedNode('foo.twig', 2, $vars, true, true, 1);
+        $tests[] = [$node, <<<EOF
+// line 1
+try {
+    \$_v0 = \$this->load("foo.twig", 1, 2);
+    \$_v0->getParent(\$context);
+;
+} catch (LoaderError \$e) {
+    // ignore missing template
+    \$_v0 = null;
+}
+if (\$_v0) {
+    yield from \$_v0->unwrap()->yield(CoreExtension::toArray(["foo" => true]));
+}
+EOF
+        ];
+
+        return $tests;
+    }
+}