diff --git a/lib/Twig/Compiler.php b/lib/Twig/Compiler.php index 2a492b7dd..93dc87660 100644 --- a/lib/Twig/Compiler.php +++ b/lib/Twig/Compiler.php @@ -74,6 +74,7 @@ class Twig_Compiler implements Twig_CompilerInterface { $this->lastLine = null; $this->source = ''; + $this->debugInfo = array(); $this->sourceOffset = 0; // source code starts at 1 (as we then increment it when we encounter new lines) $this->sourceLine = 1; diff --git a/test/Twig/Tests/Fixtures/regression/combined_debug_info.test b/test/Twig/Tests/Fixtures/regression/combined_debug_info.test new file mode 100644 index 000000000..df485783a --- /dev/null +++ b/test/Twig/Tests/Fixtures/regression/combined_debug_info.test @@ -0,0 +1,15 @@ +--TEST-- +Exception with bad line number +--TEMPLATE-- +{% block content %} + {{ foo }} + {{ include("foo") }} +{% endblock %} +index +--TEMPLATE(foo)-- +foo +{{ foo.bar }} +--DATA-- +return array('foo' => 'foo'); +--EXCEPTION-- +Twig_Error_Runtime: Impossible to access an attribute ("bar") on a string variable ("foo") in "foo" at line 3