archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 11:14:03 +00:00
Code Activity

Fix merge errors

Browse source
This commit is contained in:
lukinovec 2023-02-23 15:18:12 +01:00
parent b0560331ed
commit 8cbc855b0a
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Features/UserImpersonation.php
View file

@ -4,12 +4,12 @@ declare(strict_types=1);
namespace Stancl\Tenancy\Features; namespace Stancl\Tenancy\Features;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\Auth;
use Stancl\Tenancy\Contracts\Feature;
use Stancl\Tenancy\Contracts\Tenant;
use Stancl\Tenancy\Database\Models\ImpersonationToken;
use Stancl\Tenancy\Tenancy; use Stancl\Tenancy\Tenancy;
use Illuminate\Support\Facades\Auth;
use Stancl\Tenancy\Contracts\Tenant;
use Illuminate\Http\RedirectResponse;
use Stancl\Tenancy\Contracts\Feature;
use Stancl\Tenancy\Database\Models\ImpersonationToken;
class UserImpersonation implements Feature class UserImpersonation implements Feature
{ {
@ -56,6 +56,8 @@ class UserImpersonation implements Feature
public static function alwaysBootstrap(): bool public static function alwaysBootstrap(): bool
{ {
return false; return false;
}
public static function isImpersonating(): bool public static function isImpersonating(): bool
{ {
return session()->has('tenancy_impersonating'); return session()->has('tenancy_impersonating');

2
tests/Pest.php
View file

@ -18,6 +18,8 @@ function filesAndFoldersExcluding(array $exclude = []): array
$dirs = scandir(__DIR__); $dirs = scandir(__DIR__);
return array_filter($dirs, fn($dir) => ! in_array($dir, array_merge(['.', '..'], $exclude) , true)); return array_filter($dirs, fn($dir) => ! in_array($dir, array_merge(['.', '..'], $exclude) , true));
}
function withTenantDatabases() function withTenantDatabases()
{ {
Event::listen(TenantCreated::class, JobPipeline::make([CreateDatabase::class])->send(function (TenantCreated $event) { Event::listen(TenantCreated::class, JobPipeline::make([CreateDatabase::class])->send(function (TenantCreated $event) {