@@ -19,6 +19,7 @@

 * 1.27.0 (2016-XX-XX)

+ * added Twig_Source to hold information about the original template

  * deprecated Twig_Error::getTemplateFile() and Twig_Error::setTemplateFile() in favor of Twig_Error::getTemplateName() and Twig_Error::setTemplateName()

  * deprecated Parser::getFilename()

  * fixed template paths when a template name contains a protocol like vfs://

@@ -44,7 +44,11 @@ an instance of ``Twig_Token``, and the stream is an instance of

 You can manually convert a source code into a token stream by calling the

 ``tokenize()`` method of an environment::

-    $stream = $twig->tokenize($source, $identifier);

+    $stream = $twig->tokenize(new Twig_Source($source, $identifier));

+

+.. versionadded:: 1.27

+    ``Twig_Source`` was introduced in version 1.27, pass the source and the

+    identifier directly on previous versions.

 As the stream has a ``__toString()`` method, you can have a textual

 representation of it by echoing the object::

@@ -303,7 +303,7 @@ saving it. If the template code is stored in a `$template` variable, here is

 how you can do it::

     try {

-        $twig->parse($twig->tokenize($template));

+        $twig->parse($twig->tokenize(new Twig_Source($template)));

         // the $template is valid

     } catch (Twig_Error_Syntax $e) {

@@ -315,7 +315,7 @@ If you iterate over a set of files, you can pass the filename to the

     foreach ($files as $file) {

         try {

-            $twig->parse($twig->tokenize($template, $file));

+            $twig->parse($twig->tokenize(new Twig_Source($template, $file->getFilename(), $file)));

             // the $template is valid

         } catch (Twig_Error_Syntax $e) {

@@ -323,6 +323,10 @@ If you iterate over a set of files, you can pass the filename to the

         }

     }

+.. versionadded:: 1.27

+    ``Twig_Source`` was introduced in version 1.27, pass the source and the

+    identifier directly on previous versions.

+

 .. note::

     This method won't catch any sandbox policy violations because the policy

@@ -325,7 +325,14 @@ class Twig_Environment

             }

             if (!class_exists($cls, false)) {

-                $content = $this->compileSource($this->getLoader()->getSource($name), $name);

+                $loader = $this->getLoader();

+                if ($loader instanceof Twig_SourceContextLoaderInterface) {

+                    $source = $loader->getSourceContext($name);

+                } else {

+                    $source = new Twig_Source($loader->getSource($name), $name);

+                }

+                $content = $this->compileSource($source);

+

                 $this->cache->write($key, $content);

                 eval('?>'.$content);

@@ -436,8 +443,8 @@ class Twig_Environment

     /**

      * Tokenizes a source code.

      *

-     * @param string $source The template source code

-     * @param string $name   The template name

+     * @param string|Twig_Source $source The template source code

+     * @param string             $name   The template name (deprecated)

      *

      * @return Twig_TokenStream A Twig_TokenStream instance

      *

@@ -445,11 +452,16 @@ class Twig_Environment

      */

     public function tokenize($source, $name = null)

     {

+        if (!$source instanceof Twig_Source) {

+            @trigger_error(sprintf('Passing a string as the $source argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);

+            $source = new Twig_Source($source, $name);

+        }

+

         if (null === $this->lexer) {

             $this->lexer = new Twig_Lexer($this);

         }

-        return $this->lexer->tokenize($source, $name);

+        return $this->lexer->tokenize($source);

     }

     /**

@@ -509,8 +521,8 @@ class Twig_Environment

     /**

      * Compiles a template source code.

      *

-     * @param string $source The template source code

-     * @param string $name   The template name

+     * @param string|Twig_Source $source The template source code

+     * @param string             $name   The template name (deprecated)

      *

      * @return string The compiled PHP source code

      *

@@ -518,13 +530,18 @@ class Twig_Environment

      */

     public function compileSource($source, $name = null)

     {

+        if (!$source instanceof Twig_Source) {

+            @trigger_error(sprintf('Passing a string as the $source argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);

+            $source = new Twig_Source($source, $name);

+        }

+

         try {

-            return $this->compile($this->parse($this->tokenize($source, $name)));

+            return $this->compile($this->parse($this->tokenize($source)));

         } catch (Twig_Error $e) {

-            $e->setTemplateName($name);

+            $e->setTemplateName($source->getName());

             throw $e;

         } catch (Exception $e) {

-            throw new Twig_Error_Syntax(sprintf('An exception has been thrown during the compilation of a template ("%s").', $e->getMessage()), -1, $name, $e);

+            throw new Twig_Error_Syntax(sprintf('An exception has been thrown during the compilation of a template ("%s").', $e->getMessage()), -1, $source->getName(), $e);

         }

     }

@@ -171,7 +171,7 @@ class Twig_ExpressionParser

                     $negClass = 'Twig_Node_Expression_Unary_Neg';

                     $posClass = 'Twig_Node_Expression_Unary_Pos';

                     if (!(in_array($ref->getName(), array($negClass, $posClass)) || $ref->isSubclassOf($negClass) || $ref->isSubclassOf($posClass))) {

-                        throw new Twig_Error_Syntax(sprintf('Unexpected unary operator "%s".', $token->getValue()), $token->getLine(), $this->parser->getStream()->getFilename());

+                        throw new Twig_Error_Syntax(sprintf('Unexpected unary operator "%s".', $token->getValue()), $token->getLine(), $this->parser->getStream()->getSourceContext()->getName());

                     }

                     $this->parser->getStream()->next();

@@ -187,7 +187,7 @@ class Twig_ExpressionParser

                 } elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '{')) {

                     $node = $this->parseHashExpression();

                 } else {

-                    throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $this->parser->getStream()->getFilename());

+                    throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $this->parser->getStream()->getSourceContext()->getName());

                 }

         }

