call_user_func replaced with expression

Author: dg

src/Iterators/Mapper.php

@@ -28,7 +28,7 @@ public function __construct(\Traversable $iterator, callable $callback)
 
 	public function current()
 	{
-		return call_user_func($this->callback, parent::current(), parent::key());
+		return ($this->callback)(parent::current(), parent::key());
 	}
 
 }

src/Utils/Callback.php

@@ -59,7 +59,7 @@ public static function closure($callable, $m = NULL)
 	public static function invoke($callable, ...$args)
 	{
 		self::check($callable);
-		return call_user_func_array($callable, $args);
+		return $callable(...$args);
 	}
 
 
@@ -70,7 +70,7 @@ public static function invoke($callable, ...$args)
 	public static function invokeArgs($callable, array $args = [])
 	{
 		self::check($callable);
-		return call_user_func_array($callable, $args);
+		return $callable(...$args);
 	}
 
 

src/Utils/ObjectMixin.php

@@ -113,7 +113,7 @@ public static function call($_this, $name, $args)
 			}
 
 		} elseif ($isProp && $_this->$name instanceof \Closure) { // closure in property
-			return call_user_func_array($_this->$name, $args);
+			return ($_this->$name)(...$args);
 
 		} elseif (($methods = &self::getMethods($class)) && isset($methods[$name]) && is_array($methods[$name])) { // magic @methods
 			list($op, $rp, $type) = $methods[$name];
@@ -412,7 +412,7 @@ public static function checkType(&$val, $type)
 			case 'callable':
 			case 'resource':
 			case 'null':
-				return call_user_func("is_$type", $val);
+				return ("is_$type")($val);
 			default:
 				return $val instanceof $type;
 		}

src/Utils/Validators.php

@@ -130,7 +130,7 @@ public static function is($value, $expected)
 
 			list($type) = $item = explode(':', $item, 2);
 			if (isset(static::$validators[$type])) {
-				if (!call_user_func(static::$validators[$type], $value)) {
+				if (!static::$validators[$type]($value)) {
 					continue;
 				}
 			} elseif ($type === 'pattern') {
@@ -145,7 +145,7 @@ public static function is($value, $expected)
 			if (isset($item[1])) {
 				$length = $value;
 				if (isset(static::$counters[$type])) {
-					$length = call_user_func(static::$counters[$type], $value);
+					$length = static::$counters[$type]($value);
 				}
 				$range = explode('..', $item[1]);
 				if (!isset($range[1])) {

tests/Utils/Callback.closure.phpt

@@ -101,7 +101,7 @@ test(function () { // closure
 	Assert::same($closure, Callback::unwrap($closure));
 	Assert::same('{closure}', Callback::toString($closure));
 	Assert::same('{closure}', getName(Callback::toReflection($closure)));
-	Assert::same('{closure}', call_user_func_array(Callback::closure($closure), [&$res]));
+	Assert::same('{closure}', Callback::closure($closure)(...[&$res]));
 	Assert::same('{closure}', $res);
 });
 
@@ -142,7 +142,7 @@ test(function () { // object methods
 
 	Assert::same('Test::privateFun*', Callback::closure($test, 'privateFun')->__invoke('*'));
 
-	Assert::same('Test::ref', call_user_func_array(Callback::closure($test, 'ref'), [&$res]));
+	Assert::same('Test::ref', Callback::closure($test, 'ref')(...[&$res]));
 	Assert::same('Test::ref', $res);
 });