Revert "Ensure presenter action parameters are strings"

spaze · spaze · commit f3ff6750fe2e · 2025-01-18T17:39:58.000+01:00
This reverts commit e297212.
diff --git a/app/config/services.neon b/app/config/services.neon
@@ -3,7 +3,6 @@ services:
 	cliArgs:
 		type: MichalSpacekCz\Application\Cli\CliArgs
 		imported: true
-	- MichalSpacekCz\Application\ComponentParameters
 	- MichalSpacekCz\Application\Error
 	- MichalSpacekCz\Application\LinkGenerator
 	localeLinkGenerator: MichalSpacekCz\Application\Locale\LocaleLinkGenerator(languages: %locales.languages%)
diff --git a/app/src/Application/AppRequest.php b/app/src/Application/AppRequest.php
@@ -4,7 +4,6 @@
 namespace MichalSpacekCz\Application;
 
 use MichalSpacekCz\Application\Exceptions\NoOriginalRequestException;
-use MichalSpacekCz\Application\Exceptions\ParameterNotStringException;
 use MichalSpacekCz\ShouldNotHappenException;
 use Nette\Application\Request;
 use Throwable;
@@ -28,26 +27,6 @@ public function getOriginalRequest(?Request $request): Request
 	}
 
 
-	/**
-	 * @return array<string, string|null>
-	 * @throws NoOriginalRequestException
-	 * @throws ParameterNotStringException
-	 */
-	public function getOriginalRequestStringParameters(?Request $request): array
-	{
-		$params = [];
-		foreach ($this->getOriginalRequest($request)->getParameters() as $name => $value) {
-			$name = (string)$name;
-			if ($value === null || is_string($value)) {
-				$params[$name] = $value;
-			} else {
-				throw new ParameterNotStringException($name, get_debug_type($value));
-			}
-		}
-		return $params;
-	}
-
-
 	public function getException(Request $request): Throwable
 	{
 		$e = $request->getParameter('exception');
diff --git a/app/src/Application/ComponentParameters.php b/app/src/Application/ComponentParameters.php
diff --git a/app/src/Application/Exceptions/ParameterNotStringException.php b/app/src/Application/Exceptions/ParameterNotStringException.php
diff --git a/app/src/Www/Presenters/BasePresenter.php b/app/src/Www/Presenters/BasePresenter.php
@@ -4,8 +4,6 @@
 namespace MichalSpacekCz\Www\Presenters;
 
 use DateTimeInterface;
-use MichalSpacekCz\Application\ComponentParameters;
-use MichalSpacekCz\Application\Exceptions\ParameterNotStringException;
 use MichalSpacekCz\Application\Locale\LocaleLink;
 use MichalSpacekCz\Application\Locale\LocaleLinkGenerator;
 use MichalSpacekCz\Css\CriticalCss;
@@ -37,8 +35,6 @@ abstract class BasePresenter extends Presenter
 
 	private CriticalCssFactory $criticalCssFactory;
 
-	private ComponentParameters $componentParameters;
-
 	private FourOhFourButFound $fourOhFourButFound;
 
 
@@ -87,15 +83,6 @@ public function injectCriticalCssFactory(CriticalCssFactory $criticalCssFactory)
 	}
 
 
-	/**
-	 * @internal
-	 */
-	public function injectComponentParameters(ComponentParameters $componentParameters): void
-	{
-		$this->componentParameters = $componentParameters;
-	}
-
-
 	/**
 	 * @internal
 	 */
@@ -117,9 +104,6 @@ protected function startup(): void
 	}
 
 
