diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-07-14 15:38:04 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-07-14 15:38:04 -0400 |
| commit | 62b33968c2ef7c5bf264f8af2a39eac2183148f7 (patch) | |
| tree | 374d5d93c64e3546592d5ce63052bf04383fb8ef /phpBB/phpbb/template | |
| parent | 4311cd65e30b994c5ecd07baf0a508f40d51f155 (diff) | |
| download | forums-62b33968c2ef7c5bf264f8af2a39eac2183148f7.tar forums-62b33968c2ef7c5bf264f8af2a39eac2183148f7.tar.gz forums-62b33968c2ef7c5bf264f8af2a39eac2183148f7.tar.bz2 forums-62b33968c2ef7c5bf264f8af2a39eac2183148f7.tar.xz forums-62b33968c2ef7c5bf264f8af2a39eac2183148f7.zip | |
[ticket/11700] include and define are not valid class names
PHPBB3-11700
Diffstat (limited to 'phpBB/phpbb/template')
| -rw-r--r-- | phpBB/phpbb/template/twig/extension.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/node/definenode.php (renamed from phpBB/phpbb/template/twig/node/define.php) | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/node/includenode.php (renamed from phpBB/phpbb/template/twig/node/include.php) | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/tokenparser/defineparser.php (renamed from phpBB/phpbb/template/twig/tokenparser/define.php) | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/tokenparser/includeparser.php (renamed from phpBB/phpbb/template/twig/tokenparser/include.php) | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php index c279726434..2adee07c8c 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -54,8 +54,8 @@ class phpbb_template_twig_extension extends Twig_Extension public function getTokenParsers() { return array( - new phpbb_template_twig_tokenparser_define, - new phpbb_template_twig_tokenparser_include, + new phpbb_template_twig_tokenparser_defineparser, + new phpbb_template_twig_tokenparser_includeparser, new phpbb_template_twig_tokenparser_includejs, new phpbb_template_twig_tokenparser_includecss, new phpbb_template_twig_tokenparser_event, diff --git a/phpBB/phpbb/template/twig/node/define.php b/phpBB/phpbb/template/twig/node/definenode.php index fcb19cc773..247b908337 100644 --- a/phpBB/phpbb/template/twig/node/define.php +++ b/phpBB/phpbb/template/twig/node/definenode.php @@ -16,7 +16,7 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_node_define extends Twig_Node +class phpbb_template_twig_node_definenode extends Twig_Node { public function __construct($capture, Twig_NodeInterface $name, Twig_NodeInterface $value, $lineno, $tag = null) { diff --git a/phpBB/phpbb/template/twig/node/include.php b/phpBB/phpbb/template/twig/node/includenode.php index 5c6ae1bbcf..c5d1c6be51 100644 --- a/phpBB/phpbb/template/twig/node/include.php +++ b/phpBB/phpbb/template/twig/node/includenode.php @@ -16,7 +16,7 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_node_include extends Twig_Node_Include +class phpbb_template_twig_node_includenode extends Twig_Node_Include { /** * Compiles the node to PHP. diff --git a/phpBB/phpbb/template/twig/tokenparser/define.php b/phpBB/phpbb/template/twig/tokenparser/defineparser.php index 4ea15388c4..db023c67bf 100644 --- a/phpBB/phpbb/template/twig/tokenparser/define.php +++ b/phpBB/phpbb/template/twig/tokenparser/defineparser.php @@ -16,7 +16,7 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_tokenparser_define extends Twig_TokenParser +class phpbb_template_twig_tokenparser_defineparser extends Twig_TokenParser { /** * Parses a token and returns a node. @@ -46,7 +46,7 @@ class phpbb_template_twig_tokenparser_define extends Twig_TokenParser $stream->expect(Twig_Token::BLOCK_END_TYPE); } - return new phpbb_template_twig_node_define($capture, $name, $value, $lineno, $this->getTag()); + return new phpbb_template_twig_node_definenode($capture, $name, $value, $lineno, $this->getTag()); } public function decideBlockEnd(Twig_Token $token) diff --git a/phpBB/phpbb/template/twig/tokenparser/include.php b/phpBB/phpbb/template/twig/tokenparser/includeparser.php index 520f9fd1a0..79c53630d0 100644 --- a/phpBB/phpbb/template/twig/tokenparser/include.php +++ b/phpBB/phpbb/template/twig/tokenparser/includeparser.php @@ -16,7 +16,7 @@ if (!defined('IN_PHPBB')) } -class phpbb_template_twig_tokenparser_include extends Twig_TokenParser_Include +class phpbb_template_twig_tokenparser_includeparser extends Twig_TokenParser_Include { /** * Parses a token and returns a node. @@ -31,7 +31,7 @@ class phpbb_template_twig_tokenparser_include extends Twig_TokenParser_Include list($variables, $only, $ignoreMissing) = $this->parseArguments(); - return new phpbb_template_twig_node_include($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag()); + return new phpbb_template_twig_node_includenode($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag()); } /** |