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

[ticket/11943] Split fix_inline_variable_tokens into 3 steps

Browse source 
DEFINE shouldn't add/remove surrounding quotes, but must have the inline
variable tokens fixed

PHPBB3-11943
This commit is contained in:
Nathan Guse 2013-11-08 22:30:58 -06:00
parent da332aa0a5
commit 6370970f13
1 changed files with 50 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,8 +68,20 @@ class lexer extends \Twig_Lexer
); );
// Fix tokens that may have inline variables (e.g. <!-- DEFINE $TEST = '{FOO}') // Fix tokens that may have inline variables (e.g. <!-- DEFINE $TEST = '{FOO}')
$code = $this->strip_surrounding_quotes(array(
'INCLUDE',
'INCLUDEPHP',
'INCLUDEJS',
'INCLUDECSS',
), $code);
$code = $this->fix_inline_variable_tokens(array( $code = $this->fix_inline_variable_tokens(array(
//'DEFINE \$[a-zA-Z0-9_]+ =', // Disabling for ticket 11943 'DEFINE \$[a-zA-Z0-9_]+ =',
'INCLUDE',
'INCLUDEPHP',
'INCLUDEJS',
'INCLUDECSS',
), $code);
$code = $this->add_surrounding_quotes(array(
'INCLUDE', 'INCLUDE',
'INCLUDEPHP', 'INCLUDEPHP',
'INCLUDEJS', 'INCLUDEJS',
@ -107,10 +119,30 @@ class lexer extends \Twig_Lexer
return parent::tokenize($code, $filename); return parent::tokenize($code, $filename);
} }
/**
* Strip surrounding quotes
*
* First step to fix tokens that may have inline variables
* E.g. <!-- INCLUDE '{TEST}.html' to <!-- INCLUDE {TEST}.html
*
* @param array $tokens array of tokens to search for (imploded to a regular expression)
* @param string $code
* @return string
*/
protected function strip_surrounding_quotes($tokens, $code)
{
// Remove matching quotes at the beginning/end if a statement;
// E.g. 'asdf'"' -> asdf'"
// E.g. "asdf'"" -> asdf'"
// E.g. 'asdf'" -> 'asdf'"
return preg_replace('#<!-- (' . implode('|', $tokens) . ') (([\'"])?(.*?)\1) -->#', '<!-- $1 $2 -->', $code);
}
/** /**
* Fix tokens that may have inline variables * Fix tokens that may have inline variables
* *
* E.g. <!-- INCLUDE {TEST}.html * Second step to fix tokens that may have inline variables
* E.g. <!-- INCLUDE '{TEST}.html' to <!-- INCLUDE ' ~ {TEST} ~ '.html
* *
* @param array $tokens array of tokens to search for (imploded to a regular expression) * @param array $tokens array of tokens to search for (imploded to a regular expression)
* @param string $code * @param string $code
@ -120,22 +152,30 @@ class lexer extends \Twig_Lexer
{ {
$callback = function($matches) $callback = function($matches)
{ {
// Remove matching quotes at the beginning/end if a statement;
// E.g. 'asdf'"' -> asdf'"
// E.g. "asdf'"" -> asdf'"
// E.g. 'asdf'" -> 'asdf'"
$matches[2] = preg_replace('#^([\'"])?(.*?)\1$#', '$2', $matches[2]);
// Replace template variables with start/end to parse variables (' ~ TEST ~ '.html) // Replace template variables with start/end to parse variables (' ~ TEST ~ '.html)
$matches[2] = preg_replace('#{([a-zA-Z0-9_\.$]+)}#', "'~ \$1 ~'", $matches[2]); $matches[2] = preg_replace('#{([a-zA-Z0-9_\.$]+)}#', "'~ \$1 ~'", $matches[2]);
// Surround the matches in single quotes ('' ~ TEST ~ '.html') return "<!-- {$matches[1]} {$matches[2]} -->";
return "<!-- {$matches[1]} '{$matches[2]}' -->";
}; };
return preg_replace_callback('#<!-- (' . implode('|', $tokens) . ') (.+?) -->#', $callback, $code); return preg_replace_callback('#<!-- (' . implode('|', $tokens) . ') (.+?) -->#', $callback, $code);
} }
/**
* Add surrounding quotes
*
* Last step to fix tokens that may have inline variables
* E.g. <!-- INCLUDE '{TEST}.html' to <!-- INCLUDE '' ~ {TEST} ~ '.html'
*
* @param array $tokens array of tokens to search for (imploded to a regular expression)
* @param string $code
* @return string
*/
protected function add_surrounding_quotes($tokens, $code)
{
return preg_replace('#<!-- (' . implode('|', $tokens) . ') (.+?) -->#', '<!-- $1 \'$2\' -->', $code);
}
/** /**
* Fix begin tokens (convert our BEGIN to Twig for) * Fix begin tokens (convert our BEGIN to Twig for)
* *