Merge pull request #193

andrey-helldar · web-flow · commit 95aeedcd1d79 · 2025-03-31T20:14:42.000+03:00
Added suffixes for classes
diff --git a/database/migrations/2022_08_18_180137_change_migration_actions_table.php b/database/migrations/2022_08_18_180137_change_migration_actions_table.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use DragonCode\LaravelDeployOperations\Helpers\Config;
+use DragonCode\LaravelDeployOperations\Helpers\ConfigHelper;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -49,6 +49,6 @@ protected function doesntHaveColumn(string $column): bool
 
     protected function table(): string
     {
-        return app(Config::class)->table();
+        return app(ConfigHelper::class)->table();
     }
 };
diff --git a/database/migrations/2023_01_21_172923_rename_migrations_actions_table_to_actions.php b/database/migrations/2023_01_21_172923_rename_migrations_actions_table_to_actions.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use DragonCode\LaravelDeployOperations\Helpers\Config;
+use DragonCode\LaravelDeployOperations\Helpers\ConfigHelper;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\Schema;
 
@@ -39,6 +39,6 @@ protected function doesntSame(string $first, string $second): bool
 
     protected function table(): string
     {
-        return app(Config::class)->table();
+        return app(ConfigHelper::class)->table();
     }
 };
diff --git a/database/migrations/2024_05_21_112438_rename_actions_table_to_operations.php b/database/migrations/2024_05_21_112438_rename_actions_table_to_operations.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use DragonCode\LaravelDeployOperations\Helpers\Config;
+use DragonCode\LaravelDeployOperations\Helpers\ConfigHelper;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\Schema;
 
@@ -39,6 +39,6 @@ protected function doesntSame(string $first, string $second): bool
 
     protected function table(): string
     {
-        return app(Config::class)->table();
+        return app(ConfigHelper::class)->table();
     }
 };
diff --git a/database/migrations/2024_05_21_114318_rename_column_in_operations_table.php b/database/migrations/2024_05_21_114318_rename_column_in_operations_table.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use DragonCode\LaravelDeployOperations\Helpers\Config;
+use DragonCode\LaravelDeployOperations\Helpers\ConfigHelper;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -27,6 +27,6 @@ protected function rename(string $from, string $to): void
 
     protected function table(): string
     {
-        return app(Config::class)->table();
+        return app(ConfigHelper::class)->table();
     }
 };
diff --git a/src/Concerns/HasAbout.php b/src/Concerns/HasAbout.php
@@ -9,7 +9,7 @@
 use DragonCode\Support\Facades\Helpers\Str;
 use Illuminate\Foundation\Console\AboutCommand;
 
