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

[ticket/11700] include and define are not valid class names

Browse source 
PHPBB3-11700
This commit is contained in:
Nils Adermann 2013-07-14 15:38:04 -04:00
parent 4311cd65e3
commit 62b33968c2
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/template/twig/extension.php
View file

@ -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,

2
phpBB/phpbb/template/twig/node/define.php → phpBB/phpbb/template/twig/node/definenode.php
View file

@ -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)
{

2
phpBB/phpbb/template/twig/node/include.php → phpBB/phpbb/template/twig/node/includenode.php
View file

@ -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.

4
phpBB/phpbb/template/twig/tokenparser/define.php → phpBB/phpbb/template/twig/tokenparser/defineparser.php
View file

@ -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)

4
phpBB/phpbb/template/twig/tokenparser/include.php → phpBB/phpbb/template/twig/tokenparser/includeparser.php
View file

@ -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());
}
/**