geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-17 21:07:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the version mergeGlobals() is deprecated since

Browse Source
This commit is contained in:
Christian Flothmann
2024-09-09 10:58:08 +02:00
parent 995e7c2270
commit f72c93dbd2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/deprecated.rst
+1 -1
View File
@@ -227,7 +227,7 @@ Testing Utilities
Environment 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: and will be removed in Twig 4.0:
Before:: Before::
src/Environment.php
+2 -2
View File
@@ -837,11 +837,11 @@ class Environment
} }
/** /**
* @deprecated since Twig 3.13 * @deprecated since Twig 3.14
*/ */
public function mergeGlobals(array $context): array 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(); return $context + $this->getGlobals();
} }