code style fix

add command tests
vitodeploy · Sep 2, 2023 · e1eb420 · e1eb420
1 parent 71f9dab
commit e1eb420
Show file tree

Hide file tree

Showing 135 changed files with 1,859 additions and 135 deletions.
diff --git a/.github/workflows/style-check.yml b/.github/workflows/style-check.yml
@@ -0,0 +1,54 @@
+name: style-check
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  tests:
+    runs-on: ubuntu-20.04
+
+    services:
+      mysql:
+        image: mysql
+        env:
+          MYSQL_DATABASE: test_db
+          MYSQL_USER: user
+          MYSQL_PASSWORD: password
+          MYSQL_ROOT_PASSWORD: rootpassword
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [ 8.1 ]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v2
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
+      - name: Install dependencies
+        if: steps.composer-cache.outputs.cache-hit != 'true'
+        run: composer install --prefer-dist --no-progress --no-suggest
+
+      - name: Run test suite
+        run: php artisan test
+        env:
+          DB_HOST: 127.0.0.1
+          DB_DATABASE: test_db
+          DB_USERNAME: user
+          DB_PASSWORD: password
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -3,25 +3,11 @@ name: tests
 on:
   push:
   pull_request:
-  schedule:
-    - cron: '0 0 * * *'
 
 jobs:
   tests:
     runs-on: ubuntu-20.04
 
-    services:
-      mysql:
-        image: mysql
-        env:
-          MYSQL_DATABASE: test_db
-          MYSQL_USER: user
-          MYSQL_PASSWORD: password
-          MYSQL_ROOT_PASSWORD: rootpassword
-        ports:
-          - 3306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-
     strategy:
       fail-fast: true
       matrix:
@@ -47,10 +33,5 @@ jobs:
         if: steps.composer-cache.outputs.cache-hit != 'true'
         run: composer install --prefer-dist --no-progress --no-suggest
 
-      - name: Run test suite
-        run: php artisan test
-        env:
-          DB_HOST: 127.0.0.1
-          DB_DATABASE: test_db
-          DB_USERNAME: user
-          DB_PASSWORD: password
+      - name: Run pint
+        run: ./vendor/bin/pint --test
diff --git a/app/Actions/Database/CreateBackup.php b/app/Actions/Database/CreateBackup.php
@@ -59,7 +59,7 @@ private function validate($type, Server $server, array $input): void
                     '0 0 * * *',
                     '0 0 * * 0',
                     '0 0 1 * *',
-                    'custom'
+                    'custom',
                 ]),
             ],
         ];

diff --git a/app/Actions/FirewallRule/CreateRule.php b/app/Actions/FirewallRule/CreateRule.php
@@ -6,7 +6,6 @@
 use App\Models\FirewallRule;
 use App\Models\Server;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
 
 class CreateRule

diff --git a/app/Actions/SourceControl/ConnectSourceControl.php b/app/Actions/SourceControl/ConnectSourceControl.php
@@ -15,7 +15,7 @@ public function connect(array $input): void
         $sourceControl = new SourceControl([
             'provider' => $input['provider'],
             'profile' => $input['name'],
-            'access_token' => $input['token']
+            'access_token' => $input['token'],
         ]);
 
         if (! $sourceControl->provider()->connect()) {
@@ -24,7 +24,7 @@ public function connect(array $input): void
                 ),
             ]);
         }
-        
+
         $sourceControl->save();
     }
 
@@ -36,14 +36,14 @@ private function validate(array $input): void
         $rules = [
             'provider' => [
                 'required',
-                Rule::in(\App\Enums\SourceControl::getValues())
+                Rule::in(\App\Enums\SourceControl::getValues()),
             ],
             'name' => [
                 'required',
             ],
             'token' => [
-                'required'
-            ]
+                'required',
+            ],
         ];
         Validator::make($input, $rules)->validate();
     }

diff --git a/app/Actions/StorageProvider/CreateStorageProvider.php b/app/Actions/StorageProvider/CreateStorageProvider.php
@@ -22,15 +22,15 @@ public function create(User $user, array $input): void
             'provider' => $input['provider'],
             'profile' => $input['name'],
             'credentials' => [
-                'token' => $input['token']
-            ]
+                'token' => $input['token'],
+            ],
         ]);
         if (! $storageProvider->provider()->connect()) {
             throw ValidationException::withMessages([
-                'token' => __("Couldn't connect to the provider")
+                'token' => __("Couldn't connect to the provider"),
             ]);
         }
-        $storageProvider->save();;
+        $storageProvider->save();
     }
 
     private function validate(User $user, array $input): void
