diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-09-16 02:41:03 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-09-16 02:41:03 +0200 |
| commit | 2472271bc0cd7c15c77783c86ccaac643ab1756a (patch) | |
| tree | 0877d20f422411ed20b398c616b26b69ff30fdcd /phpBB/phpbb/template | |
| parent | 21bbb5850349326464204bdb1bea7ecf5a88c10a (diff) | |
| download | forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar.gz forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar.bz2 forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar.xz forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.zip | |
[ticket/11700] Fix tests after merging new develop code
PHPBB3-11700
Diffstat (limited to 'phpBB/phpbb/template')
| -rw-r--r-- | phpBB/phpbb/template/base.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/loader.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/node/includeasset.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/node/includecss.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/node/includejs.php | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/phpBB/phpbb/template/base.php b/phpBB/phpbb/template/base.php index 3778424a96..86868707f0 100644 --- a/phpBB/phpbb/template/base.php +++ b/phpBB/phpbb/template/base.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template; + /** * @ignore */ @@ -15,13 +17,13 @@ if (!defined('IN_PHPBB')) exit; } -abstract class phpbb_template_base implements phpbb_template +abstract class base implements template { /** * Template context. * Stores template data used during template rendering. * - * @var phpbb_template_context + * @var \phpbb\template\context */ protected $context; diff --git a/phpBB/phpbb/template/twig/loader.php b/phpBB/phpbb/template/twig/loader.php index 0829e519f7..910061dc0f 100644 --- a/phpBB/phpbb/template/twig/loader.php +++ b/phpBB/phpbb/template/twig/loader.php @@ -7,6 +7,8 @@ * */ +namespace phpbb\template\twig; + /** * @ignore */ @@ -19,7 +21,7 @@ if (!defined('IN_PHPBB')) * Twig Template loader * @package phpBB3 */ -class phpbb_template_twig_loader extends Twig_Loader_Filesystem +class loader extends \Twig_Loader_Filesystem { protected $safe_directories = array(); diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php index d632469c9e..eeedeb31f0 100644 --- a/phpBB/phpbb/template/twig/node/includeasset.php +++ b/phpBB/phpbb/template/twig/node/includeasset.php @@ -73,5 +73,5 @@ abstract class includeasset extends \Twig_Node * @param Twig_Compiler A Twig_Compiler instance * @return null */ - abstract protected function append_asset(Twig_Compiler $compiler); + abstract protected function append_asset(\Twig_Compiler $compiler); } diff --git a/phpBB/phpbb/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php index 9601cc5155..deb279fa4a 100644 --- a/phpBB/phpbb/template/twig/node/includecss.php +++ b/phpBB/phpbb/template/twig/node/includecss.php @@ -22,7 +22,7 @@ class includecss extends \phpbb\template\twig\node\includeasset /** * {@inheritdoc} */ - public function append_asset(Twig_Compiler $compiler) + public function append_asset(\Twig_Compiler $compiler) { $compiler ->raw("<link href=\"' . ") diff --git a/phpBB/phpbb/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php index 510e221e07..696b640eac 100644 --- a/phpBB/phpbb/template/twig/node/includejs.php +++ b/phpBB/phpbb/template/twig/node/includejs.php @@ -22,7 +22,7 @@ class includejs extends \phpbb\template\twig\node\includeasset /** * {@inheritdoc} */ - protected function append_asset(Twig_Compiler $compiler) + protected function append_asset(\Twig_Compiler $compiler) { $config = $this->environment->get_phpbb_config(); |