From eeaa67f67e432b2da980ee907918f2bcd819af6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Wed, 6 Sep 2023 12:11:07 +0200
Subject: [PATCH] simplify ExecutorFactory and unify

---
 src/UserAction/ExecutorFactory.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/UserAction/ExecutorFactory.php b/src/UserAction/ExecutorFactory.php
index 5d9bddd4f6..c8393d3a80 100644
--- a/src/UserAction/ExecutorFactory.php
+++ b/src/UserAction/ExecutorFactory.php
@@ -191,7 +191,9 @@ protected function createActionTrigger(UserAction $action, string $type = null):
             }
         }
 
-        $seed = is_array($seed) && is_callable($seed) ? call_user_func($seed, $action, $type) : $seed;
+        if (is_array($seed) && is_callable($seed)) {
+            $seed = call_user_func($seed, $action, $type);
+        }
 
         return Factory::factory($seed);
     }
@@ -242,7 +244,11 @@ protected function getActionCaption(UserAction $action, string $type = null): st
             }
         }
 
-        return is_array($caption) && is_callable($caption) ? call_user_func($caption, $action) : $caption;
+        if (is_array($caption) && is_callable($caption)) {
+            $caption = call_user_func($caption, $action);
+        }
+
+        return $caption;
     }
 
     /**