MicroPresenter: parameter callback must be a Closure, removed support for __invoke

dg · dg · commit db175e0a6585 · 2020-08-25T03:51:49.000+02:00
diff --git a/src/Application/MicroPresenter.php b/src/Application/MicroPresenter.php
@@ -68,11 +68,11 @@ public function run(Application\Request $request)
 		}
 
 		$params = $request->getParameters();
-		if (!isset($params['callback'])) {
-			throw new Application\BadRequestException('Parameter callback is missing.');
+		$callback = isset($params['callback']) ? $params['callback'] : null;
+		if (!$callback instanceof \Closure) {
+			throw new Application\BadRequestException('Parameter callback is not a valid closure.');
 		}
-		$callback = $params['callback'];
-		$reflection = Nette\Utils\Callback::toReflection(Nette\Utils\Callback::check($callback));
+		$reflection = new \ReflectionFunction($callback);
 
 		if ($this->context) {
 			foreach ($reflection->getParameters() as $param) {
diff --git a/tests/Application/MicroPresenter.invoke.phpt b/tests/Application/MicroPresenter.invoke.phpt
@@ -11,15 +11,6 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-class Invokable
-{
-	public function __invoke($page, $id, NetteModule\MicroPresenter $presenter)
-	{
-		$this->log[] = 'Callback id ' . $id . ' page ' . $page;
-	}
-}
-
-
 test(function () {
 	$presenter = $p = new NetteModule\MicroPresenter;
 
@@ -37,21 +28,6 @@ test(function () {
 });
 
 
-test(function () {
-	$presenter = new NetteModule\MicroPresenter;
-
-	$presenter->run(new Request('Nette:Micro', 'GET', [
-		'callback' => $invokable = new Invokable,
-		'id' => 1,
-		'page' => 2,
-	]));
-	Assert::same([
-		'Callback id 1 page 2',
-	], $invokable->log);
-});
-
-
-
 test(function () {
 	$container = Mockery::mock(Nette\DI\Container::class)
 		->shouldReceive('getByType')->with('stdClass', false)->once()->andReturn(new stdClass)

Original file line number	Diff line number	Diff line change
`@@ -68,11 +68,11 @@ public function run(Application\Request $request)`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`$params = $request->getParameters();`
`71`		`- if (!isset($params['callback'])) {`
`72`		`- throw new Application\BadRequestException('Parameter callback is missing.');`
	`71`	`+ $callback = isset($params['callback']) ? $params['callback'] : null;`
	`72`	`+ if (!$callback instanceof \Closure) {`
	`73`	`+ throw new Application\BadRequestException('Parameter callback is not a valid closure.');`
`73`	`74`	`}`
`74`		`- $callback = $params['callback'];`
`75`		`- $reflection = Nette\Utils\Callback::toReflection(Nette\Utils\Callback::check($callback));`
	`75`	`+ $reflection = new \ReflectionFunction($callback);`
`76`	`76`
`77`	`77`	`if ($this->context) {`
`78`	`78`	`foreach ($reflection->getParameters() as $param) {`