From fe18c192ea53b0b2bff262de041781bc5e534164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Svi=CC=81tok?= <mirosvitok@gmail.com>
Date: Thu, 26 May 2022 14:34:25 +0200
Subject: [PATCH] Fixes the filter loading issue

remp/crm#1135

(cherry picked from commit baeba8e0387f09c1659b3e62cca28e95590338aa)
---
 CHANGELOG.md                                         |  1 +
 .../mailer-module/src/Filters/FilterLoader.php       | 12 +++++-------
 .../mailer-module/src/Filters/YesNoFilter.php        |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf32c9fc8..178cfce2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ## [0.32.3] - 2022-05-26
 
 - Fixed deprecated warning because of using `Latte#addFilter()` method. remp/crm#1135
+- Fixed the filter loading issue. remp/crm#1135
 
 ## [0.32.2] - 2022-05-11
 
diff --git a/Mailer/extensions/mailer-module/src/Filters/FilterLoader.php b/Mailer/extensions/mailer-module/src/Filters/FilterLoader.php
index 3a0405f85..362843db1 100644
--- a/Mailer/extensions/mailer-module/src/Filters/FilterLoader.php
+++ b/Mailer/extensions/mailer-module/src/Filters/FilterLoader.php
@@ -7,20 +7,18 @@
 
 class FilterLoader
 {
-    /** @var array All registered filters */
-    private $filters = [];
+    /** All registered filters */
+    private array $filters = [];
 
     /**
      * Check if filter is registered, call filter if is registered
      *
      * @param string $helper
-     * @return mixed
+     * @return ?callable
      */
-    public function load(string $helper)
+    public function load(string $helper): ?callable
     {
-        if (isset($this->filters[$helper])) {
-            return call_user_func_array($this->filters[$helper], array_slice(func_get_args(), 1));
-        }
+        return $this->filters[$helper] ?? null;
     }
 
     /**
diff --git a/Mailer/extensions/mailer-module/src/Filters/YesNoFilter.php b/Mailer/extensions/mailer-module/src/Filters/YesNoFilter.php
index 45b94fd2a..76ccdaed0 100644
--- a/Mailer/extensions/mailer-module/src/Filters/YesNoFilter.php
+++ b/Mailer/extensions/mailer-module/src/Filters/YesNoFilter.php
@@ -7,6 +7,6 @@ class YesNoFilter
 {
     public function process(int $input): string
     {
-        return (boolean)$input ? 'Yes' : 'No';
+        return (boolean) $input ? 'Yes' : 'No';
     }
 }