Application: fixed empty $requests when createInitialRequest() failed, thx to @vlastavesely [Closes #163]

Author: dg

src/Application/Application.php

@@ -112,21 +112,9 @@ public function run()
 	public function createInitialRequest()
 	{
 		$request = $this->router->match($this->httpRequest);
-
 		if (!$request instanceof Request) {
 			throw new BadRequestException('No route for HTTP request.');
-
-		} elseif (strcasecmp($request->getPresenterName(), $this->errorPresenter) === 0) {
-			throw new BadRequestException('Invalid request. Presenter is not achievable.');
-		}
-
-		try {
-			$name = $request->getPresenterName();
-			$this->presenterFactory->getPresenterClass($name);
-		} catch (InvalidPresenterException $e) {
-			throw new BadRequestException($e->getMessage(), 0, $e);
 		}
-
 		return $request;
 	}
 
@@ -144,7 +132,15 @@ public function processRequest(Request $request)
 		$this->requests[] = $request;
 		$this->onRequest($this, $request);
 
-		$this->presenter = $this->presenterFactory->createPresenter($request->getPresenterName());
+		if (!$request->isMethod($request::FORWARD) && !strcasecmp($request->getPresenterName(), $this->errorPresenter)) {
+			throw new BadRequestException('Invalid request. Presenter is not achievable.');
+		}
+
+		try {
+			$this->presenter = $this->presenterFactory->createPresenter($request->getPresenterName());
+		} catch (InvalidPresenterException $e) {
+			throw count($this->requests) > 1 ? $e : new BadRequestException($e->getMessage(), 0, $e);
+		}
 		$this->onPresenter($this, $this->presenter);
 		$response = $this->presenter->run(clone $request);
 

tests/Application/Application.run.phpt

@@ -109,20 +109,22 @@ test(function () use ($httpRequest, $httpResponse) {
 	$app->run();
 
 	$requests = $app->getRequests();
-	Assert::count(1, $requests);
-	Assert::same(Request::FORWARD, $requests[0]->getMethod());
+	Assert::count(2, $requests);
+	Assert::same('GET', $requests[0]->getMethod());
 	Assert::same('Error', $requests[0]->getPresenterName());
+	Assert::same(Request::FORWARD, $requests[1]->getMethod());
+	Assert::same('Error', $requests[1]->getPresenterName());
 
-	Assert::equal($requests[0], $errorPresenter->request);
-	Assert::null($errorPresenter->request->getParameter('request'));
+	Assert::equal($requests[1], $errorPresenter->request);
+	Assert::equal($requests[0], $errorPresenter->request->getParameter('request'));
 	Assert::type(BadRequestException::class, $errorPresenter->request->getParameter('exception'));
 });
 
 
 // missing presenter without error presenter
 Assert::exception(function () use ($httpRequest, $httpResponse) {
 	$presenterFactory = Mockery::mock(IPresenterFactory::class);
-	$presenterFactory->shouldReceive('getPresenterClass')->with('Missing')->andThrow(Nette\Application\InvalidPresenterException::class);
+	$presenterFactory->shouldReceive('createPresenter')->with('Missing')->andThrow(Nette\Application\InvalidPresenterException::class);
 
 	$router = Mockery::mock(IRouter::class);
 	$router->shouldReceive('match')->andReturn(new Request('Missing', 'GET'));
@@ -137,7 +139,7 @@ test(function () use ($httpRequest, $httpResponse) {
 	$errorPresenter = new ErrorPresenter;
 
 	$presenterFactory = Mockery::mock(IPresenterFactory::class);
-	$presenterFactory->shouldReceive('getPresenterClass')->with('Missing')->andThrow(Nette\Application\InvalidPresenterException::class);
+	$presenterFactory->shouldReceive('createPresenter')->with('Missing')->andThrow(Nette\Application\InvalidPresenterException::class);
 	$presenterFactory->shouldReceive('createPresenter')->with('Error')->andReturn($errorPresenter);
 
 	$router = Mockery::mock(IRouter::class);
@@ -149,20 +151,21 @@ test(function () use ($httpRequest, $httpResponse) {
 	$app->run();
 
 	$requests = $app->getRequests();
-	Assert::count(1, $requests);
-	Assert::same(Request::FORWARD, $requests[0]->getMethod());
-	Assert::same('Error', $requests[0]->getPresenterName());
+	Assert::count(2, $requests);
+	Assert::same('GET', $requests[0]->getMethod());
+	Assert::same('Missing', $requests[0]->getPresenterName());
+	Assert::same(Request::FORWARD, $requests[1]->getMethod());
+	Assert::same('Error', $requests[1]->getPresenterName());
 
-	Assert::equal($requests[0], $errorPresenter->request);
-	Assert::null($errorPresenter->request->getParameter('request'));
+	Assert::equal($requests[1], $errorPresenter->request);
+	Assert::equal($requests[0], $errorPresenter->request->getParameter('request'));
 	Assert::type(BadRequestException::class, $errorPresenter->request->getParameter('exception'));
 });
 
 
 // presenter error without error presenter
 Assert::exception(function () use ($httpRequest, $httpResponse) {
 	$presenterFactory = Mockery::mock(IPresenterFactory::class);
-	$presenterFactory->shouldReceive('getPresenterClass');
 	$presenterFactory->shouldReceive('createPresenter')->with('Bad')->andReturn(new BadPresenter);
 
 	$router = Mockery::mock(IRouter::class);
@@ -178,7 +181,6 @@ test(function () use ($httpRequest, $httpResponse) {
 	$errorPresenter = new ErrorPresenter;
 
 	$presenterFactory = Mockery::mock(IPresenterFactory::class);
-	$presenterFactory->shouldReceive('getPresenterClass');
 	$presenterFactory->shouldReceive('createPresenter')->with('Bad')->andReturn(new BadPresenter);
 	$presenterFactory->shouldReceive('createPresenter')->with('Error')->andReturn($errorPresenter);
 
@@ -208,7 +210,6 @@ Assert::noError(function () use ($httpRequest, $httpResponse) {
 	$presenter = new GoodPresenter;
 
 	$presenterFactory = Mockery::mock(IPresenterFactory::class);
-	$presenterFactory->shouldReceive('getPresenterClass');
 	$presenterFactory->shouldReceive('createPresenter')->with('Good')->andReturn($presenter);
 
 	$router = Mockery::mock(IRouter::class);
@@ -232,7 +233,6 @@ Assert::noError(function () use ($httpRequest, $httpResponse) {
 	$errorPresenter = new ErrorPresenter;
 
 	$presenterFactory = Mockery::mock(IPresenterFactory::class);
-	$presenterFactory->shouldReceive('getPresenterClass');
 	$presenterFactory->shouldReceive('createPresenter')->with('Good')->andReturn($presenter);
 	$presenterFactory->shouldReceive('createPresenter')->with('Error')->andReturn($errorPresenter);