1 files changed, 49 insertions, 42 deletions
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php
index 1ed89d3ccc..83630f5992 100644
--- a/phpBB/phpbb/template/twig/twig.php
+++ b/phpBB/phpbb/template/twig/twig.php
@@ -7,19 +7,13 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\template\twig;
 
 /**
 * Twig Template class.
 * @package phpBB3
 */
-class phpbb_template_twig extends phpbb_template_base
+class twig extends \phpbb\template\base
 {
 	/**
 	* Path of the cache directory for the template
@@ -31,6 +25,12 @@ class phpbb_template_twig extends phpbb_template_base
 	private $cachepath = '';
 
 	/**
+	* phpBB path helper
+	* @var \phpbb\path_helper
+	*/
+	protected $path_helper;
+
+	/**
 	* phpBB root path
 	* @var string
 	*/
@@ -44,20 +44,20 @@ class phpbb_template_twig extends phpbb_template_base
 
 	/**
 	* phpBB config instance
-	* @var phpbb_config
+	* @var \phpbb\config\config
 	*/
 	protected $config;
 
 	/**
 	* Current user
-	* @var phpbb_user
+	* @var \phpbb\user
 	*/
 	protected $user;
 
 	/**
 	* Extension manager.
 	*
-	* @var phpbb_extension_manager
+	* @var \phpbb\extension\manager
 	*/
 	protected $extension_manager;
 
@@ -71,32 +71,31 @@ class phpbb_template_twig extends phpbb_template_base
 	/**
 	* Constructor.
 	*
-	* @param string $phpbb_root_path phpBB root path
-	* @param string $php_ext php extension (typically 'php')
-	* @param phpbb_config $config
-	* @param phpbb_user $user
-	* @param phpbb_template_context $context template context
-	* @param phpbb_extension_manager $extension_manager extension manager, if null then template events will not be invoked
-	* @param string $adm_relative_path relative path to adm directory
+	* @param \phpbb\path_helper $path_helper
+	* @param \phpbb\config\config $config
+	* @param \phpbb\user $user
+	* @param \phpbb\template\context $context template context
+	* @param \phpbb\extension\manager $extension_manager extension manager, if null then template events will not be invoked
 	*/
-	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null, $adm_relative_path = null)
+	public function __construct(\phpbb\path_helper $path_helper, $config, $user, \phpbb\template\context $context, \phpbb\extension\manager $extension_manager = null)
 	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
+		$this->path_helper = $path_helper;
+		$this->phpbb_root_path = $path_helper->get_phpbb_root_path();
+		$this->php_ext = $path_helper->get_php_ext();
 		$this->config = $config;
 		$this->user = $user;
 		$this->context = $context;
 		$this->extension_manager = $extension_manager;
 
-		$this->cachepath = $phpbb_root_path . 'cache/twig/';
+		$this->cachepath = $this->phpbb_root_path . 'cache/twig/';
 
 		// Initiate the loader, __main__ namespace paths will be setup later in set_style_names()
-		$loader = new Twig_Loader_Filesystem('');
+		$loader = new \phpbb\template\twig\loader('');
 
