From 8cbc855b0acddc31f7efd8a4191ced564fa5f426 Mon Sep 17 00:00:00 2001
From: lukinovec <lukinovec@gmail.com>
Date: Thu, 23 Feb 2023 15:18:12 +0100
Subject: [PATCH] Fix merge errors

---
 src/Features/UserImpersonation.php | 12 +++++++-----
 tests/Pest.php                     |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Features/UserImpersonation.php b/src/Features/UserImpersonation.php
index da599ae0..d07117bf 100644
--- a/src/Features/UserImpersonation.php
+++ b/src/Features/UserImpersonation.php
@@ -4,12 +4,12 @@ declare(strict_types=1);
 
 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 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
 {
@@ -56,6 +56,8 @@ class UserImpersonation implements Feature
     public static function alwaysBootstrap(): bool
     {
         return false;
+    }
+
     public static function isImpersonating(): bool
     {
         return session()->has('tenancy_impersonating');
diff --git a/tests/Pest.php b/tests/Pest.php
index 61dabfb1..99f57cd0 100644
--- a/tests/Pest.php
+++ b/tests/Pest.php
@@ -18,6 +18,8 @@ function filesAndFoldersExcluding(array $exclude = []): array
     $dirs = scandir(__DIR__);
 
     return array_filter($dirs, fn($dir) => ! in_array($dir, array_merge(['.', '..'], $exclude) , true));
+}
+
 function withTenantDatabases()
 {
     Event::listen(TenantCreated::class, JobPipeline::make([CreateDatabase::class])->send(function (TenantCreated $event) {