change PhpHelper::call args use method

Author: inhere

src/Components/DeferredCallable.php

@@ -37,7 +37,7 @@ public function __invoke(...$args)
         $callable = $this->callable;
 
         if (is_callable($callable)) {
-            return PhpHelper::call($callable, $args);
+            return PhpHelper::call($callable, ...$args);
         }
 
         if (is_string($callable) && class_exists($callable)) {

src/Components/ErrorHandler.php

@@ -203,7 +203,7 @@ public function handleError($code, $message, $file = '', $line = 0, array $conte
         }
 
         if ($this->previousErrorHandler) {
-            return PhpHelper::call($this->previousErrorHandler, [$code, $message, $file, $line, $context]);
+            return PhpHelper::call($this->previousErrorHandler, $code, $message, $file, $line, $context);
         }
 
         return false;

src/Helpers/PhpHelper.php

@@ -16,29 +16,32 @@ class PhpHelper extends EnvHelper
 {
     /**
      * @param $cb
-     * @param array $args
+     * @param array ...$args
      * @return mixed
      */
-    public static function call($cb, array $args = [])
+    public static function call($cb, ...$args)
     {
-        $args = array_values($args);
-
-        if (
-            (is_object($cb) && method_exists($cb, '__invoke')) ||
-            (is_string($cb) && function_exists($cb))
-        ) {
-            $ret = $cb(...$args);
-        } elseif (is_array($cb)) {
+        // $args = array_values($args);
+
+        if (is_string($cb)) {
+            // function
+            if (strpos($cb, '::') === false) {
+                return $cb(...$args);
+            }
+
+            // ClassName/Service::method
+            $cb = explode('::', $cb, 2);
+        } elseif (is_object($cb) && method_exists($cb, '__invoke')) {
+            return $cb(...$args);
+        }
+
+        if (is_array($cb)) {
             list($obj, $mhd) = $cb;
 
-            $ret = is_object($obj) ? $obj->$mhd(...$args) : $obj::$mhd(...$args);
-        } elseif (class_exists(Coroutine::class, false)) {
-            $ret = Coroutine::call_user_func_array($cb, $args);
-        } else {
-            $ret = call_user_func_array($cb, $args);
+            return is_object($obj) ? $obj->$mhd(...$args) : $obj::$mhd(...$args);
         }
 
-        return $ret;
+        throw new \InvalidArgumentException('The parameter is not a callable');
     }
 
     /**

src/Traits/AopProxyAwareTrait.php

@@ -58,17 +58,17 @@ public function call($method, array $args = [])
         // on before exec method
         if ($cbList = $this->findProxyCallback($target, $method)) {
             foreach ($cbList as $cb) {
-                PhpHelper::call($cb, [$target, $method, $args]);
+                PhpHelper::call($cb, $target, $method, $args);
             }
         }
 
         // exec method
-        $ret = PhpHelper::call([$target, $method], $args);
+        $ret = PhpHelper::call([$target, $method], ...$args);
 
         // on after exec method
         if ($cb = $this->findProxyCallback($target, $method, 'after')) {
             foreach ($cbList as $cb) {
-                PhpHelper::call($cb, [$target, $method, $args]);
+                PhpHelper::call($cb, $target, $method, $args);
             }
         }
 

src/Traits/EventTrait.php

@@ -76,7 +76,7 @@ public function fire($event, array $args = [])
         // call event handlers of the event.
         foreach ((array)$this->eventHandlers[$event] as $cb) {
             // return FALSE to stop go on handle.
-            if (false === PhpHelper::call($cb, $args)) {
+            if (false === PhpHelper::call($cb, ...$args)) {
                 break;
             }
         }

src/Traits/FixedEventStaticTrait.php

@@ -80,7 +80,7 @@ public static function fire($event, array $args = [])
         // call event handlers of the event.
         foreach ((array)self::$eventHandlers[$event] as $cb) {
             // return FALSE to stop go on handle.
-            if (false === PhpHelper::call($cb, $args)) {
+            if (false === PhpHelper::call($cb, ...$args)) {
                 break;
             }
         }

src/Traits/FixedEventTrait.php

@@ -150,7 +150,7 @@ protected function fire(string $event, array $args = [])
             return null;
         }
 
-        return PhpHelper::call($cb, $args);
+        return PhpHelper::call($cb, ...$args);
     }
 
 }