Skip to content

Commit f72c93d

Browse files
committed
fix the version mergeGlobals() is deprecated since
1 parent 995e7c2 commit f72c93d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

doc/deprecated.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ Testing Utilities
227227
Environment
228228
-----------
229229

230-
* The ``Twig\Environment::mergeGlobals()`` method is deprecated as of Twig 3.13
230+
* The ``Twig\Environment::mergeGlobals()`` method is deprecated as of Twig 3.14
231231
and will be removed in Twig 4.0:
232232

233233
Before::

src/Environment.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -837,11 +837,11 @@ public function resetGlobals(): void
837837
}
838838

839839
/**
840-
* @deprecated since Twig 3.13
840+
* @deprecated since Twig 3.14
841841
*/
842842
public function mergeGlobals(array $context): array
843843
{
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__);
845845

846846
return $context + $this->getGlobals();
847847
}

0 commit comments

Comments
 (0)