added Twig_Environment::mergeGlobals()

test/Twig/Tests/Fixtures/tags/macro/global.test

@@ -0,0 +1,14 @@
+--TEST--
+"macro" tag
+--TEMPLATE--
+{% from 'forms.twig' import foo %}
+
+{{ foo('foo') }}
+{{ foo() }}
+--TEMPLATE(forms.twig)--
+{% macro foo(name) %}{{ name|default('foo') }}{{ global }}{% endmacro %}
+--DATA--
+return array()
+--EXPECT--
+fooglobal
+fooglobal

test/Twig/Tests/Node/MacroTest.php

@@ -46,7 +46,7 @@ class Twig_Tests_Node_MacroTest extends Twig_Tests_Node_TestCase
             array($node, <<<EOF
 public function getfoo(\$foo = null)
 {
-    \$context = \$this->mergeContextWithGlobals(array(
+    \$context = \$this->env->mergeGlobals(array(
         "foo" => \$foo,
     ));