level 4

saeedvaziry · saeedvaziry · commit 7f70d1badfb6 · 2025-03-08T11:51:44.000+01:00
diff --git a/app/Actions/Site/CreateSite.php b/app/Actions/Site/CreateSite.php
@@ -40,7 +40,7 @@ public function create(Server $server, array $input): Site
             // check has access to repository
             try {
                 if ($site->sourceControl) {
-                    $site->sourceControl?->getRepo($site->repository);
+                    $site->sourceControl->getRepo($site->repository);
                 }
             } catch (SourceControlIsNotConnected) {
                 throw ValidationException::withMessages([
diff --git a/app/Actions/Site/UpdateBranch.php b/app/Actions/Site/UpdateBranch.php
@@ -5,12 +5,10 @@
 use App\Exceptions\SSHError;
 use App\Models\Site;
 use App\SSH\Git\Git;
-use Illuminate\Validation\ValidationException;
 
 class UpdateBranch
 {
     /**
-     * @throws ValidationException
      * @throws SSHError
      */
     public function update(Site $site, array $input): void
@@ -21,9 +19,6 @@ public function update(Site $site, array $input): void
         $site->save();
     }
 
-    /**
-     * @throws ValidationException
-     */
     public static function rules(): array
     {
         return [
diff --git a/app/Actions/Site/UpdateDeploymentScript.php b/app/Actions/Site/UpdateDeploymentScript.php
@@ -3,23 +3,16 @@
 namespace App\Actions\Site;
 
 use App\Models\Site;
-use Illuminate\Validation\ValidationException;
 
 class UpdateDeploymentScript
 {
-    /**
-     * @throws ValidationException
-     */
     public function update(Site $site, array $input): void
     {
         $script = $site->deploymentScript;
         $script->content = $input['script'];
         $script->save();
     }
 
-    /**
-     * @throws ValidationException
-     */
     public static function rules(): array
     {
         return [
diff --git a/app/Actions/Site/UpdateSourceControl.php b/app/Actions/Site/UpdateSourceControl.php
@@ -16,7 +16,7 @@ public function update(Site $site, array $input): void
         $site->source_control_id = $input['source_control'];
         try {
             if ($site->sourceControl) {
-                $site->sourceControl?->getRepo($site->repository);
+                $site->sourceControl->getRepo($site->repository);
             }
         } catch (SourceControlIsNotConnected) {
             throw ValidationException::withMessages([
diff --git a/app/Actions/SshKey/CreateSshKey.php b/app/Actions/SshKey/CreateSshKey.php
@@ -24,9 +24,6 @@ public function create(User $user, array $input): SshKey
         return $key;
     }
 
-    /**
-     * @throws ValidationException
-     */
     public static function rules(): array
     {
         return [
diff --git a/app/Actions/StorageProvider/EditStorageProvider.php b/app/Actions/StorageProvider/EditStorageProvider.php
@@ -4,7 +4,6 @@
 
 use App\Models\Project;
 use App\Models\StorageProvider;
-use Illuminate\Validation\ValidationException;
 
 class EditStorageProvider
 {
@@ -18,9 +17,6 @@ public function edit(StorageProvider $storageProvider, Project $project, array $
         return $storageProvider;
     }
 
-    /**
-     * @throws ValidationException
-     */
     public static function rules(): array
     {
         return [
diff --git a/app/Actions/User/UpdateProjects.php b/app/Actions/User/UpdateProjects.php
@@ -20,7 +20,7 @@ public function update(User $user, array $input): void
 
         $user->refresh();
 
-        /** @var Project $firstProject */
+        /** @var ?Project $firstProject */
         $firstProject = $user->projects->first();
         if (! $user->currentProject && $firstProject) {
             $user->current_project_id = $firstProject->id;
diff --git a/app/Models/Deployment.php b/app/Models/Deployment.php
@@ -16,7 +16,7 @@
  * @property string $status
  * @property Site $site
  * @property DeploymentScript $deploymentScript
- * @property ServerLog $log
+ * @property ?ServerLog $log
  */
 class Deployment extends AbstractModel
 {
diff --git a/app/Models/FirewallRule.php b/app/Models/FirewallRule.php
@@ -47,6 +47,7 @@ public function getStatusColor(): string
             FirewallRuleStatus::DELETING => 'warning',
             FirewallRuleStatus::READY => 'success',
             FirewallRuleStatus::FAILED => 'danger',
+            default => 'secondary',
         };
     }
 
diff --git a/app/Models/Metric.php b/app/Models/Metric.php
@@ -10,13 +10,13 @@
 /**
  * @property int $id
  * @property int $server_id
- * @property float $load
- * @property float $memory_total
- * @property float $memory_used
- * @property float $memory_free
- * @property float $disk_total
- * @property float $disk_used
- * @property float $disk_free
+ * @property ?float $load
+ * @property ?float $memory_total
+ * @property ?float $memory_used
+ * @property ?float $memory_free
+ * @property ?float $disk_total
+ * @property ?float $disk_used
+ * @property ?float $disk_free
  * @property-read float|int $memory_total_in_bytes
  * @property-read float|int $memory_used_in_bytes
  * @property-read float|int $memory_free_in_bytes
@@ -60,31 +60,31 @@ public function server(): BelongsTo
 
     public function getMemoryTotalInBytesAttribute(): float|int
     {
-        return $this->memory_total * 1024;
+        return ($this->memory_total ?? 0) * 1024;
     }
 
     public function getMemoryUsedInBytesAttribute(): float|int
     {
-        return $this->memory_used * 1024;
+        return ($this->memory_used ?? 0) * 1024;
     }
 
     public function getMemoryFreeInBytesAttribute(): float|int
     {
-        return $this->memory_free * 1024;
+        return ($this->memory_free ?? 0) * 1024;
     }
 
     public function getDiskTotalInBytesAttribute(): float|int
     {
-        return $this->disk_total * (1024 * 1024);
+        return ($this->disk_total ?? 0) * (1024 * 1024);
     }
 
     public function getDiskUsedInBytesAttribute(): float|int
     {
-        return $this->disk_used * (1024 * 1024);
+        return ($this->disk_used ?? 0) * (1024 * 1024);
     }
 
     public function getDiskFreeInBytesAttribute(): float|int
     {
-        return $this->disk_free * (1024 * 1024);
+        return ($this->disk_free ?? 0) * (1024 * 1024);
     }
 }
diff --git a/app/Models/Server.php b/app/Models/Server.php
@@ -64,7 +64,7 @@
  * @property Tag[] $tags
  * @property string $hostname
  * @property int $updates
- * @property Carbon $last_update_check
+ * @property ?Carbon $last_update_check
  */
 class Server extends AbstractModel
 {
@@ -295,15 +295,15 @@ public function service($type, $version = null): ?Service
 
     public function defaultService($type): ?Service
     {
-        /** @var Service $service */
+        /** @var ?Service $service */
         $service = $this->services()
             ->where('type', $type)
             ->where('is_default', 1)
             ->first();
 
         // If no default service found, get the first service with status ready or stopped
         if (! $service) {
-            /** @var Service $service */
+            /** @var ?Service $service */
             $service = $this->services()
                 ->where('type', $type)
                 ->whereIn('status', [ServiceStatus::READY, ServiceStatus::STOPPED])
diff --git a/app/Models/ServerLog.php b/app/Models/ServerLog.php
@@ -12,7 +12,17 @@
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Throwable;
 
-final class ServerLog extends AbstractModel
+/**
+ * @property int $server_id
+ * @property ?int $site_id
+ * @property string $type
+ * @property string $name
+ * @property string $disk
+ * @property bool $is_remote
+ * @property Server $server
+ * @property ?Site $site
+ */
+class ServerLog extends AbstractModel
 {
     use HasFactory;
 
@@ -165,12 +175,12 @@ public function forSite(Site|int $site): ServerLog
     {
         if ($site instanceof Site) {
             $site = $site->id;
-        }
 
-        if (is_int($site)) {
-            $this->site_id = $site;
+            return $this;
         }
 
+        $this->site_id = $site;
+
         return $this;
     }
 }
diff --git a/app/Models/ServerProvider.php b/app/Models/ServerProvider.php
@@ -17,7 +17,7 @@
  * @property User $user
  * @property ?int $project_id
  * @property Server[] $servers
- * @property Project $project
+ * @property ?Project $project
  */
 class ServerProvider extends AbstractModel
 {
diff --git a/app/Models/Site.php b/app/Models/Site.php
@@ -43,7 +43,7 @@
  * @property Deployment[] $deployments
  * @property Command[] $commands
  * @property ?GitHook $gitHook
- * @property DeploymentScript $deploymentScript
+ * @property ?DeploymentScript $deploymentScript
  * @property Queue[] $queues
  * @property Ssl[] $ssls
  * @property ?Ssl $activeSsl
@@ -324,7 +324,7 @@ public function environmentVariables(?Deployment $deployment = null): array
             'DOMAIN' => $this->domain,
             'BRANCH' => $this->branch ?? '',
             'REPOSITORY' => $this->repository ?? '',
-            'COMMIT_ID' => $deployment?->commit_id ?? '',
+            'COMMIT_ID' => $deployment->commit_id ?? '',
             'PHP_VERSION' => $this->php_version,
             'PHP_PATH' => '/usr/bin/php'.$this->php_version,
         ];
diff --git a/app/Models/Ssl.php b/app/Models/Ssl.php
@@ -17,7 +17,7 @@
  * @property Carbon $expires_at
  * @property string $status
  * @property Site $site
- * @property ?array $domains
+ * @property array|string|null $domains
  * @property int $log_id
  * @property string $email
  * @property bool $is_active
diff --git a/app/Models/StorageProvider.php b/app/Models/StorageProvider.php
@@ -13,7 +13,7 @@
  * @property string $provider
  * @property array $credentials
  * @property User $user
- * @property int $project_id
+ * @property ?int $project_id
  */
 class StorageProvider extends AbstractModel
 {
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -36,7 +36,7 @@
  * @property string $profile_photo_url
  * @property string $timezone
  * @property ?int $current_project_id
- * @property Project $currentProject
+ * @property ?Project $currentProject
  * @property Collection<Project> $projects
  * @property string $role
  * @property Carbon $created_at
@@ -126,7 +126,7 @@ public function currentProject(): HasOne
 
     public function createDefaultProject(): Project
     {
-        /** @var Project $project */
+        /** @var ?Project $project */
         $project = $this->projects()->first();
 
         if (! $project) {
diff --git a/app/Support/Testing/FTPFake.php b/app/Support/Testing/FTPFake.php
@@ -55,6 +55,5 @@ public function assertConnected(string $host): void
         if (! $connected) {
             Assert::fail('The expected host is not connected');
         }
-        Assert::assertTrue(true, $connected);
     }
 }
diff --git a/app/Support/Testing/SSHFake.php b/app/Support/Testing/SSHFake.php
@@ -109,7 +109,6 @@ public function assertExecuted(array|string $commands): void
         if (! $allExecuted) {
             Assert::fail('The expected commands are not executed. executed commands: '.implode(', ', $this->commands));
         }
-        Assert::assertTrue(true, $allExecuted);
     }
 
     public function assertExecutedContains(string $command): void
@@ -129,7 +128,6 @@ public function assertExecutedContains(string $command): void
                 'The expected command is not executed in the executed commands: '.implode(', ', $this->commands)
             );
         }
-        Assert::assertTrue(true, $executed);
     }
 
     public function assertFileUploaded(string $toPath, ?string $content = null): void
diff --git a/app/Web/Pages/Login.php b/app/Web/Pages/Login.php
@@ -96,7 +96,7 @@ public function authenticate(): ?LoginResponse
         return $loginResponse;
     }
 
-    private function confirmTwoFactor(): ?LoginResponse
+    private function confirmTwoFactor(): LoginResponse
     {
         $request = TwoFactorLoginRequest::createFrom(request())->merge([
             'code' => $this->data['code'],
diff --git a/app/Web/Pages/Scripts/Widgets/ScriptExecutionsList.php b/app/Web/Pages/Scripts/Widgets/ScriptExecutionsList.php
@@ -33,7 +33,7 @@ protected function getTableColumns(): array
         return [
             TextColumn::make('server')
                 ->formatStateUsing(function (ScriptExecution $record) {
-                    return $record->getServer()?->name ?? 'Unknown';
+                    return $record->getServer()->name ?? 'Unknown';
                 })
                 ->url(function (ScriptExecution $record) {
                     $server = $record->getServer();
diff --git a/app/Web/Pages/Servers/Metrics/Widgets/Metrics.php b/app/Web/Pages/Servers/Metrics/Widgets/Metrics.php
@@ -34,13 +34,13 @@ protected function getStats(): array
         $metrics = app(GetMetrics::class)->filter($this->server, $this->filters);
 
         return [
-            Stat::make('CPU Load', $lastMetric?->load ?? 0)
+            Stat::make('CPU Load', $lastMetric->load ?? 0)
                 ->color('success')
                 ->chart($metrics->pluck('load')->toArray()),
-            Stat::make('Memory Usage', Number::fileSize($lastMetric?->memory_used_in_bytes ?? 0, 2))
+            Stat::make('Memory Usage', Number::fileSize($lastMetric->memory_used_in_bytes ?? 0, 2))
                 ->color('warning')
                 ->chart($metrics->pluck('memory_used')->toArray()),
-            Stat::make('Disk Usage', Number::fileSize($lastMetric?->disk_used_in_bytes ?? 0, 2))
+            Stat::make('Disk Usage', Number::fileSize($lastMetric->disk_used_in_bytes ?? 0, 2))
                 ->color('primary')
                 ->chart($metrics->pluck('disk_used')->toArray()),
         ];
diff --git a/phpstan.neon b/phpstan.neon
@@ -4,4 +4,4 @@ includes:
 parameters:
     paths:
         - app/
-    level: 3
+    level: 4

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function create(Server $server, array $input): Site`
`40`	`40`	`// check has access to repository`
`41`	`41`	`try {`
`42`	`42`	`if ($site->sourceControl) {`
`43`		`- $site->sourceControl?->getRepo($site->repository);`
	`43`	`+ $site->sourceControl->getRepo($site->repository);`
`44`	`44`	`}`
`45`	`45`	`} catch (SourceControlIsNotConnected) {`
`46`	`46`	`throw ValidationException::withMessages([`
Original file line number	Diff line number	Diff line change
`@@ -3,23 +3,16 @@`
`3`	`3`	`namespace App\Actions\Site;`
`4`	`4`
`5`	`5`	`use App\Models\Site;`
`6`		`-use Illuminate\Validation\ValidationException;`
`7`	`6`
`8`	`7`	`class UpdateDeploymentScript`
`9`	`8`	`{`
`10`		`- /**`
`11`		`- * @throws ValidationException`
`12`		`- */`
`13`	`9`	`public function update(Site $site, array $input): void`
`14`	`10`	`{`
`15`	`11`	`$script = $site->deploymentScript;`
`16`	`12`	`$script->content = $input['script'];`
`17`	`13`	`$script->save();`
`18`	`14`	`}`
`19`	`15`
`20`		`- /**`
`21`		`- * @throws ValidationException`
`22`		`- */`
`23`	`16`	`public static function rules(): array`
`24`	`17`	`{`
`25`	`18`	`return [`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public function update(Site $site, array $input): void`
`16`	`16`	`$site->source_control_id = $input['source_control'];`
`17`	`17`	`try {`
`18`	`18`	`if ($site->sourceControl) {`
`19`		`- $site->sourceControl?->getRepo($site->repository);`
	`19`	`+ $site->sourceControl->getRepo($site->repository);`
`20`	`20`	`}`
`21`	`21`	`} catch (SourceControlIsNotConnected) {`
`22`	`22`	`throw ValidationException::withMessages([`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,6 @@ public function create(User $user, array $input): SshKey`
`24`	`24`	`return $key;`
`25`	`25`	`}`
`26`	`26`
`27`		`- /**`
`28`		`- * @throws ValidationException`
`29`		`- */`
`30`	`27`	`public static function rules(): array`
`31`	`28`	`{`
`32`	`29`	`return [`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`use App\Models\Project;`
`6`	`6`	`use App\Models\StorageProvider;`
`7`		`-use Illuminate\Validation\ValidationException;`
`8`	`7`
`9`	`8`	`class EditStorageProvider`
`10`	`9`	`{`
`@@ -18,9 +17,6 @@ public function edit(StorageProvider $storageProvider, Project $project, array $`
`18`	`17`	`return $storageProvider;`
`19`	`18`	`}`
`20`	`19`
`21`		`- /**`
`22`		`- * @throws ValidationException`
`23`		`- */`
`24`	`20`	`public static function rules(): array`
`25`	`21`	`{`
`26`	`22`	`return [`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`* @property string $status`
`17`	`17`	`* @property Site $site`
`18`	`18`	`* @property DeploymentScript $deploymentScript`
`19`		`- * @property ServerLog $log`
	`19`	`+ * @property ?ServerLog $log`
`20`	`20`	`*/`
`21`	`21`	`class Deployment extends AbstractModel`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public function getStatusColor(): string`
`47`	`47`	`FirewallRuleStatus::DELETING => 'warning',`
`48`	`48`	`FirewallRuleStatus::READY => 'success',`
`49`	`49`	`FirewallRuleStatus::FAILED => 'danger',`
	`50`	`+ default => 'secondary',`
`50`	`51`	`};`
`51`	`52`	`}`
`52`	`53`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,13 @@`
`10`	`10`	`/**`
`11`	`11`	`* @property int $id`
`12`	`12`	`* @property int $server_id`
`13`		`- * @property float $load`
`14`		`- * @property float $memory_total`
`15`		`- * @property float $memory_used`
`16`		`- * @property float $memory_free`
`17`		`- * @property float $disk_total`
`18`		`- * @property float $disk_used`
`19`		`- * @property float $disk_free`
	`13`	`+ * @property ?float $load`
	`14`	`+ * @property ?float $memory_total`
	`15`	`+ * @property ?float $memory_used`
	`16`	`+ * @property ?float $memory_free`
	`17`	`+ * @property ?float $disk_total`
	`18`	`+ * @property ?float $disk_used`
	`19`	`+ * @property ?float $disk_free`
`20`	`20`	`* @property-read float\|int $memory_total_in_bytes`
`21`	`21`	`* @property-read float\|int $memory_used_in_bytes`
`22`	`22`	`* @property-read float\|int $memory_free_in_bytes`
`@@ -60,31 +60,31 @@ public function server(): BelongsTo`
`60`	`60`
`61`	`61`	`public function getMemoryTotalInBytesAttribute(): float\|int`
`62`	`62`	`{`
`63`		`- return $this->memory_total * 1024;`
	`63`	`+ return ($this->memory_total ?? 0) * 1024;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public function getMemoryUsedInBytesAttribute(): float\|int`
`67`	`67`	`{`
`68`		`- return $this->memory_used * 1024;`
	`68`	`+ return ($this->memory_used ?? 0) * 1024;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`public function getMemoryFreeInBytesAttribute(): float\|int`
`72`	`72`	`{`
`73`		`- return $this->memory_free * 1024;`
	`73`	`+ return ($this->memory_free ?? 0) * 1024;`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`public function getDiskTotalInBytesAttribute(): float\|int`
`77`	`77`	`{`
`78`		`- return $this->disk_total * (1024 * 1024);`
	`78`	`+ return ($this->disk_total ?? 0) * (1024 * 1024);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public function getDiskUsedInBytesAttribute(): float\|int`
`82`	`82`	`{`
`83`		`- return $this->disk_used * (1024 * 1024);`
	`83`	`+ return ($this->disk_used ?? 0) * (1024 * 1024);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`public function getDiskFreeInBytesAttribute(): float\|int`
`87`	`87`	`{`
`88`		`- return $this->disk_free * (1024 * 1024);`
	`88`	`+ return ($this->disk_free ?? 0) * (1024 * 1024);`
`89`	`89`	`}`
`90`	`90`	`}`