From ae94e58a43bfb79d7a4930eb518e407dbd81cbe9 Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Wed, 7 Dec 2022 13:53:15 +0100 Subject: [PATCH 1/2] =?UTF-8?q?N=C2=B05725=20-=20Twig=20update=20'filter',?= =?UTF-8?q?=20'map'=20and=20'reduce'=20filters?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2.x/itop-portal-base/portal/src/Twig/AppExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php b/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php index 8e29416aa..4792f34fa 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php @@ -19,8 +19,8 @@ namespace Combodo\iTop\Portal\Twig; +use Closure; use Dict; -use PhpParser\Node\Expr\Closure; use Twig\Extension\AbstractExtension; use Twig_SimpleFilter; use Twig_SimpleFunction; From cf433f2f80932b0c087c3d0df85a4a8e27ddd675 Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Thu, 8 Dec 2022 08:25:11 +0100 Subject: [PATCH 2/2] =?UTF-8?q?N=C2=B05725=20-=20Twig=20update=20'filter',?= =?UTF-8?q?=20'map'=20and=20'reduce'=20filters?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2.x/itop-portal-base/portal/src/Twig/AppExtension.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php b/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php index 4792f34fa..f7edad1c0 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php @@ -21,6 +21,7 @@ namespace Combodo\iTop\Portal\Twig; use Closure; use Dict; +use IssueLog; use Twig\Extension\AbstractExtension; use Twig_SimpleFilter; use Twig_SimpleFunction; @@ -103,16 +104,19 @@ class AppExtension extends AbstractExtension $filters[] = new Twig_SimpleFilter('filter', function ($array, $arrow) { $ret = $this->SanitizeFilter($array, $arrow); if ($ret !== false) { + IssueLog::Error('Twig "filter" filter has limited capabilities'); return [$ret]; } return twig_array_filter($array, $arrow); }); // Since 2.7.8 deactivate map $filters[] = new Twig_SimpleFilter('map', function ($array, $arrow) { + IssueLog::Error('Twig "map" filter is deactivated'); return $array; }); // Since 2.7.8 deactivate reduce $filters[] = new Twig_SimpleFilter('reduce', function ($array, $arrow, $initial = null) { + IssueLog::Error('Twig "reduce" filter is deactivated'); return $array; });