diff --git a/assets/config.php b/assets/config.php index cddc4f44..fec50a75 100644 --- a/assets/config.php +++ b/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' => [ diff --git a/src/routes.php b/assets/routes.php similarity index 100% rename from src/routes.php rename to assets/routes.php diff --git a/src/Commands/Migrate.php b/src/Commands/Migrate.php index bbe3dc22..311e55cf 100644 --- a/src/Commands/Migrate.php +++ b/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 { diff --git a/src/Commands/MigrateFresh.php b/src/Commands/MigrateFresh.php index c4fb3a3f..b1c50856 100644 --- a/src/Commands/MigrateFresh.php +++ b/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 { diff --git a/src/Commands/Rollback.php b/src/Commands/Rollback.php index 344a95c7..d52f1b04 100644 --- a/src/Commands/Rollback.php +++ b/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 { diff --git a/src/Commands/Seed.php b/src/Commands/Seed.php index 81d61d6f..8af8f95d 100644 --- a/src/Commands/Seed.php +++ b/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 { diff --git a/src/Traits/CreatesDatabaseUsers.php b/src/Concerns/CreatesDatabaseUsers.php similarity index 94% rename from src/Traits/CreatesDatabaseUsers.php rename to src/Concerns/CreatesDatabaseUsers.php index 694bee13..b9d4e344 100644 --- a/src/Traits/CreatesDatabaseUsers.php +++ b/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; diff --git a/src/Traits/DealsWithMigrations.php b/src/Concerns/DealsWithMigrations.php similarity index 89% rename from src/Traits/DealsWithMigrations.php rename to src/Concerns/DealsWithMigrations.php index edbae934..4bb6b44c 100644 --- a/src/Traits/DealsWithMigrations.php +++ b/src/Concerns/DealsWithMigrations.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Stancl\Tenancy\Traits; +namespace Stancl\Tenancy\Concerns; trait DealsWithMigrations { diff --git a/src/Traits/HasATenantArgument.php b/src/Concerns/HasATenantArgument.php similarity index 93% rename from src/Traits/HasATenantArgument.php rename to src/Concerns/HasATenantArgument.php index 7ad0c846..5b374ff8 100644 --- a/src/Traits/HasATenantArgument.php +++ b/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; diff --git a/src/Traits/HasATenantsOption.php b/src/Concerns/HasATenantsOption.php similarity index 95% rename from src/Traits/HasATenantsOption.php rename to src/Concerns/HasATenantsOption.php index e7c24784..a2b94ac5 100644 --- a/src/Traits/HasATenantsOption.php +++ b/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; diff --git a/src/Traits/TenantAwareCommand.php b/src/Concerns/TenantAwareCommand.php similarity index 96% rename from src/Traits/TenantAwareCommand.php rename to src/Concerns/TenantAwareCommand.php index d0f3ae81..72a394cf 100644 --- a/src/Traits/TenantAwareCommand.php +++ b/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; diff --git a/src/Exceptions/NotImplementedException.php b/src/Exceptions/NotImplementedException.php deleted file mode 100644 index 4ae156f7..00000000 --- a/src/Exceptions/NotImplementedException.php +++ /dev/null @@ -1,15 +0,0 @@ -message = "Tenant with this $key does not exist: $id"; - } -} diff --git a/src/Exceptions/TenantStorageException.php b/src/Exceptions/TenantStorageException.php deleted file mode 100644 index ea152d3f..00000000 --- a/src/Exceptions/TenantStorageException.php +++ /dev/null @@ -1,9 +0,0 @@ -id} already exists."; - } - - public function __construct(string $id) - { - parent::__construct(); - - $this->id = $id; - } -} diff --git a/src/TenancyServiceProvider.php b/src/TenancyServiceProvider.php index c168aaba..5cac36c6 100644 --- a/src/TenancyServiceProvider.php +++ b/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)) { diff --git a/src/TenantDatabaseManagers/PermissionControlledMySQLDatabaseManager.php b/src/TenantDatabaseManagers/PermissionControlledMySQLDatabaseManager.php index 0855cb74..de43d502 100644 --- a/src/TenantDatabaseManagers/PermissionControlledMySQLDatabaseManager.php +++ b/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 { diff --git a/src/UniqueIDGenerators/UUIDGenerator.php b/src/UUIDGenerator.php similarity index 86% rename from src/UniqueIDGenerators/UUIDGenerator.php rename to src/UUIDGenerator.php index ebb5cdad..1b15dfa5 100644 --- a/src/UniqueIDGenerators/UUIDGenerator.php +++ b/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; diff --git a/tests/Etc/AddUserCommand.php b/tests/Etc/AddUserCommand.php index a270d158..46e1fcbb 100644 --- a/tests/Etc/AddUserCommand.php +++ b/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 { diff --git a/tests/TenantModelTest.php b/tests/TenantModelTest.php index 60a1e346..8d358990 100644 --- a/tests/TenantModelTest.php +++ b/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;