composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°5725 - Twig update 'filter', 'map' and 'reduce' filters (twig functions signature changed)

Browse Source
This commit is contained in:
Eric Espie
2022-11-30 13:40:44 +01:00
parent 5577f4a62e
commit 51a305b445
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
View File

@@ -23,7 +23,9 @@ use AttributeDate;
use AttributeDateTime; use AttributeDateTime;
use AttributeText; use AttributeText;
use Dict; use Dict;
use Twig\Environment;
use Twig\Extension\AbstractExtension; use Twig\Extension\AbstractExtension;
use Twig\Loader\FilesystemLoader;
use Twig_SimpleFilter; use Twig_SimpleFilter;
use Twig_SimpleFunction; use Twig_SimpleFunction;
use utils; use utils;
@@ -166,14 +168,16 @@ class AppExtension extends AbstractExtension
if ($ret !== false) { if ($ret !== false) {
return [$ret]; return [$ret];
} }
return twig_array_filter($array, $arrow); $oEnv = new Environment(new FilesystemLoader());
return twig_array_filter($oEnv, $array, $arrow);
}); });
$filters[] = new Twig_SimpleFilter('map', function ($array, $arrow) { $filters[] = new Twig_SimpleFilter('map', function ($array, $arrow) {
$ret = $this->SanitizeFilter($array, $arrow); $ret = $this->SanitizeFilter($array, $arrow);
if ($ret !== false) { if ($ret !== false) {
return [$ret]; return [$ret];
} }
return twig_array_map($array, $arrow); $oEnv = new Environment(new FilesystemLoader());
return twig_array_map($oEnv, $array, $arrow);
}); });
$filters[] = new Twig_SimpleFilter('reduce', function ($array, $arrow, $initial = null) { $filters[] = new Twig_SimpleFilter('reduce', function ($array, $arrow, $initial = null) {
$ret = $this->SanitizeFilter($array, $arrow); $ret = $this->SanitizeFilter($array, $arrow);
@@ -181,7 +185,8 @@ class AppExtension extends AbstractExtension
return $ret; return $ret;
} }
// reduce return mixed results not only arrays // reduce return mixed results not only arrays
return twig_array_reduce($array, $arrow, $initial); $oEnv = new Environment(new FilesystemLoader());
return twig_array_reduce($oEnv, $array, $arrow, $initial);
}); });
return $filters; return $filters;