diff --git a/src/Exception/ClickhouseConfigException.php b/src/Exception/ClickhouseConfigException.php index c9920d3..3a207c5 100644 --- a/src/Exception/ClickhouseConfigException.php +++ b/src/Exception/ClickhouseConfigException.php @@ -15,6 +15,4 @@ use Exception; -final class ClickhouseConfigException extends Exception -{ -} +final class ClickhouseConfigException extends Exception {} diff --git a/src/Factory/ClickhouseClientFactory.php b/src/Factory/ClickhouseClientFactory.php index da8ead7..ee02f82 100644 --- a/src/Factory/ClickhouseClientFactory.php +++ b/src/Factory/ClickhouseClientFactory.php @@ -18,13 +18,9 @@ final class ClickhouseClientFactory { - private array $defaultConfig; - public function __construct( - array $defaultConfig - ) { - $this->defaultConfig = $defaultConfig; - } + private array $defaultConfig, + ) {} /** * Creating a new instance of ClickHouse Client. @@ -35,7 +31,7 @@ public function __construct( * @throws ClickhouseConfigException */ public function create( - array $config = [] + array $config = [], ): Client { if (count($config) === 0) { $config = $this->defaultConfig; @@ -65,7 +61,7 @@ public function create( */ private function resolveOptionMutatorMethod( Client $client, - string $option + string $option, ): string { if (method_exists($client, $option)) { return $option; diff --git a/src/Migration/AbstractClickhouseMigration.php b/src/Migration/AbstractClickhouseMigration.php index 57e14b2..4f50a22 100644 --- a/src/Migration/AbstractClickhouseMigration.php +++ b/src/Migration/AbstractClickhouseMigration.php @@ -24,7 +24,7 @@ abstract class AbstractClickhouseMigration public function __construct( ?Client $clickhouseClient = null, - ?string $databaseName = null + ?string $databaseName = null, ) { $this->clickhouseClient = $clickhouseClient ?? app(Client::class); $this->databaseName = $databaseName ?? config('clickhouse.connection.options.database'); diff --git a/src/Migration/MigrationCreator.php b/src/Migration/MigrationCreator.php index 78f7a14..0fda5dc 100644 --- a/src/Migration/MigrationCreator.php +++ b/src/Migration/MigrationCreator.php @@ -17,20 +17,14 @@ class MigrationCreator { - private Filesystem $filesystem; - private ?string $migrationStubFilePath; - public function __construct( - Filesystem $filesystem, - ?string $migrationStubFilePath - ) { - $this->filesystem = $filesystem; - $this->migrationStubFilePath = $migrationStubFilePath; - } + private Filesystem $filesystem, + private ?string $migrationStubFilePath, + ) {} public function create( string $fileName, - string $migrationsDirectoryPath + string $migrationsDirectoryPath, ): ?string { $stubFileContent = $this->getStubFileContent(); @@ -45,7 +39,7 @@ public function create( private function generateMigrationFilePath( string $name, - string $migrationsDirectoryPath + string $migrationsDirectoryPath, ): string { return $migrationsDirectoryPath . '/' . $this->getDatePrefix() . '_' . $name . '.php'; } diff --git a/src/Migration/MigrationRepository.php b/src/Migration/MigrationRepository.php index c49fc16..9c0a854 100644 --- a/src/Migration/MigrationRepository.php +++ b/src/Migration/MigrationRepository.php @@ -18,16 +18,10 @@ final class MigrationRepository { - private Client $client; - private string $table; - public function __construct( - Client $client, - string $table - ) { - $this->client = $client; - $this->table = $table; - } + private Client $client, + private string $table, + ) {} /** * Creating a new table to store migrations. @@ -36,14 +30,14 @@ public function createMigrationRegistryTable(): Statement { return $this->client->write( << $this->table, ], @@ -57,9 +51,9 @@ public function all(): array { $rows = $this->client->select( << $this->table, ], @@ -77,10 +71,10 @@ public function latest(): array { $rows = $this->client->select( << $this->table, ], @@ -99,9 +93,9 @@ public function getLastBatchNumber(): int return $this->client ->select( << $this->table, ], @@ -111,7 +105,7 @@ public function getLastBatchNumber(): int public function add( string $migration, - int $batch + int $batch, ): Statement { return $this->client->insert( $this->table, @@ -124,9 +118,9 @@ public function total(): int { return (int)$this->client->select( << $this->table, ], @@ -137,8 +131,8 @@ public function exists(): bool { return (bool)$this->client->select( << $this->table, ], @@ -150,15 +144,15 @@ public function exists(): bool * @return array|null */ public function find( - string $migration + string $migration, ): ?array { return $this->client->select( << $this->table, 'migration' => $migration, diff --git a/src/Migration/Migrator.php b/src/Migration/Migrator.php index 3b4a33e..588b837 100644 --- a/src/Migration/Migrator.php +++ b/src/Migration/Migrator.php @@ -16,10 +16,10 @@ use ClickHouseDB\Client; use DomainException; use Generator; -use Illuminate\Contracts\Filesystem\FileNotFoundException; -use Illuminate\Support\Str; use Illuminate\Console\OutputStyle; +use Illuminate\Contracts\Filesystem\FileNotFoundException; use Illuminate\Filesystem\Filesystem; +use Illuminate\Support\Str; use ReflectionClass; use Symfony\Component\Finder\SplFileInfo; @@ -27,19 +27,11 @@ final class Migrator { - private Client $client; - private MigrationRepository $repository; - private Filesystem $filesystem; - public function __construct( - Client $client, - MigrationRepository $repository, - Filesystem $files - ) { - $this->client = $client; - $this->filesystem = $files; - $this->repository = $repository; - } + private Client $client, + private MigrationRepository $repository, + private Filesystem $filesystem, + ) {} /** * @throws FileNotFoundException @@ -47,7 +39,7 @@ public function __construct( public function runUp( string $migrationsDirectoryPath, OutputStyle $output, - int $step + int $step, ): void { $migrations = $this->getMigrationsUp($migrationsDirectoryPath); @@ -93,7 +85,7 @@ public function ensureTableExists(): self } private function getMigrationsUp( - string $migrationsDirectoryPath + string $migrationsDirectoryPath, ): Generator { $migrationFiles = $this->getUnAppliedMigrationFiles($migrationsDirectoryPath); @@ -103,7 +95,7 @@ private function getMigrationsUp( } private function getMigrationName( - string $migrationFilePath + string $migrationFilePath, ): string { return str_replace('.php', '', basename($migrationFilePath)); } @@ -112,15 +104,13 @@ private function getMigrationName( * @return list */ private function getUnAppliedMigrationFiles( - string $migrationsDirectoryPath + string $migrationsDirectoryPath, ): array { $migrationFiles = $this->filesystem->files($migrationsDirectoryPath); return collect($migrationFiles) ->reject( - fn(SplFileInfo $migrationFile) => $this->isAppliedMigration( - $migrationFile->getFilename(), - ), + fn(SplFileInfo $migrationFile) => $this->isAppliedMigration($migrationFile->getFilename()), )->all(); } @@ -128,7 +118,7 @@ private function getUnAppliedMigrationFiles( * @throws FileNotFoundException */ private function resolveMigrationInstance( - string $path + string $path, ): object { $class = $this->generateMigrationClassName($this->getMigrationName($path)); @@ -142,7 +132,7 @@ private function resolveMigrationInstance( } private function generateMigrationClassName( - string $migrationName + string $migrationName, ): string { return Str::studly( implode('_', array_slice(explode('_', $migrationName), 4)), @@ -150,7 +140,7 @@ private function generateMigrationClassName( } private function resolveMigrationNameFromInstance( - object $migration + object $migration, ): string { $reflectionClass = new ReflectionClass($migration); @@ -162,7 +152,7 @@ private function resolveMigrationNameFromInstance( } private function isAppliedMigration( - string $fileName + string $fileName, ): bool { return in_array( $this->getMigrationName($fileName), diff --git a/stubs/clickhouse-migration.stub b/stubs/clickhouse-migration.stub index 7202220..b66a70a 100644 --- a/stubs/clickhouse-migration.stub +++ b/stubs/clickhouse-migration.stub @@ -9,9 +9,9 @@ return new class extends AbstractClickhouseMigration public function up(): void { $this->clickhouseClient->write( - << 150, 'connectTimeOut' => 151, ], - ] + ], ); $client = $clickhouse->create(); @@ -61,7 +61,7 @@ public function testInitializationWithNonExistsOption(): void 'connectTimeOut' => 151, 'nonExistsOption' => 'value', ], - ] + ], ); try {