Merge branch '1.x' into 2.x

* 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
14 changed files with 34 additions and 25 deletions
+1 -1
View File
@@ -20,7 +20,7 @@ use Twig\Compiler;
*/
class WithNode extends Node
{
public function __construct(Node $body, Node $variables = null, bool $only = false, int $lineno, string $tag = null)
public function __construct(Node $body, ?Node $variables, bool $only, int $lineno, string $tag = null)
{
$nodes = ['body' => $body];
if (null !== $variables) {