geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 10:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

reduce the number of deprecations being triggered

Browse Source 
Triggering deprecations for specific arguments is not needed as the method
itself is deprecated as well.
This commit is contained in:
Christian Flothmann
2025-02-28 14:28:16 +01:00
parent 76b86aa9da
commit 155d0faab4
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -1,5 +1,6 @@
# 3.21.0 (2025-XX-XX) # 3.21.0 (2025-XX-XX)
* Deprecate `Template::loadTemplate()`
* Fix testing and expression when it evaluates to an instance of `Markup` * Fix testing and expression when it evaluates to an instance of `Markup`
* Add `ReturnPrimitiveTypeInterface` (and sub-interfaces for number, boolean, string, and array) * Add `ReturnPrimitiveTypeInterface` (and sub-interfaces for number, boolean, string, and array)
* Add `SupportDefinedTestInterface` for expression nodes supporting the `defined` test * Add `SupportDefinedTestInterface` for expression nodes supporting the `defined` test
doc/deprecated.rst
+3 -3
View File
@@ -259,10 +259,10 @@ Token
Templates Templates
--------- ---------
* The method ``Template::loadTemplate()`` is deprecated.
* Passing ``Twig\Template`` instances to Twig public API is deprecated (like * Passing ``Twig\Template`` instances to Twig public API is deprecated (like
in ``Environment::resolveTemplate()``, ``Environment::load()``, and in ``Environment::resolveTemplate()`` and ``Environment::load()``); pass
``Template::loadTemplate()``); pass instances of ``Twig\TemplateWrapper`` instances of ``Twig\TemplateWrapper`` instead.
instead.
Filters Filters
------- -------
src/Template.php
+1 -5
View File
@@ -313,21 +313,17 @@ abstract class Template
/** /**
* @param string|TemplateWrapper|array<string|TemplateWrapper> $template * @param string|TemplateWrapper|array<string|TemplateWrapper> $template
* *
* @deprecated since 3.21 and will be removed in 4.0. Use Template::load() instead. * @deprecated since Twig 3.21 and will be removed in 4.0. Use Template::load() instead.
*/ */
protected function loadTemplate($template, $templateName = null, int|null $line = null, int|null $index = null): self|TemplateWrapper protected function loadTemplate($template, $templateName = null, int|null $line = null, int|null $index = null): self|TemplateWrapper
{ {
trigger_deprecation('twig/twig', '3.21', 'The "%s" method is deprecated.', __METHOD__); trigger_deprecation('twig/twig', '3.21', 'The "%s" method is deprecated.', __METHOD__);
if (null === $line) { if (null === $line) {
trigger_deprecation('twig/twig', '3.21', 'Passing a "null" line number to "%s" is deprecated.', __METHOD__);
$line = -1; $line = -1;
} }
if ($template instanceof self) { if ($template instanceof self) {
trigger_deprecation('twig/twig', '3.9', 'Passing a "%s" instance to "%s" is deprecated.', self::class, __METHOD__);
return $template; return $template;
} }