call_user_func replaced with expression

Author: dg

src/Application/MicroPresenter.php

@@ -84,7 +84,7 @@ public function run(Application\Request $request)
 		$params['presenter'] = $this;
 		$params = Application\UI\ComponentReflection::combineArgs($reflection, $params);
 
-		$response = call_user_func_array($callback, $params);
+		$response = $callback(...array_values($params));
 
 		if (is_string($response)) {
 			$response = [$response, []];

src/Application/PresenterFactory.php

@@ -46,7 +46,7 @@ public function __construct(callable $factory = NULL)
 	 */
 	public function createPresenter($name)
 	{
-		return call_user_func($this->factory, $this->getPresenterClass($name));
+		return ($this->factory)($this->getPresenterClass($name));
 	}
 
 

src/Application/Responses/CallbackResponse.php

@@ -36,7 +36,7 @@ public function __construct(callable $callback)
 	 */
 	public function send(Nette\Http\IRequest $httpRequest, Nette\Http\IResponse $httpResponse)
 	{
-		call_user_func($this->callback, $httpRequest, $httpResponse);
+		($this->callback)($httpRequest, $httpResponse);
 	}
 
 }

src/Application/Routers/Route.php

@@ -227,7 +227,7 @@ public function match(Nette\Http\IRequest $httpRequest)
 					return NULL; // rejected by filterTable
 
 				} elseif (isset($meta[self::FILTER_IN])) { // applies filterIn only to scalar parameters
-					$params[$name] = call_user_func($meta[self::FILTER_IN], (string) $params[$name]);
+					$params[$name] = $meta[self::FILTER_IN]((string) $params[$name]);
 					if ($params[$name] === NULL && !isset($meta['fixity'])) {
 						return NULL; // rejected by filter
 					}
@@ -239,7 +239,7 @@ public function match(Nette\Http\IRequest $httpRequest)
 		}
 
 		if (isset($this->metadata[NULL][self::FILTER_IN])) {
-			$params = call_user_func($this->metadata[NULL][self::FILTER_IN], $params);
+			$params = $this->metadata[NULL][self::FILTER_IN]($params);
 			if ($params === NULL) {
 				return NULL;
 			}
@@ -302,7 +302,7 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re
 		}
 
 		if (isset($metadata[NULL][self::FILTER_OUT])) {
-			$params = call_user_func($metadata[NULL][self::FILTER_OUT], $params);
+			$params = $metadata[NULL][self::FILTER_OUT]($params);
 			if ($params === NULL) {
 				return NULL;
 			}
@@ -336,7 +336,7 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re
 				return NULL;
 
 			} elseif (isset($meta[self::FILTER_OUT])) {
-				$params[$name] = call_user_func($meta[self::FILTER_OUT], $params[$name]);
+				$params[$name] = $meta[self::FILTER_OUT]($params[$name]);
 			}
 
 			if (isset($meta[self::PATTERN]) && !preg_match($meta[self::PATTERN], rawurldecode($params[$name]))) {
@@ -581,7 +581,7 @@ private function setMask($mask, array $metadata)
 					$meta['defOut'] = $meta['filterTable2'][$meta[self::VALUE]];
 
 				} elseif (isset($meta[self::FILTER_OUT])) {
-					$meta['defOut'] = call_user_func($meta[self::FILTER_OUT], $meta[self::VALUE]);
+					$meta['defOut'] = $meta[self::FILTER_OUT]($meta[self::VALUE]);
 
 				} else {
 					$meta['defOut'] = $meta[self::VALUE];

src/Application/UI/Multiplier.php

@@ -28,7 +28,7 @@ public function __construct(callable $factory)
 
 	protected function createComponent($name)
 	{
-		return call_user_func($this->factory, $name, $this);
+		return ($this->factory)($name, $this);
 	}
 
 }

src/Bridges/ApplicationDI/ApplicationExtension.php

@@ -142,9 +142,9 @@ private function findPresenters()
 			$classFile = dirname($rc->getFileName()) . '/autoload_classmap.php';
 			if (is_file($classFile)) {
 				$this->getContainerBuilder()->addDependency($classFile);
-				$classes = array_merge($classes, array_keys(call_user_func(function ($path) {
+				$classes = array_merge($classes, array_keys((function ($path) {
 					return require $path;
-				}, $classFile)));
+				})($classFile)));
 			}
 		}