@@ -278,7 +278,7 @@ class Twig_ExpressionParser

             } else {

                 $current = $stream->getCurrent();

-                throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($current->getType()), $current->getValue()), $current->getLine(), $stream->getFilename());

+                throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($current->getType()), $current->getValue()), $current->getLine(), $stream->getSourceContext()->getName());

             }

             $stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');

@@ -317,11 +317,11 @@ class Twig_ExpressionParser

             case 'parent':

                 $this->parseArguments();

                 if (!count($this->parser->getBlockStack())) {

-                    throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden.', $line, $this->parser->getStream()->getFilename());

+                    throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden.', $line, $this->parser->getStream()->getSourceContext()->getName());

                 }

                 if (!$this->parser->getParent() && !$this->parser->hasTraits()) {

-                    throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend nor "use" another template is forbidden.', $line, $this->parser->getStream()->getFilename());

+                    throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend nor "use" another template is forbidden.', $line, $this->parser->getStream()->getSourceContext()->getName());

                 }

                 return new Twig_Node_Expression_Parent($this->parser->peekBlockStack(), $line);

@@ -330,7 +330,7 @@ class Twig_ExpressionParser

             case 'attribute':

                 $args = $this->parseArguments();

                 if (count($args) < 2) {

-                    throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes).', $line, $this->parser->getStream()->getFilename());

+                    throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes).', $line, $this->parser->getStream()->getSourceContext()->getName());

                 }

                 return new Twig_Node_Expression_GetAttr($args->getNode(0), $args->getNode(1), count($args) > 2 ? $args->getNode(2) : null, Twig_Template::ANY_CALL, $line);

