geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 11:56:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.x' into 2.x

Browse Source 
* 1.x:
  Fix integration tests
  Fix PHP 8 compat
  Install the phpunit-bridge with PHP 7.4 when testing nightly
  Add PHP 8 / nightly in Travis matrix
  Drop support for PHP 7.0
This commit is contained in:
Fabien Potencier
2020-05-19 15:03:51 +02:00
parent 25923f7d02 78348c0cc6
commit 2d5e36b759
14 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Node/ForNode.php
+1 -1
View File
@@ -25,7 +25,7 @@ class ForNode extends Node
{
private $loop;
public function __construct(AssignNameExpression $keyTarget, AssignNameExpression $valueTarget, AbstractExpression $seq, AbstractExpression $ifexpr = null, Node $body, Node $else = null, int $lineno, string $tag = null)
public function __construct(AssignNameExpression $keyTarget, AssignNameExpression $valueTarget, AbstractExpression $seq, ?AbstractExpression $ifexpr, Node $body, ?Node $else, int $lineno, string $tag = null)
{
$body = new Node([$body, $this->loop = new ForLoopNode($lineno, $tag)]);