geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-08-30 20:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This PR was merged into the 3.x branch.

Discussion
----------

fix the version mergeGlobals() is deprecated since

Commits
-------

f72c93db fix the version mergeGlobals() is deprecated since
This commit is contained in:
Fabien Potencier
2024-09-09 11:41:27 +02:00
parent 795720230c f72c93dbd2
commit 540b54e0d5
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
-----------
* 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::
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
{
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();
}