Merge branch 'release/1.0.4' into v1

nystudio107 · Dec 21, 2018 · 5141940 · 5141940
2 parents a46a45f + 6db7874
commit 5141940
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Empty Coalesce Changelog
 
+## 1.0.4 - 2018-12-20
+### Changed
+* Fixed namespacing/comments
+* Fixed tests
+
 ## 1.0.3 - 2018-12-18
 ### Changed
 * Refactored the node parser to handle all undefined values appropriately

diff --git a/test/Twig/Tests/Node/Expression/EmptyCoalesceTest.php b/test/Twig/Tests/Node/Expression/EmptyCoalesceTest.php
@@ -23,6 +23,6 @@ public function getTests()
         $right = new Twig_Node_Expression_Constant(2, 1);
         $node = new Twig_Node_Expression_EmptyCoalesce($left, $right, 1);
 
-        return array(array($node, "((// line 1\n\$context[\"foo\"]) ?? (2))"));
+        return array(array($node, "((empty(// line 1\n(\$context[\"foo\"] ?? null)) ? null : (\$context[\"foo\"] ?? null)) ?? (empty(2) ? null : 2))"));
     }
 }