@@ -45,8 +45,8 @@ private function validate(User $user, array $input): void
                 Rule::unique('storage_providers', 'profile')->where('user_id', $user->id),
             ],
             'token' => [
-                'required'
-            ]
+                'required',
+            ],
         ])->validate();
     }
 }
diff --git a/app/Console/Commands/CreateUserCommand.php b/app/Console/Commands/CreateUserCommand.php
@@ -4,7 +4,6 @@
 
 use App\Models\User;
 use Illuminate\Console\Command;
-use Illuminate\Support\Str;
 
 class CreateUserCommand extends Command
 {
@@ -20,6 +19,6 @@ public function handle(): void
             'password' => bcrypt($this->argument('password')),
         ]);
 
-        $this->info("User created with password");
+        $this->info('User created with password');
     }
 }
diff --git a/app/Contracts/StorageProvider.php b/app/Contracts/StorageProvider.php
@@ -3,7 +3,6 @@
 namespace App\Contracts;
 
 use App\Models\Server;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 
 interface StorageProvider
 {

diff --git a/app/Enums/ServerType.php b/app/Enums/ServerType.php
@@ -7,5 +7,6 @@
 final class ServerType extends Enum
 {
     const REGULAR = 'regular';
+
     const DATABASE = 'database';
 }
diff --git a/app/Helpers/SSH.php b/app/Helpers/SSH.php
@@ -74,11 +74,11 @@ public function connect(bool $sftp = false): void
             $login = $this->connection->login($this->user, $this->privateKey);
 
             if (! $login) {
-                throw new SSHAuthenticationError("Error authenticating");
+                throw new SSHAuthenticationError('Error authenticating');
             }
         } catch (Throwable $e) {
-            Log::error("Error connecting", [
-                "msg" => $e->getMessage()
+            Log::error('Error connecting', [
+                'msg' => $e->getMessage(),
             ]);
             throw $e;
         }

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -64,6 +64,6 @@ class Kernel extends HttpKernel
         'signed' => \App\Http\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
-        'server-is-ready' => ServerIsReadyMiddleware::class
+        'server-is-ready' => ServerIsReadyMiddleware::class,
     ];
 }
diff --git a/app/Http/Livewire/Databases/DatabaseBackupFiles.php b/app/Http/Livewire/Databases/DatabaseBackupFiles.php
@@ -20,9 +20,9 @@ class DatabaseBackupFiles extends Component
 
     public Backup $backup;
 
-    public string $restoreId = "";
+    public string $restoreId = '';
 
-    public string $restoreDatabaseId = "";
+    public string $restoreDatabaseId = '';
 
     public int $deleteId;
 
@@ -61,7 +61,7 @@ public function delete(): void
     public function render(): View
     {
         return view('livewire.databases.database-backup-files', [
-            'files' => $this->backup->files()->orderByDesc('id')->simplePaginate(10)
+            'files' => $this->backup->files()->orderByDesc('id')->simplePaginate(10),
         ]);
     }
 }
diff --git a/app/Http/Livewire/Databases/DatabaseBackups.php b/app/Http/Livewire/Databases/DatabaseBackups.php
@@ -75,7 +75,7 @@ public function render(): View
         return view('livewire.databases.database-backups', [
             'backups' => $this->server->backups,
             'databases' => $this->server->databases,
-            'files' => $this->files
+            'files' => $this->files,
         ]);
     }
 }
diff --git a/app/Jobs/Installation/ContinueInstallation.php b/app/Jobs/Installation/ContinueInstallation.php
@@ -21,6 +21,7 @@ public function handle(): void
     {
         if ($this->server->provider()->isRunning()) {
             $this->server->install();
+
             return;
         }
 
@@ -33,6 +34,7 @@ public function handle(): void
                     'server' => $this->server,
                 ])
             );
+
             return;
         }
 

diff --git a/app/Jobs/Installation/UninstallPHPMyAdmin.php b/app/Jobs/Installation/UninstallPHPMyAdmin.php
@@ -5,7 +5,7 @@
 use App\Jobs\Job;
 use App\Models\FirewallRule;
 use App\Models\Service;
-use App\SSHCommands\PHPMyAdmin\DeleteNginxPHPMyAdminVHost;
+use App\SSHCommands\PHPMyAdmin\DeleteNginxPHPMyAdminVHostCommand;
 use Exception;
 use Throwable;
 
