Return correct exception when no original request has been found (#160)

Close #158
spaze · Jul 1, 2023 · fda48e7 · fda48e7
2 parents 9331ce5 + d85cc15
commit fda48e7
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 19 deletions.
diff --git a/site/app/Application/AppRequest.php b/site/app/Application/AppRequest.php
@@ -4,20 +4,24 @@
 namespace MichalSpacekCz\Application;
 
 use Exception;
+use MichalSpacekCz\Application\Exceptions\NoOriginalRequestException;
 use MichalSpacekCz\ShouldNotHappenException;
 use Nette\Application\Request;
 
 class AppRequest
 {
 
+	/**
+	 * @throws NoOriginalRequestException
+	 */
 	public function getOriginalRequest(?Request $request): Request
 	{
 		if (!$request) {
 			throw new ShouldNotHappenException('Request should be set before this method is called in UI\Presenter::run()');
 		}
 		$requestParam = $request->getParameter('request');
 		if (!$requestParam instanceof Request) {
-			throw new ShouldNotHappenException('No original request');
+			throw new NoOriginalRequestException('No original request');
 		}
 		return $requestParam;
 	}

diff --git a/site/app/Application/Exceptions/NoOriginalRequestException.php b/site/app/Application/Exceptions/NoOriginalRequestException.php
@@ -0,0 +1,10 @@
+<?php
+declare(strict_types = 1);
+
+namespace MichalSpacekCz\Application\Exceptions;
+
+use Exception;
+
+class NoOriginalRequestException extends Exception
+{
+}
diff --git a/site/app/Www/Presenters/BasePresenter.php b/site/app/Www/Presenters/BasePresenter.php
@@ -7,7 +7,6 @@
 use MichalSpacekCz\Application\LocaleLinkGeneratorInterface;
 use MichalSpacekCz\Application\Theme;
 use MichalSpacekCz\User\Manager;
-use Nette\Application\UI\InvalidLinkException;
 use Nette\Application\UI\Presenter;
 use Nette\Bridges\ApplicationLatte\DefaultTemplate;
 use Nette\Http\IResponse;
@@ -82,11 +81,13 @@ protected function startup(): void
 
 	public function beforeRender(): void
 	{
-		try {
-			$this->template->localeLinks = $this->localeLinkGenerator->links($this->getLocaleLinkAction(), $this->getLocaleLinkParams());
-		} catch (InvalidLinkException) {
-			$this->template->localeLinks = $this->getLocaleLinkDefault();
-		}
+		$this->addLocaleLinks();
+	}
+
+
+	protected function addLocaleLinks(): void
+	{
+		$this->template->localeLinks = $this->localeLinkGenerator->links($this->getLocaleLinkAction(), $this->getLocaleLinkParams());
 	}
 
 

diff --git a/site/app/Www/Presenters/ErrorPresenter.php b/site/app/Www/Presenters/ErrorPresenter.php
@@ -4,6 +4,7 @@
 namespace MichalSpacekCz\Www\Presenters;
 
 use MichalSpacekCz\Application\AppRequest;
+use MichalSpacekCz\Application\Exceptions\NoOriginalRequestException;
 use MichalSpacekCz\Application\LocaleLinkGeneratorInterface;
 use MichalSpacekCz\EasterEgg\FourOhFourButFound;
 use Nette\Application\BadRequestException;
@@ -32,6 +33,16 @@ public function __construct(
 	}
 
 
+	protected function addLocaleLinks(): void
+	{
+		try {
+			$this->template->localeLinks = $this->localeLinkGenerator->links($this->getLocaleLinkAction(), $this->getLocaleLinkParams());
+		} catch (NoOriginalRequestException) {
+			$this->template->localeLinks = $this->getLocaleLinkDefault();
+		}
+	}
+
+
 	public function actionDefault(BadRequestException $exception): void
 	{
 		$this->fourOhFourButFound->sendItMaybe($this);
@@ -62,23 +73,25 @@ protected function getLocaleLinkDefault(): ?array
 	 * Get original module:presenter:action for locale links.
 	 *
 	 * @return string
+	 * @throws NoOriginalRequestException
 	 */
 	protected function getLocaleLinkAction(): string
 	{
-		$requestParam = $this->appRequest->getOriginalRequest($this->getRequest());
-		return $requestParam->getPresenterName() . ':' . $requestParam->getParameter(self::ActionKey);
+		$originalRequest = $this->appRequest->getOriginalRequest($this->getRequest());
+		return $originalRequest->getPresenterName() . ':' . $originalRequest->getParameter(self::ActionKey);
 	}
 
 
 	/**
 	 * Get original parameters for locale links.
 	 *
 	 * @return array<string, array<string, string|null>>
+	 * @throws NoOriginalRequestException
 	 */
 	protected function getLocaleLinkParams(): array
 	{
-		$requestParam = $this->appRequest->getOriginalRequest($this->getRequest());
-		return $this->localeLinkGenerator->defaultParams($requestParam->getParameters());
+		$originalRequest = $this->appRequest->getOriginalRequest($this->getRequest());
+		return $this->localeLinkGenerator->defaultParams($originalRequest->getParameters());
 	}
 
 }
diff --git a/site/tests/Application/AppRequestTest.phpt b/site/tests/Application/AppRequestTest.phpt
@@ -1,11 +1,14 @@
 <?php
+/** @noinspection PhpDocMissingThrowsInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
 /** @noinspection PhpFullyQualifiedNameUsageInspection */
 declare(strict_types = 1);
 
 namespace MichalSpacekCz\Application;
 
 use DateTime;
 use Exception;
+use MichalSpacekCz\Application\Exceptions\NoOriginalRequestException;
 use Nette\Application\Request;
 use Tester\Assert;
 use Tester\TestCase;
@@ -31,25 +34,23 @@ class AppRequestTest extends TestCase
 	}
 
 
-	/**
-	 * @throws \MichalSpacekCz\ShouldNotHappenException No original request
-	 */
 	public function testGetOriginalRequestNoOriginalRequest(): void
 	{
 		$request = new Request('name');
 		$request->setParameters(['request' => null]);
-		$this->appRequest->getOriginalRequest($request);
+		Assert::throws(function () use ($request): void {
+			$this->appRequest->getOriginalRequest($request);
+		}, NoOriginalRequestException::class, 'No original request');
 	}
 
 
-	/**
-	 * @throws \MichalSpacekCz\ShouldNotHappenException No original request
-	 */
 	public function testGetOriginalRequestInvalidOriginalRequest(): void
 	{
 		$request = new Request('name');
 		$request->setParameters(['request' => new DateTime()]);
-		$this->appRequest->getOriginalRequest($request);
+		Assert::throws(function () use ($request): void {
+			$this->appRequest->getOriginalRequest($request);
+		}, NoOriginalRequestException::class, 'No original request');
 	}