Merge branch '2.x' into 3.x

* 2.x:
  Try running all tests on nightly
  Minor fixes
  Fix Travis config
This commit is contained in:
Nicolas Grekas
2020-05-21 11:56:39 +02:00
16 changed files with 26 additions and 31 deletions
+1 -1
View File
@@ -28,7 +28,7 @@ use Twig\Source;
*/
final class ModuleNode extends Node
{
public function __construct(Node $body, AbstractExpression $parent = null, Node $blocks, Node $macros, Node $traits, $embeddedTemplates, Source $source)
public function __construct(Node $body, ?AbstractExpression $parent, Node $blocks, Node $macros, Node $traits, $embeddedTemplates, Source $source)
{
$nodes = [
'body' => $body,