@@ -48,7 +48,7 @@ private function removeFirewallRule(): void
     private function deleteVHost(): void
     {
         $this->service->server->ssh()->exec(
-            new DeleteNginxPHPMyAdminVHost('/home/vito/phpmyadmin'),
+            new DeleteNginxPHPMyAdminVHostCommand('/home/vito/phpmyadmin'),
             'delete-phpmyadmin-vhost'
         );
     }

diff --git a/app/Jobs/Site/Deploy.php b/app/Jobs/Site/Deploy.php
@@ -7,7 +7,7 @@
 use App\Helpers\SSH;
 use App\Jobs\Job;
 use App\Models\Deployment;
-use App\SSHCommands\System\RunScript;
+use App\SSHCommands\System\RunScriptCommand;
 use Throwable;
 
 class Deploy extends Job
@@ -34,7 +34,7 @@ public function handle(): void
     {
         $this->ssh = $this->deployment->site->server->ssh();
         $this->ssh->exec(
-            new RunScript($this->path, $this->script),
+            new RunScriptCommand($this->path, $this->script),
             'deploy',
             $this->deployment->site_id
         );

diff --git a/app/Jobs/Site/DeployKey.php b/app/Jobs/Site/DeployKey.php
@@ -34,7 +34,7 @@ public function handle(): void
         );
         $this->site->save();
         $this->site->sourceControl()->provider()->deployKey(
-            $this->site->domain.'-key-' . $this->site->id,
+            $this->site->domain.'-key-'.$this->site->id,
             $this->site->repository,
             $this->site->ssh_key
         );

diff --git a/app/Listeners/BroadcastListener.php b/app/Listeners/BroadcastListener.php
@@ -15,7 +15,7 @@ public function handle(Broadcast $event): void
     {
         Cache::set('broadcast', [
             'type' => $event->type,
-            'data' => $event->data
+            'data' => $event->data,
         ], now()->addMinutes(5));
     }
 }
diff --git a/app/Models/Site.php b/app/Models/Site.php
@@ -110,7 +110,7 @@ public static function boot(): void
         static::created(function (Site $site) {
             $site->deploymentScript()->create([
                 'name' => 'default',
-                'content' => ''
+                'content' => '',
             ]);
         });
     }

diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -7,7 +7,6 @@
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {

diff --git a/app/SSHCommands/Database/BackupDatabaseCommand.php b/app/SSHCommands/Database/BackupDatabaseCommand.php
@@ -13,7 +13,7 @@ public function __construct(protected string $provider, protected string $databa
 
     public function file(): string
     {
-        return File::get(resource_path(sprintf("commands/database/%s/backup.sh", $this->provider)));
+        return File::get(resource_path(sprintf('commands/database/%s/backup.sh', $this->provider)));
     }
 
     public function content(): string

diff --git a/app/SSHCommands/Database/CreateCommand.php b/app/SSHCommands/Database/CreateCommand.php
@@ -13,7 +13,7 @@ public function __construct(protected string $provider, protected string $name)
 
     public function file(): string
     {
-        return File::get(resource_path(sprintf("commands/database/%s/create.sh", $this->provider)));
+        return File::get(resource_path(sprintf('commands/database/%s/create.sh', $this->provider)));
     }
 
     public function content(): string

diff --git a/app/SSHCommands/Database/CreateUserCommand.php b/app/SSHCommands/Database/CreateUserCommand.php
@@ -17,7 +17,7 @@ public function __construct(
 
     public function file(): string
     {
-        return File::get(resource_path(sprintf("commands/database/%s/create-user.sh", $this->provider)));
+        return File::get(resource_path(sprintf('commands/database/%s/create-user.sh', $this->provider)));
     }
 
     public function content(): string

diff --git a/app/SSHCommands/Database/DeleteCommand.php b/app/SSHCommands/Database/DeleteCommand.php
@@ -13,7 +13,7 @@ public function __construct(protected string $provider, protected string $name)
 
     public function file(): string
     {
-        return File::get(resource_path(sprintf("commands/database/%s/delete.sh", $this->provider)));
+        return File::get(resource_path(sprintf('commands/database/%s/delete.sh', $this->provider)));
     }
 
     public function content(): string

diff --git a/app/SSHCommands/Database/DeleteUserCommand.php b/app/SSHCommands/Database/DeleteUserCommand.php
@@ -13,7 +13,7 @@ public function __construct(protected string $provider, protected string $userna
 
     public function file(): string
     {
-        return File::get(resource_path(sprintf("commands/database/%s/delete-user.sh", $this->provider)));
+        return File::get(resource_path(sprintf('commands/database/%s/delete-user.sh', $this->provider)));
     }
 
     public function content(): string