From 3b1a126f290e324144413a43480901f27ce739f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Mon, 2 Jun 2025 03:12:22 +0200 Subject: [PATCH] TenancyUrlGenerator: add a check for queryParameterName being null Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/Overrides/TenancyUrlGenerator.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Overrides/TenancyUrlGenerator.php b/src/Overrides/TenancyUrlGenerator.php index ed940e2f..1849c339 100644 --- a/src/Overrides/TenancyUrlGenerator.php +++ b/src/Overrides/TenancyUrlGenerator.php @@ -187,10 +187,12 @@ class TenancyUrlGenerator extends UrlGenerator { if (tenant() && static::$passTenantParameterToRoutes) { if (static::$passQueryParameter) { - return array_merge($parameters, [RequestDataTenantResolver::queryParameterName() => RequestDataTenantResolver::payloadValue(tenant())]); - } else { - return array_merge($parameters, [PathTenantResolver::tenantParameterName() => PathTenantResolver::tenantParameterValue(tenant())]); + $queryParameterName = RequestDataTenantResolver::queryParameterName(); + if ($queryParameterName !== null) { + return array_merge($parameters, [$queryParameterName => RequestDataTenantResolver::payloadValue(tenant())]); + } } + return array_merge($parameters, [PathTenantResolver::tenantParameterName() => PathTenantResolver::tenantParameterValue(tenant())]); } else { return $parameters; }