#591 - php

app/Actions/PHP/ChangeDefaultCli.php

@@ -21,6 +21,13 @@ public function change(Server $server, array $input): void
         $this->validate($server, $input);
         /** @var Service $service */
         $service = $server->php($input['version']);
+
+        if ($service->is_default) {
+            throw ValidationException::withMessages(
+                ['version' => __('This version is already the default CLI')]
+            );
+        }
+
         /** @var PHP $handler */
         $handler = $service->handler();
         $handler->setDefaultCli();

app/Actions/PHP/InstallNewPHP.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Actions\PHP;
-
-use App\Enums\PHP;
-use App\Enums\ServiceStatus;
-use App\Models\Server;
-use App\Models\Service;
-use Illuminate\Validation\Rule;
-
-class InstallNewPHP
-{
-    /**
-     * @param  array<string, mixed>  $input
-     */
-    public function install(Server $server, array $input): void
-    {
-        $php = new Service([
-            'server_id' => $server->id,
-            'type' => 'php',
-            'type_data' => [
-                'extensions' => [],
-                'settings' => config('core.php_settings'),
-            ],
-            'name' => 'php',
-            'version' => $input['version'],
-            'status' => ServiceStatus::INSTALLING,
-            'is_default' => false,
-        ]);
-        $php->save();
-
-        dispatch(function () use ($php): void {
-            $php->handler()->install();
-            $php->status = ServiceStatus::READY;
-            $php->save();
-        })->catch(function () use ($php): void {
-            $php->delete();
-        })->onConnection('ssh');
-    }
-
-    /**
-     * @return array<string, array<string>>
-     */
-    public static function rules(Server $server): array
-    {
-        return [
-            'version' => [
-                'required',
-                Rule::in(config('core.php_versions')),
-                Rule::notIn(array_merge($server->installedPHPVersions(), [PHP::NONE])),
-            ],
-        ];
-    }
-}

app/Actions/PHP/InstallPHPExtension.php

@@ -5,6 +5,7 @@
 use App\Models\Server;
 use App\Models\Service;
 use App\SSH\Services\PHP\PHP;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
 
@@ -12,11 +13,11 @@ class InstallPHPExtension
 {
     /**
      * @param  array<string, mixed>  $input
-     *
-     * @throws ValidationException
      */
     public function install(Server $server, array $input): Service
     {
+        Validator::make($input, self::rules($server))->validate();
+
         /** @var Service $service */
         $service = $server->php($input['version']);
 

app/Actions/PHP/UpdatePHPIni.php

@@ -7,6 +7,7 @@
 use App\Models\Service;
 use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
@@ -21,6 +22,8 @@ class UpdatePHPIni
      */
     public function update(Server $server, array $input): void
     {
+        Validator::make($input, self::rules($server))->validate();
+
         /** @var Service $service */
         $service = $server->php($input['version']);
 

app/Actions/Service/Install.php

@@ -26,6 +26,7 @@ public function install(Server $server, array $input): Service
             'version' => $input['version'],
             'status' => ServiceStatus::INSTALLING,
         ]);
+        $service->is_default = ! $server->defaultService($input['type']);
 
         Validator::make($input, $service->handler()->creationRules($input))->validate();