Fix: #1842 - support PHP functions in report expressions

1 files changed, 6 insertions, 1 deletions

diff --git a/app/Report/ReportParserGenerate.php b/app/Report/ReportParserGenerate.php
index 232c57a19b..b0901e9de4 100644
--- a/app/Report/ReportParserGenerate.php
+++ b/app/Report/ReportParserGenerate.php
@@ -32,6 +32,7 @@ use Fisharebest\Webtrees\Note;
 use Fisharebest\Webtrees\Place;
 use Fisharebest\Webtrees\Tree;
 use stdClass;
+use Symfony\Component\ExpressionLanguage\ExpressionFunction;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 
 /**
@@ -1522,7 +1523,11 @@ class ReportParserGenerate extends ReportParserBase
             $i++;
         }
 
-        $ret = (new ExpressionLanguage())->evaluate($condition);
+        // Create an expression language with the functions used by our reports.
+        $expression_provider  = new ReportExpressionLanguageProvider();
+        $expression_language  = new ExpressionLanguage(null, [$expression_provider]);
+
+        $ret = $expression_language->evaluate($condition);
 
         if (!$ret) {
             $this->process_ifs++;