Merge branch '1.x' into 2.x

* 1.x:
  added TemplateWrapper::getTemplateName()
  bumped version to 1.38.2-DEV
  prepared the 1.38.1 release
This commit is contained in:
Fabien Potencier
2019-03-12 19:42:32 +01:00
2 changed files with 14 additions and 2 deletions
+6 -2
View File
@@ -1,6 +1,6 @@
* 2.7.2 (2019-XX-XX)
* n/a
* added TemplateWrapper::getTemplateName()
* 2.7.1 (2019-03-12)
@@ -175,7 +175,11 @@
* improved the performance of the filesystem loader
* removed features that were deprecated in 1.x
* 1.38.1 (2019-XX-XX)
* 1.38.2 (2019-XX-XX)
* added TemplateWrapper::getTemplateName()
* 1.38.1 (2019-03-12)
* fixed class aliases
+8
View File
@@ -128,6 +128,14 @@ final class TemplateWrapper
{
return $this->template->getSourceContext();
}
/**
* @return string
*/
public function getTemplatename()
{
return $this->template->getTemplateName();
}
}
class_alias('Twig\TemplateWrapper', 'Twig_TemplateWrapper');