Merge branch 'master' into shared-users

src/Contracts/Feature.php

@@ -4,10 +4,10 @@ declare(strict_types=1);
 
 namespace Stancl\Tenancy\Contracts;
 
-use Stancl\Tenancy\TenantManager;
+use Stancl\Tenancy\Facades\Tenancy;
 
 /** Additional features, like Telescope tags and tenant redirects. */
 interface Feature
 {
-    public function bootstrap(TenantManager $tenantManager): void;
+    public function bootstrap(Tenancy $tenancy): void;
 }

src/Contracts/ModifiesDatabaseNameForConnection.php

@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Stancl\Tenancy\Contracts;
-
-/**
- * Used by sqlite to wrap database name in database_path().
- */
-interface ModifiesDatabaseNameForConnection
-{
-    public function getDatabaseNameForConnection(string $original): string;
-}

src/Contracts/StorageDriver.php

@@ -1,95 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Stancl\Tenancy\Contracts;
-
-use Stancl\Tenancy\Tenant;
-
-interface StorageDriver
-{
-    public function createTenant(Tenant $tenant): void;
-
-    public function updateTenant(Tenant $tenant): void;
-
-    public function deleteTenant(Tenant $tenant): void;
-
-    /**
-     * Find a tenant using an id.
-     *
-     * @param string $id
-     * @return Tenant
-     * @throws \Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedException
-     */
-    public function findById(string $id): Tenant;
-
-    /**
-     * Find a tenant using a domain name.
-     *
-     * @param string $domain
-     * @return Tenant
-     */
-    public function findByDomain(string $domain): Tenant;
-
-    /**
-     * Get all tenants.
-     *
-     * @param string[] $ids
-     * @return Tenant[]
-     */
-    public function all(array $ids = []): array;
-
-    /**
-     * Ensure a tenant can be created.
-     *
-     * @param Tenant $tenant
-     * @return void
-     * @throws TenantCannotBeCreatedException
-     */
-    public function ensureTenantCanBeCreated(Tenant $tenant): void;
-
-    /**
-     * Set default tenant (will be used for get/put when no tenant is supplied).
-     *
-     * @param Tenant $tenant
-     * @return self
-     */
-    public function withDefaultTenant(Tenant $tenant);
-
-    /**
-     * Get a value from storage.
-     *
-     * @param string $key
-     * @param ?Tenant $tenant
-     * @return mixed
-     */
-    public function get(string $key, Tenant $tenant = null);
-
-    /**
-     * Get multiple values from storage.
-     *
-     * @param array $keys
-     * @param ?Tenant $tenant
-     * @return void
-     */
-    public function getMany(array $keys, Tenant $tenant = null);
-
-    /**
-     * Put a value into storage.
-     *
-     * @param string $key
-     * @param mixed $value
-     * @param ?Tenant $tenant
-     * @return void
-     */
-    public function put(string $key, $value, Tenant $tenant = null): void;
-
-    /**
-     * Put multiple values into storage.
-     *
-     * @param mixed[string] $kvPairs
-     * @param ?Tenant $tenant
-     * @return void
-     */
-    public function putMany(array $kvPairs, Tenant $tenant = null): void;
-}

src/Contracts/TenancyBootstrapper.php

@@ -9,6 +9,7 @@ namespace Stancl\Tenancy\Contracts;
  */
 interface TenancyBootstrapper
 {
+    // todo rename methods
     public function start(Tenant $tenant);
 
     public function end();

src/Contracts/TenantDatabaseManager.php

@@ -6,13 +6,6 @@ namespace Stancl\Tenancy\Contracts;
 
 interface TenantDatabaseManager
 {
-    /**
-     * Return the config key that separates databases (e.g. 'database' or 'schema').
-     *
-     * @return string
-     */
-    public function getSeparator(): string;
-
     /**
      * Create a database.
      */
@@ -30,4 +23,13 @@ interface TenantDatabaseManager
      * @return bool
      */
     public function databaseExists(string $name): bool;
+
+    /**
+     * Make a DB connection config array.
+     *
+     * @param array $baseConfig
+     * @param string $databaseName
+     * @return array
+     */
+    public function makeConnectionConfig(array $baseConfig, string $databaseName): array;
 }

src/Contracts/TenantWithDatabase.php

@@ -7,4 +7,7 @@ use Stancl\Tenancy\DatabaseConfig;
 interface TenantWithDatabase extends Tenant
 {
     public function database(): DatabaseConfig;
+
+    /** Get an internal key. */
+    public function getInternal(string $key);
 }