mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +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

2
phpBB/phpbb/template/twig/tokenparser/defineparser.php
View File

@@ -41,7 +41,7 @@ class defineparser extends \Twig\TokenParser\AbstractTokenParser
{
// This would happen if someone improperly formed their DEFINE syntax
// e.g. <!-- DEFINE $VAR = foo -->
throw new \Twig\Error\SyntaxError('Invalid DEFINE', $token->getLine(), $this->parser->getStream()->getSourceContext()->getPath());
throw new \Twig\Error\SyntaxError('Invalid DEFINE', $token->getLine(), $this->parser->getStream()->getSourceContext());
}
$stream->expect(\Twig\Token::BLOCK_END_TYPE);

4
phpBB/phpbb/template/twig/tokenparser/includeparser.php
View File

@@ -23,7 +23,7 @@ class includeparser extends \Twig\TokenParser\IncludeTokenParser
*
* @return \Twig\Node\Node A Twig\Node instance
*/
public function parse(\Twig\Token $token)
public function parse(\Twig\Token $token) : \Twig\Node\Node
{
$expr = $this->parser->getExpressionParser()->parseExpression();
@@ -37,7 +37,7 @@ class includeparser extends \Twig\TokenParser\IncludeTokenParser
*
* @return string The tag name
*/
public function getTag()
public function getTag() : string
{
return 'INCLUDE';
}