-	/**
-	 * @throws ParameterNotStringException
-	 */
 	#[Override]
 	public function beforeRender(): void
 	{
@@ -139,7 +123,6 @@ protected function getLocaleLinksGeneratorDestination(): string
 
 	/**
 	 * @return array<string, array<string, string|null>>
-	 * @throws ParameterNotStringException
 	 */
 	protected function getLocaleLinksGeneratorParams(): array
 	{
@@ -171,11 +154,10 @@ protected function getLocaleLinkAction(): string
 	 * Default parameters for locale links.
 	 *
 	 * @return array<string, array<string, string|null>>
-	 * @throws ParameterNotStringException
 	 */
 	protected function getLocaleLinkParams(): array
 	{
-		return $this->localeLinkGenerator->defaultParams($this->componentParameters->getStringParameters($this));
+		return $this->localeLinkGenerator->defaultParams($this->getParameters());
 	}
 
 
diff --git a/app/src/Www/Presenters/CompanyTrainingsPresenter.php b/app/src/Www/Presenters/CompanyTrainingsPresenter.php
@@ -4,8 +4,6 @@
 namespace MichalSpacekCz\Www\Presenters;
 
 use Contributte\Translation\Translator;
-use MichalSpacekCz\Application\ComponentParameters;
-use MichalSpacekCz\Application\Exceptions\ParameterNotStringException;
 use MichalSpacekCz\Formatter\TexyFormatter;
 use MichalSpacekCz\Training\Company\CompanyTrainings;
 use MichalSpacekCz\Training\Discontinued\DiscontinuedTrainings;
@@ -32,7 +30,6 @@ public function __construct(
 		private readonly TrainingReviews $trainingReviews,
 		private readonly Prices $prices,
 		private readonly Translator $translator,
-		private readonly ComponentParameters $componentParameters,
 	) {
 		parent::__construct();
 	}
@@ -73,12 +70,11 @@ public function actionTraining(string $name): void
 	 * Translated locale parameters for trainings.
 	 *
 	 * @return array<string, array<string, string|null>>
-	 * @throws ParameterNotStringException
 	 */
 	#[Override]
 	protected function getLocaleLinkParams(): array
 	{
-		return $this->trainingLocales->getLocaleLinkParams($this->trainingAction, $this->componentParameters->getStringParameters($this));
+		return $this->trainingLocales->getLocaleLinkParams($this->trainingAction, $this->getParameters());
 	}
 
 }
diff --git a/app/src/Www/Presenters/ErrorPresenter.php b/app/src/Www/Presenters/ErrorPresenter.php
@@ -6,7 +6,6 @@
 use Contributte\Translation\Translator;
 use MichalSpacekCz\Application\AppRequest;
 use MichalSpacekCz\Application\Exceptions\NoOriginalRequestException;
-use MichalSpacekCz\Application\Exceptions\ParameterNotStringException;
 use MichalSpacekCz\Application\Locale\LocaleLink;
 use MichalSpacekCz\Application\Locale\LocaleLinkGenerator;
 use MichalSpacekCz\ShouldNotHappenException;
@@ -114,13 +113,12 @@ protected function getLocaleLinkAction(): string
 	 *
 	 * @return array<string, array<string, string|null>>
 	 * @throws NoOriginalRequestException
-	 * @throws ParameterNotStringException
 	 */
 	#[Override]
 	protected function getLocaleLinkParams(): array
 	{
-		$params = $this->appRequest->getOriginalRequestStringParameters($this->getRequest());
-		return $this->localeLinkGenerator->defaultParams($params);
+		$requestParam = $this->appRequest->getOriginalRequest($this->getRequest());
+		return $this->localeLinkGenerator->defaultParams($requestParam->getParameters());
 	}
 
 }
diff --git a/app/src/Www/Presenters/TrainingsPresenter.php b/app/src/Www/Presenters/TrainingsPresenter.php
@@ -4,8 +4,6 @@
 namespace MichalSpacekCz\Www\Presenters;
 
 use Contributte\Translation\Translator;
-use MichalSpacekCz\Application\ComponentParameters;
-use MichalSpacekCz\Application\Exceptions\ParameterNotStringException;
 use MichalSpacekCz\CompanyInfo\CompanyInfo;
 use MichalSpacekCz\Form\TrainingApplicationFormFactory;
 use MichalSpacekCz\Form\TrainingApplicationPreliminaryFormFactory;
@@ -66,7 +64,6 @@ public function __construct(
 		private readonly Translator $translator,
 		private readonly Session $sessionHandler,
 		private readonly Robots $robots,
-		private readonly ComponentParameters $componentParameters,
 	) {
 		parent::__construct();
 	}
@@ -309,12 +306,11 @@ protected function createComponentOtherUpcomingDatesList(): UpcomingTrainingDate
 	 * Translated locale parameters for trainings.
 	 *
 	 * @return array<string, array<string, string|null>>
-	 * @throws ParameterNotStringException
 	 */
 	#[Override]
 	protected function getLocaleLinkParams(): array
 	{
-		return $this->trainingLocales->getLocaleLinkParams($this->trainingAction, $this->componentParameters->getStringParameters($this));
+		return $this->trainingLocales->getLocaleLinkParams($this->trainingAction, $this->getParameters());
 	}
 
 
diff --git a/app/tests/Application/AppRequestTest.phpt b/app/tests/Application/AppRequestTest.phpt
@@ -8,7 +8,6 @@ use DateTime;
 use Error;
 use Exception;
 use MichalSpacekCz\Application\Exceptions\NoOriginalRequestException;
-use MichalSpacekCz\Application\Exceptions\ParameterNotStringException;
 use MichalSpacekCz\ShouldNotHappenException;
 use MichalSpacekCz\Test\TestCaseRunner;
 use Nette\Application\Request;
