mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2020-03-01 21:41:03 +01:00
parent 7945c452ec 3feafaade6
commit e95778df58
25 changed files with 134 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/phpbb/template/twig/node/definenode.php
View File

@@ -14,9 +14,9 @@
namespace phpbb\template\twig\node;
class definenode extends \Twig_Node
class definenode extends \Twig\Node\Node
{
public function __construct($capture, \Twig_Node $name, \Twig_Node $value, $lineno, $tag = null)
public function __construct($capture, \Twig\Node\Node $name, \Twig\Node\Node $value, $lineno, $tag = null)
{
parent::__construct(array('name' => $name, 'value' => $value), array('capture' => $capture, 'safe' => false), $lineno, $tag);
}
@@ -24,9 +24,9 @@ class definenode extends \Twig_Node
/**
* 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)
{
$compiler->addDebugInfo($this);
@@ -37,7 +37,7 @@ class definenode extends \Twig_Node
->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
{

10
phpBB/phpbb/template/twig/node/event.php
View File

@@ -13,7 +13,7 @@
namespace phpbb\template\twig\node;
class event extends \Twig_Node
class event extends \Twig\Node\Node
{
/**
* The subdirectory in which all template listener files must be placed
@@ -21,10 +21,10 @@ class event extends \Twig_Node
*/
protected $listener_directory = 'event/';
/** @var \Twig_Environment */
/** @var \Twig\Environment */
protected $environment;
public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
public function __construct(\Twig\Node\Expression\AbstractExpression $expr, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
{
$this->environment = $environment;
@@ -34,9 +34,9 @@ class event extends \Twig_Node
/**
* 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)
{
$compiler->addDebugInfo($this);

4
phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
View File

@@ -13,9 +13,9 @@
namespace phpbb\template\twig\node\expression\binary;
class equalequal extends \Twig_Node_Expression_Binary
class equalequal extends \Twig\Node\Expression\Binary\AbstractBinary
{
public function operator(\Twig_Compiler $compiler)
public function operator(\Twig\Compiler $compiler)
{
return $compiler->raw('===');
}

4
phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
View File

@@ -13,9 +13,9 @@
namespace phpbb\template\twig\node\expression\binary;
class notequalequal extends \Twig_Node_Expression_Binary
class notequalequal extends \Twig\Node\Expression\Binary\AbstractBinary
{
public function operator(\Twig_Compiler $compiler)
public function operator(\Twig\Compiler $compiler)
{
return $compiler->raw('!==');
}

8
phpBB/phpbb/template/twig/node/includeasset.php
View File

@@ -13,9 +13,9 @@
namespace phpbb\template\twig\node;
abstract class includeasset extends \Twig_Node
abstract class includeasset extends \Twig\Node\Node
{
public function __construct(\Twig_Node_Expression $expr, $lineno, $tag = null)
public function __construct(\Twig\Node\Expression\AbstractExpression $expr, $lineno, $tag = null)
{
parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
}
@@ -23,9 +23,9 @@ abstract class includeasset extends \Twig_Node
/**
* 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)
{
$compiler->addDebugInfo($this);

6
phpBB/phpbb/template/twig/node/includenode.php
View File

@@ -13,14 +13,14 @@
namespace phpbb\template\twig\node;
class includenode extends \Twig_Node_Include
class includenode extends \Twig\Node\IncludeNode
{
/**
* 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)
{
$compiler->addDebugInfo($this);

12
phpBB/phpbb/template/twig/node/includephp.php
View File

@@ -14,12 +14,12 @@
namespace phpbb\template\twig\node;
class includephp extends \Twig_Node
class includephp extends \Twig\Node\Node
{
/** @var \Twig_Environment */
/** @var \Twig\Environment */
protected $environment;
public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $lineno, $ignoreMissing = false, $tag = null)
public function __construct(\Twig\Node\Expression\AbstractExpression $expr, \phpbb\template\twig\environment $environment, $lineno, $ignoreMissing = false, $tag = null)
{
$this->environment = $environment;
@@ -29,9 +29,9 @@ class includephp extends \Twig_Node
/**
* 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)
{
$compiler->addDebugInfo($this);
@@ -80,7 +80,7 @@ class includephp extends \Twig_Node
{
$compiler
->outdent()
->write("} catch (\Twig_Error_Loader \$e) {\n")
->write("} catch (\Twig\Error\LoaderError \$e) {\n")
->indent()
->write("// ignore missing template\n")
->outdent()

10
phpBB/phpbb/template/twig/node/php.php
View File

@@ -13,12 +13,12 @@
namespace phpbb\template\twig\node;
class php extends \Twig_Node
class php extends \Twig\Node\Node
{
/** @var \Twig_Environment */
/** @var \Twig\Environment */
protected $environment;
public function __construct(\Twig_Node_Text $text, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
public function __construct(\Twig\Node\TextNode $text, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
{
$this->environment = $environment;
@@ -28,9 +28,9 @@ class php extends \Twig_Node
/**
* 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)
{
$compiler->addDebugInfo($this);