MicroPresenter: fixed passing of services to closure in 2.4

Author: dg

src/Application/MicroPresenter.php

@@ -71,21 +71,18 @@ public function run(Application\Request $request)
 		if (!isset($params['callback'])) {
 			throw new Application\BadRequestException('Parameter callback is missing.');
 		}
-		$params['presenter'] = $this;
 		$callback = $params['callback'];
 		$reflection = Nette\Utils\Callback::toReflection(Nette\Utils\Callback::check($callback));
-		$params = Application\UI\ComponentReflection::combineArgs($reflection, $params);
 
 		if ($this->context) {
 			foreach ($reflection->getParameters() as $param) {
 				if ($param->getClass()) {
-					unset($params[$param->getPosition()]);
+					$params[$param->getName()] = $this->context->getByType($param->getClass()->getName(), FALSE);
 				}
 			}
-
-			$params = Nette\DI\Helpers::autowireArguments($reflection, $params, $this->context);
-			$params['presenter'] = $this;
 		}
+		$params['presenter'] = $this;
+		$params = Application\UI\ComponentReflection::combineArgs($reflection, $params);
 
 		$response = call_user_func_array($callback, $params);
 

tests/Application/MicroPresenter.invoke.phpt

@@ -49,3 +49,28 @@ test(function () {
 		'Callback id 1 page 2',
 	], Notes::fetch());
 });
+
+
+
+class MockContainer extends Nette\DI\Container
+{
+	function getByType($class, $need = TRUE)
+	{
+		Notes::add("getByType($class)");
+		return new stdClass;
+	}
+}
+
+test(function () {
+	$presenter = new NetteModule\MicroPresenter(new MockContainer);
+
+	$presenter->run(new Request('Nette:Micro', 'GET', [
+		'callback' => function (stdClass $obj) {
+			Notes::add(get_class($obj));
+		},
+	]));
+	Assert::same([
+		'getByType(stdClass)',
+		'stdClass',
+	], Notes::fetch());
+});