simplify ExecutorFactory and unify

atk4 · Sep 6, 2023 · eeaa67f · eeaa67f
1 parent b48701a
commit eeaa67f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git 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;
     }
 
     /**