-trait About
+trait HasAbout
 {
     protected string $composer = __DIR__ . '/../../composer.json';
 
diff --git a/src/Concerns/HasArtisan.php b/src/Concerns/HasArtisan.php
@@ -5,12 +5,12 @@
 namespace DragonCode\LaravelDeployOperations\Concerns;
 
 use Illuminate\Console\OutputStyle;
-use Illuminate\Support\Facades\Artisan as Command;
+use Illuminate\Support\Facades\Artisan;
 
-trait Artisan
+trait HasArtisan
 {
     protected function artisan(string $command, array $parameters = [], ?OutputStyle $outputBuffer = null): void
     {
-        Command::call($command, $parameters, $outputBuffer);
+        Artisan::call($command, $parameters, $outputBuffer);
     }
 }
diff --git a/src/Concerns/HasIsolatable.php b/src/Concerns/HasIsolatable.php
@@ -5,15 +5,15 @@
 namespace DragonCode\LaravelDeployOperations\Concerns;
 
 use DragonCode\LaravelDeployOperations\Constants\Options;
-use DragonCode\LaravelDeployOperations\Services\Mutex;
+use DragonCode\LaravelDeployOperations\Services\MutexService;
 
 use function is_numeric;
 
-trait Isolatable
+trait HasIsolatable
 {
-    protected function isolationMutex(): Mutex
+    protected function isolationMutex(): MutexService
     {
-        return app(Mutex::class);
+        return app(MutexService::class);
     }
 
     protected function isolatedStatusCode(): int
diff --git a/src/Concerns/HasOptionable.php b/src/Concerns/HasOptionable.php
@@ -12,7 +12,7 @@
 use function in_array;
 
 /** @mixin \DragonCode\LaravelDeployOperations\Console\Command */
-trait Optionable
+trait HasOptionable
 {
     protected array $arguments = [];
 
diff --git a/src/Console/Command.php b/src/Console/Command.php
@@ -5,10 +5,10 @@
 namespace DragonCode\LaravelDeployOperations\Console;
 
 use DragonCode\LaravelDeployOperations\Concerns\ConfirmableTrait;
-use DragonCode\LaravelDeployOperations\Concerns\Isolatable;
-use DragonCode\LaravelDeployOperations\Concerns\Optionable;
+use DragonCode\LaravelDeployOperations\Concerns\HasIsolatable;
+use DragonCode\LaravelDeployOperations\Concerns\HasOptionable;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
-use DragonCode\LaravelDeployOperations\Values\Options as OptionsData;
+use DragonCode\LaravelDeployOperations\Values\OptionsData;
 use Illuminate\Console\Command as BaseCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -19,8 +19,8 @@
 abstract class Command extends BaseCommand
 {
     use ConfirmableTrait;
-    use Isolatable;
-    use Optionable;
+    use HasIsolatable;
+    use HasOptionable;
 
     protected Processor|string $processor;
 
diff --git a/src/Console/FreshCommand.php b/src/Console/FreshCommand.php
@@ -6,10 +6,10 @@
 
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
-use DragonCode\LaravelDeployOperations\Processors\Fresh as FreshProcessor;
+use DragonCode\LaravelDeployOperations\Processors\FreshProcessor;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
 
-class Fresh extends Command
+class FreshCommand extends Command
 {
     protected $name = Names::Fresh;
 
diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -5,10 +5,10 @@
 namespace DragonCode\LaravelDeployOperations\Console;
 
 use DragonCode\LaravelDeployOperations\Constants\Names;
-use DragonCode\LaravelDeployOperations\Processors\Install as InstallProcessor;
+use DragonCode\LaravelDeployOperations\Processors\InstallProcessor;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
 
-class Install extends Command
+class InstallCommand extends Command
 {
     protected $name = Names::Install;
 
diff --git a/src/Console/MakeCommand.php b/src/Console/MakeCommand.php
@@ -6,10 +6,10 @@
 
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
-use DragonCode\LaravelDeployOperations\Processors\Make as MakeProcessor;
+use DragonCode\LaravelDeployOperations\Processors\MakeProcessor;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
 
-class Make extends Command
+class MakeCommand extends Command
 {
     protected $signature = Names::Make;
 
diff --git a/src/Console/OperationsCommand.php b/src/Console/OperationsCommand.php
@@ -6,10 +6,10 @@
 
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
-use DragonCode\LaravelDeployOperations\Processors\Operations as OperationsProcessor;
+use DragonCode\LaravelDeployOperations\Processors\OperationsProcessor;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
 
-class Operations extends Command
+class OperationsCommand extends Command
 {
     protected $signature = Names::Operations;
 
diff --git a/src/Console/RefreshCommand.php b/src/Console/RefreshCommand.php
@@ -7,9 +7,9 @@
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
-use DragonCode\LaravelDeployOperations\Processors\Refresh as RefreshProcessor;
+use DragonCode\LaravelDeployOperations\Processors\RefreshProcessor;
 
-class Refresh extends Command
+class RefreshCommand extends Command
 {
     protected $name = Names::Refresh;
 
diff --git a/src/Console/ResetCommand.php b/src/Console/ResetCommand.php
@@ -7,9 +7,9 @@
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
-use DragonCode\LaravelDeployOperations\Processors\Reset as ResetProcessor;
+use DragonCode\LaravelDeployOperations\Processors\ResetProcessor;
 
-class Reset extends Command
+class ResetCommand extends Command
 {
     protected $name = Names::Reset;
 
diff --git a/src/Console/RollbackCommand.php b/src/Console/RollbackCommand.php
@@ -7,9 +7,9 @@
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
-use DragonCode\LaravelDeployOperations\Processors\Rollback as RollbackProcessor;
+use DragonCode\LaravelDeployOperations\Processors\RollbackProcessor;
 
-class Rollback extends Command
+class RollbackCommand extends Command
 {
     protected $name = Names::Rollback;
 
diff --git a/src/Console/StatusCommand.php b/src/Console/StatusCommand.php
@@ -7,9 +7,9 @@
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
-use DragonCode\LaravelDeployOperations\Processors\Status as StatusProcessor;
+use DragonCode\LaravelDeployOperations\Processors\StatusProcessor;
 
-class Status extends Command
+class StatusCommand extends Command
 {
     protected $name = Names::Status;
 
diff --git a/src/Helpers/ConfigHelper.php b/src/Helpers/ConfigHelper.php
@@ -12,7 +12,7 @@
 use function rtrim;
 use function str_replace;
 
-class Config
+class ConfigHelper
 {
     public function __construct(
         protected Repository $config
diff --git a/src/Helpers/GitHelper.php b/src/Helpers/GitHelper.php
@@ -11,10 +11,10 @@
 use function rtrim;
 use function sprintf;
 
-class Git
+class GitHelper
 {
     public function __construct(
-        protected Config $config
+        protected ConfigHelper $config
     ) {}
 
     public function currentBranch(?string $path = null): ?string
diff --git a/src/Helpers/SorterHelper.php b/src/Helpers/SorterHelper.php
@@ -10,7 +10,7 @@
 
 use function in_array;
 
-class Sorter
+class SorterHelper
 {
     public function byValues(array $items): array
     {
diff --git a/src/Operation.php b/src/Operation.php
@@ -4,11 +4,11 @@
 
 namespace DragonCode\LaravelDeployOperations;
 
-use DragonCode\LaravelDeployOperations\Concerns\Artisan;
+use DragonCode\LaravelDeployOperations\Concerns\HasArtisan;
 
 abstract class Operation
 {
-    use Artisan;
+    use HasArtisan;
 
     /**
      * Determines the type of launch of the deploy operation.
diff --git a/src/Processors/FreshProcessor.php b/src/Processors/FreshProcessor.php
@@ -7,7 +7,7 @@
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
 
-class Fresh extends Processor
+class FreshProcessor extends Processor
 {
     public function handle(): void
     {
diff --git a/src/Processors/InstallProcessor.php b/src/Processors/InstallProcessor.php
@@ -8,7 +8,7 @@
 use DragonCode\Support\Facades\Filesystem\Path;
 use DragonCode\Support\Facades\Helpers\Str;
 
-class Install extends Processor
+class InstallProcessor extends Processor
 {
     public function handle(): void
     {
diff --git a/src/Processors/MakeProcessor.php b/src/Processors/MakeProcessor.php
@@ -14,7 +14,7 @@
 use function Laravel\Prompts\text;
 use function realpath;
 
-class Make extends Processor
+class MakeProcessor extends Processor
 {
     protected string $fallback = 'auto';
 
diff --git a/src/Processors/OperationsProcessor.php b/src/Processors/OperationsProcessor.php
@@ -14,7 +14,7 @@
 use DragonCode\Support\Facades\Helpers\Str;
 use Throwable;
 
-class Operations extends Processor
+class OperationsProcessor extends Processor
 {
     public function handle(): void
     {
diff --git a/src/Processors/Processor.php b/src/Processors/Processor.php
@@ -5,15 +5,15 @@
 namespace DragonCode\LaravelDeployOperations\Processors;
 
 use Closure;
-use DragonCode\LaravelDeployOperations\Concerns\Artisan;
+use DragonCode\LaravelDeployOperations\Concerns\HasArtisan;
 use DragonCode\LaravelDeployOperations\Enums\MethodEnum;
-use DragonCode\LaravelDeployOperations\Helpers\Config;
-use DragonCode\LaravelDeployOperations\Helpers\Git;
-use DragonCode\LaravelDeployOperations\Helpers\Sorter;
+use DragonCode\LaravelDeployOperations\Helpers\ConfigHelper;
+use DragonCode\LaravelDeployOperations\Helpers\GitHelper;
+use DragonCode\LaravelDeployOperations\Helpers\SorterHelper;
 use DragonCode\LaravelDeployOperations\Notifications\Notification;
 use DragonCode\LaravelDeployOperations\Repositories\OperationsRepository;
-use DragonCode\LaravelDeployOperations\Services\Migrator;
-use DragonCode\LaravelDeployOperations\Values\Options;
+use DragonCode\LaravelDeployOperations\Services\MigratorService;
+use DragonCode\LaravelDeployOperations\Values\OptionsData;
 use DragonCode\Support\Facades\Helpers\Arr;
 use DragonCode\Support\Facades\Helpers\Str;
 use DragonCode\Support\Filesystem\File;
@@ -25,22 +25,22 @@
 
 abstract class Processor
 {
-    use Artisan;
+    use HasArtisan;
 
     abstract public function handle(): void;
 
     public function __construct(
-        protected Options $options,
+        protected OptionsData $options,
         protected InputInterface $input,
         protected OutputStyle $output,
-        protected Config $config,
+        protected ConfigHelper $config,
         protected OperationsRepository $repository,
-        protected Git $git,
+        protected GitHelper $git,
         protected File $file,
-        protected Migrator $migrator,
+        protected MigratorService $migrator,
         protected Notification $notification,
         protected Dispatcher $events,
-        protected Sorter $sorter
+        protected SorterHelper $sorter
     ) {
         $this->notification->setOutput($this->output, $this->options->mute);
         $this->repository->setConnection($this->options->connection);
diff --git a/src/Processors/RefreshProcessor.php b/src/Processors/RefreshProcessor.php
@@ -7,7 +7,7 @@
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
 
-class Refresh extends Processor
+class RefreshProcessor extends Processor
 {
     public function handle(): void
     {
diff --git a/src/Processors/ResetProcessor.php b/src/Processors/ResetProcessor.php
@@ -7,7 +7,7 @@
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
 
-class Reset extends Processor
+class ResetProcessor extends Processor
 {
     public function handle(): void
     {
diff --git a/src/Processors/RollbackProcessor.php b/src/Processors/RollbackProcessor.php
diff --git a/src/Processors/StatusProcessor.php b/src/Processors/StatusProcessor.php
diff --git a/src/Repositories/OperationsRepository.php b/src/Repositories/OperationsRepository.php
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
diff --git a/src/Services/MigratorService.php b/src/Services/MigratorService.php
diff --git a/src/Services/MutexService.php b/src/Services/MutexService.php
diff --git a/src/Values/OptionsData.php b/src/Values/OptionsData.php
diff --git a/tests/Commands/MutexTest.php b/tests/Commands/MutexTest.php
diff --git a/tests/Helpers/GitTest.php b/tests/Helpers/GitTest.php
diff --git a/tests/Helpers/SorterTest.php b/tests/Helpers/SorterTest.php

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-use DragonCode\LaravelDeployOperations\Helpers\Config;`
	`5`	`+use DragonCode\LaravelDeployOperations\Helpers\ConfigHelper;`
`6`	`6`	`use Illuminate\Database\Migrations\Migration;`
`7`	`7`	`use Illuminate\Database\Schema\Blueprint;`
`8`	`8`	`use Illuminate\Support\Facades\Schema;`
`@@ -49,6 +49,6 @@ protected function doesntHaveColumn(string $column): bool`
`49`	`49`
`50`	`50`	`protected function table(): string`
`51`	`51`	`{`
`52`		`- return app(Config::class)->table();`
	`52`	`+ return app(ConfigHelper::class)->table();`
`53`	`53`	`}`
`54`	`54`	`};`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use DragonCode\Support\Facades\Helpers\Str;`
`10`	`10`	`use Illuminate\Foundation\Console\AboutCommand;`
`11`	`11`
`12`		`-trait About`
	`12`	`+trait HasAbout`
`13`	`13`	`{`
`14`	`14`	`protected string $composer = __DIR__ . '/../../composer.json';`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@`
`5`	`5`	`namespace DragonCode\LaravelDeployOperations\Concerns;`
`6`	`6`
`7`	`7`	`use Illuminate\Console\OutputStyle;`
`8`		`-use Illuminate\Support\Facades\Artisan as Command;`
	`8`	`+use Illuminate\Support\Facades\Artisan;`
`9`	`9`
`10`		`-trait Artisan`
	`10`	`+trait HasArtisan`
`11`	`11`	`{`
`12`	`12`	`protected function artisan(string $command, array $parameters = [], ?OutputStyle $outputBuffer = null): void`
`13`	`13`	`{`
`14`		`- Command::call($command, $parameters, $outputBuffer);`
	`14`	`+ Artisan::call($command, $parameters, $outputBuffer);`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,15 @@`
`5`	`5`	`namespace DragonCode\LaravelDeployOperations\Concerns;`
`6`	`6`
`7`	`7`	`use DragonCode\LaravelDeployOperations\Constants\Options;`
`8`		`-use DragonCode\LaravelDeployOperations\Services\Mutex;`
	`8`	`+use DragonCode\LaravelDeployOperations\Services\MutexService;`
`9`	`9`
`10`	`10`	`use function is_numeric;`
`11`	`11`
`12`		`-trait Isolatable`
	`12`	`+trait HasIsolatable`
`13`	`13`	`{`
`14`		`- protected function isolationMutex(): Mutex`
	`14`	`+ protected function isolationMutex(): MutexService`
`15`	`15`	`{`
`16`		`- return app(Mutex::class);`
	`16`	`+ return app(MutexService::class);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`protected function isolatedStatusCode(): int`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`use function in_array;`
`13`	`13`
`14`	`14`	`/** @mixin \DragonCode\LaravelDeployOperations\Console\Command */`
`15`		`-trait Optionable`
	`15`	`+trait HasOptionable`
`16`	`16`	`{`
`17`	`17`	`protected array $arguments = [];`
`18`	`18`