Merge branch '1.x' into 2.x

* 1.x:
  Add support for exponential numbers
  Fix phpdoc
This commit is contained in:
Fabien Potencier
2019-11-07 22:14:26 +01:00
4 changed files with 11 additions and 3 deletions
+1 -1
View File
@@ -435,7 +435,7 @@ class Environment
*
* This method should not be used as a generic way to load templates.
*
* @param string $template The template name
* @param string $template The template source
* @param string $name An optional name of the template to be used in error messages
*
* @return TemplateWrapper A template instance representing the given template name