From 68bc26eb38245863eb1aa14e17117bb7baa8057d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Wed, 28 Apr 2021 09:57:48 +0200
Subject: [PATCH] refactor call_user_func

---
 src/Form/Control/Multiline.php     | 6 +++---
 src/Form/Control/ScopeBuilder.php  | 4 ++--
 src/UserAction/ExecutorFactory.php | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Form/Control/Multiline.php b/src/Form/Control/Multiline.php
index 86c68c51ce..af1a962bcd 100644
--- a/src/Form/Control/Multiline.php
+++ b/src/Form/Control/Multiline.php
@@ -590,7 +590,7 @@ protected function getComponentDefinition(Field $field): array
         }
 
         $definition = array_map(function ($value) use ($field) {
-            return is_array($value) && is_callable($value) ? call_user_func($value, $field) : $value;
+            return is_array($value) && is_callable($value) ? $value($field) : $value;
         }, $component);
 
         return $definition;
@@ -629,7 +629,7 @@ protected function valuePropsBinding(string $values)
         foreach ($fieldValues as $rows) {
             foreach ($rows as $fieldName => $value) {
                 if (array_key_exists($fieldName, $this->valuePropsBinding)) {
-                    call_user_func($this->valuePropsBinding[$fieldName], $this->getModel()->getField($fieldName), $value);
+                    ($this->valuePropsBinding[$fieldName])($this->getModel()->getField($fieldName), $value);
                 }
             }
         }
@@ -690,7 +690,7 @@ private function outputJson(): void
 
                 break;
             case 'on-change':
-                $response = call_user_func($this->onChangeFunction, $this->getApp()->decodeJson($_POST['rows']), $this->form);
+                $response = ($this->onChangeFunction)($this->getApp()->decodeJson($_POST['rows']), $this->form);
                 $this->renderCallback->terminateAjax($this->renderCallback->getAjaxec($response));
 
                 break;
diff --git a/src/Form/Control/ScopeBuilder.php b/src/Form/Control/ScopeBuilder.php
index 5a17b77662..6d570cbd1a 100644
--- a/src/Form/Control/ScopeBuilder.php
+++ b/src/Form/Control/ScopeBuilder.php
@@ -495,12 +495,12 @@ protected function getRule($type, array $defaults = [], Field $field = null): ar
 
         // when $rule is callable
         if (is_callable($rule)) {
-            $rule = call_user_func($rule, $field, $options);
+            $rule = $rule($field, $options);
         }
 
         // map all values for callables and merge with defaults
         return array_merge(array_map(function ($value) use ($field, $options) {
-            return is_array($value) && is_callable($value) ? call_user_func($value, $field, $options) : $value;
+            return is_array($value) && is_callable($value) ? $value($field, $options) : $value;
         }, $rule), $defaults);
     }
 
diff --git a/src/UserAction/ExecutorFactory.php b/src/UserAction/ExecutorFactory.php
index 8e8a597514..dd18d1fabf 100644
--- a/src/UserAction/ExecutorFactory.php
+++ b/src/UserAction/ExecutorFactory.php
@@ -202,7 +202,7 @@ protected function createActionTrigger(UserAction $action, string $type = null):
             $seed = $viewType['default'];
         }
 
-        $seed = is_array($seed) && is_callable($seed) ? call_user_func($seed, $action, $type) : $seed;
+        $seed = is_array($seed) && is_callable($seed) ? $seed($action, $type) : $seed;
 
         return Factory::factory($seed);
     }
@@ -249,7 +249,7 @@ protected function getActionCaption(UserAction $action, string $type = null): st
             $caption = $action->getCaption();
         }
 
-        return is_array($caption) && is_callable($caption) ? call_user_func($caption, $action) : $caption;
+        return is_array($caption) && is_callable($caption) ? $caption($action) : $caption;
     }
 
     /**