@@ -379,12 +379,12 @@ class Twig_ExpressionParser

                     }

                 }

             } else {

-                throw new Twig_Error_Syntax('Expected name or number.', $lineno, $stream->getFilename());

+                throw new Twig_Error_Syntax('Expected name or number.', $lineno, $stream->getSourceContext()->getName());

             }

             if ($node instanceof Twig_Node_Expression_Name && null !== $this->parser->getImportedSymbol('template', $node->getAttribute('name'))) {

                 if (!$arg instanceof Twig_Node_Expression_Constant) {

-                    throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s").', $node->getAttribute('name')), $token->getLine(), $stream->getFilename());

+                    throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s").', $node->getAttribute('name')), $token->getLine(), $stream->getSourceContext()->getName());

                 }

                 $name = $arg->getAttribute('value');

@@ -496,7 +496,7 @@ class Twig_ExpressionParser

             $name = null;

             if ($namedArguments && $token = $stream->nextIf(Twig_Token::OPERATOR_TYPE, '=')) {

                 if (!$value instanceof Twig_Node_Expression_Name) {

-                    throw new Twig_Error_Syntax(sprintf('A parameter name must be a string, "%s" given.', get_class($value)), $token->getLine(), $stream->getFilename());

+                    throw new Twig_Error_Syntax(sprintf('A parameter name must be a string, "%s" given.', get_class($value)), $token->getLine(), $stream->getSourceContext()->getName());

                 }

                 $name = $value->getAttribute('name');

@@ -504,7 +504,7 @@ class Twig_ExpressionParser

                     $value = $this->parsePrimaryExpression();

                     if (!$this->checkConstantExpression($value)) {

-                        throw new Twig_Error_Syntax(sprintf('A default value for an argument must be a constant (a boolean, a string, a number, or an array).'), $token->getLine(), $stream->getFilename());

+                        throw new Twig_Error_Syntax(sprintf('A default value for an argument must be a constant (a boolean, a string, a number, or an array).'), $token->getLine(), $stream->getSourceContext()->getName());

                     }

                 } else {

                     $value = $this->parseExpression();

@@ -538,7 +538,7 @@ class Twig_ExpressionParser

             $token = $stream->expect(Twig_Token::NAME_TYPE, null, 'Only variables can be assigned to');

             $value = $token->getValue();

             if (in_array(strtolower($value), array('true', 'false', 'none', 'null'))) {

-                throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s".', $value), $token->getLine(), $stream->getFilename());

+                throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s".', $value), $token->getLine(), $stream->getSourceContext()->getName());

             }

             $targets[] = new Twig_Node_Expression_AssignName($value, $token->getLine());

@@ -568,7 +568,7 @@ class Twig_ExpressionParser

         $env = $this->parser->getEnvironment();

         if (false === $function = $env->getFunction($name)) {

-            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" function.', $name), $line, $this->parser->getStream()->getFilename());

+            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" function.', $name), $line, $this->parser->getStream()->getSourceContext()->getName());

             $e->addSuggestions($name, array_keys($env->getFunctions()));

             throw $e;

@@ -582,7 +582,7 @@ class Twig_ExpressionParser

             if ($function->getAlternative()) {

                 $message .= sprintf('. Use "%s" instead', $function->getAlternative());

             }

-            $message .= sprintf(' in %s at line %d.', $this->parser->getStream()->getFilename(), $line);

+            $message .= sprintf(' in %s at line %d.', $this->parser->getStream()->getSourceContext()->getName(), $line);

             @trigger_error($message, E_USER_DEPRECATED);

         }

@@ -595,7 +595,7 @@ class Twig_ExpressionParser

         $env = $this->parser->getEnvironment();

         if (false === $filter = $env->getFilter($name)) {

-            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" filter.', $name), $line, $this->parser->getStream()->getFilename());

+            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" filter.', $name), $line, $this->parser->getStream()->getSourceContext()->getName());

             $e->addSuggestions($name, array_keys($env->getFilters()));

             throw $e;

@@ -609,7 +609,7 @@ class Twig_ExpressionParser

             if ($filter->getAlternative()) {

                 $message .= sprintf('. Use "%s" instead', $filter->getAlternative());

             }

-            $message .= sprintf(' in %s at line %d.', $this->parser->getStream()->getFilename(), $line);

+            $message .= sprintf(' in %s at line %d.', $this->parser->getStream()->getSourceContext()->getName(), $line);

             @trigger_error($message, E_USER_DEPRECATED);

         }

@@ -296,7 +296,7 @@ class Twig_Extension_Core extends Twig_Extension

             }

         }

-        $e = new Twig_Error_Syntax(sprintf('Unknown "%s" test.', $name), $line, $stream->getFilename());

+        $e = new Twig_Error_Syntax(sprintf('Unknown "%s" test.', $name), $line, $stream->getSourceContext()->getName());

         $e->addSuggestions($name, array_keys($env->getTests()));

         throw $e;

@@ -26,6 +26,7 @@ class Twig_Lexer

     private $states;

     private $brackets;

     private $env;

+    // to be renamed to $name in 2.0 (where it is private)

     private $filename;

     private $options;

     private $regexes;

@@ -75,8 +76,10 @@ class Twig_Lexer

     /**

      * {@inheritdoc}

      */

-    public function tokenize($code, $filename = null)

+    public function tokenize($code, $name = null)

     {

+        $source = $code;

+

         if (((int) ini_get('mbstring.func_overload')) & 2) {

             $mbEncoding = mb_internal_encoding();

             mb_internal_encoding('ASCII');

@@ -84,8 +87,8 @@ class Twig_Lexer

             $mbEncoding = null;

         }

-        $this->code = str_replace(array("\r\n", "\r"), "\n", $code);

-        $this->filename = $filename;

+        $this->code = str_replace(array("\r\n", "\r"), "\n", $source->getCode());

+        $this->filename = $source->getName();

         $this->cursor = 0;

         $this->lineno = 1;

         $this->end = strlen($this->code);

@@ -136,7 +139,7 @@ class Twig_Lexer

             mb_internal_encoding($mbEncoding);

         }

-        return new Twig_TokenStream($this->tokens, $this->filename, $this->env->isDebug() ? $code : '');

+        return new Twig_TokenStream($this->tokens, $source);

     }

     private function lexData()

