archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-06 09:34:04 +00:00
Code Activity

Merge branch '2.x' into saas

Browse source
This commit is contained in:
Samuel Štancl 2019-10-26 22:54:27 +02:00 • committed by GitHub
commit dfffcebec2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/TenancyServiceProvider.php
View file

@ -78,7 +78,9 @@ class TenancyServiceProvider extends ServiceProvider
__DIR__ . '/../assets/migrations/' => database_path('migrations'),
], 'migrations');
$this->app->make(Kernel::class)->prependMiddleware(Middleware\InitializeTenancy::class);
if ($this->app['config']['tenancy.push_initialization_middleware_to_global_stack'] ?? true) {
$this->app->make(Kernel::class)->prependMiddleware(Middleware\InitializeTenancy::class);
}
/*
* Since tenancy is initialized in the global middleware stack, this

4
src/TenantManager.php
View file

@ -301,6 +301,10 @@ class TenantManager
public function endTenancy(): self
{
if (! $this->initialized) {
return $this;
}
$prevented = $this->event('ending', $this->getTenant());
foreach ($this->tenancyBootstrappers($prevented) as $bootstrapper) {