Action params can also be arrays of whatever, not just strings (#474)

Docblocks now reflect this.

This reverts e297212 of #443 which means no exception is being thrown on non-string params when some bots scan try to exploit some bugs with arrays.

Author: spaze

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%)

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');

app/src/Application/ComponentParameters.php

@@ -19,7 +19,7 @@ public function __construct(
 	/**
 	 * Same as `Nette\Application\LinkGenerator::link()` but will always return just string, not string|null.
 	 *
-	 * @param array<int|string, string|null> $args
+	 * @param array<array-key, mixed> $args
 	 * @throws InvalidLinkException
 	 */
 	public function link(string $destination, array $args = [], ?NetteLinkGenerator $linkGenerator = null): string

app/src/Application/Exceptions/ParameterNotStringException.php

@@ -40,7 +40,7 @@ public function __construct(
 	 * Generates localized URLs.
 	 *
 	 * @param string $destination destination in format "[[[module:]presenter:]action] [#fragment]"
-	 * @param array<string, list<string>|array<string, string|null>> $params of locale => [position|name => value]
+	 * @param array<string, list<string>|array<array-key, mixed>> $params of locale => [position|name => value]
 	 * @return array<string, LocaleLink> of locale => URL
 	 * @throws InvalidLinkException
 	 */
@@ -70,8 +70,8 @@ public function links(string $destination, array $params = []): array
 	/**
 	 * Return default params for all locales.
 	 *
-	 * @param array<string, string|null> $params
-	 * @return array<string, array<string, string|null>>
+	 * @param array<array-key, mixed> $params
+	 * @return array<string, array<array-key, mixed>>
 	 */
 	public function defaultParams(array $params): array
 	{
@@ -114,9 +114,9 @@ public function allLinks(string $destination, array $params = []): array
 
 
 	/**
-	 * @param array<string, list<string>|array<string, string|null>> $params
+	 * @param array<string, list<string>|array<array-key, mixed>> $params
 	 * @param string $locale
-	 * @return list<string>|array<string, string|null>
+	 * @return list<string>|array<array-key, mixed>
 	 */
 	private function getParams(array $params, string $locale): array
 	{

app/src/Application/LinkGenerator.php

@@ -47,8 +47,8 @@ public function getLocaleActions(string $action): array
 	/**
 	 * Translated locale parameters for trainings.
 	 *
-	 * @param array<string, string|null> $defaultParams
-	 * @return array<string, array<string, string|null>>
+	 * @param array<array-key, mixed> $defaultParams
+	 * @return array<string, array<array-key, mixed>>
 	 */
 	public function getLocaleLinkParams(?string $trainingAction, array $defaultParams): array
 	{

app/src/Application/Locale/LocaleLinkGenerator.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
 	{
@@ -138,8 +122,7 @@ protected function getLocaleLinksGeneratorDestination(): string
 
 
 	/**
-	 * @return array<string, array<string, string|null>>
-	 * @throws ParameterNotStringException
+	 * @return array<string, array<array-key, mixed>>
 	 */
 	protected function getLocaleLinksGeneratorParams(): array
 	{
@@ -170,12 +153,11 @@ protected function getLocaleLinkAction(): string
 	/**
 	 * Default parameters for locale links.
 	 *
-	 * @return array<string, array<string, string|null>>
-	 * @throws ParameterNotStringException
+	 * @return array<string, array<array-key, mixed>>
 	 */
 	protected function getLocaleLinkParams(): array
 	{
-		return $this->localeLinkGenerator->defaultParams($this->componentParameters->getStringParameters($this));
+		return $this->localeLinkGenerator->defaultParams($this->getParameters());
 	}
 
 

app/src/Training/TrainingLocales.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();
 	}
@@ -72,13 +69,12 @@ public function actionTraining(string $name): void
 	/**
 	 * Translated locale parameters for trainings.
 	 *
-	 * @return array<string, array<string, string|null>>
-	 * @throws ParameterNotStringException
+	 * @return array<string, array<array-key, mixed>>
 	 */
 	#[Override]
 	protected function getLocaleLinkParams(): array
 	{
-		return $this->trainingLocales->getLocaleLinkParams($this->trainingAction, $this->componentParameters->getStringParameters($this));
+		return $this->trainingLocales->getLocaleLinkParams($this->trainingAction, $this->getParameters());
 	}
 
 }

app/src/Www/Presenters/BasePresenter.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;
@@ -112,15 +111,14 @@ protected function getLocaleLinkAction(): string
 	/**
 	 * Get original parameters for locale links.
 	 *
-	 * @return array<string, array<string, string|null>>
+	 * @return array<string, array<array-key, mixed>>
 	 * @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());
 	}
 
 }

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\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();
 	}
@@ -308,13 +305,12 @@ protected function createComponentOtherUpcomingDatesList(): UpcomingTrainingDate
 	/**
 	 * Translated locale parameters for trainings.
 	 *
-	 * @return array<string, array<string, string|null>>
-	 * @throws ParameterNotStringException
+	 * @return array<string, array<array-key, mixed>>
 	 */
 	#[Override]
 	protected function getLocaleLinkParams(): array
 	{
-		return $this->trainingLocales->getLocaleLinkParams($this->trainingAction, $this->componentParameters->getStringParameters($this));
+		return $this->trainingLocales->getLocaleLinkParams($this->trainingAction, $this->getParameters());
 	}
 
 

app/src/Www/Presenters/ErrorPresenter.php

@@ -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 {