Merge branch '1.x' into 2.x

* 1.x:
  added some tests
  bumped version to 1.42.1-DEV
  prepared the 1.42.0 release
  Use v5.0 of the phpunit bridge

CHANGELOG

@@ -243,7 +243,11 @@
  * improved the performance of the filesystem loader
  * removed features that were deprecated in 1.x
 
-* 1.42.0 (2019-XX-XX)
+* 1.42.1 (2019-XX-XX)
+
+ * n/a
+
+* 1.42.0 (2019-05-31)
 
  * fixed the "filter" filter when the argument is \Traversable but does not implement \Iterator (\SimpleXmlElement for instance)
  * fixed a PHP fatal error when calling a macro imported in a block in a nested block

composer.json

@@ -29,7 +29,7 @@
         "symfony/polyfill-ctype": "^1.8"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^3.4.19|^4.1.8",
+        "symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0",
         "symfony/debug": "^2.7",
         "psr/container": "^1.0"
     },

test/Twig/Tests/Fixtures/macros/macros_in_parent.test

@@ -0,0 +1,23 @@
+--TEST--
+macro
+--TEMPLATE--
+{% extends "parent" %}
+{% import _self as me %}
+
+{% block test %}
+    {{ me.testMacro() }}
+{% endblock test %}
+--TEMPLATE(parent)--
+{% import _self as me %}
+
+{% block test %}
+Hello
+{% endblock test %}
+
+{% macro testMacro() %}
+    Test
+{% endmacro %}
+--DATA--
+return []
+--EXPECT--
+Test