mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/16654] Upgrade Twig to version 3

Browse Source 
PHPBB3-16654
This commit is contained in:
rxu
2020-12-01 13:10:45 +07:00
parent 382c7acbc8
commit 1d9f9b5ecd
14 changed files with 83 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
phpBB/phpbb/template/twig/environment.php
View File

@@ -181,7 +181,7 @@ class environment extends \Twig\Environment
/**
* {@inheritdoc}
*/
public function render($name, array $context = [])
public function render($name, array $context = []) : string
{
return $this->display_with_assets($name, $context);
}
@@ -189,7 +189,7 @@ class environment extends \Twig\Environment
/**
* {@inheritdoc}
*/
public function display($name, array $context = [])
public function display($name, array $context = []) : void
{
echo $this->display_with_assets($name, $context);
}
@@ -259,12 +259,13 @@ class environment extends \Twig\Environment
/**
* Loads a template by name.
*
* @param string $cls The template class associated with the given template name
* @param string $name The template name
* @param integer $index The index if it is an embedded template
* @return \Twig\Template A template instance representing the given template name
* @throws \Twig\Error\LoaderError
*/
public function loadTemplate($name, $index = null)
public function loadTemplate(string $cls, string $name, int $index = null) : \Twig\Template
{
if (strpos($name, '@') === false)
{
@@ -274,10 +275,10 @@ class environment extends \Twig\Environment
{
if ($namespace === '__main__')
{
return parent::loadTemplate($name, $index);
return parent::loadTemplate($cls, $name, $index);
}
return parent::loadTemplate('@' . $namespace . '/' . $name, $index);
return parent::loadTemplate($this->getTemplateClass('@' . $namespace . '/' . $name), '@' . $namespace . '/' . $name, $index);
}
catch (\Twig\Error\LoaderError $e)
{
@@ -289,7 +290,7 @@ class environment extends \Twig\Environment
}
else
{
return parent::loadTemplate($name, $index);
return parent::loadTemplate($cls, $name, $index);
}
}