From 648acc48c72ec8793f30379cacf514decb9d14f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Tue, 25 Oct 2022 18:04:13 +0200
Subject: [PATCH] remove HasDataColumn trait

---
 src/Database/Concerns/HasDataColumn.php | 15 ---------------
 src/Database/Models/Tenant.php          | 14 +++++++++-----
 2 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 src/Database/Concerns/HasDataColumn.php

diff --git a/src/Database/Concerns/HasDataColumn.php b/src/Database/Concerns/HasDataColumn.php
deleted file mode 100644
index cf67b832..00000000
--- a/src/Database/Concerns/HasDataColumn.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Stancl\Tenancy\Database\Concerns;
-
-use Stancl\VirtualColumn\VirtualColumn;
-
-/**
- * Extends VirtualColumn for backwards compatibility. This trait will be removed in v4.
- */
-trait HasDataColumn
-{
-    use VirtualColumn;
-}
diff --git a/src/Database/Models/Tenant.php b/src/Database/Models/Tenant.php
index 83e75332..9cb5f5f3 100644
--- a/src/Database/Models/Tenant.php
+++ b/src/Database/Models/Tenant.php
@@ -11,6 +11,7 @@ use Stancl\Tenancy\Database\Concerns;
 use Stancl\Tenancy\Database\TenantCollection;
 use Stancl\Tenancy\Events;
 use Stancl\Tenancy\Exceptions\TenancyNotInitializedException;
+use Stancl\VirtualColumn\VirtualColumn;
 
 /**
  * @property string|int $id
@@ -22,18 +23,16 @@ use Stancl\Tenancy\Exceptions\TenancyNotInitializedException;
  */
 class Tenant extends Model implements Contracts\Tenant
 {
-    use Concerns\CentralConnection,
+    use VirtualColumn,
+        Concerns\CentralConnection,
         Concerns\GeneratesIds,
-        Concerns\HasDataColumn,
         Concerns\HasInternalKeys,
         Concerns\TenantRun,
         Concerns\InitializationHelpers,
         Concerns\InvalidatesResolverCache;
 
     protected $table = 'tenants';
-
     protected $primaryKey = 'id';
-
     protected $guarded = [];
 
     public function getTenantKeyName(): string
@@ -46,12 +45,17 @@ class Tenant extends Model implements Contracts\Tenant
         return $this->getAttribute($this->getTenantKeyName());
     }
 
+    /** Get the current tenant. */
     public static function current(): static|null
     {
         return tenant();
     }
 
-    /** @throws TenancyNotInitializedException */
+    /**
+     * Get the current tenant or throw an exception if tenancy is not initialized.
+     *
+     * @throws TenancyNotInitializedException
+     */
     public static function currentOrFail(): static
     {
         return static::current() ?? throw new TenancyNotInitializedException;