Backport #69 to 4.x

cakephp · Oct 21, 2017 · 1f82a27 · 1f82a27
1 parent 558dace
commit 1f82a27
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/Lib/Twig/Node/Cell.php b/src/Lib/Twig/Node/Cell.php
@@ -46,6 +46,14 @@ public function __construct(
         $lineno = '',
         $tag = null
     ) {
+        if ($data === null) {
+            $data = new \Twig_Node_Expression_Array([], $lineno);
+        }
+
+        if ($options === null) {
+            $options = new \Twig_Node_Expression_Array([], $lineno);
+        }
+
         parent::__construct(
             [
                 'name' => $name,

diff --git a/src/Lib/Twig/Node/Element.php b/src/Lib/Twig/Node/Element.php
@@ -32,6 +32,14 @@ public function __construct(
         $lineno = '',
         $tag = null
     ) {
+        if ($data === null) {
+            $data = new \Twig_Node_Expression_Array([], $lineno);
+        }
+
+        if ($options === null) {
+            $options = new \Twig_Node_Expression_Array([], $lineno);
+        }
+
         parent::__construct(
             [
                 'name' => $name,