More realistic types for action params, they can also be arrays of wh…

…atever
spaze · Jan 18, 2025 · 41ab924 · 41ab924
1 parent f3ff675
commit 41ab924
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/app/src/Application/LinkGenerator.php b/app/src/Application/LinkGenerator.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

diff --git a/app/src/Application/Locale/LocaleLinkGenerator.php b/app/src/Application/Locale/LocaleLinkGenerator.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
 	{

diff --git a/app/src/Training/TrainingLocales.php b/app/src/Training/TrainingLocales.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
 	{

diff --git a/app/src/Www/Presenters/BasePresenter.php b/app/src/Www/Presenters/BasePresenter.php
@@ -122,7 +122,7 @@ protected function getLocaleLinksGeneratorDestination(): string
 
 
 	/**
-	 * @return array<string, array<string, string|null>>
+	 * @return array<string, array<array-key, mixed>>
 	 */
 	protected function getLocaleLinksGeneratorParams(): array
 	{
@@ -153,7 +153,7 @@ protected function getLocaleLinkAction(): string
 	/**
 	 * Default parameters for locale links.
 	 *
-	 * @return array<string, array<string, string|null>>
+	 * @return array<string, array<array-key, mixed>>
 	 */
 	protected function getLocaleLinkParams(): array
 	{

diff --git a/app/src/Www/Presenters/CompanyTrainingsPresenter.php b/app/src/Www/Presenters/CompanyTrainingsPresenter.php
@@ -69,7 +69,7 @@ public function actionTraining(string $name): void
 	/**
 	 * Translated locale parameters for trainings.
 	 *
-	 * @return array<string, array<string, string|null>>
+	 * @return array<string, array<array-key, mixed>>
 	 */
 	#[Override]
 	protected function getLocaleLinkParams(): array

diff --git a/app/src/Www/Presenters/ErrorPresenter.php b/app/src/Www/Presenters/ErrorPresenter.php
@@ -111,7 +111,7 @@ 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
 	 */
 	#[Override]

diff --git a/app/src/Www/Presenters/TrainingsPresenter.php b/app/src/Www/Presenters/TrainingsPresenter.php
@@ -305,7 +305,7 @@ protected function createComponentOtherUpcomingDatesList(): UpcomingTrainingDate
 	/**
 	 * Translated locale parameters for trainings.
 	 *
-	 * @return array<string, array<string, string|null>>
+	 * @return array<string, array<array-key, mixed>>
 	 */
 	#[Override]
 	protected function getLocaleLinkParams(): array