Remove obsolete files, restructure

assets/config.php

@@ -8,7 +8,7 @@ use Stancl\Tenancy\Database\Models\Tenant;
 return [
     'tenant_model' => Tenant::class,
     'internal_prefix' => 'tenancy_',
-    'id_generator' => Stancl\Tenancy\UniqueIDGenerators\UUIDGenerator::class,
+    'id_generator' => Stancl\Tenancy\UUIDGenerator::class,
     
     'domain_model' => Domain::class,
     'central_domains' => [

src/Commands/Migrate.php

@@ -10,8 +10,8 @@ use Illuminate\Database\Migrations\Migrator;
 use Stancl\Tenancy\Contracts\TenantWithDatabase;
 use Stancl\Tenancy\DatabaseManager;
 use Stancl\Tenancy\Events\DatabaseMigrated;
-use Stancl\Tenancy\Traits\DealsWithMigrations;
-use Stancl\Tenancy\Traits\HasATenantsOption;
+use Stancl\Tenancy\Concerns\DealsWithMigrations;
+use Stancl\Tenancy\Concerns\HasATenantsOption;
 
 class Migrate extends MigrateCommand
 {

src/Commands/MigrateFresh.php

@@ -6,8 +6,8 @@ namespace Stancl\Tenancy\Commands;
 
 use Illuminate\Console\Command;
 use Stancl\Tenancy\Contracts\TenantWithDatabase;
-use Stancl\Tenancy\Traits\DealsWithMigrations;
-use Stancl\Tenancy\Traits\HasATenantsOption;
+use Stancl\Tenancy\Concerns\DealsWithMigrations;
+use Stancl\Tenancy\Concerns\HasATenantsOption;
 
 final class MigrateFresh extends Command
 {

src/Commands/Rollback.php

@@ -10,8 +10,8 @@ use Illuminate\Database\Migrations\Migrator;
 use Stancl\Tenancy\Contracts\TenantWithDatabase;
 use Stancl\Tenancy\DatabaseManager;
 use Stancl\Tenancy\Events\DatabaseRolledBack;
-use Stancl\Tenancy\Traits\DealsWithMigrations;
-use Stancl\Tenancy\Traits\HasATenantsOption;
+use Stancl\Tenancy\Concerns\DealsWithMigrations;
+use Stancl\Tenancy\Concerns\HasATenantsOption;
 
 class Rollback extends RollbackCommand
 {

src/Commands/Seed.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Console\Seeds\SeedCommand;
 use Stancl\Tenancy\Contracts\TenantWithDatabase;
 use Stancl\Tenancy\DatabaseManager;
 use Stancl\Tenancy\Events\DatabaseSeeded;
-use Stancl\Tenancy\Traits\HasATenantsOption;
+use Stancl\Tenancy\Concerns\HasATenantsOption;
 
 class Seed extends SeedCommand
 {

src/Concerns/CreatesDatabaseUsers.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Stancl\Tenancy\Traits;
+namespace Stancl\Tenancy\Concerns;
 
 use Stancl\Tenancy\Contracts\TenantWithDatabase;
 

src/Concerns/DealsWithMigrations.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Stancl\Tenancy\Traits;
+namespace Stancl\Tenancy\Concerns;
 
 trait DealsWithMigrations
 {

src/Concerns/HasATenantArgument.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Stancl\Tenancy\Traits;
+namespace Stancl\Tenancy\Concerns;
 
 use Symfony\Component\Console\Input\InputArgument;
 

src/Concerns/HasATenantsOption.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Stancl\Tenancy\Traits;
+namespace Stancl\Tenancy\Concerns;
 
 use Illuminate\Support\LazyCollection;
 use Symfony\Component\Console\Input\InputOption;

src/Concerns/TenantAwareCommand.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Stancl\Tenancy\Traits;
+namespace Stancl\Tenancy\Concerns;
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

src/Exceptions/NotImplementedException.php

@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Stancl\Tenancy\Exceptions;
-
-use Exception;
-
-class NotImplementedException extends Exception
-{
-    public function __construct($class, $method, $extra)
-    {
-        parent::__construct("The $class class does not implement the $method method. $extra");
-    }
-}

src/Exceptions/TenantDoesNotExistException.php

@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Stancl\Tenancy\Exceptions;
-
-use Exception;
-
-class TenantDoesNotExistException extends Exception
-{
-    public function __construct(string $id, string $key = 'id')
-    {
-        $this->message = "Tenant with this $key does not exist: $id";
-    }
-}

src/Exceptions/TenantStorageException.php

@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Stancl\Tenancy\Exceptions;
-
-class TenantStorageException extends \Exception
-{
-}

src/Exceptions/TenantWithThisIdAlreadyExistsException.php

@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Stancl\Tenancy\Exceptions;
-
-use Stancl\Tenancy\Contracts\TenantCannotBeCreatedException;
-
-class TenantWithThisIdAlreadyExistsException extends TenantCannotBeCreatedException
-{
-    /** @var string */
-    protected $id;
-
-    public function reason(): string
-    {
-        return "Tenant with id {$this->id} already exists.";
-    }
-
-    public function __construct(string $id)
-    {
-        parent::__construct();
-
-        $this->id = $id;
-    }
-}

src/TenancyServiceProvider.php

@@ -95,7 +95,7 @@ class TenancyServiceProvider extends ServiceProvider
             __DIR__ . '/../assets/TenancyServiceProvider.stub.php' => app_path('Providers/TenancyServiceProvider.php'),
         ], 'providers');
 
-        $this->loadRoutesFrom(__DIR__ . '/routes.php');
+        $this->loadRoutesFrom(__DIR__ . '/../assets/routes.php');
 
         $this->app->singleton('globalUrl', function ($app) {
             if ($app->bound(FilesystemTenancyBootstrapper::class)) {

src/TenantDatabaseManagers/PermissionControlledMySQLDatabaseManager.php

@@ -7,7 +7,7 @@ namespace Stancl\Tenancy\TenantDatabaseManagers;
 use Stancl\Tenancy\Contracts\ManagesDatabaseUsers;
 use Stancl\Tenancy\DatabaseConfig;
 use Stancl\Tenancy\Exceptions\TenantDatabaseUserAlreadyExistsException;
-use Stancl\Tenancy\Traits\CreatesDatabaseUsers;
+use Stancl\Tenancy\Concerns\CreatesDatabaseUsers;
 
 class PermissionControlledMySQLDatabaseManager extends MySQLDatabaseManager implements ManagesDatabaseUsers
 {

src/UUIDGenerator.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Stancl\Tenancy\UniqueIDGenerators;
+namespace Stancl\Tenancy;
 
 use Ramsey\Uuid\Uuid;
 use Stancl\Tenancy\Contracts\UniqueIdentifierGenerator;

tests/Etc/AddUserCommand.php

@@ -6,8 +6,8 @@ namespace Stancl\Tenancy\Tests\Etc;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
-use Stancl\Tenancy\Traits\HasATenantsOption;
-use Stancl\Tenancy\Traits\TenantAwareCommand;
+use Stancl\Tenancy\Concerns\HasATenantsOption;
+use Stancl\Tenancy\Concerns\TenantAwareCommand;
 
 class AddUserCommand extends Command
 {

tests/TenantModelTest.php

@@ -10,7 +10,7 @@ use Illuminate\Support\Facades\Schema;
 use Stancl\Tenancy\Tests\Etc\Tenant;
 use Stancl\Tenancy\Events\TenantCreated;
 use Stancl\Tenancy\Tests\TestCase;
-use Stancl\Tenancy\UniqueIDGenerators\UUIDGenerator;
+use Stancl\Tenancy\UUIDGenerator;
 use Stancl\Tenancy\Contracts;
 use Stancl\Tenancy\Contracts\UniqueIdentifierGenerator;
 use Stancl\Tenancy\Events\TenancyInitialized;