-		$this->twig = new phpbb_template_twig_environment(
+		$this->twig = new \phpbb\template\twig\environment(
 			$this->config,
-			($this->extension_manager) ? $this->extension_manager->all_enabled() : array(),
-			$this->phpbb_root_path,
+			$this->path_helper,
+			$this->extension_manager,
 			$loader,
 			array(
 				'cache'			=> (defined('IN_INSTALL')) ? false : $this->cachepath,
@@ -107,27 +106,27 @@ class phpbb_template_twig extends phpbb_template_base
 		);
 
 		$this->twig->addExtension(
-			new phpbb_template_twig_extension(
+			new \phpbb\template\twig\extension(
 				$this->context,
 				$this->user
 			)
 		);
 
-		$lexer = new phpbb_template_twig_lexer($this->twig);
+		$lexer = new \phpbb\template\twig\lexer($this->twig);
 
 		$this->twig->setLexer($lexer);
 
 		// Add admin namespace
-		if ($adm_relative_path !== null && is_dir($this->phpbb_root_path . $adm_relative_path . 'style/'))
+		if ($this->path_helper->get_adm_relative_path() !== null && is_dir($this->phpbb_root_path . $this->path_helper->get_adm_relative_path() . 'style/'))
 		{
-			$this->twig->getLoader()->setPaths($this->phpbb_root_path . $adm_relative_path . 'style/', 'admin');
+			$this->twig->getLoader()->setPaths($this->phpbb_root_path . $this->path_helper->get_adm_relative_path() . 'style/', 'admin');
 		}
 	}
 
 	/**
 	* Clear the cache
 	*
-	* @return phpbb_template
+	* @return \phpbb\template\template
 	*/
 	public function clear_cache()
 	{
@@ -164,7 +163,7 @@ class phpbb_template_twig extends phpbb_template_base
 	* @param array $style_directories The directories to add style paths for
 	* 	E.g. array('ext/foo/bar/styles', 'styles')
 	* 	Default: array('styles') (phpBB's style directory)
-	* @return phpbb_template $this
+	* @return \phpbb\template\template $this
 	*/
 	public function set_style($style_directories = array('styles'))
 	{
@@ -181,11 +180,15 @@ class phpbb_template_twig extends phpbb_template_base
 		{
 			foreach ($names as $name)
 			{
-				$path = $this->phpbb_root_path . trim($directory, '/') . "/{$name}/template/";
+				$path = $this->phpbb_root_path . trim($directory, '/') . "/{$name}/";
+				$template_path = $path . 'template/';
 
-				if (is_dir($path))
+				if (is_dir($template_path))
 				{
-					$paths[] = $path;
+					// Add the base style directory as a safe directory
+					$this->twig->getLoader()->addSafeDirectory($path);
+
+					$paths[] = $template_path;
 				}
 			}
 		}
@@ -221,7 +224,7 @@ class phpbb_template_twig extends phpbb_template_base
 		$this->twig->getLoader()->setPaths($paths);
 
 		// Add all namespaces for all extensions
-		if ($this->extension_manager instanceof phpbb_extension_manager)
+		if ($this->extension_manager instanceof \phpbb\extension\manager)
 		{
 			$names[] = 'all';
 
@@ -233,11 +236,15 @@ class phpbb_template_twig extends phpbb_template_base
 
 				foreach ($names as $style_name)
 				{
-					$ext_style_path = $ext_path . 'styles/' . $style_name . '/template';
+					$ext_style_path = $ext_path . 'styles/' . $style_name . '/';
+					$ext_style_template_path = $ext_style_path . 'template/';
 
-					if (is_dir($ext_style_path))
+					if (is_dir($ext_style_template_path))
 					{
-						$paths[] = $ext_style_path;
+						// Add the base style directory as a safe directory
+						$this->twig->getLoader()->addSafeDirectory($ext_style_path);
+
+						$paths[] = $ext_style_template_path;
 					}
 				}
 
@@ -256,7 +263,7 @@ class phpbb_template_twig extends phpbb_template_base
 	* This function calls hooks.
 	*
 	* @param string $handle Handle to display
-	* @return phpbb_template $this
+	* @return \phpbb\template\template $this
 	*/
 	public function display($handle)
 	{
@@ -278,7 +285,7 @@ class phpbb_template_twig extends phpbb_template_base
 	* @param string $handle Handle to operate on
 	* @param string $template_var Template variable to assign compiled handle to
 	* @param bool $return_content If true return compiled handle, otherwise assign to $template_var
-	* @return phpbb_template|string if $return_content is true return string of the compiled handle, otherwise return $this
+	* @return \phpbb\template\template|string if $return_content is true return string of the compiled handle, otherwise return $this
 	*/
 	public function assign_display($handle, $template_var = '', $return_content = true)
 	{
@@ -304,7 +311,7 @@ class phpbb_template_twig extends phpbb_template_base
 		$vars = array_merge(
 			$context_vars['.'][0], // To get normal vars
 			array(
-				'definition'	=> new phpbb_template_twig_definition(),
+				'definition'	=> new \phpbb\template\twig\definition(),
 				'user'			=> $this->user,
 				'loops'			=> $context_vars, // To get loops
 			)