From 1ec224fde16db002fe5eb7520172767dc53de38b Mon Sep 17 00:00:00 2001 From: Lucas Michot Date: Thu, 31 Oct 2024 18:20:11 +0100 Subject: [PATCH] Inline many variables. --- app/Actions/Proxy/StartProxy.php | 4 +--- app/Actions/Server/RunCommand.php | 4 +--- app/Actions/Service/StartService.php | 3 +-- app/Http/Controllers/Api/ApplicationsController.php | 3 +-- app/Http/Controllers/Api/ServicesController.php | 3 +-- app/Jobs/ScheduledTaskJob.php | 8 ++------ app/Livewire/Project/Database/BackupExecutions.php | 3 +-- .../Project/Shared/ScheduledTask/Executions.php | 3 +-- app/Models/ScheduledTask.php | 12 +++--------- app/Models/Server.php | 13 ++++--------- app/Models/Service.php | 4 +--- app/Models/Team.php | 7 ++----- app/Notifications/Application/StatusChanged.php | 4 +--- bootstrap/helpers/api.php | 4 +--- bootstrap/helpers/docker.php | 6 ++---- bootstrap/helpers/github.php | 5 ++--- bootstrap/helpers/proxy.php | 5 ++--- bootstrap/helpers/services.php | 5 +---- bootstrap/helpers/shared.php | 12 ++++-------- bootstrap/helpers/subscriptions.php | 5 ++--- 20 files changed, 34 insertions(+), 79 deletions(-) diff --git a/app/Actions/Proxy/StartProxy.php b/app/Actions/Proxy/StartProxy.php index 8b584833f..7c93720cb 100644 --- a/app/Actions/Proxy/StartProxy.php +++ b/app/Actions/Proxy/StartProxy.php @@ -58,9 +58,7 @@ class StartProxy } if ($async) { - $activity = remote_process($commands, $server, callEventOnFinish: 'ProxyStarted', callEventData: $server); - - return $activity; + return remote_process($commands, $server, callEventOnFinish: 'ProxyStarted', callEventData: $server); } else { instant_remote_process($commands, $server); $server->proxy->set('status', 'running'); diff --git a/app/Actions/Server/RunCommand.php b/app/Actions/Server/RunCommand.php index fce862eb0..254c78587 100644 --- a/app/Actions/Server/RunCommand.php +++ b/app/Actions/Server/RunCommand.php @@ -12,8 +12,6 @@ class RunCommand public function handle(Server $server, $command) { - $activity = remote_process(command: [$command], server: $server, ignore_errors: true, type: ActivityTypes::COMMAND->value); - - return $activity; + return remote_process(command: [$command], server: $server, ignore_errors: true, type: ActivityTypes::COMMAND->value); } } diff --git a/app/Actions/Service/StartService.php b/app/Actions/Service/StartService.php index 5b8279221..82de066d7 100644 --- a/app/Actions/Service/StartService.php +++ b/app/Actions/Service/StartService.php @@ -33,8 +33,7 @@ class StartService $commands[] = "docker network connect --alias {$serviceName}-{$service->uuid} $network {$serviceName}-{$service->uuid} >/dev/null 2>&1 || true"; } } - $activity = remote_process($commands, $service->server, type_uuid: $service->uuid, callEventOnFinish: 'ServiceStatusChanged'); - return $activity; + return remote_process($commands, $service->server, type_uuid: $service->uuid, callEventOnFinish: 'ServiceStatusChanged'); } } diff --git a/app/Http/Controllers/Api/ApplicationsController.php b/app/Http/Controllers/Api/ApplicationsController.php index 5c0024af1..dee75578f 100644 --- a/app/Http/Controllers/Api/ApplicationsController.php +++ b/app/Http/Controllers/Api/ApplicationsController.php @@ -1691,9 +1691,8 @@ class ApplicationsController extends Controller 'standalone_postgresql_id', 'standalone_redis_id', ]); - $env = $this->removeSensitiveData($env); - return $env; + return $this->removeSensitiveData($env); }); return response()->json($envs); diff --git a/app/Http/Controllers/Api/ServicesController.php b/app/Http/Controllers/Api/ServicesController.php index 91595adb8..bf90322e2 100644 --- a/app/Http/Controllers/Api/ServicesController.php +++ b/app/Http/Controllers/Api/ServicesController.php @@ -566,9 +566,8 @@ class ServicesController extends Controller 'standalone_postgresql_id', 'standalone_redis_id', ]); - $env = $this->removeSensitiveData($env); - return $env; + return $this->removeSensitiveData($env); }); return response()->json($envs); diff --git a/app/Jobs/ScheduledTaskJob.php b/app/Jobs/ScheduledTaskJob.php index c68b02c59..827641e8c 100644 --- a/app/Jobs/ScheduledTaskJob.php +++ b/app/Jobs/ScheduledTaskJob.php @@ -54,13 +54,9 @@ class ScheduledTaskJob implements ShouldQueue private function getServerTimezone(): string { if ($this->resource instanceof Application) { - $timezone = $this->resource->destination->server->settings->server_timezone; - - return $timezone; + return $this->resource->destination->server->settings->server_timezone; } elseif ($this->resource instanceof Service) { - $timezone = $this->resource->server->settings->server_timezone; - - return $timezone; + return $this->resource->server->settings->server_timezone; } return 'UTC'; diff --git a/app/Livewire/Project/Database/BackupExecutions.php b/app/Livewire/Project/Database/BackupExecutions.php index 03d78487a..f91b8bfaf 100644 --- a/app/Livewire/Project/Database/BackupExecutions.php +++ b/app/Livewire/Project/Database/BackupExecutions.php @@ -119,9 +119,8 @@ class BackupExecutions extends Component if (! $server) { return 'UTC'; } - $serverTimezone = $server->settings->server_timezone; - return $serverTimezone; + return $server->settings->server_timezone; } public function formatDateInServerTimezone($date) diff --git a/app/Livewire/Project/Shared/ScheduledTask/Executions.php b/app/Livewire/Project/Shared/ScheduledTask/Executions.php index 6bb45b68e..05d9a7a13 100644 --- a/app/Livewire/Project/Shared/ScheduledTask/Executions.php +++ b/app/Livewire/Project/Shared/ScheduledTask/Executions.php @@ -54,9 +54,8 @@ class Executions extends Component if (! $server) { return 'UTC'; } - $serverTimezone = $server->settings->server_timezone; - return $serverTimezone; + return $server->settings->server_timezone; } public function formatDateInServerTimezone($date) diff --git a/app/Models/ScheduledTask.php b/app/Models/ScheduledTask.php index 3cee5a875..264a04d1f 100644 --- a/app/Models/ScheduledTask.php +++ b/app/Models/ScheduledTask.php @@ -34,21 +34,15 @@ class ScheduledTask extends BaseModel { if ($this->application) { if ($this->application->destination && $this->application->destination->server) { - $server = $this->application->destination->server; - - return $server; + return $this->application->destination->server; } } elseif ($this->service) { if ($this->service->destination && $this->service->destination->server) { - $server = $this->service->destination->server; - - return $server; + return $this->service->destination->server; } } elseif ($this->database) { if ($this->database->destination && $this->database->destination->server) { - $server = $this->database->destination->server; - - return $server; + return $this->database->destination->server; } } diff --git a/app/Models/Server.php b/app/Models/Server.php index 1980bc429..d43ae54d3 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -602,11 +602,10 @@ $schema://$host { throw new \Exception($error); } $cpu = json_decode($cpu, true); - $parsedCollection = collect($cpu)->map(function ($metric) { + + return collect($cpu)->map(function ($metric) { return [(int) $metric['time'], (float) $metric['percent']]; }); - - return $parsedCollection; } } @@ -837,9 +836,7 @@ $schema://$host { { return Attribute::make( get: function ($value) { - $sanitizedValue = preg_replace('/[^A-Za-z0-9\-_]/', '', $value); - - return $sanitizedValue; + return preg_replace('/[^A-Za-z0-9\-_]/', '', $value); } ); } @@ -1096,9 +1093,7 @@ $schema://$host { public function installDocker() { - $activity = InstallDocker::run($this); - - return $activity; + return InstallDocker::run($this); } public function validateDockerEngine($throwError = false) diff --git a/app/Models/Service.php b/app/Models/Service.php index fe2ebcbd6..f88a23641 100644 --- a/app/Models/Service.php +++ b/app/Models/Service.php @@ -1307,9 +1307,7 @@ class Service extends BaseModel public function networks() { - $networks = getTopLevelNetworks($this); - - return $networks; + return getTopLevelNetworks($this); } protected function isDeployable(): Attribute diff --git a/app/Models/Team.php b/app/Models/Team.php index 49b019725..5b4a80cb1 100644 --- a/app/Models/Team.php +++ b/app/Models/Team.php @@ -131,9 +131,7 @@ class Team extends Model implements SendsDiscord, SendsEmail { $recipients = data_get($notification, 'emails', null); if (is_null($recipients)) { - $recipients = $this->members()->pluck('email')->toArray(); - - return $recipients; + return $this->members()->pluck('email')->toArray(); } return explode(',', $recipients); @@ -251,9 +249,8 @@ class Team extends Model implements SendsDiscord, SendsEmail $sources = collect([]); $github_apps = $this->hasMany(GithubApp::class)->whereisPublic(false)->get(); $gitlab_apps = $this->hasMany(GitlabApp::class)->whereisPublic(false)->get(); - $sources = $sources->merge($github_apps)->merge($gitlab_apps); - return $sources; + return $sources->merge($github_apps)->merge($gitlab_apps); } public function s3s() diff --git a/app/Notifications/Application/StatusChanged.php b/app/Notifications/Application/StatusChanged.php index a080fcabe..852c6b526 100644 --- a/app/Notifications/Application/StatusChanged.php +++ b/app/Notifications/Application/StatusChanged.php @@ -58,14 +58,12 @@ class StatusChanged extends Notification implements ShouldQueue public function toDiscord(): DiscordMessage { - $message = new DiscordMessage( + return new DiscordMessage( title: ':cross_mark: Application stopped', description: '[Open Application in Coolify]('.$this->resource_url.')', color: DiscordMessage::errorColor(), isCritical: true, ); - - return $message; } public function toTelegram(): array diff --git a/bootstrap/helpers/api.php b/bootstrap/helpers/api.php index a1dae612c..875866e2f 100644 --- a/bootstrap/helpers/api.php +++ b/bootstrap/helpers/api.php @@ -21,7 +21,7 @@ function invalidTokenResponse() function serializeApiResponse($data) { if ($data instanceof Collection) { - $data = $data->map(function ($d) { + return $data->map(function ($d) { $d = collect($d)->sortKeys(); $created_at = data_get($d, 'created_at'); $updated_at = data_get($d, 'updated_at'); @@ -49,8 +49,6 @@ function serializeApiResponse($data) return $d; }); - - return $data; } else { $d = collect($data)->sortKeys(); $created_at = data_get($d, 'created_at'); diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php index f262b3cd8..52435703c 100644 --- a/bootstrap/helpers/docker.php +++ b/bootstrap/helpers/docker.php @@ -32,9 +32,8 @@ function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pul return null; }); - $containers = $containers->filter(); - return $containers; + return $containers->filter(); } return $containers; @@ -46,9 +45,8 @@ function getCurrentServiceContainerStatus(Server $server, int $id): Collection if (! $server->isSwarm()) { $containers = instant_remote_process(["docker ps -a --filter='label=coolify.serviceId={$id}' --format '{{json .}}' "], $server); $containers = format_docker_command_output_to_json($containers); - $containers = $containers->filter(); - return $containers; + return $containers->filter(); } return $containers; diff --git a/bootstrap/helpers/github.php b/bootstrap/helpers/github.php index fee7cb8bf..529ac82b1 100644 --- a/bootstrap/helpers/github.php +++ b/bootstrap/helpers/github.php @@ -43,14 +43,13 @@ function generate_github_jwt_token(GithubApp $source) $tokenBuilder = (new Builder(new JoseEncoder, ChainedFormatter::default())); $now = CarbonImmutable::now(); $now = $now->setTime($now->format('H'), $now->format('i')); - $issuedToken = $tokenBuilder + + return $tokenBuilder ->issuedBy($source->app_id) ->issuedAt($now->modify('-1 minute')) ->expiresAt($now->modify('+10 minutes')) ->getToken($algorithm, $signingKey) ->toString(); - - return $issuedToken; } function githubApi(GithubApp|GitlabApp|null $source, string $endpoint, string $method = 'get', ?array $data = null, bool $throwError = true) diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php index 8da537807..a8ef0fe5a 100644 --- a/bootstrap/helpers/proxy.php +++ b/bootstrap/helpers/proxy.php @@ -16,11 +16,10 @@ function collectProxyDockerNetworksByServer(Server $server) return collect(); } $networks = instant_remote_process(['docker inspect --format="{{json .NetworkSettings.Networks }}" coolify-proxy'], $server, false); - $networks = collect($networks)->map(function ($network) { + + return collect($networks)->map(function ($network) { return collect(json_decode($network))->keys(); })->flatten()->unique(); - - return $networks; } function collectDockerNetworksByServer(Server $server) { diff --git a/bootstrap/helpers/services.php b/bootstrap/helpers/services.php index 18ef4cb6b..fd2e1231f 100644 --- a/bootstrap/helpers/services.php +++ b/bootstrap/helpers/services.php @@ -245,8 +245,5 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource) } function serviceKeys() { - $services = get_service_templates(); - $serviceKeys = $services->keys(); - - return $serviceKeys; + return get_service_templates()->keys(); } diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php index 273dd8c55..fb4ae3699 100644 --- a/bootstrap/helpers/shared.php +++ b/bootstrap/helpers/shared.php @@ -501,9 +501,8 @@ function generateFqdn(Server $server, string $random, bool $forceHttps = false): if ($forceHttps) { $scheme = 'https'; } - $finalFqdn = "$scheme://{$random}.$host$path"; - return $finalFqdn; + return "$scheme://{$random}.$host$path"; } function sslip(Server $server) { @@ -653,9 +652,8 @@ function generateTagDeployWebhook($tag_name) $baseUrl = base_url(); $api = Url::fromString($baseUrl).'/api/v1'; $endpoint = "/deploy?tag=$tag_name"; - $url = $api.$endpoint; - return $url; + return $api.$endpoint; } function generateDeployWebhook($resource) { @@ -663,9 +661,8 @@ function generateDeployWebhook($resource) $api = Url::fromString($baseUrl).'/api/v1'; $endpoint = '/deploy'; $uuid = data_get($resource, 'uuid'); - $url = $api.$endpoint."?uuid=$uuid&force=false"; - return $url; + return $api.$endpoint."?uuid=$uuid&force=false"; } function generateGitManualWebhook($resource, $type) { @@ -674,9 +671,8 @@ function generateGitManualWebhook($resource, $type) } if ($resource->getMorphClass() === \App\Models\Application::class) { $baseUrl = base_url(); - $api = Url::fromString($baseUrl)."/webhooks/source/$type/events/manual"; - return $api; + return Url::fromString($baseUrl)."/webhooks/source/$type/events/manual"; } return null; diff --git a/bootstrap/helpers/subscriptions.php b/bootstrap/helpers/subscriptions.php index aadd2dd34..8ddb1331c 100644 --- a/bootstrap/helpers/subscriptions.php +++ b/bootstrap/helpers/subscriptions.php @@ -55,12 +55,11 @@ function getStripeCustomerPortalSession(Team $team) if (! $stripe_customer_id) { return null; } - $session = \Stripe\BillingPortal\Session::create([ + + return \Stripe\BillingPortal\Session::create([ 'customer' => $stripe_customer_id, 'return_url' => $return_url, ]); - - return $session; } function allowedPathsForUnsubscribedAccounts() {