Merge branch '1.x' into 2.x

* 1.x:
  fixed the autoloader to take into account namespaced classes
  added some tests for the set tag
  bumped version to 1.38.3-DEV
  prepared the 1.38.2 release
This commit is contained in:
Fabien Potencier
2019-03-14 07:47:25 +01:00
4 changed files with 63 additions and 1 deletions
+5 -1
View File
@@ -179,7 +179,11 @@
* improved the performance of the filesystem loader
* removed features that were deprecated in 1.x
* 1.38.2 (2019-XX-XX)
* 1.38.3 (2019-XX-XX)
* fixed the bundled Autoloader to also load namespaced classes
* 1.38.2 (2019-03-12)
* added TemplateWrapper::getTemplateName()
@@ -0,0 +1,10 @@
--TEST--
"set" tag block capture
--TEMPLATE--
{% set foo %}{{ foo }}{% endset %}
{{ foo }}
--DATA--
return ['foo' => 'foo']
--EXPECT--
foo
@@ -0,0 +1,24 @@
--TEST--
"set" tag with inheritance
--TEMPLATE--
{% extends "layout.twig" %}
{% set bar %}bar{% endset %}
{% block var_from_child %}
{{- bar -}}
{% endblock %}
--TEMPLATE(layout.twig)--
{% set foo %}foo{% endset %}
{% block var_from_layout %}
{{- foo -}}
{% endblock %}
{% block var_from_child %}
{% endblock %}
--DATA--
return []
--EXPECT--
foo
bar
@@ -0,0 +1,24 @@
--TEST--
"set" tag with inheritance
--TEMPLATE--
{% extends "layout.twig" %}
{% set foo %}bar{% endset %}
{% block var_from_child %}
{{- foo -}}
{% endblock %}
--TEMPLATE(layout.twig)--
{% set foo %}foo{% endset %}
{% block var_from_layout %}
{{- foo -}}
{% endblock %}
{% block var_from_child %}
{% endblock %}
--DATA--
return []
--EXPECT--
foo
foo