Forget tenant parameter when a tenant is resolved from cache in PathTenantResolver (fix #1174)

stancl · stancl · commit 8db27a358ef7 · 2024-01-27T22:55:59.000+01:00
diff --git a/src/Resolvers/PathTenantResolver.php b/src/Resolvers/PathTenantResolver.php
@@ -37,6 +37,14 @@ public function resolveWithoutCache(...$args): Tenant
         throw new TenantCouldNotBeIdentifiedByPathException($id);
     }
 
+    public function resolved(Tenant $tenant, ...$args): void
+    {
+        /** @var Route $route */
+        $route = $args[0];
+
+        $route->forgetParameter(static::$tenantParameterName);
+    }
+
     public function getArgsForTenant(Tenant $tenant): array
     {
         return [

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,14 @@ public function resolveWithoutCache(...$args): Tenant`
`37`	`37`	`throw new TenantCouldNotBeIdentifiedByPathException($id);`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ public function resolved(Tenant $tenant, ...$args): void`
	`41`	`+ {`
	`42`	`+ /** @var Route $route */`
	`43`	`+ $route = $args[0];`
	`44`	`+`
	`45`	`+ $route->forgetParameter(static::$tenantParameterName);`
	`46`	`+ }`
	`47`	`+`
`40`	`48`	`public function getArgsForTenant(Tenant $tenant): array`
`41`	`49`	`{`
`42`	`50`	`return [`