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/16382] Update remaining Twig_ references

Browse source 
PHPBB3-16382
This commit is contained in:
mrgoldy 2020-02-27 17:15:31 +01:00
parent 75c25556aa
commit 49845c1155
19 changed files with 56 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/phpbb/template/twig/environment.php
View file

@ -261,8 +261,8 @@ class environment extends \Twig\Environment
* *
* @param string $name The template name * @param string $name The template name
* @param integer $index The index if it is an embedded template * @param integer $index The index if it is an embedded template
* @return \Twig_TemplateInterface A template instance representing the given template name * @return \Twig\Template A template instance representing the given template name
* @throws \Twig_Error_Loader * @throws \Twig\Error\LoaderError
*/ */
public function loadTemplate($name, $index = null) public function loadTemplate($name, $index = null)
{ {
@ -279,7 +279,7 @@ class environment extends \Twig\Environment
return parent::loadTemplate('@' . $namespace . '/' . $name, $index); return parent::loadTemplate('@' . $namespace . '/' . $name, $index);
} }
catch (\Twig_Error_Loader $e) catch (\Twig\Error\LoaderError $e)
{ {
} }
} }
@ -298,7 +298,7 @@ class environment extends \Twig\Environment
* *
* @param string $name The template name * @param string $name The template name
* @return string * @return string
* @throws \Twig_Error_Loader * @throws \Twig\Error\LoaderError
*/ */
public function findTemplate($name) public function findTemplate($name)
{ {
@ -315,7 +315,7 @@ class environment extends \Twig\Environment
return parent::getLoader()->getCacheKey('@' . $namespace . '/' . $name); return parent::getLoader()->getCacheKey('@' . $namespace . '/' . $name);
} }
catch (\Twig_Error_Loader $e) catch (\Twig\Error\LoaderError $e)
{ {
} }
} }

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

