Change default tenant model, write more tests, cleanup

src/Database/Concerns/HasDataColumn.php

@@ -2,7 +2,7 @@
 
 namespace Stancl\Tenancy\Database\Concerns;
 
-trait HasADataColumn
+trait HasDataColumn
 {
     public static $priorityListeners = [];
 
@@ -13,9 +13,9 @@ trait HasADataColumn
      *
      * @var string
      */
-    public $dataEncodingStatus = 'decoded'; // todo write tests for this
+    public $dataEncodingStatus = 'decoded';
 
-    public static function bootHasADataColumn()
+    public static function bootHasDataColumn()
     {
         $encode = function (self $model) {
             if ($model->dataEncodingStatus === 'encoded') {

src/Database/Concerns/HasDatabase.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Stancl\Tenancy\Database\Concerns;
+
+use Stancl\Tenancy\Contracts\TenantWithDatabase;
+use Stancl\Tenancy\DatabaseConfig;
+
+trait HasDatabase
+{
+    public function database(): DatabaseConfig
+    {
+        /** @var TenantWithDatabase $this */
+
+        return new DatabaseConfig($this);
+    }
+}

src/Database/Models/Tenant.php

@@ -4,7 +4,6 @@ namespace Stancl\Tenancy\Database\Models;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
-use Stancl\Tenancy\DatabaseConfig;
 use Stancl\Tenancy\Events;
 use Stancl\Tenancy\Contracts;
 use Stancl\Tenancy\Database\Concerns;
@@ -15,14 +14,13 @@ use Stancl\Tenancy\Database\Concerns;
  * @property Carbon $updated_at
  * @property array $data
  */
-class Tenant extends Model implements Contracts\TenantWithDatabase // todo base model that isn't TenantWithDatabase & domains
+class Tenant extends Model implements Contracts\Tenant
 {
     use Concerns\CentralConnection,
-        Concerns\HasADataColumn,
+        Concerns\HasDataColumn,
         Concerns\GeneratesIds,
-        Concerns\HasADataColumn,
-        Concerns\HasDomains {
-        Concerns\HasADataColumn::getCasts as dataColumnCasts;
+        Concerns\HasDataColumn {
+        Concerns\HasDataColumn::getCasts as dataColumnCasts;
     }
 
     protected $table = 'tenants';
@@ -69,11 +67,6 @@ class Tenant extends Model implements Contracts\TenantWithDatabase // todo base
         return $this;
     }
 
-    public function database(): DatabaseConfig
-    {
-        return new DatabaseConfig($this);
-    }
-
     public function run(callable $callback)
     {
         $originalTenant = tenant();