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

fabpot · fabpot · commit 540b54e0d5c7 · 2024-09-09T11:41:27.000+02:00
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
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();
     }

Original file line number	Diff line number	Diff line change
`@@ -837,11 +837,11 @@ public function resetGlobals(): void`
`837`	`837`	`}`
`838`	`838`
`839`	`839`	`/**`
`840`		`- * @deprecated since Twig 3.13`
	`840`	`+ * @deprecated since Twig 3.14`
`841`	`841`	`*/`
`842`	`842`	`public function mergeGlobals(array $context): array`
`843`	`843`	`{`
`844`		`- trigger_deprecation('twig/twig', '3.13', 'The "%s" method is deprecated.', __METHOD__);`
	`844`	`+ trigger_deprecation('twig/twig', '3.14', 'The "%s" method is deprecated.', __METHOD__);`
`845`	`845`
`846`	`846`	`return $context + $this->getGlobals();`
`847`	`847`	`}`