@ -13,7 +13,7 @@
namespace phpbb\template\twig; namespace phpbb\template\twig;
class extension extends \Twig_Extension class extension extends \Twig\Extension\AbstractExtension
{ {
/** @var \phpbb\template\context */ /** @var \phpbb\template\context */
protected $context; protected $context;
@ -51,7 +51,7 @@ class extension extends \Twig_Extension
/** /**
* Returns the token parser instance to add to the existing list. * Returns the token parser instance to add to the existing list.
* *
* @return array An array of Twig_TokenParser instances * @return array An array of \Twig\TokenParser\AbstractTokenParser instances
*/ */
public function getTokenParsers() public function getTokenParsers()
{ {
@ -74,9 +74,9 @@ class extension extends \Twig_Extension
public function getFilters() public function getFilters()
{ {
return array( return array(
new \Twig_SimpleFilter('subset', array($this, 'loop_subset'), array('needs_environment' => true)), new \Twig\TwigFilter('subset', array($this, 'loop_subset'), array('needs_environment' => true)),
// @deprecated 3.2.0 Uses twig's JS escape method instead of addslashes // @deprecated 3.2.0 Uses twig's JS escape method instead of addslashes
new \Twig_SimpleFilter('addslashes', 'addslashes'), new \Twig\TwigFilter('addslashes', 'addslashes'),
); );
} }
@ -88,9 +88,9 @@ class extension extends \Twig_Extension
public function getFunctions() public function getFunctions()
{ {
return array( return array(
new \Twig_SimpleFunction('lang', array($this, 'lang')), new \Twig\TwigFunction('lang', array($this, 'lang')),
new \Twig_SimpleFunction('lang_defined', array($this, 'lang_defined')), new \Twig\TwigFunction('lang_defined', array($this, 'lang_defined')),
new \Twig_SimpleFunction('get_class', 'get_class'), new \Twig\TwigFunction('get_class', 'get_class'),
); );
} }
@ -103,30 +103,30 @@ class extension extends \Twig_Extension
{ {
return array( return array(
array( array(
'!' => array('precedence' => 50, 'class' => 'Twig_Node_Expression_Unary_Not'), '!' => array('precedence' => 50, 'class' => '\Twig\Node\Expression\Unary\NotUnary'),
), ),
array( array(
// precedence settings are copied from similar operators in Twig core extension // precedence settings are copied from similar operators in Twig core extension
'||' => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), '||' => array('precedence' => 10, 'class' => '\Twig\Node\Expression\Binary\OrBinary', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
'&&' => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), '&&' => array('precedence' => 15, 'class' => '\Twig\Node\Expression\Binary\AndBinary', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
'eq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), 'eq' => array('precedence' => 20, 'class' => '\Twig\Node\Expression\Binary\EqualBinary', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
'ne' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), 'ne' => array('precedence' => 20, 'class' => '\Twig\Node\Expression\Binary\NotEqualBinary', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
'neq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), 'neq' => array('precedence' => 20, 'class' => '\Twig\Node\Expression\Binary\NotEqualBinary', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
'<>' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), '<>' => array('precedence' => 20, 'class' => '\Twig\Node\Expression\Binary\NotEqualBinary', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
'===' => array('precedence' => 20, 'class' => '\phpbb\template\twig\node\expression\binary\equalequal', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), '===' => array('precedence' => 20, 'class' => '\phpbb\template\twig\node\expression\binary\equalequal', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
'!==' => array('precedence' => 20, 'class' => '\phpbb\template\twig\node\expression\binary\notequalequal', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), '!==' => array('precedence' => 20, 'class' => '\phpbb\template\twig\node\expression\binary\notequalequal', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
'gt' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Greater', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), 'gt' => array('precedence' => 20, 'class' => '\Twig\Node\Expression\Binary\GreaterBinary', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
'gte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), 'gte' => array('precedence' => 20, 'class' => '\Twig\Node\Expression\Binary\GreaterEqualBinary', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
'ge' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), 'ge' => array('precedence' => 20, 'class' => '\Twig\Node\Expression\Binary\GreaterEqualBinary', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
'lt' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), 'lt' => array('precedence' => 20, 'class' => '\Twig\Node\Expression\Binary\LessBinary', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
'lte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), 'lte' => array('precedence' => 20, 'class' => '\Twig\Node\Expression\Binary\LessEqualBinary', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
'le' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), 'le' => array('precedence' => 20, 'class' => '\Twig\Node\Expression\Binary\LessEqualBinary', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
'mod' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => \Twig_ExpressionParser::OPERATOR_LEFT), 'mod' => array('precedence' => 60, 'class' => '\Twig\Node\Expression\Binary\ModBinary', 'associativity' => \Twig\ExpressionParser::OPERATOR_LEFT),
), ),
); );
} }

2
phpBB/phpbb/template/twig/extension/avatar.php
View file

@ -33,7 +33,7 @@ class avatar extends \Twig_Extension
public function getFunctions() public function getFunctions()
{ {
return array( return array(
new \Twig_SimpleFunction('avatar', array($this, 'get_avatar')), new \Twig\TwigFunction('avatar', array($this, 'get_avatar')),
); );
} }

2
phpBB/phpbb/template/twig/extension/config.php
View file

@ -46,7 +46,7 @@ class config extends \Twig_Extension
public function getFunctions() public function getFunctions()
{ {
return array( return array(
new \Twig_SimpleFunction('config', array($this, 'get_config')), new \Twig\TwigFunction('config', array($this, 'get_config')),
); );
} }

2
phpBB/phpbb/template/twig/extension/username.php
View file

@ -33,7 +33,7 @@ class username extends \Twig_Extension
public function getFunctions() public function getFunctions()
{ {
return array( return array(
new \Twig_SimpleFunction('username', array($this, 'get_username')), new \Twig\TwigFunction('username', array($this, 'get_username')),
); );
} }

2
phpBB/phpbb/template/twig/loader.php
View file

@ -139,7 +139,7 @@ class loader extends \Twig\Loader\FilesystemLoader
// Try validating the name (which may throw an exception) // Try validating the name (which may throw an exception)
$this->validateName($name); $this->validateName($name);
} }
catch (\Twig_Error_Loader $e) catch (\Twig\Error\LoaderError $e)
{ {
if (strpos($e->getRawMessage(), 'Looks like you try to load a template outside configured directories') === 0) if (strpos($e->getRawMessage(), 'Looks like you try to load a template outside configured directories') === 0)
{ {

4
phpBB/phpbb/template/twig/node/definenode.php
View file

@ -24,7 +24,7 @@ class definenode extends \Twig\Node\Node
/** /**
* Compiles the node to PHP. * Compiles the node to PHP.
* *
* @param \Twig\Compiler A Twig_Compiler instance * @param \Twig\Compiler A Twig\Compiler instance
*/ */
public function compile(\Twig\Compiler $compiler) public function compile(\Twig\Compiler $compiler)
{ {
@ -37,7 +37,7 @@ class definenode extends \Twig\Node\Node
->subcompile($this->getNode('value')) ->subcompile($this->getNode('value'))
; ;
$compiler->write("\$value = ('' === \$value = ob_get_clean()) ? '' : new \Twig_Markup(\$value, \$this->env->getCharset());\n"); $compiler->write("\$value = ('' === \$value = ob_get_clean()) ? '' : new \Twig\Markup(\$value, \$this->env->getCharset());\n");
} }
else else
{ {

2
phpBB/phpbb/template/twig/node/event.php
View file

@ -34,7 +34,7 @@ class event extends \Twig\Node\Node
/** /**
* Compiles the node to PHP. * Compiles the node to PHP.
* *
* @param \Twig\Compiler A Twig_Compiler instance * @param \Twig\Compiler A Twig\Compiler instance
*/ */
public function compile(\Twig\Compiler $compiler) public function compile(\Twig\Compiler $compiler)
{ {

2
phpBB/phpbb/template/twig/node/includeasset.php
View file

@ -23,7 +23,7 @@ abstract class includeasset extends \Twig\Node\Node
/** /**
* Compiles the node to PHP. * Compiles the node to PHP.
* *
* @param \Twig\Compiler A Twig_Compiler instance * @param \Twig\Compiler A Twig\Compiler instance
*/ */
public function compile(\Twig\Compiler $compiler) public function compile(\Twig\Compiler $compiler)
{ {

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

@ -18,7 +18,7 @@ class includenode extends \Twig\Node\IncludeNode
/** /**
* Compiles the node to PHP. * Compiles the node to PHP.
* *
* @param \Twig\Compiler A Twig_Compiler instance * @param \Twig\Compiler A Twig\Compiler instance
*/ */
public function compile(\Twig\Compiler $compiler) public function compile(\Twig\Compiler $compiler)
{ {

4
phpBB/phpbb/template/twig/node/includephp.php
View file

@ -29,7 +29,7 @@ class includephp extends \Twig\Node\Node
/** /**
* Compiles the node to PHP. * Compiles the node to PHP.
* *
* @param \Twig\Compiler A Twig_Compiler instance * @param \Twig\Compiler A Twig\Compiler instance
*/ */
public function compile(\Twig\Compiler $compiler) public function compile(\Twig\Compiler $compiler)
{ {
@ -80,7 +80,7 @@ class includephp extends \Twig\Node\Node
{ {
$compiler $compiler
->outdent() ->outdent()
->write("} catch (\Twig_Error_Loader \$e) {\n") ->write("} catch (\Twig\Error\LoaderError \$e) {\n")
->indent() ->indent()
->write("// ignore missing template\n") ->write("// ignore missing template\n")
->outdent() ->outdent()

2
phpBB/phpbb/template/twig/node/php.php
View file

@ -28,7 +28,7 @@ class php extends \Twig\Node\Node
/** /**
* Compiles the node to PHP. * Compiles the node to PHP.
* *
* @param \Twig\Compiler A Twig_Compiler instance * @param \Twig\Compiler A Twig\Compiler instance
*/ */
public function compile(\Twig\Compiler $compiler) public function compile(\Twig\Compiler $compiler)
{ {

8
phpBB/phpbb/template/twig/tokenparser/defineparser.php
View file

@ -19,10 +19,10 @@ class defineparser extends \Twig\TokenParser\AbstractTokenParser
/** /**
* Parses a token and returns a node. * Parses a token and returns a node.
* *
* @param \Twig\Token $token A Twig_Token instance * @param \Twig\Token $token A Twig\Token instance
* *
* @return \Twig\Node\Node A Twig_Node instance * @return \Twig\Node\Node A Twig\Node instance
* @throws \Twig_Error_Syntax * @throws \Twig\Error\SyntaxError
* @throws \phpbb\template\twig\node\definenode * @throws \phpbb\template\twig\node\definenode
*/ */
public function parse(\Twig\Token $token) public function parse(\Twig\Token $token)
@ -41,7 +41,7 @@ class defineparser extends \Twig\TokenParser\AbstractTokenParser
{ {
// This would happen if someone improperly formed their DEFINE syntax // This would happen if someone improperly formed their DEFINE syntax
// e.g. <!-- DEFINE $VAR = foo --> // e.g. <!-- DEFINE $VAR = foo -->
throw new \Twig_Error_Syntax('Invalid DEFINE', $token->getLine(), $this->parser->getStream()->getSourceContext()->getPath()); throw new \Twig\Error\SyntaxError('Invalid DEFINE', $token->getLine(), $this->parser->getStream()->getSourceContext()->getPath());
} }
$stream->expect(\Twig\Token::BLOCK_END_TYPE); $stream->expect(\Twig\Token::BLOCK_END_TYPE);

4
phpBB/phpbb/template/twig/tokenparser/event.php
View file

@ -31,9 +31,9 @@ class event extends \Twig\TokenParser\AbstractTokenParser
/** /**
* Parses a token and returns a node. * Parses a token and returns a node.
* *
* @param \Twig\Token $token A Twig_Token instance * @param \Twig\Token $token A Twig\Token instance
* *
* @return \Twig\Node\Node A Twig_Node instance * @return \Twig\Node\Node A Twig\Node instance
*/ */
public function parse(\Twig\Token $token) public function parse(\Twig\Token $token)
{ {

4
phpBB/phpbb/template/twig/tokenparser/includecss.php
View file

@ -18,9 +18,9 @@ class includecss extends \Twig\TokenParser\AbstractTokenParser
/** /**
* Parses a token and returns a node. * Parses a token and returns a node.
* *
* @param \Twig\Token $token A Twig_Token instance * @param \Twig\Token $token A Twig\Token instance
* *
* @return \Twig\Node\Node A Twig_Node instance * @return \Twig\Node\Node A Twig\Node instance
*/ */
public function parse(\Twig\Token $token) public function parse(\Twig\Token $token)
{ {

4
phpBB/phpbb/template/twig/tokenparser/includejs.php
View file

@ -18,9 +18,9 @@ class includejs extends \Twig\TokenParser\AbstractTokenParser
/** /**
* Parses a token and returns a node. * Parses a token and returns a node.
* *
* @param \Twig\Token $token A Twig_Token instance * @param \Twig\Token $token A Twig\Token instance
* *
* @return \Twig\Node\Node A Twig_Node instance * @return \Twig\Node\Node A Twig\Node instance
*/ */
public function parse(\Twig\Token $token) public function parse(\Twig\Token $token)
{ {

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

@ -19,9 +19,9 @@ class includeparser extends \Twig\TokenParser\IncludeTokenParser
/** /**
* Parses a token and returns a node. * Parses a token and returns a node.
* *
* @param \Twig\Token $token A Twig_Token instance * @param \Twig\Token $token A Twig\Token instance
* *
* @return \Twig\Node\Node A Twig_Node instance * @return \Twig\Node\Node A Twig\Node instance
*/ */
public function parse(\Twig\Token $token) public function parse(\Twig\Token $token)
{ {

4
phpBB/phpbb/template/twig/tokenparser/includephp.php
View file

@ -32,9 +32,9 @@ class includephp extends \Twig\TokenParser\AbstractTokenParser
/** /**
* Parses a token and returns a node. * Parses a token and returns a node.
* *
* @param \Twig\Token $token A Twig_Token instance * @param \Twig\Token $token A Twig\Token instance
* *
* @return \Twig\Node\Node A Twig_Node instance * @return \Twig\Node\Node A Twig\Node instance
*/ */
public function parse(\Twig\Token $token) public function parse(\Twig\Token $token)
{ {

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

@ -31,9 +31,9 @@ class php extends \Twig\TokenParser\AbstractTokenParser
/** /**
* Parses a token and returns a node. * Parses a token and returns a node.
* *
* @param \Twig\Token $token A Twig_Token instance * @param \Twig\Token $token A Twig\Token instance
* *
* @return \Twig\Node\Node A Twig_Node instance * @return \Twig\Node\Node A Twig\Node instance
*/ */
public function parse(\Twig\Token $token) public function parse(\Twig\Token $token)
{ {