level 7

saeedvaziry · saeedvaziry · commit 4900d3fbf5db · 2025-03-09T14:55:23.000+01:00
diff --git a/app/Actions/Database/DeleteDatabase.php b/app/Actions/Database/DeleteDatabase.php
@@ -9,7 +9,9 @@ class DeleteDatabase
 {
     public function delete(Server $server, Database $database): void
     {
-        $server->database()->handler()->delete($database->name);
+        /** @var \App\SSH\Services\Database\Database $handler */
+        $handler = $server->database()->handler();
+        $handler->delete($database->name);
         $database->delete();
     }
 }
diff --git a/app/Actions/Database/DeleteDatabaseUser.php b/app/Actions/Database/DeleteDatabaseUser.php
@@ -9,7 +9,9 @@ class DeleteDatabaseUser
 {
     public function delete(Server $server, DatabaseUser $databaseUser): void
     {
-        $server->database()->handler()->deleteUser($databaseUser->username, $databaseUser->host);
+        /** @var \App\SSH\Services\Database\Database $handler */
+        $handler = $server->database()->handler();
+        $handler->deleteUser($databaseUser->username, $databaseUser->host);
         $databaseUser->delete();
     }
 }
diff --git a/app/Actions/Database/LinkUser.php b/app/Actions/Database/LinkUser.php
@@ -32,14 +32,17 @@ public function link(DatabaseUser $databaseUser, array $input): DatabaseUser
 
         $databaseUser->databases = $input['databases'];
 
+        /** @var \App\SSH\Services\Database\Database $handler */
+        $handler = $databaseUser->server->database()->handler();
+
         // Unlink the user from all databases
