Merge branch '2.x' into 3.x

* 2.x:
  fixed typo
  fixed tests
  fixed a PHP fatal error when calling a macro imported in the template in a nested block
  fixed typo
  added some tests
  fixed a regression

CHANGELOG

@@ -250,6 +250,7 @@
 
 * 1.41.1 (2019-XX-XX)
 
+ * fixed a PHP fatal error when calling a macro imported in a block in a nested block
  * fixed a PHP fatal error when calling a macro imported in the template in another macro
  * fixed wrong error message on "import" and "from"
 

src/Parser.php

@@ -266,7 +266,19 @@ class Parser
 
     public function getImportedSymbol(string $type, string $alias)
     {
-        return $this->importedSymbols[0][$type][$alias] ?? null;
+        if (null !== $this->peekBlockStack()) {
+            foreach ($this->importedSymbols as $functions) {
+                if (isset($functions[$type][$alias])) {
+                    if (count($this->blockStack) > 1) {
+                        return null;
+                    }
+
+                    return $functions[$type][$alias];
+                }
+            }
+        } else {
+            return $this->importedSymbols[0][$type][$alias] ?? null;
+        }
     }
 
     public function isMainScope(): bool

test/Twig/Tests/Fixtures/tags/macro/from_in_block_is_local.test

@@ -0,0 +1,18 @@
+--TEST--
+"macro" tag
+--TEMPLATE--
+{% block foo %}
+    {%- from _self import input as linput %}
+{% endblock %}
+
+{% block bar %}
+    {{- linput('username') }}
+{% endblock %}
+
+{% macro input(name) -%}
+    <input name="{{ name }}">
+{% endmacro %}
+--DATA--
+return []
+--EXCEPTION--
+Twig\Error\SyntaxError: Unknown "linput" function in "index.twig" at line 7.

test/Twig/Tests/Fixtures/tags/macro/from_macro_in_a_macro.test

@@ -1,15 +1,18 @@
 --TEST--
 "from" tag with syntax error
 --TEMPLATE--
-{% from _self import another %}
+{% from _self import another, foo %}
+
+{{ foo() }}
 
 {% macro foo() %}
     {{ another() }}
 {% endmacro %}
 
 {% macro another() %}
+    OK
 {% endmacro %}
 --DATA--
 return []
 --EXCEPTION--
-Twig\Error\SyntaxError: Unknown "another" function in "index.twig" at line 5.
+Twig\Error\SyntaxError: Unknown "another" function in "index.twig" at line 7.

test/Twig/Tests/Fixtures/tags/macro/from_nested_blocks.test

@@ -0,0 +1,18 @@
+--TEST--
+"macro" tag
+--TEMPLATE--
+{% block foo %}
+    {%- from _self import input as linput %}
+
+    {% block bar %}
+        {{- linput('username') }}
+    {% endblock %}
+{% endblock %}
+
+{% macro input(name) -%}
+    <input name="{{ name }}">
+{% endmacro %}
+--DATA--
+return []
+--EXCEPTION--
+Twig\Error\SyntaxError: Unknown "linput" function in "index.twig" at line 6.

test/Twig/Tests/Fixtures/tags/macro/from_nested_blocks_with_global_macro.test

@@ -0,0 +1,18 @@
+--TEST--
+"macro" tag
+--TEMPLATE--
+{%- from _self import input %}
+
+{% block foo %}
+    {% block bar %}
+        {{- input('username') }}
+    {% endblock %}
+{% endblock %}
+
+{% macro input(name) -%}
+    <input name="{{ name }}">
+{% endmacro %}
+--DATA--
+return []
+--EXCEPTION--
+Twig\Error\SyntaxError: Unknown "input" function in "index.twig" at line 6.

test/Twig/Tests/Fixtures/tags/macro/import_and_blocks.test

@@ -0,0 +1,36 @@
+--TEST--
+"macro" tag
+--TEMPLATE--
+{% import _self as macros %}
+{% from _self import input %}
+
+{% block foo %}
+    {{- macros.input('username') }}
+    {{- input('username') }}
+
+    {%- import _self as lmacros %}
+    {%- from _self import input as linput %}
+
+    {{- lmacros.input('username') }}
+    {{- linput('username') }}
+{% endblock %}
+
+{% block bar %}
+    {{- macros.input('username') }}
+    {{- input('username') }}
+{% endblock %}
+
+{% macro input(name) -%}
+    <input name="{{ name }}">
+{% endmacro %}
+--DATA--
+return []
+--EXPECT--
+<input name="username">
+<input name="username">
+<input name="username">
+<input name="username">
+
+
+<input name="username">
+<input name="username">

test/Twig/Tests/Fixtures/tags/macro/import_in_block_is_local.test

@@ -0,0 +1,18 @@
+--TEST--
+"macro" tag
+--TEMPLATE--
+{% block foo %}
+    {%- import _self as lmacros %}
+{% endblock %}
+
+{% block bar %}
+    {{- lmacros.input('username') }}
+{% endblock %}
+
+{% macro input(name) -%}
+    <input name="{{ name }}">
+{% endmacro %}
+--DATA--
+return []
+--EXCEPTION--
+Twig\Error\RuntimeError: Variable "lmacros" does not exist in "index.twig" at line 7.

test/Twig/Tests/Fixtures/tags/macro/import_macro_in_a_macro.test

@@ -0,0 +1,18 @@
+--TEST--
+"import" tag with syntax error
+--TEMPLATE--
+{% import _self as foo %}
+
+{{ foo.foo() }}
+
+{% macro foo() %}
+    {{ foo.another() }}
+{% endmacro %}
+
+{% macro another() %}
+    OK
+{% endmacro %}
+--DATA--
+return []
+--EXCEPTION--
+Twig\Error\RuntimeError: Variable "foo" does not exist in "index.twig" at line 7.

test/Twig/Tests/Fixtures/tags/macro/import_nested_blocks.test

@@ -0,0 +1,18 @@
+--TEST--
+"macro" tag
+--TEMPLATE--
+{% block foo %}
+    {%- import _self as lmacros %}
+
+    {% block bar %}
+        {{- lmacros.input('username') }}
+    {% endblock %}
+{% endblock %}
+
+{% macro input(name) -%}
+    <input name="{{ name }}">
+{% endmacro %}
+--DATA--
+return []
+--EXCEPTION--
+Twig\Error\RuntimeError: Accessing \Twig\Template attributes is forbidden in "index.twig" at line 6.

test/Twig/Tests/Fixtures/tags/macro/import_nested_blocks_with_global_macro.test

@@ -0,0 +1,18 @@
+--TEST--
+"macro" tag
+--TEMPLATE--
+{%- import _self as macros %}
+
+{% block foo %}
+    {% block bar %}
+        {{- macros.input('username') }}
+    {% endblock %}
+{% endblock %}
+
+{% macro input(name) -%}
+    <input name="{{ name }}">
+{% endmacro %}
+--DATA--
+return []
+--EXCEPTION--
+Twig\Error\RuntimeError: Accessing \Twig\Template attributes is forbidden in "index.twig" at line 6.