makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14948] Update lexer to be compatible with twig 2.6

Browse source 
PHPBB3-14948
This commit is contained in:
Marc Alexander 2018-12-30 16:31:09 +01:00
parent 7c062505aa
commit 830269dfee
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/phpbb/template/twig/lexer.php
View file

@ -15,20 +15,10 @@ namespace phpbb\template\twig;
class lexer extends \Twig_Lexer class lexer extends \Twig_Lexer
{ {
public function set_environment(\Twig_Environment $env) public function tokenize(\Twig_Source $source)
{ {
$this->env = $env; $code = $source->getCode();
} $filename = $source->getName();
public function tokenize($code, $filename = null)
{
// Handle \Twig_Source format input
if ($code instanceof \Twig_Source)
{
$source = $code;
$code = $source->getCode();
$filename = $source->getName();
}
// Our phpBB tags // Our phpBB tags
// Commented out tokens are handled separately from the main replace // Commented out tokens are handled separately from the main replace