From 1bfe4a7ea55355adcf883000551e5d71ea75e120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Wed, 11 Sep 2019 17:37:02 +0200 Subject: [PATCH] Apply fixes from StyleCI (#126) --- .../migrations/2019_08_08_000000_create_tenants_table.php | 4 ++-- src/Commands/Migrate.php | 8 ++++---- src/Commands/Rollback.php | 8 ++++---- src/Commands/Seed.php | 4 ++-- src/DatabaseManager.php | 4 ++-- src/DatabaseManagerv2.php | 6 +++--- src/Facades/Tenancy.php | 2 +- src/Features/TelescopeTags.php | 4 ++-- src/Features/TenantRedirect.php | 2 +- src/Jobs/QueuedTenantDatabaseCreator.php | 4 ++-- src/Jobs/QueuedTenantDatabaseDeleter.php | 4 ++-- src/StorageDrivers/DatabaseStorageDriver.php | 4 ++-- src/StorageDrivers/RedisStorageDriver.php | 6 +++--- src/TenancyBootstrappers/DatabaseTenancyBootstrapper.php | 2 +- src/TenancyServiceProvider.php | 8 ++++---- src/TenantManager.php | 6 +++--- src/TenantManagerv2.php | 4 ++-- src/TenantRouteServiceProvider.php | 2 +- src/Traits/BootstrapsTenancy.php | 2 +- tests/BootstrapsTenancyTest.php | 2 +- tests/CommandsTest.php | 2 +- tests/DataSeparationTest.php | 4 ++-- tests/Etc/2019_08_08_000001_add_custom_column.php | 4 ++-- tests/Etc/ExampleSeeder.php | 2 +- tests/FacadeTest.php | 2 +- tests/QueueTest.php | 8 ++++---- tests/TenantDatabaseManagerTest.php | 2 +- tests/TenantManagerEventsTest.php | 2 +- tests/TenantStorageTest.php | 4 ++-- tests/TestCase.php | 2 +- 30 files changed, 59 insertions(+), 59 deletions(-) diff --git a/assets/migrations/2019_08_08_000000_create_tenants_table.php b/assets/migrations/2019_08_08_000000_create_tenants_table.php index f3de166a..fc9aa876 100644 --- a/assets/migrations/2019_08_08_000000_create_tenants_table.php +++ b/assets/migrations/2019_08_08_000000_create_tenants_table.php @@ -2,9 +2,9 @@ declare(strict_types=1); -use Illuminate\Support\Facades\Schema; -use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class CreateTenantsTable extends Migration { diff --git a/src/Commands/Migrate.php b/src/Commands/Migrate.php index b5e525a1..d3e73be0 100644 --- a/src/Commands/Migrate.php +++ b/src/Commands/Migrate.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace Stancl\Tenancy\Commands; use Illuminate\Console\Command; -use Stancl\Tenancy\DatabaseManager; -use Illuminate\Database\Migrations\Migrator; -use Stancl\Tenancy\Traits\HasATenantsOption; -use Stancl\Tenancy\Traits\DealsWithMigrations; use Illuminate\Database\Console\Migrations\MigrateCommand; +use Illuminate\Database\Migrations\Migrator; +use Stancl\Tenancy\DatabaseManager; +use Stancl\Tenancy\Traits\DealsWithMigrations; +use Stancl\Tenancy\Traits\HasATenantsOption; class Migrate extends MigrateCommand { diff --git a/src/Commands/Rollback.php b/src/Commands/Rollback.php index 8ec52459..42cdcfbb 100644 --- a/src/Commands/Rollback.php +++ b/src/Commands/Rollback.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace Stancl\Tenancy\Commands; use Illuminate\Console\Command; -use Stancl\Tenancy\DatabaseManager; -use Illuminate\Database\Migrations\Migrator; -use Stancl\Tenancy\Traits\HasATenantsOption; -use Stancl\Tenancy\Traits\DealsWithMigrations; use Illuminate\Database\Console\Migrations\RollbackCommand; +use Illuminate\Database\Migrations\Migrator; +use Stancl\Tenancy\DatabaseManager; +use Stancl\Tenancy\Traits\DealsWithMigrations; +use Stancl\Tenancy\Traits\HasATenantsOption; class Rollback extends RollbackCommand { diff --git a/src/Commands/Seed.php b/src/Commands/Seed.php index 9acbee7b..6350f5eb 100644 --- a/src/Commands/Seed.php +++ b/src/Commands/Seed.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace Stancl\Tenancy\Commands; +use Illuminate\Database\ConnectionResolverInterface; +use Illuminate\Database\Console\Seeds\SeedCommand; use Stancl\Tenancy\DatabaseManager; use Stancl\Tenancy\Traits\HasATenantsOption; -use Illuminate\Database\Console\Seeds\SeedCommand; -use Illuminate\Database\ConnectionResolverInterface; class Seed extends SeedCommand { diff --git a/src/DatabaseManager.php b/src/DatabaseManager.php index 002cb3df..22fc7480 100644 --- a/src/DatabaseManager.php +++ b/src/DatabaseManager.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace Stancl\Tenancy; -use Stancl\Tenancy\Jobs\QueuedTenantDatabaseCreator; -use Stancl\Tenancy\Jobs\QueuedTenantDatabaseDeleter; use Illuminate\Database\DatabaseManager as BaseDatabaseManager; use Stancl\Tenancy\Exceptions\DatabaseManagerNotRegisteredException; +use Stancl\Tenancy\Jobs\QueuedTenantDatabaseCreator; +use Stancl\Tenancy\Jobs\QueuedTenantDatabaseDeleter; /** * @final Class is subject to breaking changes in minor and patch versions. diff --git a/src/DatabaseManagerv2.php b/src/DatabaseManagerv2.php index 5d370b86..93005ed3 100644 --- a/src/DatabaseManagerv2.php +++ b/src/DatabaseManagerv2.php @@ -4,11 +4,11 @@ declare(strict_types=1); namespace Stancl\Tenancy; -use Illuminate\Foundation\Application; -use Stancl\Tenancy\Jobs\QueuedTenantDatabaseCreator; use Illuminate\Database\DatabaseManager as BaseDatabaseManager; -use Stancl\Tenancy\Exceptions\TenantDatabaseAlreadyExistsException; +use Illuminate\Foundation\Application; use Stancl\Tenancy\Exceptions\DatabaseManagerNotRegisteredException; +use Stancl\Tenancy\Exceptions\TenantDatabaseAlreadyExistsException; +use Stancl\Tenancy\Jobs\QueuedTenantDatabaseCreator; class DatabaseManagerv2 { diff --git a/src/Facades/Tenancy.php b/src/Facades/Tenancy.php index c50bd498..58fef2ac 100644 --- a/src/Facades/Tenancy.php +++ b/src/Facades/Tenancy.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace Stancl\Tenancy\Facades; -use Stancl\Tenancy\TenantManager; use Illuminate\Support\Facades\Facade; +use Stancl\Tenancy\TenantManager; class Tenancy extends Facade { diff --git a/src/Features/TelescopeTags.php b/src/Features/TelescopeTags.php index 7094746a..ecafacb2 100644 --- a/src/Features/TelescopeTags.php +++ b/src/Features/TelescopeTags.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace Stancl\Tenancy\Features; -use Laravel\Telescope\Telescope; -use Stancl\Tenancy\TenantManager; use Laravel\Telescope\IncomingEntry; +use Laravel\Telescope\Telescope; use Stancl\Tenancy\Contracts\FeatureProvider; +use Stancl\Tenancy\TenantManager; class TelescopeTags implements FeatureProvider { diff --git a/src/Features/TenantRedirect.php b/src/Features/TenantRedirect.php index f4413463..691c66cf 100644 --- a/src/Features/TenantRedirect.php +++ b/src/Features/TenantRedirect.php @@ -2,8 +2,8 @@ declare(strict_types=1); -use Stancl\Tenancy\TenantManager; use Stancl\Tenancy\Contracts\FeatureProvider; +use Stancl\Tenancy\TenantManager; class TenantRedirect implements FeatureProvider { diff --git a/src/Jobs/QueuedTenantDatabaseCreator.php b/src/Jobs/QueuedTenantDatabaseCreator.php index ce8e737c..a3fe776e 100644 --- a/src/Jobs/QueuedTenantDatabaseCreator.php +++ b/src/Jobs/QueuedTenantDatabaseCreator.php @@ -5,10 +5,10 @@ declare(strict_types=1); namespace Stancl\Tenancy\Jobs; use Illuminate\Bus\Queueable; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; use Stancl\Tenancy\Interfaces\TenantDatabaseManager; class QueuedTenantDatabaseCreator implements ShouldQueue diff --git a/src/Jobs/QueuedTenantDatabaseDeleter.php b/src/Jobs/QueuedTenantDatabaseDeleter.php index 48371f3d..5dcce1cb 100644 --- a/src/Jobs/QueuedTenantDatabaseDeleter.php +++ b/src/Jobs/QueuedTenantDatabaseDeleter.php @@ -5,10 +5,10 @@ declare(strict_types=1); namespace Stancl\Tenancy\Jobs; use Illuminate\Bus\Queueable; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; use Stancl\Tenancy\Interfaces\TenantDatabaseManager; class QueuedTenantDatabaseDeleter implements ShouldQueue diff --git a/src/StorageDrivers/DatabaseStorageDriver.php b/src/StorageDrivers/DatabaseStorageDriver.php index b5b17c7f..3de91c33 100644 --- a/src/StorageDrivers/DatabaseStorageDriver.php +++ b/src/StorageDrivers/DatabaseStorageDriver.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace Stancl\Tenancy\StorageDrivers; -use Stancl\Tenancy\TenantModel as Tenant; -use Stancl\Tenancy\Interfaces\StorageDriver; use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedException; +use Stancl\Tenancy\Interfaces\StorageDriver; +use Stancl\Tenancy\TenantModel as Tenant; class DatabaseStorageDriver implements StorageDriver { diff --git a/src/StorageDrivers/RedisStorageDriver.php b/src/StorageDrivers/RedisStorageDriver.php index 9c61feb2..9c02e32d 100644 --- a/src/StorageDrivers/RedisStorageDriver.php +++ b/src/StorageDrivers/RedisStorageDriver.php @@ -4,11 +4,11 @@ declare(strict_types=1); namespace Stancl\Tenancy\StorageDrivers; -use Stancl\Tenancy\Tenant; -use Illuminate\Foundation\Application; -use Stancl\Tenancy\Interfaces\StorageDriver; use Illuminate\Contracts\Redis\Factory as Redis; +use Illuminate\Foundation\Application; use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedException; +use Stancl\Tenancy\Interfaces\StorageDriver; +use Stancl\Tenancy\Tenant; class RedisStorageDriver implements StorageDriver { diff --git a/src/TenancyBootstrappers/DatabaseTenancyBootstrapper.php b/src/TenancyBootstrappers/DatabaseTenancyBootstrapper.php index 60174580..09ae3529 100644 --- a/src/TenancyBootstrappers/DatabaseTenancyBootstrapper.php +++ b/src/TenancyBootstrappers/DatabaseTenancyBootstrapper.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace Stancl\Tenancy\TenancyBoostrappers; -use Stancl\Tenancy\DatabaseManager; use Illuminate\Foundation\Application; use Stancl\Tenancy\Contracts\TenancyBootstrapper; +use Stancl\Tenancy\DatabaseManager; class DatabaseTenancyBootstrapper implements TenancyBootstrapper { diff --git a/src/TenancyServiceProvider.php b/src/TenancyServiceProvider.php index df1ba8f3..8a88a090 100644 --- a/src/TenancyServiceProvider.php +++ b/src/TenancyServiceProvider.php @@ -4,14 +4,14 @@ declare(strict_types=1); namespace Stancl\Tenancy; -use Stancl\Tenancy\Commands\Run; -use Stancl\Tenancy\Commands\Seed; use Illuminate\Cache\CacheManager; +use Illuminate\Support\Facades\Route; +use Illuminate\Support\ServiceProvider; use Stancl\Tenancy\Commands\Install; use Stancl\Tenancy\Commands\Migrate; -use Illuminate\Support\Facades\Route; use Stancl\Tenancy\Commands\Rollback; -use Illuminate\Support\ServiceProvider; +use Stancl\Tenancy\Commands\Run; +use Stancl\Tenancy\Commands\Seed; use Stancl\Tenancy\Commands\TenantList; use Stancl\Tenancy\Interfaces\StorageDriver; diff --git a/src/TenantManager.php b/src/TenantManager.php index 52eda8f8..ae112331 100644 --- a/src/TenantManager.php +++ b/src/TenantManager.php @@ -4,12 +4,12 @@ declare(strict_types=1); namespace Stancl\Tenancy; -use Stancl\Tenancy\Interfaces\StorageDriver; -use Stancl\Tenancy\Traits\BootstrapsTenancy; use Illuminate\Contracts\Foundation\Application; -use Stancl\Tenancy\Interfaces\UniqueIdentifierGenerator; use Stancl\Tenancy\Exceptions\CannotChangeUuidOrDomainException; use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedException; +use Stancl\Tenancy\Interfaces\StorageDriver; +use Stancl\Tenancy\Interfaces\UniqueIdentifierGenerator; +use Stancl\Tenancy\Traits\BootstrapsTenancy; /** * @final Class is subject to breaking changes in minor and patch versions. diff --git a/src/TenantManagerv2.php b/src/TenantManagerv2.php index bde3a00d..a1bcf3ab 100644 --- a/src/TenantManagerv2.php +++ b/src/TenantManagerv2.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace Stancl\Tenancy; -use Illuminate\Foundation\Application; use Illuminate\Contracts\Console\Kernel as ConsoleKernel; -use Stancl\Tenancy\Exceptions\NoTenantIdentifiedException; +use Illuminate\Foundation\Application; use Stancl\Tenancy\Contracts\TenantCannotBeCreatedException; +use Stancl\Tenancy\Exceptions\NoTenantIdentifiedException; use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedException; /** diff --git a/src/TenantRouteServiceProvider.php b/src/TenantRouteServiceProvider.php index f6d7f60f..84cfdefd 100644 --- a/src/TenantRouteServiceProvider.php +++ b/src/TenantRouteServiceProvider.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace Stancl\Tenancy; -use Illuminate\Support\Facades\Route; use Illuminate\Foundation\Support\Providers\RouteServiceProvider; +use Illuminate\Support\Facades\Route; class TenantRouteServiceProvider extends RouteServiceProvider { diff --git a/src/Traits/BootstrapsTenancy.php b/src/Traits/BootstrapsTenancy.php index 82ca708f..84e2f724 100644 --- a/src/Traits/BootstrapsTenancy.php +++ b/src/Traits/BootstrapsTenancy.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace Stancl\Tenancy\Traits; -use Stancl\Tenancy\CacheManager; use Illuminate\Support\Facades\Redis; use Illuminate\Support\Facades\Storage; +use Stancl\Tenancy\CacheManager; use Stancl\Tenancy\Exceptions\PhpRedisNotInstalledException; trait BootstrapsTenancy diff --git a/tests/BootstrapsTenancyTest.php b/tests/BootstrapsTenancyTest.php index fae9e1f2..860b56d1 100644 --- a/tests/BootstrapsTenancyTest.php +++ b/tests/BootstrapsTenancyTest.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace Stancl\Tenancy\Tests; -use Illuminate\Support\Facades\Redis; use Illuminate\Support\Facades\Config; +use Illuminate\Support\Facades\Redis; class BootstrapsTenancyTest extends TestCase { diff --git a/tests/CommandsTest.php b/tests/CommandsTest.php index 7b3fc454..577792d7 100644 --- a/tests/CommandsTest.php +++ b/tests/CommandsTest.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace Stancl\Tenancy\Tests; +use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Schema; -use Illuminate\Support\Facades\Artisan; use Stancl\Tenancy\Tests\Etc\ExampleSeeder; class CommandsTest extends TestCase diff --git a/tests/DataSeparationTest.php b/tests/DataSeparationTest.php index 0c3d6dc4..3f52715d 100644 --- a/tests/DataSeparationTest.php +++ b/tests/DataSeparationTest.php @@ -4,11 +4,11 @@ declare(strict_types=1); namespace Stancl\Tenancy\Tests; -use Illuminate\Support\Str; -use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Redis; use Illuminate\Support\Facades\Storage; +use Illuminate\Support\Str; class DataSeparationTest extends TestCase { diff --git a/tests/Etc/2019_08_08_000001_add_custom_column.php b/tests/Etc/2019_08_08_000001_add_custom_column.php index 5b5ac3f4..5d68e876 100644 --- a/tests/Etc/2019_08_08_000001_add_custom_column.php +++ b/tests/Etc/2019_08_08_000001_add_custom_column.php @@ -2,9 +2,9 @@ declare(strict_types=1); -use Illuminate\Support\Facades\Schema; -use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class AddCustomColumn extends Migration { diff --git a/tests/Etc/ExampleSeeder.php b/tests/Etc/ExampleSeeder.php index 9d80b32a..a3e36123 100644 --- a/tests/Etc/ExampleSeeder.php +++ b/tests/Etc/ExampleSeeder.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace Stancl\Tenancy\Tests\Etc; -use Illuminate\Support\Str; use Illuminate\Database\Seeder; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Str; class ExampleSeeder extends Seeder { diff --git a/tests/FacadeTest.php b/tests/FacadeTest.php index b7a2e8f7..796e9ce1 100644 --- a/tests/FacadeTest.php +++ b/tests/FacadeTest.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace Stancl\Tenancy\Tests; -use Tenant; use Tenancy; +use Tenant; class FacadeTest extends TestCase { diff --git a/tests/QueueTest.php b/tests/QueueTest.php index 70750f03..132f7163 100644 --- a/tests/QueueTest.php +++ b/tests/QueueTest.php @@ -5,12 +5,12 @@ declare(strict_types=1); namespace Stancl\Tenancy\Tests; use Illuminate\Bus\Queueable; -use Illuminate\Support\Facades\Event; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Queue\Events\JobProcessing; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; +use Illuminate\Queue\Events\JobProcessing; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\Event; class QueueTest extends TestCase { diff --git a/tests/TenantDatabaseManagerTest.php b/tests/TenantDatabaseManagerTest.php index 5b857e45..759e797c 100644 --- a/tests/TenantDatabaseManagerTest.php +++ b/tests/TenantDatabaseManagerTest.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace Stancl\Tenancy\Tests; use Illuminate\Support\Facades\DB; -use Stancl\Tenancy\DatabaseManager; use Illuminate\Support\Facades\Queue; +use Stancl\Tenancy\DatabaseManager; use Stancl\Tenancy\Jobs\QueuedTenantDatabaseCreator; use Stancl\Tenancy\Jobs\QueuedTenantDatabaseDeleter; diff --git a/tests/TenantManagerEventsTest.php b/tests/TenantManagerEventsTest.php index 51aec6b5..5b0bb04b 100644 --- a/tests/TenantManagerEventsTest.php +++ b/tests/TenantManagerEventsTest.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace Stancl\Tenancy\Tests; -use Tenant; use Tenancy; +use Tenant; class TenantManagerEventsTest extends TestCase { diff --git a/tests/TenantStorageTest.php b/tests/TenantStorageTest.php index f5f2dcee..5f95411d 100644 --- a/tests/TenantStorageTest.php +++ b/tests/TenantStorageTest.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace Stancl\Tenancy\Tests; -use Stancl\Tenancy\Tenant; -use Stancl\Tenancy\StorageDrivers\RedisStorageDriver; use Stancl\Tenancy\StorageDrivers\DatabaseStorageDriver; +use Stancl\Tenancy\StorageDrivers\RedisStorageDriver; +use Stancl\Tenancy\Tenant; class TenantStorageTest extends TestCase { diff --git a/tests/TestCase.php b/tests/TestCase.php index 24c3377f..b0657015 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace Stancl\Tenancy\Tests; use Illuminate\Support\Facades\Redis; -use Stancl\Tenancy\StorageDrivers\RedisStorageDriver; use Stancl\Tenancy\StorageDrivers\DatabaseStorageDriver; +use Stancl\Tenancy\StorageDrivers\RedisStorageDriver; abstract class TestCase extends \Orchestra\Testbench\TestCase {