archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 13:54:03 +00:00
Code Activity

handle exceptions in Tenancy:run()

Browse source
This commit is contained in:
Samuel Štancl 2025-02-19 12:02:58 +01:00
parent 7bc2bb6f6a
commit b9cc63feed
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Tenancy.php
View file

@ -77,19 +77,22 @@ class Tenancy
public function run(Tenant $tenant, Closure $callback): mixed public function run(Tenant $tenant, Closure $callback): mixed
{ {
$originalTenant = $this->tenant; $originalTenant = $this->tenant;
$result = null;
try {
$this->initialize($tenant); $this->initialize($tenant);
$result = $callback($tenant); $result = $callback($tenant);
} finally {
if ($result instanceof PendingDispatch) { // #1277
$result = null;
}
if ($originalTenant) { if ($originalTenant) {
$this->initialize($originalTenant); $this->initialize($originalTenant);
} else { } else {
$this->end(); $this->end();
} }
}
if ($result instanceof PendingDispatch) { // #1277
$result = null;
}
return $result; return $result;
} }