minor #4290 fix the version mergeGlobals() is deprecated since (xabbuh)

This PR was merged into the 3.x branch. Discussion ---------- fix the version mergeGlobals() is deprecated since Commits ------- f72c93d fix the version mergeGlobals() is deprecated since
twigphp · Sep 9, 2024 · 540b54e · 540b54e
2 parents 7957202 + f72c93d
commit 540b54e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/doc/deprecated.rst b/doc/deprecated.rst
@@ -227,7 +227,7 @@ Testing Utilities
 Environment
 -----------
 
-* The ``Twig\Environment::mergeGlobals()`` method is deprecated as of Twig 3.13
+* The ``Twig\Environment::mergeGlobals()`` method is deprecated as of Twig 3.14
   and will be removed in Twig 4.0:
 
   Before::

diff --git a/src/Environment.php b/src/Environment.php
@@ -837,11 +837,11 @@ public function resetGlobals(): void
     }
 
     /**
-     * @deprecated since Twig 3.13
+     * @deprecated since Twig 3.14
      */
     public function mergeGlobals(array $context): array
     {
-        trigger_deprecation('twig/twig', '3.13', 'The "%s" method is deprecated.', __METHOD__);
+        trigger_deprecation('twig/twig', '3.14', 'The "%s" method is deprecated.', __METHOD__);
 
         return $context + $this->getGlobals();
     }