@@ -64,26 +63,6 @@ class AppRequestTest extends TestCase
 	}
 
 
-	public function testGetOriginalRequestStringParameters(): void
-	{
-		$original = new Request('bar', params: ['foo' => 'bar', 1 => 'one']);
-		$request = new Request('foo');
-		$request->setParameters(['request' => $original]);
-		Assert::same(['foo' => 'bar', '1' => 'one'], $this->appRequest->getOriginalRequestStringParameters($request));
-	}
-
-
-	public function testGetOriginalRequestStringParametersException(): void
-	{
-		$original = new Request('bar', params: ['foo' => 'bar', 'one' => 1]);
-		$request = new Request('foo');
-		$request->setParameters(['request' => $original]);
-		Assert::exception(function () use ($request): void {
-			$this->appRequest->getOriginalRequestStringParameters($request);
-		}, ParameterNotStringException::class, "Component parameter 'one' is not a string but it's a int");
-	}
-
-
 	public function testGetExceptionNoException(): void
 	{
 		Assert::exception(function (): void {
diff --git a/app/tests/Application/ComponentParametersTest.phpt b/app/tests/Application/ComponentParametersTest.phpt

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@`
`4`	`4`	`namespace MichalSpacekCz\Www\Presenters;`
`5`	`5`
`6`	`6`	`use Contributte\Translation\Translator;`
`7`		`-use MichalSpacekCz\Application\ComponentParameters;`
`8`		`-use MichalSpacekCz\Application\Exceptions\ParameterNotStringException;`
`9`	`7`	`use MichalSpacekCz\Formatter\TexyFormatter;`
`10`	`8`	`use MichalSpacekCz\Training\Company\CompanyTrainings;`
`11`	`9`	`use MichalSpacekCz\Training\Discontinued\DiscontinuedTrainings;`
`@@ -32,7 +30,6 @@ public function __construct(`
`32`	`30`	`private readonly TrainingReviews $trainingReviews,`
`33`	`31`	`private readonly Prices $prices,`
`34`	`32`	`private readonly Translator $translator,`
`35`		`- private readonly ComponentParameters $componentParameters,`
`36`	`33`	`) {`
`37`	`34`	`parent::__construct();`
`38`	`35`	`}`
`@@ -73,12 +70,11 @@ public function actionTraining(string $name): void`
`73`	`70`	`* Translated locale parameters for trainings.`
`74`	`71`	`*`
`75`	`72`	`* @return array<string, array<string, string\|null>>`
`76`		`- * @throws ParameterNotStringException`
`77`	`73`	`*/`
`78`	`74`	`#[Override]`
`79`	`75`	`protected function getLocaleLinkParams(): array`
`80`	`76`	`{`
`81`		`- return $this->trainingLocales->getLocaleLinkParams($this->trainingAction, $this->componentParameters->getStringParameters($this));`
	`77`	`+ return $this->trainingLocales->getLocaleLinkParams($this->trainingAction, $this->getParameters());`
`82`	`78`	`}`
`83`	`79`
`84`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`use Contributte\Translation\Translator;`
`7`	`7`	`use MichalSpacekCz\Application\AppRequest;`
`8`	`8`	`use MichalSpacekCz\Application\Exceptions\NoOriginalRequestException;`
`9`		`-use MichalSpacekCz\Application\Exceptions\ParameterNotStringException;`
`10`	`9`	`use MichalSpacekCz\Application\Locale\LocaleLink;`
`11`	`10`	`use MichalSpacekCz\Application\Locale\LocaleLinkGenerator;`
`12`	`11`	`use MichalSpacekCz\ShouldNotHappenException;`
`@@ -114,13 +113,12 @@ protected function getLocaleLinkAction(): string`
`114`	`113`	`*`
`115`	`114`	`* @return array<string, array<string, string\|null>>`
`116`	`115`	`* @throws NoOriginalRequestException`
`117`		`- * @throws ParameterNotStringException`
`118`	`116`	`*/`
`119`	`117`	`#[Override]`
`120`	`118`	`protected function getLocaleLinkParams(): array`
`121`	`119`	`{`
`122`		`- $params = $this->appRequest->getOriginalRequestStringParameters($this->getRequest());`
`123`		`- return $this->localeLinkGenerator->defaultParams($params);`
	`120`	`+ $requestParam = $this->appRequest->getOriginalRequest($this->getRequest());`
	`121`	`+ return $this->localeLinkGenerator->defaultParams($requestParam->getParameters());`
`124`	`122`	`}`
`125`	`123`
`126`	`124`	`}`