@@ -14,7 +14,7 @@

  *

  * @author Fabien Potencier <fabien@symfony.com>

  */

-class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterface

+class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface

 {

     private $hasSourceCache = array();

     private $loaders = array();

@@ -66,6 +66,35 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf

     /**

      * {@inheritdoc}

      */

+    public function getSourceContext($name)

+    {

+        $exceptions = array();

+        foreach ($this->loaders as $loader) {

+            if (!$loader instanceof Twig_SourceContextLoaderInterface) {

+                continue;

+            }

+

+            if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {

+                continue;

+            }

+

+            try {

+                return $loader->getSourceContext($name);

+            } catch (Twig_Error_Loader $e) {

+                $exceptions[] = $e->getMessage();

+            }

+        }

+

+        if ($exceptions) {

+            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));

+        }

+

+        return new Twig_Source($this->getSource($name), $name);

+    }

+

+    /**

+     * {@inheritdoc}

+     */

     public function exists($name)

     {

         if (isset($this->hasSourceCache[$name])) {

@@ -14,7 +14,7 @@

  *

  * @author Fabien Potencier <fabien@symfony.com>

  */

-class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderInterface

+class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface

 {

     /** Identifier of the main namespace. */

     const MAIN_NAMESPACE = '__main__';

@@ -134,6 +134,16 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI

     /**

      * {@inheritdoc}

      */

+    public function getSourceContext($name)

+    {

+        $path = $this->findTemplate($name);

+

+        return new Twig_Source(file_get_contents($path), $name, $path);

+    }

+

+    /**

+     * {@inheritdoc}

+     */

     public function getCacheKey($name)

     {

         return $this->findTemplate($name);

@@ -21,8 +21,15 @@

  */

 class Twig_Node_Module extends Twig_Node

 {

-    public function __construct(Twig_Node $body, Twig_Node_Expression $parent = null, Twig_Node $blocks, Twig_Node $macros, Twig_Node $traits, $embeddedTemplates, $filename, $source = '')

+    public function __construct(Twig_Node $body, Twig_Node_Expression $parent = null, Twig_Node $blocks, Twig_Node $macros, Twig_Node $traits, $embeddedTemplates, $name, $source = '')

     {

+        if (!$name instanceof Twig_Source) {

+            @trigger_error(sprintf('Passing a string as the $name argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);

+            $source = new Twig_Source($source, $name);

+        } else {

+            $source = $name;

+        }

+

         $nodes = array(

             'body' => $body,

             'blocks' => $blocks,

@@ -40,8 +47,11 @@ class Twig_Node_Module extends Twig_Node

         // embedded templates are set as attributes so that they are only visited once by the visitors

         parent::__construct($nodes, array(

-            'source' => $source,

-            'filename' => $filename,

+            'source' => $source->getCode(),

+            'name' => $source->getName(),

+            // filename to be remove in 2.0 (use name instead)

+            'filename' => $source->getName(),

+            'path' => $source->getPath(),

             'index' => null,

             'embedded_templates' => $embeddedTemplates,

         ), 1);

@@ -96,6 +106,8 @@ class Twig_Node_Module extends Twig_Node

         $this->compileGetSource($compiler);

+        $this->compileGetSourceContext($compiler);

+

         $this->compileClassFooter($compiler);

     }

@@ -120,7 +132,7 @@ class Twig_Node_Module extends Twig_Node

                 ->raw('$this->loadTemplate(')

                 ->subcompile($parent)

                 ->raw(', ')

-                ->repr($this->getAttribute('filename'))

+                ->repr($this->getAttribute('name'))

                 ->raw(', ')

                 ->repr($parent->getLine())

                 ->raw(')')

@@ -139,8 +151,8 @@ class Twig_Node_Module extends Twig_Node

         $compiler

             ->write("\n\n")

             // if the filename contains */, add a blank to avoid a PHP parse error

-            ->write('/* '.str_replace('*/', '* /', $this->getAttribute('filename'))." */\n")

-            ->write('class '.$compiler->getEnvironment()->getTemplateClass($this->getAttribute('filename'), $this->getAttribute('index')))

+            ->write('/* '.str_replace('*/', '* /', $this->getAttribute('name'))." */\n")

+            ->write('class '.$compiler->getEnvironment()->getTemplateClass($this->getAttribute('name'), $this->getAttribute('index')))

             ->raw(sprintf(" extends %s\n", $compiler->getEnvironment()->getBaseTemplateClass()))

             ->write("{\n")

             ->indent()

@@ -165,7 +177,7 @@ class Twig_Node_Module extends Twig_Node

                 ->write('$this->parent = $this->loadTemplate(')

                 ->subcompile($parent)

                 ->raw(', ')

-                ->repr($this->getAttribute('filename'))

+                ->repr($this->getAttribute('name'))

                 ->raw(', ')

                 ->repr($parent->getLine())

                 ->raw(");\n")

@@ -333,7 +345,7 @@ class Twig_Node_Module extends Twig_Node

             ->write("public function getTemplateName()\n", "{\n")

             ->indent()

             ->write('return ')

-            ->repr($this->getAttribute('filename'))

+            ->repr($this->getAttribute('name'))

             ->raw(";\n")

             ->outdent()

             ->write("}\n\n")

@@ -409,9 +421,26 @@ class Twig_Node_Module extends Twig_Node

             ->write("public function getSource()\n", "{\n")

             ->indent()

             ->write('return ')

-            ->string($this->getAttribute('source'))

+            ->string($compiler->getEnvironment()->isDebug() ? $this->getAttribute('source') : '')

             ->raw(";\n")

             ->outdent()

+            ->write("}\n\n")

+        ;

+    }

+

+    protected function compileGetSourceContext(Twig_Compiler $compiler)

+    {

+        $compiler

+            ->write("public function getSourceContext()\n", "{\n")

+            ->indent()

+            ->write('return new Twig_Source(')

+            ->string($compiler->getEnvironment()->isDebug() ? $this->getAttribute('source') : '')

+            ->raw(', ')

+            ->string($this->getAttribute('name'))

+            ->raw(', ')

+            ->string($this->getAttribute('path'))

+            ->raw(");\n")

+            ->outdent()

             ->write("}\n")

         ;

     }

@@ -102,7 +102,7 @@ class Twig_Parser

             }

         } catch (Twig_Error_Syntax $e) {

             if (!$e->getTemplateName()) {

-                $e->setTemplateName($this->stream->getFilename());

+                $e->setTemplateName($this->stream->getSourceContext()->getName());

             }

             if (!$e->getTemplateLine()) {

@@ -112,7 +112,7 @@ class Twig_Parser

             throw $e;

         }

-        $node = new Twig_Node_Module(new Twig_Node_Body(array($body)), $this->parent, new Twig_Node($this->blocks), new Twig_Node($this->macros), new Twig_Node($this->traits), $this->embeddedTemplates, $this->stream->getFilename(), $stream->getSource());

+        $node = new Twig_Node_Module(new Twig_Node_Body(array($body)), $this->parent, new Twig_Node($this->blocks), new Twig_Node($this->macros), new Twig_Node($this->traits), $this->embeddedTemplates, $stream->getSourceContext());

         $traverser = new Twig_NodeTraverser($this->env, $this->visitors);

@@ -149,7 +149,7 @@ class Twig_Parser

                     $token = $this->getCurrentToken();

                     if ($token->getType() !== Twig_Token::NAME_TYPE) {

-                        throw new Twig_Error_Syntax('A block must start with a tag name.', $token->getLine(), $this->stream->getFilename());

+                        throw new Twig_Error_Syntax('A block must start with a tag name.', $token->getLine(), $this->stream->getSourceContext()->getName());

                     }

                     if (null !== $test && $test($token)) {

@@ -166,13 +166,13 @@ class Twig_Parser

                     if (!isset($this->handlers[$token->getValue()])) {

                         if (null !== $test) {

-                            $e = new Twig_Error_Syntax(sprintf('Unexpected "%s" tag', $token->getValue()), $token->getLine(), $this->stream->getFilename());

+                            $e = new Twig_Error_Syntax(sprintf('Unexpected "%s" tag', $token->getValue()), $token->getLine(), $this->stream->getSourceContext()->getName());

                             if (is_array($test) && isset($test[0]) && $test[0] instanceof Twig_TokenParserInterface) {

                                 $e->appendMessage(sprintf(' (expecting closing tag for the "%s" tag defined near line %s).', $test[0]->getTag(), $lineno));

                             }

                         } else {

-                            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" tag.', $token->getValue()), $token->getLine(), $this->stream->getFilename());

+                            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" tag.', $token->getValue()), $token->getLine(), $this->stream->getSourceContext()->getName());

                             $e->addSuggestions($token->getValue(), array_keys($this->env->getTags()));

                         }

@@ -189,7 +189,7 @@ class Twig_Parser

                     break;

                 default:

-                    throw new Twig_Error_Syntax('Lexer or parser ended up in unsupported state.', 0, $this->stream->getFilename());

+                    throw new Twig_Error_Syntax('Lexer or parser ended up in unsupported state.', 0, $this->stream->getSourceContext()->getName());

             }

         }

@@ -355,10 +355,10 @@ class Twig_Parser

             (!$node instanceof Twig_Node_Text && !$node instanceof Twig_Node_BlockReference && $node instanceof Twig_NodeOutputInterface)

         ) {

             if (false !== strpos((string) $node, chr(0xEF).chr(0xBB).chr(0xBF))) {

-                throw new Twig_Error_Syntax('A template that extends another one cannot start with a byte order mark (BOM); it must be removed.', $node->getLine(), $this->stream->getFilename());

+                throw new Twig_Error_Syntax('A template that extends another one cannot start with a byte order mark (BOM); it must be removed.', $node->getLine(), $this->stream->getSourceContext()->getName());

             }

-            throw new Twig_Error_Syntax('A template that extends another one cannot include contents outside Twig blocks. Did you forget to put the contents inside a {% block %} tag?', $node->getLine(), $this->stream->getFilename());

+            throw new Twig_Error_Syntax('A template that extends another one cannot include contents outside Twig blocks. Did you forget to put the contents inside a {% block %} tag?', $node->getLine(), $this->stream->getSourceContext()->getName());

         }

         // bypass "set" nodes as they "capture" the output

new file mode 100644

@@ -0,0 +1,49 @@

+<?php

+

+/*

+ * This file is part of Twig.

+ *

+ * (c) 2016 Fabien Potencier

+ *

+ * For the full copyright and license information, please view the LICENSE

+ * file that was distributed with this source code.

+ */

+

+/**

+ * Holds information about a non-compiled Twig template.

+ *

+ * @author Fabien Potencier <fabien@symfony.com>

+ */

+class Twig_Source

+{

+    private $code;

+    private $name;

+    private $path;

+

+    /**

+     * @param string $code The template source code

+     * @param string $name The template logical name

+     * @param string $path The filesystem path of the template if any

+     */

+    public function __construct($code, $name = null, $path = null)

+    {

+        $this->code = $code;

+        $this->name = $name;

+        $this->path = $path;

+    }

+

+    public function getCode()

+    {

+        return $this->code;

+    }

+

+    public function getName()

+    {

+        return $this->name;

+    }

+

+    public function getPath()

+    {

+        return $this->path;

+    }

+}

new file mode 100644

@@ -0,0 +1,22 @@

+<?php

+

+/*

+ * This file is part of Twig.

+ *

+ * (c) 2016 Fabien Potencier

+ *

+ * For the full copyright and license information, please view the LICENSE

+ * file that was distributed with this source code.

+ */

+

+interface Twig_SourceContextLoaderInterface

+{

+    /**

+     * Returns the source context for a given template logical name.

+     *

+     * @param string $name The template logical name

+     *

+     * @return Twig_Source

+     */

+    public function getSourceContext($name);

+}

@@ -24,7 +24,7 @@ class Twig_TokenParser_AutoEscape extends Twig_TokenParser

         } else {

             $expr = $this->parser->getExpressionParser()->parseExpression();

             if (!$expr instanceof Twig_Node_Expression_Constant) {

-                throw new Twig_Error_Syntax('An escaping strategy must be a string or false.', $stream->getCurrent()->getLine(), $stream->getFilename());

+                throw new Twig_Error_Syntax('An escaping strategy must be a string or false.', $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());

             }

             $value = $expr->getAttribute('value');

         }

@@ -28,7 +28,7 @@ class Twig_TokenParser_Block extends Twig_TokenParser

         $stream = $this->parser->getStream();

         $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();

         if ($this->parser->hasBlock($name)) {

-            throw new Twig_Error_Syntax(sprintf("The block '%s' has already been defined line %d.", $name, $this->parser->getBlock($name)->getLine()), $stream->getCurrent()->getLine(), $stream->getFilename());

+            throw new Twig_Error_Syntax(sprintf("The block '%s' has already been defined line %d.", $name, $this->parser->getBlock($name)->getLine()), $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());

         }

         $this->parser->setBlock($name, $block = new Twig_Node_Block($name, new Twig_Node(array()), $lineno));

         $this->parser->pushLocalScope();

@@ -40,7 +40,7 @@ class Twig_TokenParser_Block extends Twig_TokenParser

                 $value = $token->getValue();

                 if ($value != $name) {

-                    throw new Twig_Error_Syntax(sprintf('Expected endblock for block "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getFilename());

+                    throw new Twig_Error_Syntax(sprintf('Expected endblock for block "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());

                 }

             }

         } else {

@@ -24,11 +24,11 @@ class Twig_TokenParser_Extends extends Twig_TokenParser

         $stream = $this->parser->getStream();

         if (!$this->parser->isMainScope()) {

-            throw new Twig_Error_Syntax('Cannot extend from a block.', $token->getLine(), $stream->getFilename());

+            throw new Twig_Error_Syntax('Cannot extend from a block.', $token->getLine(), $stream->getSourceContext()->getName());

         }

         if (null !== $this->parser->getParent()) {

-            throw new Twig_Error_Syntax('Multiple extends tags are forbidden.', $token->getLine(), $stream->getFilename());

+            throw new Twig_Error_Syntax('Multiple extends tags are forbidden.', $token->getLine(), $stream->getSourceContext()->getName());

         }

         $this->parser->setParent($this->parser->getExpressionParser()->parseExpression());

@@ -79,7 +79,7 @@ class Twig_TokenParser_For extends Twig_TokenParser

     private function checkLoopUsageCondition(Twig_TokenStream $stream, Twig_Node $node)

     {

         if ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name && 'loop' == $node->getNode('node')->getAttribute('name')) {

-            throw new Twig_Error_Syntax('The "loop" variable cannot be used in a looping condition.', $node->getLine(), $stream->getFilename());

+            throw new Twig_Error_Syntax('The "loop" variable cannot be used in a looping condition.', $node->getLine(), $stream->getSourceContext()->getName());

         }

         foreach ($node as $n) {

@@ -98,7 +98,7 @@ class Twig_TokenParser_For extends Twig_TokenParser

         if ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name && 'loop' == $node->getNode('node')->getAttribute('name')) {

             $attribute = $node->getNode('attribute');

             if ($attribute instanceof Twig_Node_Expression_Constant && in_array($attribute->getAttribute('value'), array('length', 'revindex0', 'revindex', 'last'))) {

-                throw new Twig_Error_Syntax(sprintf('The "loop.%s" variable is not defined when looping with a condition.', $attribute->getAttribute('value')), $node->getLine(), $stream->getFilename());

+                throw new Twig_Error_Syntax(sprintf('The "loop.%s" variable is not defined when looping with a condition.', $attribute->getAttribute('value')), $node->getLine(), $stream->getSourceContext()->getName());

             }

         }

@@ -56,7 +56,7 @@ class Twig_TokenParser_If extends Twig_TokenParser

                     break;

                 default:

-                    throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "else", "elseif", or "endif" to close the "if" block started at line %d).', $lineno), $stream->getCurrent()->getLine(), $stream->getFilename());

+                    throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "else", "elseif", or "endif" to close the "if" block started at line %d).', $lineno), $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());

             }

         }

@@ -35,7 +35,7 @@ class Twig_TokenParser_Macro extends Twig_TokenParser

             $value = $token->getValue();

             if ($value != $name) {

-                throw new Twig_Error_Syntax(sprintf('Expected endmacro for macro "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getFilename());

+                throw new Twig_Error_Syntax(sprintf('Expected endmacro for macro "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());

             }

         }

         $this->parser->popLocalScope();

@@ -37,7 +37,7 @@ class Twig_TokenParser_Sandbox extends Twig_TokenParser

                 }

                 if (!$node instanceof Twig_Node_Include) {

-                    throw new Twig_Error_Syntax('Only "include" tags are allowed within a "sandbox" section.', $node->getLine(), $stream->getFilename());

+                    throw new Twig_Error_Syntax('Only "include" tags are allowed within a "sandbox" section.', $node->getLine(), $stream->getSourceContext()->getName());

                 }

             }

         }

@@ -41,13 +41,13 @@ class Twig_TokenParser_Set extends Twig_TokenParser

             $stream->expect(Twig_Token::BLOCK_END_TYPE);

             if (count($names) !== count($values)) {

-                throw new Twig_Error_Syntax('When using set, you must have the same number of variables and assignments.', $stream->getCurrent()->getLine(), $stream->getFilename());

+                throw new Twig_Error_Syntax('When using set, you must have the same number of variables and assignments.', $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());

             }

         } else {

             $capture = true;

             if (count($names) > 1) {

-                throw new Twig_Error_Syntax('When using set with a block, you cannot have a multi-target.', $stream->getCurrent()->getLine(), $stream->getFilename());

+                throw new Twig_Error_Syntax('When using set with a block, you cannot have a multi-target.', $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());

             }

             $stream->expect(Twig_Token::BLOCK_END_TYPE);

@@ -31,7 +31,7 @@ class Twig_TokenParser_Use extends Twig_TokenParser

         $stream = $this->parser->getStream();

         if (!$template instanceof Twig_Node_Expression_Constant) {

-            throw new Twig_Error_Syntax('The template references in a "use" statement must be a string.', $stream->getCurrent()->getLine(), $stream->getFilename());

+            throw new Twig_Error_Syntax('The template references in a "use" statement must be a string.', $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());

         }

         $targets = array();

@@ -26,15 +26,25 @@ class Twig_TokenStream

     /**

      * Constructor.

      *

-     * @param array       $tokens   An array of tokens

-     * @param string|null $filename The name of the filename which tokens are associated with

-     * @param string|null $source   The source code associated with the tokens

+     * @param array       $tokens An array of tokens

+     * @param string|null $name   The name of the template which tokens are associated with

+     * @param string|null $source The source code associated with the tokens

      */

-    public function __construct(array $tokens, $filename = null, $source = null)

+    public function __construct(array $tokens, $name = null, $source = null)

     {

+        if (!$name instanceof Twig_Source) {

+            if (null !== $name || null !== $source) {

+                @trigger_error(sprintf('Passing a string as the $name argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);

+            }

+            $this->source = new Twig_Source($source, $name);

+        } else {

+            $this->source = $name;

+        }

+

         $this->tokens = $tokens;

-        $this->filename = $filename;

-        $this->source = $source ? $source : '';

+

+        // deprecated, not used anymore, to be removed in 2.0

+        $this->filename = $this->source->getName();

     }

     /**

@@ -60,7 +70,7 @@ class Twig_TokenStream

     public function next()

     {

         if (!isset($this->tokens[++$this->current])) {

-            throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current - 1]->getLine(), $this->filename);

+            throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current - 1]->getLine(), $this->source->getName());

         }

         return $this->tokens[$this->current - 1];

@@ -93,7 +103,7 @@ class Twig_TokenStream

                 Twig_Token::typeToEnglish($token->getType()), $token->getValue(),

                 Twig_Token::typeToEnglish($type), $value ? sprintf(' with value "%s"', $value) : ''),

                 $line,

-                $this->filename

+                $this->source->getName()

             );

         }

         $this->next();

@@ -111,7 +121,7 @@ class Twig_TokenStream

     public function look($number = 1)

     {

         if (!isset($this->tokens[$this->current + $number])) {

-            throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current + $number - 1]->getLine(), $this->filename);

+            throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current + $number - 1]->getLine(), $this->source->getName());

         }

         return $this->tokens[$this->current + $number];

@@ -148,13 +158,17 @@ class Twig_TokenStream

     }

     /**

-     * Gets the filename associated with this stream (null if not defined).

+     * Gets the name associated with this stream (null if not defined).

      *

      * @return string|null

+     *

+     * @deprecated since 1.27 (to be removed in 2.0)

      */

     public function getFilename()

     {

-        return $this->filename;

+        @trigger_error(sprintf('The %s() method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);

+

+        return $this->source->getName();

     }

     /**

@@ -163,9 +177,25 @@ class Twig_TokenStream

      * @return string

      *

      * @internal Don't use this as it might be empty depending on the environment configuration

+     *

+     * @deprecated since 1.27 (to be removed in 2.0)

      */

     public function getSource()

     {

+        @trigger_error(sprintf('The %s() method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);

+

+        return $this->source->getCode();

+    }

+

+    /**

+     * Gets the source associated with this stream.

+     *

+     * @return Twig_Source

+     *

+     * @internal

+     */

+    public function getSourceContext()

+    {

         return $this->source;

     }

 }

@@ -134,7 +134,7 @@ class Twig_Tests_EnvironmentTest extends PHPUnit_Framework_TestCase

         $twig = new Twig_Environment($loader = new Twig_Loader_Array(array('index' => '{{ foo }}')), $options);

         $key = $cache->generateKey('index', $twig->getTemplateClass('index'));

-        $cache->write($key, $twig->compileSource('{{ foo }}', 'index'));

+        $cache->write($key, $twig->compileSource(new Twig_Source('{{ foo }}', 'index')));

         // check that extensions won't be initialized when rendering a template that is already in the cache

         $twig = $this

@@ -20,7 +20,7 @@ class Twig_Tests_ExpressionParserTest extends PHPUnit_Framework_TestCase

         $env = new Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock(), array('cache' => false, 'autoescape' => false));

         $parser = new Twig_Parser($env);

-        $parser->parse($env->tokenize($template, 'index'));

+        $parser->parse($env->tokenize(new Twig_Source($template, 'index')));

     }

     public function getFailingTestsForAssignment()

@@ -47,7 +47,7 @@ class Twig_Tests_ExpressionParserTest extends PHPUnit_Framework_TestCase

     public function testArrayExpression($template, $expected)

     {

         $env = new Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock(), array('cache' => false, 'autoescape' => false));