Merge branch 'support/3.0' into develop

# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
This commit is contained in:
Eric Espie
2022-12-08 08:39:55 +01:00

View File

@@ -25,6 +25,7 @@ use AttributeText;
use Closure;
use Dict;
use Exception;
use IssueLog;
use Twig\Environment;
use Twig\Extension\AbstractExtension;
use Twig\Loader\FilesystemLoader;
@@ -168,6 +169,7 @@ class AppExtension extends AbstractExtension
$filters[] = new TwigFilter('filter', function ($array, $arrow) {
$ret = $this->SanitizeFilter($array, $arrow);
if ($ret !== false) {
IssueLog::Error('Twig "filter" filter has limited capabilities');
return [$ret];
}
$oEnv = new Environment(new FilesystemLoader());
@@ -175,13 +177,16 @@ class AppExtension extends AbstractExtension
});
// Since 2.7.8 deactivate map
$filters[] = new TwigFilter('map', function ($array, $arrow) {
IssueLog::Error('Twig "map" filter is deactivated');
return $array;
});
// Since 2.7.8 deactivate reduce
$filters[] = new TwigFilter('reduce', function ($array, $arrow, $initial = null) {
IssueLog::Error('Twig "reduce" filter is deactivated');
return $array;
});
$filters[] = new TwigFilter('sort', function ($array, $arrow, $initial = null) {
IssueLog::Error('Twig "sort" filter is deactivated');
return $array;
});
return $filters;