1 files changed, 74 insertions, 26 deletions
diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php
index aa55f1e011..6e75403159 100644
--- a/phpBB/phpbb/template/twig/environment.php
+++ b/phpBB/phpbb/template/twig/environment.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -14,9 +18,15 @@ class environment extends \Twig_Environment
 	/** @var \phpbb\config\config */
 	protected $phpbb_config;
 
+	/** @var \phpbb\filesystem\filesystem */
+	protected $filesystem;
+
 	/** @var \phpbb\path_helper */
 	protected $phpbb_path_helper;
 
+	/** @var \Symfony\Component\DependencyInjection\ContainerInterface */
+	protected $container;
+
 	/** @var \phpbb\extension\manager */
 	protected $extension_manager;
 
@@ -32,27 +42,53 @@ class environment extends \Twig_Environment
 	/**
 	* Constructor
 	*
-	* @param \phpbb\config\config $phpbb_config
-	* @param \phpbb\path_helper
-	* @param \phpbb\extension\manager
-	* @param string $phpbb_root_path
-	* @param Twig_LoaderInterface $loader
+	* @param \phpbb\config\config $phpbb_config The phpBB configuration
+	* @param \phpbb\filesystem\filesystem $filesystem
+	* @param \phpbb\path_helper $path_helper phpBB path helper
+	* @param \Symfony\Component\DependencyInjection\ContainerInterface $container The dependency injection container
+	* @param string $cache_path The path to the cache directory
+	* @param \phpbb\extension\manager $extension_manager phpBB extension manager
+	* @param \Twig_LoaderInterface $loader Twig loader interface
 	* @param array $options Array of options to pass to Twig
 	*/
-	public function __construct($phpbb_config, \phpbb\path_helper $path_helper, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, $options = array())
+	public function __construct(\phpbb\config\config $phpbb_config, \phpbb\filesystem\filesystem $filesystem, \phpbb\path_helper $path_helper, \Symfony\Component\DependencyInjection\ContainerInterface $container, $cache_path, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, $options = array())
 	{
 		$this->phpbb_config = $phpbb_config;
 
+		$this->filesystem = $filesystem;
 		$this->phpbb_path_helper = $path_helper;
 		$this->extension_manager = $extension_manager;
+		$this->container = $container;
 
 		$this->phpbb_root_path = $this->phpbb_path_helper->get_phpbb_root_path();
 		$this->web_root_path = $this->phpbb_path_helper->get_web_root_path();
 
+		$options = array_merge(array(
+			'cache'			=> (defined('IN_INSTALL')) ? false : $cache_path,
+			'debug'			=> false,
+			'auto_reload'	=> (bool) $this->phpbb_config['load_tplcompile'],
+			'autoescape'	=> false,
+		), $options);
+
 		return parent::__construct($loader, $options);
 	}
 
 	/**
+	* {@inheritdoc}
+	*/
+	public function getLexer()
+	{
+		if (null === $this->lexer)
+		{
+			$this->lexer = $this->container->get('template.twig.lexer');
+			$this->lexer->set_environment($this);
+		}
+
+		return $this->lexer;
+	}
+
+
+	/**
 	* Get the list of enabled phpBB extensions
 	*
 	* Used in EVENT node
@@ -75,16 +111,26 @@ class environment extends \Twig_Environment
 	}
 
 	/**
-	* Get the phpBB root path
-	*
-	* @return string
-	*/
+	 * Get the phpBB root path
+	 *
+	 * @return string
+	 */
 	public function get_phpbb_root_path()
 	{
 		return $this->phpbb_root_path;
 	}
 
 	/**
+	* Get the filesystem object
+	*
+	* @return \phpbb\filesystem\filesystem
+	*/
+	public function get_filesystem()
+	{
+		return $this->filesystem;
+	}
+
+	/**
 	* Get the web root path
 	*
 	* @return string
@@ -118,7 +164,7 @@ class environment extends \Twig_Environment
 	* Set the namespace look up order to load templates from
 	*
 	* @param array $namespace
-	* @return Twig_Environment
+	* @return \Twig_Environment
 	*/
 	public function setNamespaceLookUpOrder($namespace)
 	{
@@ -128,12 +174,13 @@ class environment extends \Twig_Environment
 	}
 
 	/**
-	 * Loads a template by name.
-	 *
-	 * @param string  $name  The template name
-	 * @param integer $index The index if it is an embedded template
-	 * @return Twig_TemplateInterface A template instance representing the given template name
-	 */
+	* Loads a template by name.
+	*
+	* @param string  $name  The template name
+	* @param integer $index The index if it is an embedded template
+	* @return \Twig_TemplateInterface A template instance representing the given template name
+	* @throws \Twig_Error_Loader
+	*/
 	public function loadTemplate($name, $index = null)
 	{
 		if (strpos($name, '@') === false)
@@ -164,11 +211,12 @@ class environment extends \Twig_Environment
 	}
 
 	/**
-	 * Finds a template by name.
-	 *
-	 * @param string  $name  The template name
-	 * @return string
-	 */
+	* Finds a template by name.
+	*
+	* @param string  $name  The template name
+	* @return string
+	* @throws \Twig_Error_Loader
+	*/
 	public function findTemplate($name)
 	{
 		if (strpos($name, '@') === false)
@@ -184,7 +232,7 @@ class environment extends \Twig_Environment
 
 					return parent::getLoader()->getCacheKey('@' . $namespace . '/' . $name);
 				}
-				catch (Twig_Error_Loader $e)
+				catch (\Twig_Error_Loader $e)
 				{
 				}
 			}