Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-10-17 03:03:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Twig from 1.35.0 to 1.42.4 (PHP 5.5 is now required!)

Browse Source 
This fixes some errors on PHP 7.4 and contains even more fixes
Also bumped PHP version to 5.5 as Twig requires it.
This commit is contained in:
slawkens
2020-02-15 05:41:38 +01:00
parent d9e449b6cf
commit 8021308822
414 changed files with 9276 additions and 5531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
system/libs/Twig/NodeTraverser.php
View File

@@ -9,8 +9,12 @@
* file that was distributed with this source code.
*/
namespace Twig;
use Twig\NodeVisitor\NodeVisitorInterface;
/**
* Twig_NodeTraverser is a node traverser.
* A node traverser.
*
* It visits all nodes and their children and calls the given visitor for each.
*
@@ -18,16 +22,15 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
class Twig_NodeTraverser
class NodeTraverser
{
protected $env;
protected $visitors = array();
protected $visitors = [];
/**
* @param Twig_Environment $env
* @param Twig_NodeVisitorInterface[] $visitors
* @param NodeVisitorInterface[] $visitors
*/
public function __construct(Twig_Environment $env, array $visitors = array())
public function __construct(Environment $env, array $visitors = [])
{
$this->env = $env;
foreach ($visitors as $visitor) {
@@ -35,21 +38,17 @@ class Twig_NodeTraverser
}
}
public function addVisitor(Twig_NodeVisitorInterface $visitor)
public function addVisitor(NodeVisitorInterface $visitor)
{
if (!isset($this->visitors[$visitor->getPriority()])) {
$this->visitors[$visitor->getPriority()] = array();
}
$this->visitors[$visitor->getPriority()][] = $visitor;
}
/**
* Traverses a node and calls the registered visitors.
*
* @return Twig_NodeInterface
* @return \Twig_NodeInterface
*/
public function traverse(Twig_NodeInterface $node)
public function traverse(\Twig_NodeInterface $node)
{
ksort($this->visitors);
foreach ($this->visitors as $visitors) {
@@ -61,7 +60,7 @@ class Twig_NodeTraverser
return $node;
}
protected function traverseForVisitor(Twig_NodeVisitorInterface $visitor, Twig_NodeInterface $node = null)
protected function traverseForVisitor(NodeVisitorInterface $visitor, \Twig_NodeInterface $node = null)
{
if (null === $node) {
return;
@@ -70,8 +69,14 @@ class Twig_NodeTraverser
$node = $visitor->enterNode($node, $this->env);
foreach ($node as $k => $n) {
if (false !== $n = $this->traverseForVisitor($visitor, $n)) {
$node->setNode($k, $n);
if (null === $n) {
continue;
}
if (false !== ($m = $this->traverseForVisitor($visitor, $n)) && null !== $m) {
if ($m !== $n) {
$node->setNode($k, $m);
}
} else {
$node->removeNode($k);
}
@@ -81,4 +86,4 @@ class Twig_NodeTraverser
}
}
class_alias('Twig_NodeTraverser', 'Twig\NodeTraverser', false);
class_alias('Twig\NodeTraverser', 'Twig_NodeTraverser');