MicroPresenter: fixed passing params to callback

nette · Mar 10, 2015 · 4d40d7e · 4d40d7e
1 parent 6e3ac0c
commit 4d40d7e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/Application/MicroPresenter.php b/src/Application/MicroPresenter.php
@@ -78,14 +78,15 @@ public function run(Application\Request $request)
 		$reflection = Nette\Utils\Callback::toReflection(Nette\Utils\Callback::check($callback));
 		$params = Application\UI\PresenterComponentReflection::combineArgs($reflection, $params);
 
-		foreach ($reflection->getParameters() as $param) {
-			if ($param->getClassName()) {
-				unset($params[$param->getPosition()]);
+		if ($this->context) {
+			foreach ($reflection->getParameters() as $param) {
+				if ($param->getClassName()) {
+					unset($params[$param->getPosition()]);
+				}
 			}
-		}
 
-		if ($this->context) {
 			$params = Nette\DI\Helpers::autowireArguments($reflection, $params, $this->context);
+			$params['presenter'] = $this;
 		}
 
 		$response = call_user_func_array($callback, $params);

diff --git a/tests/Application/MicroPresenter.invoke.phpt b/tests/Application/MicroPresenter.invoke.phpt
@@ -13,18 +13,19 @@ require __DIR__ . '/../bootstrap.php';
 
 class Invokable extends Nette\Object
 {
-	public function __invoke($page, $id)
+	public function __invoke($page, $id, NetteModule\MicroPresenter $presenter)
 	{
 		Notes::add('Callback id ' . $id . ' page ' . $page);
 	}
 }
 
 
 test(function() {
-	$presenter = new NetteModule\MicroPresenter;
+	$presenter = $p = new NetteModule\MicroPresenter;
 
 	$presenter->run(new Request('Nette:Micro', 'GET', array(
-		'callback' => function($id, $page) {
+		'callback' => function($id, $page, $presenter) use ($p) {
+			Assert::same($p, $presenter);
 			Notes::add('Callback id ' . $id . ' page ' . $page);
 		},
 		'id' => 1,