Merge branch '1.x' into 2.x

* 1.x:
  do not check sandbox for __toString if method does not exist on object
  tweaked sandbox generated code
  fixed indentation of the compiled template
This commit is contained in:
Fabien Potencier
2019-03-11 12:07:26 +01:00
8 changed files with 12 additions and 15 deletions
+1 -1
View File
@@ -317,8 +317,8 @@ class ModuleNode extends Node
}
$compiler
->outdent()
->subcompile($this->getNode('constructor_end'))
->outdent()
->write("}\n\n")
;
}