-        $databaseUser->server->database()->handler()->unlink(
+        $handler->unlink(
             $databaseUser->username,
             $databaseUser->host
         );
 
         // Link the user to the selected databases
-        $databaseUser->server->database()->handler()->link(
+        $handler->link(
             $databaseUser->username,
             $databaseUser->host,
             $databaseUser->databases
diff --git a/app/Actions/Monitoring/UpdateMetricSettings.php b/app/Actions/Monitoring/UpdateMetricSettings.php
@@ -12,8 +12,9 @@ class UpdateMetricSettings
     public function update(Server $server, array $input): void
     {
         $service = $server->monitoring();
-
-        $data = $service->handler()->data();
+        /** @var \App\SSH\Services\ServiceInterface $handler */
+        $handler = $service->handler();
+        $data = $handler->data();
         $data['data_retention'] = $input['data_retention'];
         $service->type_data = $data;
         $service->save();
diff --git a/app/Actions/NotificationChannels/AddChannel.php b/app/Actions/NotificationChannels/AddChannel.php
@@ -53,7 +53,7 @@ public function add(User $user, array $input): void
 
     /**
      * @param  array<string, mixed>  $input
-     * @return array<string, array<string>>
+     * @return array<string, mixed>
      */
     public static function rules(array $input): array
     {
diff --git a/app/Actions/SSL/CreateSSL.php b/app/Actions/SSL/CreateSSL.php
@@ -57,7 +57,7 @@ public function create(Site $site, array $input): void
 
     /**
      * @param  array<string, mixed>  $input
-     * @return array<string, array<string>>
+     * @return array<string, mixed>
      */
     public static function rules(array $input): array
     {
diff --git a/app/Actions/Server/CreateServer.php b/app/Actions/Server/CreateServer.php
@@ -119,7 +119,7 @@ private function install(Server $server): void
 
     /**
      * @param  array<string, mixed>  $input
-     * @return array<string, array<string>>
+     * @return array<string, mixed>
      */
     public static function rules(Project $project, array $input): array
     {
diff --git a/app/Actions/ServerProvider/CreateServerProvider.php b/app/Actions/ServerProvider/CreateServerProvider.php
@@ -45,13 +45,15 @@ public function create(User $user, Project $project, array $input): ServerProvid
     private static function getProvider(string $name): ServerProviderContract
     {
         $providerClass = config('core.server_providers_class.'.$name);
+        /** @var ServerProviderContract $provider */
+        $provider = new $providerClass;
 
-        return new $providerClass;
+        return $provider;
     }
 
     /**
      * @param  array<string, mixed>  $input
-     * @return array<string, array<string>>
+     * @return array<string, mixed>
      */
     public static function rules(array $input): array
     {
diff --git a/app/Actions/Site/CreateSite.php b/app/Actions/Site/CreateSite.php
@@ -103,7 +103,7 @@ public function create(Server $server, array $input): Site
 
     /**
      * @param  array<string, mixed>  $input
-     * @return array<string, array<string>>
+     * @return array<string, mixed>
      */
     public static function rules(Server $server, array $input): array
     {
diff --git a/app/Actions/StorageProvider/CreateStorageProvider.php b/app/Actions/StorageProvider/CreateStorageProvider.php
@@ -45,7 +45,7 @@ public function create(User $user, Project $project, array $input): StorageProvi
 
     /**
      * @param  array<string, mixed>  $input
-     * @return array<string, array<mixed>>
+     * @return array<string, mixed>
      */
     public static function rules(array $input): array
     {
diff --git a/app/Helpers/FTP.php b/app/Helpers/FTP.php
@@ -15,22 +15,22 @@ public function connect(string $host, int $port, bool $ssl = false): bool|Connec
         return ftp_connect($host, $port, 5);
     }
 
-    public function login(string $username, string $password, bool|Connection $connection): bool
+    public function login(string $username, string $password, Connection $connection): bool
     {
         return ftp_login($connection, $username, $password);
     }
 
-    public function close(bool|Connection $connection): void
+    public function close(Connection $connection): void
     {
         ftp_close($connection);
     }
 
-    public function passive(bool|Connection $connection, bool $passive): bool
+    public function passive(Connection $connection, bool $passive): bool
     {
         return ftp_pasv($connection, $passive);
     }
 
-    public function delete(bool|Connection $connection, string $path): bool
+    public function delete(Connection $connection, string $path): bool
     {
         return ftp_delete($connection, $path);
     }
diff --git a/app/Helpers/SSH.php b/app/Helpers/SSH.php
@@ -46,7 +46,7 @@ public function init(Server $server, ?string $asUser = null): self
             $this->asUser = $asUser;
         }
         $this->privateKey = PublicKeyLoader::loadPrivateKey(
-            file_get_contents($this->server->sshKey()['private_key_path'])
+            (string) file_get_contents($this->server->sshKey()['private_key_path'])
         );
 
         return $this;
diff --git a/app/Models/NotificationChannel.php b/app/Models/NotificationChannel.php
@@ -43,7 +43,10 @@ public function provider(): \App\NotificationChannels\NotificationChannel
     {
         $class = config('core.notification_channels_providers_class')[$this->provider];
 
-        return new $class($this);
+        /** @var \App\NotificationChannels\NotificationChannel $provider */
+        $provider = new $class($this);
+
+        return $provider;
     }
 
     public static function notifyAll(NotificationInterface $notification): void
diff --git a/app/Models/Server.php b/app/Models/Server.php
@@ -46,7 +46,7 @@
  * @property bool $auto_update
  * @property int $available_updates
  * @property int $security_updates
- * @property int $progress
+ * @property int|float $progress
  * @property string $progress_step
  * @property Project $project
  * @property User $creator
@@ -107,7 +107,7 @@ class Server extends AbstractModel
         'auto_update' => 'boolean',
         'available_updates' => 'integer',
         'security_updates' => 'integer',
-        'progress' => 'integer',
+        'progress' => 'float',
         'updates' => 'integer',
         'last_update_check' => 'datetime',
     ];
@@ -413,14 +413,20 @@ public function type(): ServerType
     {
         $typeClass = config('core.server_types_class')[$this->type];
 
-        return new $typeClass($this);
+        /** @var ServerType $type */
+        $type = new $typeClass($this);
+
+        return $type;
     }
 
     public function provider(): \App\ServerProviders\ServerProvider
     {
         $providerClass = config('core.server_providers_class')[$this->provider];
 
-        return new $providerClass($this->serverProvider, $this);
+        /** @var \App\ServerProviders\ServerProvider $provider */
+        $provider = new $providerClass($this->serverProvider, $this);
+
+        return $provider;
     }
 
     public function webserver(?string $version = null): ?Service
diff --git a/app/Models/ServerProvider.php b/app/Models/ServerProvider.php
@@ -68,7 +68,10 @@ public function provider(): \App\ServerProviders\ServerProvider
     {
         $providerClass = config('core.server_providers_class')[$this->provider];
 
-        return new $providerClass($this);
+        /** @var \App\ServerProviders\ServerProvider $provider */
+        $provider = new $providerClass($this);
+
+        return $provider;
     }
 
     /**
diff --git a/app/Models/Service.php b/app/Models/Service.php
@@ -90,7 +90,10 @@ public function handler(): ServiceInterface|Webserver|PHP|Firewall|\App\SSH\Serv
     {
         $handler = config('core.service_handlers')[$this->name];
 
-        return new $handler($this);
+        /** @var ServiceInterface $service */
+        $service = new $handler($this);
+
+        return $service;
     }
 
     /**
diff --git a/app/Models/Site.php b/app/Models/Site.php
@@ -235,7 +235,10 @@ public function type(): SiteType
     {
         $typeClass = config('core.site_types_class.'.$this->type);
 
-        return new $typeClass($this);
+        /** @var SiteType $type */
+        $type = new $typeClass($this);
+
+        return $type;
     }
 
     public function php(): ?Service
diff --git a/app/Models/SourceControl.php b/app/Models/SourceControl.php
@@ -43,7 +43,10 @@ public function provider(): SourceControlProvider
     {
         $providerClass = config('core.source_control_providers_class')[$this->provider];
 
-        return new $providerClass($this);
+        /** @var SourceControlProvider $provider */
+        $provider = new $providerClass($this);
+
+        return $provider;
     }
 
     public function getRepo(?string $repo = null): mixed
diff --git a/app/Models/StorageProvider.php b/app/Models/StorageProvider.php
@@ -46,7 +46,10 @@ public function provider(): \App\StorageProviders\StorageProvider
     {
         $providerClass = config('core.storage_providers_class')[$this->provider];
 
-        return new $providerClass($this);
+        /** @var \App\StorageProviders\StorageProvider $provider */
+        $provider = new $providerClass($this);
+
+        return $provider;
     }
 
     /**
diff --git a/app/Providers/DemoServiceProvider.php b/app/Providers/DemoServiceProvider.php
@@ -50,7 +50,8 @@ public function boot(): void
         }
 
         // get all classes inside App\Models namespace
-        $models = collect(scandir(app_path('Models')))
+        $files = scandir(app_path('Models')) ?: [];
+        $models = collect($files)
             ->filter(fn ($file): bool => ! in_array($file, ['.', '..']))
             ->map(fn ($file) => 'App\\Models\\'.str_replace('.php', '', $file));
 
diff --git a/app/SSH/Services/Database/AbstractDatabase.php b/app/SSH/Services/Database/AbstractDatabase.php
@@ -24,8 +24,12 @@ abstract class AbstractDatabase extends AbstractService implements Database
 
     protected bool $removeLastRow = false;
 
+    /**
+     * @phpstan-return view-string
+     */
     protected function getScriptView(string $script): string
     {
+        /** @phpstan-ignore-next-line */
         return 'ssh.services.database.'.$this->service->name.'.'.$script;
     }
 
@@ -354,7 +358,8 @@ protected function tableToArray(string $data, bool $keepHeader = false): array
 
         $rows = [];
         foreach ($lines as $line) {
-            $row = explode($this->separator, $line);
+            $separator = ! empty($this->separator) ? $this->separator : "\t";
+            $row = explode($separator, $line);
             $row = array_map('trim', $row);
             $rows[] = $row;
         }
diff --git a/app/SSH/Services/Database/Database.php b/app/SSH/Services/Database/Database.php
@@ -3,8 +3,9 @@
 namespace App\SSH\Services\Database;
 
 use App\Models\BackupFile;
+use App\SSH\Services\ServiceInterface;
 
-interface Database
+interface Database extends ServiceInterface
 {
     public function create(string $name, string $charset, string $collation): void;
 
diff --git a/app/SSH/Services/Firewall/Firewall.php b/app/SSH/Services/Firewall/Firewall.php
@@ -2,7 +2,9 @@
 
 namespace App\SSH\Services\Firewall;
 
-interface Firewall
+use App\SSH\Services\ServiceInterface;
+
+interface Firewall extends ServiceInterface
 {
     public function applyRules(): void;
 }
diff --git a/app/SSH/Services/PHP/PHP.php b/app/SSH/Services/PHP/PHP.php
@@ -97,7 +97,11 @@ public function installExtension(string $name): void
             ]),
             'install-php-extension-'.$name
         );
-        $result = Str::substr($result, strpos($result, '[PHP Modules]'));
+        $pos = strpos($result, '[PHP Modules]');
+        if ($pos === false) {
+            throw new SSHCommandError('Failed to install extension');
+        }
+        $result = Str::substr($result, $pos);
         if (! Str::contains($result, $name)) {
             throw new SSHCommandError('Failed to install extension');
         }
diff --git a/app/SSH/Services/ProcessManager/ProcessManager.php b/app/SSH/Services/ProcessManager/ProcessManager.php
@@ -2,7 +2,9 @@
 
 namespace App\SSH\Services\ProcessManager;
 
-interface ProcessManager
+use App\SSH\Services\ServiceInterface;
+
+interface ProcessManager extends ServiceInterface
 {
     public function create(
         int $id,
diff --git a/app/SSH/Services/Webserver/Webserver.php b/app/SSH/Services/Webserver/Webserver.php
@@ -4,8 +4,9 @@
 
 use App\Models\Site;
 use App\Models\Ssl;
+use App\SSH\Services\ServiceInterface;
 
-interface Webserver
+interface Webserver extends ServiceInterface
 {
     public function createVHost(Site $site): void;
 
diff --git a/app/ServerTypes/AbstractType.php b/app/ServerTypes/AbstractType.php
@@ -53,7 +53,7 @@ protected function createUser(): void
         $this->server->save();
     }
 
-    protected function progress(int $percentage, ?string $step = null): void
+    protected function progress(int|float $percentage, ?string $step = null): void
     {
         $this->server->progress = $percentage;
         $this->server->progress_step = $step;
diff --git a/app/SourceControlProviders/Gitlab.php b/app/SourceControlProviders/Gitlab.php
@@ -54,7 +54,7 @@ public function getRepo(?string $repo = null): mixed
 
     public function fullRepoUrl(string $repo, string $key): string
     {
-        $host = parse_url($this->getApiUrl())['host'];
+        $host = parse_url($this->getApiUrl())['host'] ?? 'gitlab.com';
 
         return sprintf('git@%s-%s:%s.git', $host, $key, $repo);
     }
diff --git a/app/Support/Testing/SSHFake.php b/app/Support/Testing/SSHFake.php
@@ -84,7 +84,7 @@ public function upload(string $local, string $remote, ?string $owner = null): vo
     {
         $this->uploadedLocalPath = $local;
         $this->uploadedRemotePath = $remote;
-        $this->uploadedContent = file_get_contents($local);
+        $this->uploadedContent = file_get_contents($local) ?: '';
         $this->log = null;
     }
 
diff --git a/app/Support/helpers.php b/app/Support/helpers.php
diff --git a/app/Web/Pages/Scripts/Executions.php b/app/Web/Pages/Scripts/Executions.php
diff --git a/app/Web/Pages/Servers/Sites/Widgets/SiteDetails.php b/app/Web/Pages/Servers/Sites/Widgets/SiteDetails.php
diff --git a/app/Web/Pages/Servers/Widgets/ServerDetails.php b/app/Web/Pages/Servers/Widgets/ServerDetails.php
diff --git a/app/Web/Pages/Settings/Profile/Widgets/BrowserSession.php b/app/Web/Pages/Settings/Profile/Widgets/BrowserSession.php
diff --git a/composer.json b/composer.json
diff --git a/composer.lock b/composer.lock
diff --git a/config/cache.php b/config/cache.php
diff --git a/config/database.php b/config/database.php
diff --git a/config/session.php b/config/session.php
diff --git a/phpstan.neon b/phpstan.neon

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@ class DeleteDatabase`
`9`	`9`	`{`
`10`	`10`	`public function delete(Server $server, Database $database): void`
`11`	`11`	`{`
`12`		`- $server->database()->handler()->delete($database->name);`
	`12`	`+ /** @var \App\SSH\Services\Database\Database $handler */`
	`13`	`+ $handler = $server->database()->handler();`
	`14`	`+ $handler->delete($database->name);`
`13`	`15`	`$database->delete();`
`14`	`16`	`}`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@ class DeleteDatabaseUser`
`9`	`9`	`{`
`10`	`10`	`public function delete(Server $server, DatabaseUser $databaseUser): void`
`11`	`11`	`{`
`12`		`- $server->database()->handler()->deleteUser($databaseUser->username, $databaseUser->host);`
	`12`	`+ /** @var \App\SSH\Services\Database\Database $handler */`
	`13`	`+ $handler = $server->database()->handler();`
	`14`	`+ $handler->deleteUser($databaseUser->username, $databaseUser->host);`
`13`	`15`	`$databaseUser->delete();`
`14`	`16`	`}`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function add(User $user, array $input): void`
`53`	`53`
`54`	`54`	`/**`
`55`	`55`	`* @param array<string, mixed> $input`
`56`		`- * @return array<string, array<string>>`
	`56`	`+ * @return array<string, mixed>`
`57`	`57`	`*/`
`58`	`58`	`public static function rules(array $input): array`
`59`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function create(Site $site, array $input): void`
`57`	`57`
`58`	`58`	`/**`
`59`	`59`	`* @param array<string, mixed> $input`
`60`		`- * @return array<string, array<string>>`
	`60`	`+ * @return array<string, mixed>`
`61`	`61`	`*/`
`62`	`62`	`public static function rules(array $input): array`
`63`	`63`	`{`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ private function install(Server $server): void`
`119`	`119`
`120`	`120`	`/**`
`121`	`121`	`* @param array<string, mixed> $input`
`122`		`- * @return array<string, array<string>>`
	`122`	`+ * @return array<string, mixed>`
`123`	`123`	`*/`
`124`	`124`	`public static function rules(Project $project, array $input): array`
`125`	`125`	`{`
Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,15 @@ public function create(User $user, Project $project, array $input): ServerProvid`
`45`	`45`	`private static function getProvider(string $name): ServerProviderContract`
`46`	`46`	`{`
`47`	`47`	`$providerClass = config('core.server_providers_class.'.$name);`
	`48`	`+ /** @var ServerProviderContract $provider */`
	`49`	`+ $provider = new $providerClass;`
`48`	`50`
`49`		`- return new $providerClass;`
	`51`	`+ return $provider;`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`/**`
`53`	`55`	`* @param array<string, mixed> $input`
`54`		`- * @return array<string, array<string>>`
	`56`	`+ * @return array<string, mixed>`
`55`	`57`	`*/`
`56`	`58`	`public static function rules(array $input): array`
`57`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function create(Server $server, array $input): Site`
`103`	`103`
`104`	`104`	`/**`
`105`	`105`	`* @param array<string, mixed> $input`
`106`		`- * @return array<string, array<string>>`
	`106`	`+ * @return array<string, mixed>`
`107`	`107`	`*/`
`108`	`108`	`public static function rules(Server $server, array $input): array`
`109`	`109`	`{`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function create(User $user, Project $project, array $input): StorageProvi`
`45`	`45`
`46`	`46`	`/**`
`47`	`47`	`* @param array<string, mixed> $input`
`48`		`- * @return array<string, array<mixed>>`
	`48`	`+ * @return array<string, mixed>`
`49`	`49`	`*/`
`50`	`50`	`public static function rules(array $input): array`
`51`	`51`	`{`