Merge branch '1.x' into 2.x

* 1.x:
  fixed the "with" behavior to always include the globals

CHANGELOG

@@ -194,6 +194,7 @@
 
 * 1.39.0 (2019-XX-XX)
 
+ * fixed the "with" behavior to always include the globals (for consistency with the "include" and "embed" tags)
  * fixed "include" with "ignore missing" when an error loading occurs in the included template
  * added support for a new whitespace trimming option ({%~ ~%}, {{~ ~}}, {#~ ~#})
 

src/Node/WithNode.php

@@ -56,7 +56,7 @@ class WithNode extends Node
                 $compiler->write("\$context['_parent'] = \$context;\n");
             }
 
-            $compiler->write(sprintf("\$context = array_merge(\$context, \$%s);\n", $varsName));
+            $compiler->write(sprintf("\$context = \$this->env->mergeGlobals(array_merge(\$context, \$%s));\n", $varsName));
         } else {
             $compiler->write("\$context['_parent'] = \$context;\n");
         }

test/Twig/Tests/Fixtures/tags/with/globals.test

@@ -0,0 +1,10 @@
+--TEST--
+"with" tag
+--TEMPLATE--
+{% with [] only %}
+    {{ global }}
+{% endwith %}
+--DATA--
+return []
+--EXPECT--
+global