From b95fdacdd378877d277e261465da73deb06e50da Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 10 Sep 2013 14:01:09 +0200
Subject: [ticket/11700] Move all recent code to namespaces

PHPBB3-11700
---
 phpBB/phpbb/template/twig/environment.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'phpBB/phpbb/template/twig/environment.php')

diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php
index b60cd72325..64f3ace52d 100644
--- a/phpBB/phpbb/template/twig/environment.php
+++ b/phpBB/phpbb/template/twig/environment.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\template\twig;
+
 /**
 * @ignore
 */
@@ -15,12 +17,12 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-class phpbb_template_twig_environment extends Twig_Environment
+class environment extends \Twig_Environment
 {
 	/** @var array */
 	protected $phpbb_extensions;
 
-	/** @var phpbb_config */
+	/** @var \phpbb\config\config */
 	protected $phpbb_config;
 
 	/** @var string */
@@ -32,13 +34,13 @@ class phpbb_template_twig_environment extends Twig_Environment
 	/**
 	* Constructor
 	*
-	* @param phpbb_config $phpbb_config
+	* @param \phpbb\config\config $phpbb_config
 	* @param array $phpbb_extensions Array of enabled extensions (name => path)
 	* @param string $phpbb_root_path
 	* @param Twig_LoaderInterface $loader
 	* @param array $options Array of options to pass to Twig
 	*/
-	public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array())
+	public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, \Twig_LoaderInterface $loader = null, $options = array())
 	{
 		$this->phpbb_config = $phpbb_config;
 		$this->phpbb_extensions = $phpbb_extensions;
@@ -62,7 +64,7 @@ class phpbb_template_twig_environment extends Twig_Environment
 	/**
 	* Get phpBB config
 	*
-	* @return phpbb_config
+	* @return \phpbb\config\config
 	*/
 	public function get_phpbb_config()
 	{
@@ -124,7 +126,7 @@ class phpbb_template_twig_environment extends Twig_Environment
 
 					return parent::loadTemplate('@' . $namespace . '/' . $name, $index);
 				}
-				catch (Twig_Error_Loader $e)
+				catch (\Twig_Error_Loader $e)
 				{
 				}
 			}
-- 
cgit v1.2.1