From 9a93e4511ee7f85ea25e1c5ed787fc6a3307416d Mon Sep 17 00:00:00 2001
From: Lucas Michot <lucas@semalead.com>
Date: Thu, 10 Oct 2024 12:55:31 +0200
Subject: [PATCH 01/21] Simplify and optimize the service-templates.yaml
 generation command

---
 app/Console/Commands/ServicesGenerate.php | 137 ++++++++--------------
 1 file changed, 46 insertions(+), 91 deletions(-)

diff --git a/app/Console/Commands/ServicesGenerate.php b/app/Console/Commands/ServicesGenerate.php
index 9720e81ac..7e91b38ad 100644
--- a/app/Console/Commands/ServicesGenerate.php
+++ b/app/Console/Commands/ServicesGenerate.php
@@ -3,128 +3,83 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Arr;
 use Symfony\Component\Yaml\Yaml;
 
 class ServicesGenerate extends Command
 {
     /**
-     * The name and signature of the console command.
-     *
-     * @var string
+     * {@inheritdoc}
      */
     protected $signature = 'services:generate';
 
     /**
-     * The console command description.
-     *
-     * @var string
+     * {@inheritdoc}
      */
     protected $description = 'Generate service-templates.yaml based on /templates/compose directory';
 
-    /**
-     * Execute the console command.
-     */
-    public function handle()
+    public function handle(): int
     {
-        $files = array_diff(scandir(base_path('templates/compose')), ['.', '..']);
-        $files = array_filter($files, function ($file) {
-            return strpos($file, '.yaml') !== false;
-        });
-        $serviceTemplatesJson = [];
-        foreach ($files as $file) {
-            $parsed = $this->process_file($file);
-            if ($parsed) {
-                $name = data_get($parsed, 'name');
-                $parsed = data_forget($parsed, 'name');
-                $serviceTemplatesJson[$name] = $parsed;
-            }
-        }
-        $serviceTemplatesJson = json_encode($serviceTemplatesJson, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+        $serviceTemplatesJson = collect(glob(base_path('templates/compose/*.yaml')))
+            ->mapWithKeys(function ($file): array {
+                $file = basename($file);
+                $parsed = $this->processFile($file);
+
+                return $parsed === false ? [] : [
+                    Arr::pull($parsed, 'name') => $parsed,
+                ];
+            })->toJson(JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+
         file_put_contents(base_path('templates/service-templates.json'), $serviceTemplatesJson.PHP_EOL);
+
+        return self::SUCCESS;
     }
 
-    private function process_file($file)
+    private function processFile(string $file): false|array
     {
-        $serviceName = str($file)->before('.yaml')->value();
         $content = file_get_contents(base_path("templates/compose/$file"));
-        // $this->info($content);
-        $ignore = collect(preg_grep('/^# ignore:/', explode("\n", $content)))->values();
-        if ($ignore->count() > 0) {
-            $ignore = (bool) str($ignore[0])->after('# ignore:')->trim()->value();
-        } else {
-            $ignore = false;
-        }
-        if ($ignore) {
+
+        preg_match_all(
+            '/#\s*(documentation|env_file|ignore|logo|minversion|port|slogan|tags)\s*:\s*(.+)\s*/',
+            $content, $matches
+        );
+
+        $data = array_combine($matches[1], $matches[2]);
+
+        if (str($data['ignore'] ?? false)->toBoolean()) {
             $this->info("Ignoring $file");
 
-            return;
+            return false;
         }
+
         $this->info("Processing $file");
-        $documentation = collect(preg_grep('/^# documentation:/', explode("\n", $content)))->values();
-        if ($documentation->count() > 0) {
-            $documentation = str($documentation[0])->after('# documentation:')->trim()->value();
-            $documentation = str($documentation)->append('?utm_source=coolify.io');
-        } else {
-            $documentation = 'https://coolify.io/docs';
-        }
 
-        $slogan = collect(preg_grep('/^# slogan:/', explode("\n", $content)))->values();
-        if ($slogan->count() > 0) {
-            $slogan = str($slogan[0])->after('# slogan:')->trim()->value();
-        } else {
-            $slogan = str($file)->headline()->value();
-        }
-        $logo = collect(preg_grep('/^# logo:/', explode("\n", $content)))->values();
-        if ($logo->count() > 0) {
-            $logo = str($logo[0])->after('# logo:')->trim()->value();
-        } else {
-            $logo = 'svgs/coolify.png';
-        }
-        $minversion = collect(preg_grep('/^# minversion:/', explode("\n", $content)))->values();
-        if ($minversion->count() > 0) {
-            $minversion = str($minversion[0])->after('# minversion:')->trim()->value();
-        } else {
-            $minversion = '0.0.0';
-        }
-        $env_file = collect(preg_grep('/^# env_file:/', explode("\n", $content)))->values();
-        if ($env_file->count() > 0) {
-            $env_file = str($env_file[0])->after('# env_file:')->trim()->value();
-        } else {
-            $env_file = null;
-        }
+        $documentation = $data['documentation'] ?? null;
+        $documentation = $documentation ? $documentation.'?utm_source=coolify.io' : 'https://coolify.io/docs';
 
-        $tags = collect(preg_grep('/^# tags:/', explode("\n", $content)))->values();
-        if ($tags->count() > 0) {
-            $tags = str($tags[0])->after('# tags:')->trim()->explode(',')->map(function ($tag) {
-                return str($tag)->trim()->lower()->value();
-            })->values();
-        } else {
-            $tags = null;
-        }
-        $port = collect(preg_grep('/^# port:/', explode("\n", $content)))->values();
-        if ($port->count() > 0) {
-            $port = str($port[0])->after('# port:')->trim()->value();
-        } else {
-            $port = null;
-        }
         $json = Yaml::parse($content);
-        $yaml = base64_encode(Yaml::dump($json, 10, 2));
+        $compose = base64_encode(Yaml::dump($json, 10, 2));
+
+        $tags = str($data['tags'] ?? '')->lower()->explode(',')->map(fn ($tag) => trim($tag))->filter();
+        $tags = $tags->isEmpty() ? null : $tags->all();
+
         $payload = [
-            'name' => $serviceName,
+            'name' => pathinfo($file, PATHINFO_FILENAME),
             'documentation' => $documentation,
-            'slogan' => $slogan,
-            'compose' => $yaml,
+            'slogan' => $data['slogan'] ?? str($file)->headline(),
+            'compose' => $compose,
             'tags' => $tags,
-            'logo' => $logo,
-            'minversion' => $minversion,
+            'logo' => $data['logo'] ?? 'svgs/coolify.png',
+            'minversion' => $data['minversion'] ?? '0.0.0',
         ];
-        if ($port) {
+
+        if ($port = $data['port'] ?? null) {
             $payload['port'] = $port;
         }
-        if ($env_file) {
-            $env_file_content = file_get_contents(base_path("templates/compose/$env_file"));
-            $env_file_base64 = base64_encode($env_file_content);
-            $payload['envs'] = $env_file_base64;
+
+        if ($envFile = $data['env_file'] ?? null) {
+            $envFileContent = file_get_contents(base_path("templates/compose/$envFile"));
+            $payload['envs'] = base64_encode($envFileContent);
         }
 
         return $payload;

From 79d5434da282501ae12d6097c1f48562316155f4 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Thu, 31 Oct 2024 14:20:11 +0100
Subject: [PATCH 02/21] Update service-templates.json

---
 templates/service-templates.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/service-templates.json b/templates/service-templates.json
index b693b6638..0cecec796 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -1492,7 +1492,7 @@
     "mediawiki": {
         "documentation": "https://www.mediawiki.org?utm_source=coolify.io",
         "slogan": "MediaWiki is a collaboration and documentation platform brought to you by a vibrant community.",
-        "compose": "c2VydmljZXM6CiAgbWVkaWF3aWtpOgogICAgaW1hZ2U6ICdtZWRpYXdpa2k6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX01FRElBV0lLSV84MAogICAgdm9sdW1lczoKICAgICAgLSAnbWVkaWF3aWtpLWltYWdlczovdmFyL3d3dy9odG1sL2ltYWdlcycKICAgICAgLSAnbWVkaWF3aWtpLXNxbGl0ZTovdmFyL3d3dy9odG1sL2RhdGEnCiAgICAgIC0gJy4vTG9jYWxTZXR0aW5ncy5waHA6L3Zhci93d3cvaHRtbC9Mb2NhbFNldHRpbmdzLnBocCcKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovL2xvY2FsaG9zdDo4MCcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "compose": "c2VydmljZXM6CiAgbWVkaWF3aWtpOgogICAgaW1hZ2U6ICdtZWRpYXdpa2k6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX01FRElBV0lLSV84MAogICAgdm9sdW1lczoKICAgICAgLSAnbWVkaWF3aWtpLWltYWdlczovdmFyL3d3dy9odG1sL2ltYWdlcycKICAgICAgLSAnbWVkaWF3aWtpLXNxbGl0ZTovdmFyL3d3dy9odG1sL2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly9sb2NhbGhvc3Q6ODAnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
         "tags": [
             "wiki",
             "collaboration",

From fc1b43cd89ddcb886030696252b260cbba3d68d6 Mon Sep 17 00:00:00 2001
From: Lucas Michot <lucas@semalead.com>
Date: Thu, 31 Oct 2024 14:59:17 +0100
Subject: [PATCH 03/21] Adapt command

---
 app/Console/Commands/ServicesGenerate.php | 25 +++++++++++------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/Console/Commands/ServicesGenerate.php b/app/Console/Commands/ServicesGenerate.php
index 7e91b38ad..1559e5f6d 100644
--- a/app/Console/Commands/ServicesGenerate.php
+++ b/app/Console/Commands/ServicesGenerate.php
@@ -39,14 +39,13 @@ private function processFile(string $file): false|array
     {
         $content = file_get_contents(base_path("templates/compose/$file"));
 
-        preg_match_all(
-            '/#\s*(documentation|env_file|ignore|logo|minversion|port|slogan|tags)\s*:\s*(.+)\s*/',
-            $content, $matches
-        );
+        $data = collect(explode(PHP_EOL, $content))->mapWithKeys(function ($line): array {
+            preg_match('/^#(?<key>.*):(?<value>.*)$/U', $line, $m);
 
-        $data = array_combine($matches[1], $matches[2]);
+            return $m ? [trim($m['key']) => trim($m['value'])] : [];
+        });
 
-        if (str($data['ignore'] ?? false)->toBoolean()) {
+        if (str($data->get('ignore'))->toBoolean()) {
             $this->info("Ignoring $file");
 
             return false;
@@ -54,30 +53,30 @@ private function processFile(string $file): false|array
 
         $this->info("Processing $file");
 
-        $documentation = $data['documentation'] ?? null;
+        $documentation = $data->get('documentation');
         $documentation = $documentation ? $documentation.'?utm_source=coolify.io' : 'https://coolify.io/docs';
 
         $json = Yaml::parse($content);
         $compose = base64_encode(Yaml::dump($json, 10, 2));
 
-        $tags = str($data['tags'] ?? '')->lower()->explode(',')->map(fn ($tag) => trim($tag))->filter();
+        $tags = str($data->get('tags'))->lower()->explode(',')->map(fn ($tag) => trim($tag))->filter();
         $tags = $tags->isEmpty() ? null : $tags->all();
 
         $payload = [
             'name' => pathinfo($file, PATHINFO_FILENAME),
             'documentation' => $documentation,
-            'slogan' => $data['slogan'] ?? str($file)->headline(),
+            'slogan' => $data->get('slogan', str($file)->headline()),
             'compose' => $compose,
             'tags' => $tags,
-            'logo' => $data['logo'] ?? 'svgs/coolify.png',
-            'minversion' => $data['minversion'] ?? '0.0.0',
+            'logo' => $data->get('logo', 'svgs/coolify.png'),
+            'minversion' => $data->get('minversion', '0.0.0'),
         ];
 
-        if ($port = $data['port'] ?? null) {
+        if ($port = $data->get('port')) {
             $payload['port'] = $port;
         }
 
-        if ($envFile = $data['env_file'] ?? null) {
+        if ($envFile = $data->get('env_file')) {
             $envFileContent = file_get_contents(base_path("templates/compose/$envFile"));
             $payload['envs'] = base64_encode($envFileContent);
         }

From fca18152169c67c5f54f51dc22b511e522dee4f0 Mon Sep 17 00:00:00 2001
From: Tim Koch <me@timkoch.dev>
Date: Sun, 27 Oct 2024 11:25:55 +0100
Subject: [PATCH 04/21] Apply tailwind shadow to .box class

Makes .box elements appear raised above the background.
Only works in light mode!
---
 resources/css/app.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/css/app.css b/resources/css/app.css
index 00a62a131..55d8d95f8 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -217,7 +217,7 @@ .kbd-custom {
 }
 
 .box {
-    @apply relative flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 bg-white border text-black dark:text-white hover:text-black border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline;
+    @apply relative flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 shadow bg-white border text-black dark:text-white hover:text-black border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline;
 }
 
 .box-boarding {

From a35e2f427bb077f0ab563c44e62de4eb21175b5b Mon Sep 17 00:00:00 2001
From: Tim Koch <me@timkoch.dev>
Date: Sun, 27 Oct 2024 12:10:07 +0100
Subject: [PATCH 05/21] Fix inconsistent navbar padding

"Coolify" had pl-3 while the SwitchTeam element and the menu items below had px-2
---
 resources/views/components/navbar.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index 93dd72f8e..460b9350b 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -46,7 +46,7 @@
             }
         }
 }">
-    <div class="flex pt-6 pb-4 pl-3">
+    <div class="flex pt-6 pb-4 pl-2">
         <div class="flex flex-col w-full">
             <div class="text-2xl font-bold tracking-wide dark:text-white">Coolify</div>
             <x-version />

From f073d01a5f819ad209f6d78ee3ccd7c5fa436113 Mon Sep 17 00:00:00 2001
From: Tim Koch <me@timkoch.dev>
Date: Sun, 27 Oct 2024 12:24:34 +0100
Subject: [PATCH 06/21] Give more space to navbar

Especially in full width and mobile view, the navbar looked cramped
because there was very little padding to the left end of the screen.
This commit adds horizontal padding to the navbar
and increases its width from 48 to 56 tailwind units.
---
 resources/views/components/navbar.blade.php | 2 +-
 resources/views/layouts/app.blade.php       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index 460b9350b..2f908fc81 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -1,4 +1,4 @@
-<nav class="flex flex-col flex-1 bg-white border-r dark:border-coolgray-200 dark:bg-base" x-data="{
+<nav class="flex flex-col flex-1 px-2 bg-white border-r dark:border-coolgray-200 dark:bg-base" x-data="{
     switchWidth() {
             if (this.full === 'full') {
                 localStorage.setItem('pageWidth', 'center');
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index e0f044353..47ea71ecc 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -18,7 +18,7 @@
             <div class="relative z-50 lg:hidden" :class="open ? 'block' : 'hidden'" role="dialog" aria-modal="true">
                 <div class="fixed inset-0 bg-black/80"></div>
                 <div class="fixed inset-0 flex">
-                    <div class="relative flex flex-1 w-full mr-16 max-w-48 ">
+                    <div class="relative flex flex-1 w-full mr-16 max-w-56 ">
                         <div class="absolute top-0 flex justify-center w-16 pt-5 left-full">
                             <button type="button" class="-m-2.5 p-2.5" x-on:click="open = !open">
                                 <span class="sr-only">Close sidebar</span>
@@ -29,14 +29,14 @@
                             </button>
                         </div>
 
-                        <div class="flex flex-col pb-2 overflow-y-auto min-w-48 dark:bg-coolgray-100 gap-y-5 scrollbar">
+                        <div class="flex flex-col pb-2 overflow-y-auto min-w-56 dark:bg-coolgray-100 gap-y-5 scrollbar">
                             <x-navbar />
                         </div>
                     </div>
                 </div>
             </div>
 
-            <div class="hidden lg:fixed lg:inset-y-0 lg:z-50 lg:flex lg:w-48 lg:flex-col">
+            <div class="hidden lg:fixed lg:inset-y-0 lg:z-50 lg:flex lg:w-56 lg:flex-col">
                 <div class="flex flex-col overflow-y-auto grow gap-y-5 scrollbar">
                     <x-navbar />
                 </div>
@@ -52,7 +52,7 @@
                 </button>
             </div>
 
-            <main class="lg:pl-48">
+            <main class="lg:pl-56">
                 <div class="p-4 sm:px-6 lg:px-8 lg:py-6">
                     {{ $slot }}
                 </div>

From 1a668d6c46d8bb4913783ab6ce80091cb580d5cc Mon Sep 17 00:00:00 2001
From: Tim Koch <me@timkoch.dev>
Date: Tue, 29 Oct 2024 15:20:36 +0100
Subject: [PATCH 07/21] Make h1 text size even larger

This is to make it even easier to visually distringuish between h1 and other heading elements.
For example, on pages with a h1 heading and multiple section headings,
this makes it easier to understand the structure of the page subconciously.
---
 resources/css/app.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/css/app.css b/resources/css/app.css
index 55d8d95f8..0f4f19fb9 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -69,7 +69,7 @@ button[isHighlighted]:not(:disabled) {
 }
 
 h1 {
-    @apply text-2xl font-bold dark:text-white;
+    @apply text-3xl font-bold dark:text-white;
 }
 
 h2 {

From c3fc22479a71348d7d7983c3a11d52a23d860778 Mon Sep 17 00:00:00 2001
From: Tim Koch <me@timkoch.dev>
Date: Wed, 30 Oct 2024 08:39:14 +0100
Subject: [PATCH 08/21] Apply mb-12 to <section> elements

I think Coolify's design would benefit from a bit more space
between groups of content throughout the site.
HTML's section elements are a perfect fit to
a) semantically group related content and
b) add spacing/visual coherence to it at the same time
---
 resources/css/app.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/css/app.css b/resources/css/app.css
index 0f4f19fb9..73f19de96 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -124,6 +124,10 @@ tr td:first-child {
     @apply pl-4 pr-3 font-bold sm:pl-6;
 }
 
+section {
+    @apply mb-12;
+}
+
 .alert-success {
     @apply flex items-center gap-2 text-success;
 }

From 23211c3d142453c431379048ed63a6c778f22a77 Mon Sep 17 00:00:00 2001
From: Tim Koch <me@timkoch.dev>
Date: Wed, 30 Oct 2024 08:39:47 +0100
Subject: [PATCH 09/21] Utilize <section> on dashboard page

---
 resources/views/livewire/dashboard.blade.php | 280 ++++++++++---------
 1 file changed, 144 insertions(+), 136 deletions(-)

diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index 2e4f8fc99..2b9620e30 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -18,155 +18,163 @@
             subscription is activated.<br> Please be patient.
         </div>
     @endif
-    <h3 class="pb-4">Projects</h3>
-    @if ($projects->count() > 0)
-        <div class="grid grid-cols-1 gap-2 xl:grid-cols-2">
-            @foreach ($projects as $project)
-                <div class="gap-2 border border-transparent cursor-pointer box group"
-                    onclick="gotoProject('{{ $project->uuid }}','{{ $project->default_environment }}')">
-                    <div class="flex flex-1 mx-6">
-                        <div class="flex flex-col justify-center flex-1">
-                            <div class="box-title">{{ $project->name }}</div>
-                            <div class="box-description">
-                                {{ $project->description }}
+
+    <section>
+        <h3 class="pb-2">Projects</h3>
+        @if ($projects->count() > 0)
+            <div class="grid grid-cols-1 gap-2 xl:grid-cols-2">
+                @foreach ($projects as $project)
+                    <div class="gap-2 border border-transparent cursor-pointer box group"
+                        onclick="gotoProject('{{ $project->uuid }}','{{ $project->default_environment }}')">
+                        <div class="flex flex-1 mx-6">
+                            <div class="flex flex-col justify-center flex-1">
+                                <div class="box-title">{{ $project->name }}</div>
+                                <div class="box-description">
+                                    {{ $project->description }}
+                                </div>
+                            </div>
+                            <div class="flex items-center justify-center gap-2 text-xs font-bold">
+                                <a class="hover:underline"
+                                    href="{{ route('project.resource.create', ['project_uuid' => $project->uuid, 'environment_name' => data_get($project, 'default_environment', 'production')]) }}">
+                                    <span class="p-2 font-bold">+ Add Resource</span>
+                                </a>
+                                <a class="hover:underline"
+                                    href="{{ route('project.edit', ['project_uuid' => $project->uuid]) }}">
+                                    Settings
+                                </a>
                             </div>
                         </div>
-                        <div class="flex items-center justify-center gap-2 text-xs font-bold">
-                            <a class="hover:underline"
-                                href="{{ route('project.resource.create', ['project_uuid' => $project->uuid, 'environment_name' => data_get($project, 'default_environment', 'production')]) }}">
-                                <span class="p-2 font-bold">+ Add Resource</span>
-                            </a>
-                            <a class="hover:underline"
-                                href="{{ route('project.edit', ['project_uuid' => $project->uuid]) }}">
-                                Settings
-                            </a>
-                        </div>
                     </div>
-                </div>
-            @endforeach
-        </div>
-    @else
-        <div class="flex flex-col gap-1">
-            <div class='font-bold dark:text-warning'>No projects found.</div>
-            <div class="flex items-center gap-1">
-                <x-modal-input buttonTitle="Add" title="New Project">
-                    <livewire:project.add-empty />
-                </x-modal-input> your first project or
-                go to the <a class="underline dark:text-white" href="{{ route('onboarding') }}">onboarding</a> page.
-            </div>
-        </div>
-    @endif
-
-    <h3 class="py-4">Servers</h3>
-    @if ($servers->count() > 0)
-        <div class="grid grid-cols-1 gap-2 xl:grid-cols-2">
-            @foreach ($servers as $server)
-                <a href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}"
-                    @class([
-                        'gap-2 border cursor-pointer box group',
-                        'border-transparent' => $server->settings->is_reachable,
-                        'border-red-500' => !$server->settings->is_reachable,
-                    ])>
-                    <div class="flex flex-col justify-center mx-6">
-                        <div class="box-title">
-                            {{ $server->name }}
-                        </div>
-                        <div class="box-description">
-                            {{ $server->description }}</div>
-                        <div class="flex gap-1 text-xs text-error">
-                            @if (!$server->settings->is_reachable)
-                                Not reachable
-                            @endif
-                            @if (!$server->settings->is_reachable && !$server->settings->is_usable)
-                                &
-                            @endif
-                            @if (!$server->settings->is_usable)
-                                Not usable by Coolify
-                            @endif
-                        </div>
-                    </div>
-                    <div class="flex-1"></div>
-                </a>
-            @endforeach
-        </div>
-    @else
-        @if ($private_keys->count() === 0)
-            <div class="flex flex-col gap-1">
-                <div class='font-bold dark:text-warning'>No private keys found.</div>
-                <div class="flex items-center gap-1">Before you can add your server, first <x-modal-input
-                        buttonTitle="add" title="New Private Key">
-                        <livewire:security.private-key.create from="server" />
-                    </x-modal-input> a private key
-                    or
-                    go to the <a class="underline dark:text-white" href="{{ route('onboarding') }}">onboarding</a>
-                    page.
-                </div>
+                @endforeach
             </div>
         @else
             <div class="flex flex-col gap-1">
-                <div class='font-bold dark:text-warning'>No servers found.</div>
+                <div class='font-bold dark:text-warning'>No projects found.</div>
                 <div class="flex items-center gap-1">
-                    <x-modal-input buttonTitle="Add" title="New Server" :closeOutside="false">
-                        <livewire:server.create />
-                    </x-modal-input> your first server
-                    or
-                    go to the <a class="underline dark:text-white" href="{{ route('onboarding') }}">onboarding</a>
-                    page.
+                    <x-modal-input buttonTitle="Add" title="New Project">
+                        <livewire:project.add-empty />
+                    </x-modal-input> your first project or
+                    go to the <a class="underline dark:text-white" href="{{ route('onboarding') }}">onboarding</a> page.
                 </div>
             </div>
         @endif
-    @endif
-    @if ($servers->count() > 0 && $projects->count() > 0)
-        <div class="flex items-center gap-2">
-            <h3 class="py-4">Deployments</h3>
-            @if (count($deployments_per_server) > 0)
-                <x-loading />
-            @endif
-            <x-modal-confirmation
-                title="Confirm Cleanup Queues?"
-                buttonTitle="Cleanup Queues"
-                isErrorButton
-                submitAction="cleanup_queue"
-                :actions="['All running Deployment Queues will be cleaned up.']"
-                :confirmWithText="false"
-                :confirmWithPassword="false"
-                step2ButtonText="Permanently Cleanup Deployment Queues"
-                :dispatchEvent="true"
-                dispatchEventType="success"
-                dispatchEventMessage="Deployment Queues cleanup started."
-            />
-        </div>
-        <div wire:poll.3000ms="get_deployments" class="grid grid-cols-1">
-            @forelse ($deployments_per_server as $server_name => $deployments)
-                <h4 class="py-4">{{ $server_name }}</h4>
-                <div class="grid grid-cols-1 gap-2 lg:grid-cols-3">
-                    @foreach ($deployments as $deployment)
-                        <a href="{{ data_get($deployment, 'deployment_url') }}" @class([
-                            'gap-2 cursor-pointer box group border-l-2 border-dotted',
-                            'dark:border-coolgray-300' => data_get($deployment, 'status') === 'queued',
-                            'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
+    </section>
+
+    <section>
+        <h3 class="pb-2">Servers</h3>
+        @if ($servers->count() > 0)
+            <div class="grid grid-cols-1 gap-2 xl:grid-cols-2">
+                @foreach ($servers as $server)
+                    <a href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}"
+                        @class([
+                            'gap-2 border cursor-pointer box group',
+                            'border-transparent' => $server->settings->is_reachable,
+                            'border-red-500' => !$server->settings->is_reachable,
                         ])>
-                            <div class="flex flex-col justify-center mx-6">
-                                <div class="box-title">
-                                    {{ data_get($deployment, 'application_name') }}
-                                </div>
-                                @if (data_get($deployment, 'pull_request_id') !== 0)
-                                    <div class="box-description">
-                                        PR #{{ data_get($deployment, 'pull_request_id') }}
-                                    </div>
-                                @endif
-                                <div class="box-description">
-                                    {{ str(data_get($deployment, 'status'))->headline() }}
-                                </div>
+                        <div class="flex flex-col justify-center mx-6">
+                            <div class="box-title">
+                                {{ $server->name }}
                             </div>
-                            <div class="flex-1"></div>
-                        </a>
-                    @endforeach
+                            <div class="box-description">
+                                {{ $server->description }}</div>
+                            <div class="flex gap-1 text-xs text-error">
+                                @if (!$server->settings->is_reachable)
+                                    Not reachable
+                                @endif
+                                @if (!$server->settings->is_reachable && !$server->settings->is_usable)
+                                    &
+                                @endif
+                                @if (!$server->settings->is_usable)
+                                    Not usable by Coolify
+                                @endif
+                            </div>
+                        </div>
+                        <div class="flex-1"></div>
+                    </a>
+                @endforeach
+            </div>
+        @else
+            @if ($private_keys->count() === 0)
+                <div class="flex flex-col gap-1">
+                    <div class='font-bold dark:text-warning'>No private keys found.</div>
+                    <div class="flex items-center gap-1">Before you can add your server, first <x-modal-input
+                            buttonTitle="add" title="New Private Key">
+                            <livewire:security.private-key.create from="server" />
+                        </x-modal-input> a private key
+                        or
+                        go to the <a class="underline dark:text-white" href="{{ route('onboarding') }}">onboarding</a>
+                        page.
+                    </div>
                 </div>
-            @empty
-                <div>No deployments running.</div>
-            @endforelse
-        </div>
+            @else
+                <div class="flex flex-col gap-1">
+                    <div class='font-bold dark:text-warning'>No servers found.</div>
+                    <div class="flex items-center gap-1">
+                        <x-modal-input buttonTitle="Add" title="New Server" :closeOutside="false">
+                            <livewire:server.create />
+                        </x-modal-input> your first server
+                        or
+                        go to the <a class="underline dark:text-white" href="{{ route('onboarding') }}">onboarding</a>
+                        page.
+                    </div>
+                </div>
+            @endif
+        @endif
+    </section>
+
+    @if ($servers->count() > 0 && $projects->count() > 0)
+        <section>
+            <div class="flex items-center gap-2">
+                <h3 class="pb-2">Deployments</h3>
+                @if (count($deployments_per_server) > 0)
+                    <x-loading />
+                @endif
+                <x-modal-confirmation
+                    title="Confirm Cleanup Queues?"
+                    buttonTitle="Cleanup Queues"
+                    isErrorButton
+                    submitAction="cleanup_queue"
+                    :actions="['All running Deployment Queues will be cleaned up.']"
+                    :confirmWithText="false"
+                    :confirmWithPassword="false"
+                    step2ButtonText="Permanently Cleanup Deployment Queues"
+                    :dispatchEvent="true"
+                    dispatchEventType="success"
+                    dispatchEventMessage="Deployment Queues cleanup started."
+                />
+            </div>
+            <div wire:poll.3000ms="get_deployments" class="grid grid-cols-1">
+                @forelse ($deployments_per_server as $server_name => $deployments)
+                    <h4 class="pb-2">{{ $server_name }}</h4>
+                    <div class="grid grid-cols-1 gap-2 lg:grid-cols-3">
+                        @foreach ($deployments as $deployment)
+                            <a href="{{ data_get($deployment, 'deployment_url') }}" @class([
+                                'gap-2 cursor-pointer box group border-l-2 border-dotted',
+                                'dark:border-coolgray-300' => data_get($deployment, 'status') === 'queued',
+                                'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
+                            ])>
+                                <div class="flex flex-col justify-center mx-6">
+                                    <div class="box-title">
+                                        {{ data_get($deployment, 'application_name') }}
+                                    </div>
+                                    @if (data_get($deployment, 'pull_request_id') !== 0)
+                                        <div class="box-description">
+                                            PR #{{ data_get($deployment, 'pull_request_id') }}
+                                        </div>
+                                    @endif
+                                    <div class="box-description">
+                                        {{ str(data_get($deployment, 'status'))->headline() }}
+                                    </div>
+                                </div>
+                                <div class="flex-1"></div>
+                            </a>
+                        @endforeach
+                    </div>
+                @empty
+                    <div>No deployments running.</div>
+                @endforelse
+            </div>
+        </section>
     @endif
 
 

From 1fa7ac7993a431bf48244326680f61ddf6f772d4 Mon Sep 17 00:00:00 2001
From: Lucas Michot <lucas@semalead.com>
Date: Mon, 28 Oct 2024 13:40:00 +0100
Subject: [PATCH 10/21] Update some properties within composer.json file

---
 composer.json | 11 +++++++----
 composer.lock |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index b17c3bf4e..ddfe3f598 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,13 @@
 {
-    "name": "laravel/laravel",
+    "name": "coollabsio/coolify",
     "type": "project",
-    "description": "The Laravel Framework.",
+    "description": "The Coolify project.",
     "keywords": [
-        "framework",
-        "laravel"
+        "coolify",
+        "deployment",
+        "docker",
+        "self-hosted",
+        "server"
     ],
     "license": "MIT",
     "require": {
diff --git a/composer.lock b/composer.lock
index 981e723d4..5636627dc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "943975ec232403b96a40d215253492d8",
+    "content-hash": "86f43c2e25a32afe65da962885fc9f25",
     "packages": [
         {
             "name": "amphp/amp",

From 42bfc0bf537f87ba781018001354fb500786934a Mon Sep 17 00:00:00 2001
From: Lucas Michot <lucas@semalead.com>
Date: Mon, 28 Oct 2024 13:40:29 +0100
Subject: [PATCH 11/21] Normalize composer.json file

---
 composer.json | 94 +++++++++++++++++++++++++--------------------------
 composer.lock |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/composer.json b/composer.json
index ddfe3f598..d593ca220 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
 {
     "name": "coollabsio/coolify",
-    "type": "project",
     "description": "The Coolify project.",
+    "license": "MIT",
+    "type": "project",
     "keywords": [
         "coolify",
         "deployment",
@@ -9,21 +10,20 @@
         "self-hosted",
         "server"
     ],
-    "license": "MIT",
     "require": {
         "php": "^8.2",
         "danharrin/livewire-rate-limiting": "^1.1",
         "doctrine/dbal": "^3.6",
         "guzzlehttp/guzzle": "^7.5.0",
-        "laravel/fortify": "^v1.16.0",
-        "laravel/framework": "^v11",
+        "laravel/fortify": "^1.16.0",
+        "laravel/framework": "^11",
         "laravel/horizon": "^5.29.1",
         "laravel/pail": "^1.1",
         "laravel/prompts": "^0.1.6",
-        "laravel/sanctum": "^v4.0",
-        "laravel/socialite": "^v5.14.0",
+        "laravel/sanctum": "^4.0",
+        "laravel/socialite": "^5.14.0",
         "laravel/telescope": "^5.2",
-        "laravel/tinker": "^v2.8.1",
+        "laravel/tinker": "^2.8.1",
         "laravel/ui": "^4.2",
         "lcobucci/jwt": "^5.0.0",
         "league/flysystem-aws-s3-v3": "^3.0",
@@ -32,7 +32,7 @@
         "log1x/laravel-webfonts": "^1.0",
         "lorisleiva/laravel-actions": "^2.7",
         "nubs/random-name-generator": "^2.2",
-        "phpseclib/phpseclib": "~3.0",
+        "phpseclib/phpseclib": "^3.0",
         "pion/laravel-chunk-upload": "^1.5",
         "poliander/cron": "^3.0",
         "purplepixie/phpdns": "^2.1",
@@ -53,53 +53,43 @@
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.13",
-        "fakerphp/faker": "^v1.21.0",
-        "laravel/dusk": "^v8.0",
+        "fakerphp/faker": "^1.21.0",
+        "laravel/dusk": "^8.0",
         "laravel/pint": "^1.16",
         "mockery/mockery": "^1.5.1",
-        "nunomaduro/collision": "^v8.1",
+        "nunomaduro/collision": "^8.1",
         "pestphp/pest": "^2.16",
         "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^10.0.19",
-        "serversideup/spin": "^v1.1.0",
+        "serversideup/spin": "^1.1.0",
         "spatie/laravel-ignition": "^2.1.0",
         "symfony/http-client": "^6.2"
     },
+    "minimum-stability": "stable",
+    "prefer-stable": true,
     "autoload": {
-        "files": [
-            "bootstrap/includeHelpers.php"
-        ],
         "psr-4": {
             "App\\": "app/",
             "Database\\Factories\\": "database/factories/",
             "Database\\Seeders\\": "database/seeders/"
-        }
+        },
+        "files": [
+            "bootstrap/includeHelpers.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
             "Tests\\": "tests/"
         }
     },
-    "scripts": {
-        "post-autoload-dump": [
-            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-            "@php artisan package:discover --ansi"
-        ],
-        "post-update-cmd": [
-            "@php artisan vendor:publish --tag=laravel-assets --ansi --force",
-            "Illuminate\\Foundation\\ComposerScripts::postUpdate"
-        ],
-        "post-install-cmd": [
-            "cp -r 'hooks/' '.git/hooks/'",
-            "php -r \"copy('hooks/pre-commit', '.git/hooks/pre-commit');\"",
-            "php -r \"chmod('.git/hooks/pre-commit', 0777);\""
-        ],
-        "post-root-package-install": [
-            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
-        ],
-        "post-create-project-cmd": [
-            "@php artisan key:generate --ansi"
-        ]
+    "config": {
+        "allow-plugins": {
+            "pestphp/pest-plugin": true,
+            "php-http/discovery": true
+        },
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
     },
     "extra": {
         "laravel": {
@@ -108,15 +98,25 @@
             ]
         }
     },
-    "config": {
-        "optimize-autoloader": true,
-        "preferred-install": "dist",
-        "sort-packages": true,
-        "allow-plugins": {
-            "pestphp/pest-plugin": true,
-            "php-http/discovery": true
-        }
-    },
-    "minimum-stability": "stable",
-    "prefer-stable": true
+    "scripts": {
+        "post-install-cmd": [
+            "cp -r 'hooks/' '.git/hooks/'",
+            "php -r \"copy('hooks/pre-commit', '.git/hooks/pre-commit');\"",
+            "php -r \"chmod('.git/hooks/pre-commit', 0777);\""
+        ],
+        "post-update-cmd": [
+            "@php artisan vendor:publish --tag=laravel-assets --ansi --force",
+            "Illuminate\\Foundation\\ComposerScripts::postUpdate"
+        ],
+        "post-autoload-dump": [
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+            "@php artisan package:discover --ansi"
+        ],
+        "post-root-package-install": [
+            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+        ],
+        "post-create-project-cmd": [
+            "@php artisan key:generate --ansi"
+        ]
+    }
 }
diff --git a/composer.lock b/composer.lock
index 5636627dc..4b33d41cd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "86f43c2e25a32afe65da962885fc9f25",
+    "content-hash": "74c6029744c5c1101c704098a280bba1",
     "packages": [
         {
             "name": "amphp/amp",

From e2b396a0f0a9c5dcc858c825ceb5b6e4126a9154 Mon Sep 17 00:00:00 2001
From: Lucas Michot <lucas@semalead.com>
Date: Thu, 31 Oct 2024 15:14:30 +0100
Subject: [PATCH 12/21] Use match when possible.

---
 app/Livewire/Project/Shared/Danger.php     | 41 ++++++++-------------
 app/Livewire/Subscription/PricingPlans.php | 42 +++++++---------------
 2 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/app/Livewire/Project/Shared/Danger.php b/app/Livewire/Project/Shared/Danger.php
index 2a21532ce..a0b4ac2c4 100644
--- a/app/Livewire/Project/Shared/Danger.php
+++ b/app/Livewire/Project/Shared/Danger.php
@@ -62,32 +62,21 @@ public function mount()
             return;
         }
 
-        switch ($this->resource->type()) {
-            case 'application':
-                $this->resourceName = $this->resource->name ?? 'Application';
-                break;
-            case 'standalone-postgresql':
-            case 'standalone-redis':
-            case 'standalone-mongodb':
-            case 'standalone-mysql':
-            case 'standalone-mariadb':
-            case 'standalone-keydb':
-            case 'standalone-dragonfly':
-            case 'standalone-clickhouse':
-                $this->resourceName = $this->resource->name ?? 'Database';
-                break;
-            case 'service':
-                $this->resourceName = $this->resource->name ?? 'Service';
-                break;
-            case 'service-application':
-                $this->resourceName = $this->resource->name ?? 'Service Application';
-                break;
-            case 'service-database':
-                $this->resourceName = $this->resource->name ?? 'Service Database';
-                break;
-            default:
-                $this->resourceName = 'Unknown Resource';
-        }
+        $this->resourceName = match ($this->resource->type()) {
+            'application' => $this->resource->name ?? 'Application',
+            'standalone-postgresql',
+            'standalone-redis',
+            'standalone-mongodb',
+            'standalone-mysql',
+            'standalone-mariadb',
+            'standalone-keydb',
+            'standalone-dragonfly',
+            'standalone-clickhouse' => $this->resource->name ?? 'Database',
+            'service' => $this->resource->name ?? 'Service',
+            'service-application' => $this->resource->name ?? 'Service Application',
+            'service-database' => $this->resource->name ?? 'Service Database',
+            default => 'Unknown Resource',
+        };
     }
 
     public function delete($password)
diff --git a/app/Livewire/Subscription/PricingPlans.php b/app/Livewire/Subscription/PricingPlans.php
index 9bc11d862..09d11038d 100644
--- a/app/Livewire/Subscription/PricingPlans.php
+++ b/app/Livewire/Subscription/PricingPlans.php
@@ -22,35 +22,19 @@ public function subscribeStripe($type)
     {
         $team = currentTeam();
         Stripe::setApiKey(config('subscription.stripe_api_key'));
-        switch ($type) {
-            case 'basic-monthly':
-                $priceId = config('subscription.stripe_price_id_basic_monthly');
-                break;
-            case 'basic-yearly':
-                $priceId = config('subscription.stripe_price_id_basic_yearly');
-                break;
-            case 'pro-monthly':
-                $priceId = config('subscription.stripe_price_id_pro_monthly');
-                break;
-            case 'pro-yearly':
-                $priceId = config('subscription.stripe_price_id_pro_yearly');
-                break;
-            case 'ultimate-monthly':
-                $priceId = config('subscription.stripe_price_id_ultimate_monthly');
-                break;
-            case 'ultimate-yearly':
-                $priceId = config('subscription.stripe_price_id_ultimate_yearly');
-                break;
-            case 'dynamic-monthly':
-                $priceId = config('subscription.stripe_price_id_dynamic_monthly');
-                break;
-            case 'dynamic-yearly':
-                $priceId = config('subscription.stripe_price_id_dynamic_yearly');
-                break;
-            default:
-                $priceId = config('subscription.stripe_price_id_basic_monthly');
-                break;
-        }
+
+        $priceId = match ($type) {
+            'basic-monthly' => config('subscription.stripe_price_id_basic_monthly'),
+            'basic-yearly' => config('subscription.stripe_price_id_basic_yearly'),
+            'pro-monthly' => config('subscription.stripe_price_id_pro_monthly'),
+            'pro-yearly' => config('subscription.stripe_price_id_pro_yearly'),
+            'ultimate-monthly' => config('subscription.stripe_price_id_ultimate_monthly'),
+            'ultimate-yearly' => config('subscription.stripe_price_id_ultimate_yearly'),
+            'dynamic-monthly' => config('subscription.stripe_price_id_dynamic_monthly'),
+            'dynamic-yearly' => config('subscription.stripe_price_id_dynamic_yearly'),
+            default => config('subscription.stripe_price_id_basic_monthly'),
+        };
+
         if (! $priceId) {
             $this->dispatch('error', 'Price ID not found! Please contact the administrator.');
 

From b1d04912a00a946c28c41ca9fd22b19ebc7db07d Mon Sep 17 00:00:00 2001
From: Lucas Michot <lucas@semalead.com>
Date: Thu, 31 Oct 2024 15:19:37 +0100
Subject: [PATCH 13/21] Remove all useless catch block useless variables.

---
 app/Livewire/Notifications/Discord.php             |  2 +-
 app/Livewire/Notifications/Telegram.php            |  2 +-
 app/Livewire/Project/Application/Preview/Form.php  |  2 +-
 app/Livewire/Project/Database/BackupExecutions.php |  2 +-
 app/Livewire/Project/Service/Database.php          |  2 +-
 app/Livewire/Project/Service/Navbar.php            |  2 +-
 .../Project/Shared/ScheduledTask/Executions.php    |  2 +-
 app/Livewire/Security/PrivateKey/Show.php          |  2 +-
 app/Livewire/Server/Advanced.php                   |  2 +-
 app/Livewire/Team/Invitations.php                  |  2 +-
 bootstrap/helpers/docker.php                       |  6 +++---
 bootstrap/helpers/remoteProcess.php                |  4 ++--
 bootstrap/helpers/shared.php                       | 14 +++++++-------
 13 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/Livewire/Notifications/Discord.php b/app/Livewire/Notifications/Discord.php
index 01ba8ffe1..db8594558 100644
--- a/app/Livewire/Notifications/Discord.php
+++ b/app/Livewire/Notifications/Discord.php
@@ -34,7 +34,7 @@ public function instantSave()
     {
         try {
             $this->submit();
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             $this->team->discord_enabled = false;
             $this->validate();
         }
diff --git a/app/Livewire/Notifications/Telegram.php b/app/Livewire/Notifications/Telegram.php
index 09a0f1c3c..862b9b3ea 100644
--- a/app/Livewire/Notifications/Telegram.php
+++ b/app/Livewire/Notifications/Telegram.php
@@ -41,7 +41,7 @@ public function instantSave()
     {
         try {
             $this->submit();
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             $this->team->telegram_enabled = false;
             $this->validate();
         }
diff --git a/app/Livewire/Project/Application/Preview/Form.php b/app/Livewire/Project/Application/Preview/Form.php
index 9a0b9b851..73b423f90 100644
--- a/app/Livewire/Project/Application/Preview/Form.php
+++ b/app/Livewire/Project/Application/Preview/Form.php
@@ -36,7 +36,7 @@ public function generate_real_url()
                 $url = Url::fromString($firstFqdn);
                 $host = $url->getHost();
                 $this->preview_url_template = str($this->application->preview_url_template)->replace('{{domain}}', $host);
-            } catch (\Exception $e) {
+            } catch (\Exception) {
                 $this->dispatch('error', 'Invalid FQDN.');
             }
         }
diff --git a/app/Livewire/Project/Database/BackupExecutions.php b/app/Livewire/Project/Database/BackupExecutions.php
index 45c7c30e2..03d78487a 100644
--- a/app/Livewire/Project/Database/BackupExecutions.php
+++ b/app/Livewire/Project/Database/BackupExecutions.php
@@ -130,7 +130,7 @@ public function formatDateInServerTimezone($date)
         $dateObj = new \DateTime($date);
         try {
             $dateObj->setTimezone(new \DateTimeZone($serverTimezone));
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             $dateObj->setTimezone(new \DateTimeZone('UTC'));
         }
 
diff --git a/app/Livewire/Project/Service/Database.php b/app/Livewire/Project/Service/Database.php
index f95075de6..9f02db05c 100644
--- a/app/Livewire/Project/Service/Database.php
+++ b/app/Livewire/Project/Service/Database.php
@@ -95,7 +95,7 @@ public function submit()
             $this->database->save();
             updateCompose($this->database);
             $this->dispatch('success', 'Database saved.');
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
         } finally {
             $this->dispatch('generateDockerCompose');
         }
diff --git a/app/Livewire/Project/Service/Navbar.php b/app/Livewire/Project/Service/Navbar.php
index 2c5198387..67b575599 100644
--- a/app/Livewire/Project/Service/Navbar.php
+++ b/app/Livewire/Project/Service/Navbar.php
@@ -76,7 +76,7 @@ public function checkDeployments()
             } else {
                 $this->isDeploymentProgress = false;
             }
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             $this->isDeploymentProgress = false;
         }
     }
diff --git a/app/Livewire/Project/Shared/ScheduledTask/Executions.php b/app/Livewire/Project/Shared/ScheduledTask/Executions.php
index 017cc9fd7..6bb45b68e 100644
--- a/app/Livewire/Project/Shared/ScheduledTask/Executions.php
+++ b/app/Livewire/Project/Shared/ScheduledTask/Executions.php
@@ -65,7 +65,7 @@ public function formatDateInServerTimezone($date)
         $dateObj = new \DateTime($date);
         try {
             $dateObj->setTimezone(new \DateTimeZone($serverTimezone));
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             $dateObj->setTimezone(new \DateTimeZone('UTC'));
         }
 
diff --git a/app/Livewire/Security/PrivateKey/Show.php b/app/Livewire/Security/PrivateKey/Show.php
index 249c84f14..b9195b543 100644
--- a/app/Livewire/Security/PrivateKey/Show.php
+++ b/app/Livewire/Security/PrivateKey/Show.php
@@ -28,7 +28,7 @@ public function mount()
     {
         try {
             $this->private_key = PrivateKey::ownedByCurrentTeam(['name', 'description', 'private_key', 'is_git_related'])->whereUuid(request()->private_key_uuid)->firstOrFail();
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             abort(404);
         }
     }
diff --git a/app/Livewire/Server/Advanced.php b/app/Livewire/Server/Advanced.php
index 87b42cf3c..becae9f04 100644
--- a/app/Livewire/Server/Advanced.php
+++ b/app/Livewire/Server/Advanced.php
@@ -43,7 +43,7 @@ public function mount(string $server_uuid)
             $this->server = Server::ownedByCurrentTeam()->whereUuid($server_uuid)->firstOrFail();
             $this->parameters = get_route_parameters();
             $this->syncData();
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             return redirect()->route('server.show');
         }
     }
diff --git a/app/Livewire/Team/Invitations.php b/app/Livewire/Team/Invitations.php
index 043c4e2e8..93432efc8 100644
--- a/app/Livewire/Team/Invitations.php
+++ b/app/Livewire/Team/Invitations.php
@@ -18,7 +18,7 @@ public function deleteInvitation(int $invitation_id)
             $initiation_found->delete();
             $this->refreshInvitations();
             $this->dispatch('success', 'Invitation revoked.');
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             return $this->dispatch('error', 'Invitation not found.');
         }
     }
diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index 2795ae295..77070128d 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -67,7 +67,7 @@ function format_docker_command_output_to_json($rawOutput): Collection
         return $outputLines
             ->reject(fn ($line) => empty($line))
             ->map(fn ($outputLine) => json_decode($outputLine, true, flags: JSON_THROW_ON_ERROR));
-    } catch (\Throwable $e) {
+    } catch (\Throwable) {
         return collect([]);
     }
 }
@@ -104,7 +104,7 @@ function format_docker_envs_to_json($rawOutput)
 
             return [$env[0] => $env[1]];
         });
-    } catch (\Throwable $e) {
+    } catch (\Throwable) {
         return collect([]);
     }
 }
@@ -510,7 +510,7 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     }
                 }
             }
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             continue;
         }
     }
diff --git a/bootstrap/helpers/remoteProcess.php b/bootstrap/helpers/remoteProcess.php
index 67b60d6b7..c7dd2cb83 100644
--- a/bootstrap/helpers/remoteProcess.php
+++ b/bootstrap/helpers/remoteProcess.php
@@ -124,7 +124,7 @@ function decode_remote_command_output(?ApplicationDeploymentQueue $application_d
             associative: true,
             flags: JSON_THROW_ON_ERROR
         );
-    } catch (\JsonException $exception) {
+    } catch (\JsonException) {
         return collect([]);
     }
     $seenCommands = collect();
@@ -204,7 +204,7 @@ function checkRequiredCommands(Server $server)
         }
         try {
             instant_remote_process(["docker run --rm --privileged --net=host --pid=host --ipc=host --volume /:/host busybox chroot /host bash -c 'apt update && apt install -y {$command}'"], $server);
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             break;
         }
         $commandFound = instant_remote_process(["docker run --rm --privileged --net=host --pid=host --ipc=host --volume /:/host busybox chroot /host bash -c 'command -v {$command}'"], $server, false);
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 89462215c..e260491ba 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -172,7 +172,7 @@ function get_latest_sentinel_version(): string
         $versions = $response->json();
 
         return data_get($versions, 'coolify.sentinel.version');
-    } catch (\Throwable $e) {
+    } catch (\Throwable) {
         return '0.0.0';
     }
 }
@@ -301,7 +301,7 @@ function getFqdnWithoutPort(string $fqdn)
         $path = $url->getPath();
 
         return "$scheme://$host$path";
-    } catch (\Throwable $e) {
+    } catch (\Throwable) {
         return $fqdn;
     }
 }
@@ -540,7 +540,7 @@ function get_service_templates(bool $force = false): Collection
             $services = $response->json();
 
             return collect($services);
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             $services = File::get(base_path('templates/service-templates.json'));
 
             return collect(json_decode($services))->sortKeys();
@@ -1052,7 +1052,7 @@ function validate_dns_entry(string $fqdn, Server $server)
                     }
                 }
             }
-        } catch (\Exception $e) {
+        } catch (\Exception) {
         }
     }
     ray("Found match: $found_matching_ip");
@@ -2213,7 +2213,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
     } elseif ($resource->getMorphClass() === \App\Models\Application::class) {
         try {
             $yaml = Yaml::parse($resource->docker_compose_raw);
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             return;
         }
         $server = $resource->destination->server;
@@ -2959,7 +2959,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
 
     try {
         $yaml = Yaml::parse($compose);
-    } catch (\Exception $e) {
+    } catch (\Exception) {
         return collect([]);
     }
 
@@ -4010,7 +4010,7 @@ function loadConfigFromGit(string $repository, string $branch, string $base_dire
     ]);
     try {
         return instant_remote_process($commands, $server);
-    } catch (\Exception $e) {
+    } catch (\Exception) {
         // continue
     }
 }

From 601f1a4717a6724f9dd16aeba626b023f22effca Mon Sep 17 00:00:00 2001
From: Lucas Michot <lucas@semalead.com>
Date: Thu, 31 Oct 2024 15:23:19 +0100
Subject: [PATCH 14/21] Always prefer stricter string comparisons.

---
 app/Jobs/ScheduledTaskJob.php                          |  4 ++--
 app/Livewire/Project/Application/Deployment/Show.php   |  2 +-
 app/Livewire/Project/Database/BackupEdit.php           |  2 +-
 app/Livewire/Project/Database/Import.php               | 10 +++++-----
 .../Project/New/GithubPrivateRepositoryDeployKey.php   |  2 +-
 app/Livewire/Project/New/PublicGitRepository.php       |  4 ++--
 app/Livewire/Project/Shared/ScheduledTask/Add.php      |  4 ++--
 app/Livewire/Project/Shared/ScheduledTask/All.php      |  4 ++--
 app/Livewire/Project/Shared/ScheduledTask/Show.php     |  2 +-
 app/Livewire/Tags/Index.php                            |  2 +-
 app/Models/Application.php                             |  8 ++++----
 app/Models/EnvironmentVariable.php                     |  4 ++--
 app/Models/LocalFileVolume.php                         | 10 +++++-----
 app/Models/Server.php                                  |  6 +++---
 app/Models/StandaloneClickhouse.php                    |  4 ++--
 app/Models/StandaloneDragonfly.php                     |  4 ++--
 app/Models/StandaloneKeydb.php                         |  4 ++--
 app/Models/StandaloneMariadb.php                       |  4 ++--
 app/Models/StandaloneMongodb.php                       |  4 ++--
 app/Models/StandaloneMysql.php                         |  4 ++--
 app/Models/StandalonePostgresql.php                    |  4 ++--
 app/Models/StandaloneRedis.php                         |  4 ++--
 bootstrap/helpers/github.php                           |  2 +-
 bootstrap/helpers/services.php                         | 10 +++++-----
 bootstrap/helpers/socialite.php                        |  2 +-
 25 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/app/Jobs/ScheduledTaskJob.php b/app/Jobs/ScheduledTaskJob.php
index 6850ae98a..b2788a351 100644
--- a/app/Jobs/ScheduledTaskJob.php
+++ b/app/Jobs/ScheduledTaskJob.php
@@ -76,14 +76,14 @@ public function handle(): void
 
             $this->server = $this->resource->destination->server;
 
-            if ($this->resource->type() == 'application') {
+            if ($this->resource->type() === 'application') {
                 $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
                 if ($containers->count() > 0) {
                     $containers->each(function ($container) {
                         $this->containers[] = str_replace('/', '', $container['Names']);
                     });
                 }
-            } elseif ($this->resource->type() == 'service') {
+            } elseif ($this->resource->type() === 'service') {
                 $this->resource->applications()->get()->each(function ($application) {
                     if (str(data_get($application, 'status'))->contains('running')) {
                         $this->containers[] = data_get($application, 'name').'-'.data_get($this->resource, 'uuid');
diff --git a/app/Livewire/Project/Application/Deployment/Show.php b/app/Livewire/Project/Application/Deployment/Show.php
index 3de895f8c..04170fa28 100644
--- a/app/Livewire/Project/Application/Deployment/Show.php
+++ b/app/Livewire/Project/Application/Deployment/Show.php
@@ -64,7 +64,7 @@ public function polling()
     {
         $this->dispatch('deploymentFinished');
         $this->application_deployment_queue->refresh();
-        if (data_get($this->application_deployment_queue, 'status') == 'finished' || data_get($this->application_deployment_queue, 'status') == 'failed') {
+        if (data_get($this->application_deployment_queue, 'status') === 'finished' || data_get($this->application_deployment_queue, 'status') === 'failed') {
             $this->isKeepAliveOn = false;
         }
     }
diff --git a/app/Livewire/Project/Database/BackupEdit.php b/app/Livewire/Project/Database/BackupEdit.php
index 8d838ed3b..9b82c4b11 100644
--- a/app/Livewire/Project/Database/BackupEdit.php
+++ b/app/Livewire/Project/Database/BackupEdit.php
@@ -121,7 +121,7 @@ public function submit()
     {
         try {
             $this->custom_validate();
-            if ($this->backup->databases_to_backup == '' || $this->backup->databases_to_backup === null) {
+            if ($this->backup->databases_to_backup === '' || $this->backup->databases_to_backup === null) {
                 $this->backup->databases_to_backup = null;
             }
             $this->backup->save();
diff --git a/app/Livewire/Project/Database/Import.php b/app/Livewire/Project/Database/Import.php
index cd9818b41..39db28d9b 100644
--- a/app/Livewire/Project/Database/Import.php
+++ b/app/Livewire/Project/Database/Import.php
@@ -77,10 +77,10 @@ public function getContainers()
         }
 
         if (
-            $this->resource->getMorphClass() == \App\Models\StandaloneRedis::class ||
-            $this->resource->getMorphClass() == \App\Models\StandaloneKeydb::class ||
-            $this->resource->getMorphClass() == \App\Models\StandaloneDragonfly::class ||
-            $this->resource->getMorphClass() == \App\Models\StandaloneClickhouse::class
+            $this->resource->getMorphClass() === \App\Models\StandaloneRedis::class ||
+            $this->resource->getMorphClass() === \App\Models\StandaloneKeydb::class ||
+            $this->resource->getMorphClass() === \App\Models\StandaloneDragonfly::class ||
+            $this->resource->getMorphClass() === \App\Models\StandaloneClickhouse::class
         ) {
             $this->unsupported = true;
         }
@@ -89,7 +89,7 @@ public function getContainers()
     public function runImport()
     {
 
-        if ($this->filename == '') {
+        if ($this->filename === '') {
             $this->dispatch('error', 'Please select a file to import.');
 
             return;
diff --git a/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php b/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
index 0edafd040..b46c4a794 100644
--- a/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
+++ b/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
@@ -198,7 +198,7 @@ private function get_git_source()
         $this->git_host = $this->repository_url_parsed->getHost();
         $this->git_repository = $this->repository_url_parsed->getSegment(1).'/'.$this->repository_url_parsed->getSegment(2);
 
-        if ($this->git_host == 'github.com') {
+        if ($this->git_host === 'github.com') {
             $this->git_source = GithubApp::where('name', 'Public GitHub')->first();
 
             return;
diff --git a/app/Livewire/Project/New/PublicGitRepository.php b/app/Livewire/Project/New/PublicGitRepository.php
index 55eb5c77d..49f017270 100644
--- a/app/Livewire/Project/New/PublicGitRepository.php
+++ b/app/Livewire/Project/New/PublicGitRepository.php
@@ -174,7 +174,7 @@ public function loadBranch()
 
                 return;
             }
-            if (! $this->branchFound && $this->git_branch == 'main') {
+            if (! $this->branchFound && $this->git_branch === 'main') {
                 try {
                     $this->git_branch = 'master';
                     $this->getBranch();
@@ -197,7 +197,7 @@ private function getGitSource()
         } else {
             $this->git_branch = 'main';
         }
-        if ($this->git_host == 'github.com') {
+        if ($this->git_host === 'github.com') {
             $this->git_source = GithubApp::where('name', 'Public GitHub')->first();
 
             return;
diff --git a/app/Livewire/Project/Shared/ScheduledTask/Add.php b/app/Livewire/Project/Shared/ScheduledTask/Add.php
index f36b7b141..adfd59217 100644
--- a/app/Livewire/Project/Shared/ScheduledTask/Add.php
+++ b/app/Livewire/Project/Shared/ScheduledTask/Add.php
@@ -55,8 +55,8 @@ public function submit()
 
                 return;
             }
-            if (empty($this->container) || $this->container == 'null') {
-                if ($this->type == 'service') {
+            if (empty($this->container) || $this->container === 'null') {
+                if ($this->type === 'service') {
                     $this->container = $this->subServiceName;
                 }
             }
diff --git a/app/Livewire/Project/Shared/ScheduledTask/All.php b/app/Livewire/Project/Shared/ScheduledTask/All.php
index b383e294a..6ab8426f3 100644
--- a/app/Livewire/Project/Shared/ScheduledTask/All.php
+++ b/app/Livewire/Project/Shared/ScheduledTask/All.php
@@ -21,10 +21,10 @@ class All extends Component
     public function mount()
     {
         $this->parameters = get_route_parameters();
-        if ($this->resource->type() == 'service') {
+        if ($this->resource->type() === 'service') {
             $this->containerNames = $this->resource->applications()->pluck('name');
             $this->containerNames = $this->containerNames->merge($this->resource->databases()->pluck('name'));
-        } elseif ($this->resource->type() == 'application') {
+        } elseif ($this->resource->type() === 'application') {
             if ($this->resource->build_pack === 'dockercompose') {
                 $parsed = $this->resource->parse();
                 $containers = collect(data_get($parsed, 'services'))->keys();
diff --git a/app/Livewire/Project/Shared/ScheduledTask/Show.php b/app/Livewire/Project/Shared/ScheduledTask/Show.php
index 37f50dd32..36194edb7 100644
--- a/app/Livewire/Project/Shared/ScheduledTask/Show.php
+++ b/app/Livewire/Project/Shared/ScheduledTask/Show.php
@@ -77,7 +77,7 @@ public function delete()
         try {
             $this->task->delete();
 
-            if ($this->type == 'application') {
+            if ($this->type === 'application') {
                 return redirect()->route('project.application.configuration', $this->parameters, $this->scheduledTaskName);
             } else {
                 return redirect()->route('project.service.configuration', $this->parameters, $this->scheduledTaskName);
diff --git a/app/Livewire/Tags/Index.php b/app/Livewire/Tags/Index.php
index 642b2bded..116f19e4e 100644
--- a/app/Livewire/Tags/Index.php
+++ b/app/Livewire/Tags/Index.php
@@ -47,7 +47,7 @@ public function updateDeployments($deployments)
 
     public function tagUpdated()
     {
-        if ($this->tag == '') {
+        if ($this->tag === '') {
             return;
         }
         $sanitizedTag = htmlspecialchars($this->tag, ENT_QUOTES, 'UTF-8');
diff --git a/app/Models/Application.php b/app/Models/Application.php
index c747c75c5..cd7bb533e 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -114,7 +114,7 @@ class Application extends BaseModel
     protected static function booted()
     {
         static::saving(function ($application) {
-            if ($application->fqdn == '') {
+            if ($application->fqdn === '') {
                 $application->fqdn = null;
             }
             $application->forceFill([
@@ -936,7 +936,7 @@ public function generateGitImportCommands(string $deployment_uuid, int $pull_req
             $source_html_url_host = $url['host'];
             $source_html_url_scheme = $url['scheme'];
 
-            if ($this->source->getMorphClass() == \App\Models\GithubApp::class) {
+            if ($this->source->getMorphClass() === \App\Models\GithubApp::class) {
                 if ($this->source->is_public) {
                     $fullRepoUrl = "{$this->source->html_url}/{$customRepository}";
                     $git_clone_command = "{$git_clone_command} {$this->source->html_url}/{$customRepository} {$baseDir}";
@@ -1407,7 +1407,7 @@ public function getCpuMetrics(int $mins = 5)
             if (str($metrics)->contains('error')) {
                 $error = json_decode($metrics, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-                if ($error == 'Unauthorized') {
+                if ($error === 'Unauthorized') {
                     $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
                 }
                 throw new \Exception($error);
@@ -1431,7 +1431,7 @@ public function getMemoryMetrics(int $mins = 5)
             if (str($metrics)->contains('error')) {
                 $error = json_decode($metrics, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-                if ($error == 'Unauthorized') {
+                if ($error === 'Unauthorized') {
                     $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
                 }
                 throw new \Exception($error);
diff --git a/app/Models/EnvironmentVariable.php b/app/Models/EnvironmentVariable.php
index f77d73db8..f9e09941d 100644
--- a/app/Models/EnvironmentVariable.php
+++ b/app/Models/EnvironmentVariable.php
@@ -156,7 +156,7 @@ protected function isShared(): Attribute
 
     private function get_real_environment_variables(?string $environment_variable = null, $resource = null)
     {
-        if ((is_null($environment_variable) && $environment_variable == '') || is_null($resource)) {
+        if ((is_null($environment_variable) && $environment_variable === '') || is_null($resource)) {
             return null;
         }
         $environment_variable = trim($environment_variable);
@@ -202,7 +202,7 @@ private function get_environment_variables(?string $environment_variable = null)
 
     private function set_environment_variables(?string $environment_variable = null): ?string
     {
-        if (is_null($environment_variable) && $environment_variable == '') {
+        if (is_null($environment_variable) && $environment_variable === '') {
             return null;
         }
         $environment_variable = trim($environment_variable);
diff --git a/app/Models/LocalFileVolume.php b/app/Models/LocalFileVolume.php
index d528099ff..97a1e4cbb 100644
--- a/app/Models/LocalFileVolume.php
+++ b/app/Models/LocalFileVolume.php
@@ -113,15 +113,15 @@ public function saveStorageOnServer()
         }
         $isFile = instant_remote_process(["test -f $path && echo OK || echo NOK"], $server);
         $isDir = instant_remote_process(["test -d $path && echo OK || echo NOK"], $server);
-        if ($isFile == 'OK' && $this->is_directory) {
+        if ($isFile === 'OK' && $this->is_directory) {
             $content = instant_remote_process(["cat $path"], $server, false);
             $this->is_directory = false;
             $this->content = $content;
             $this->save();
             FileStorageChanged::dispatch(data_get($server, 'team_id'));
             throw new \Exception('The following file is a file on the server, but you are trying to mark it as a directory. Please delete the file on the server or mark it as directory.');
-        } elseif ($isDir == 'OK' && ! $this->is_directory) {
-            if ($path == '/' || $path == '.' || $path == '..' || $path == '' || str($path)->isEmpty() || is_null($path)) {
+        } elseif ($isDir === 'OK' && ! $this->is_directory) {
+            if ($path === '/' || $path === '.' || $path === '..' || $path === '' || str($path)->isEmpty() || is_null($path)) {
                 $this->is_directory = true;
                 $this->save();
                 throw new \Exception('The following file is a directory on the server, but you are trying to mark it as a file. <br><br>Please delete the directory on the server or mark it as directory.');
@@ -132,7 +132,7 @@ public function saveStorageOnServer()
             ], $server, false);
             FileStorageChanged::dispatch(data_get($server, 'team_id'));
         }
-        if ($isDir == 'NOK' && ! $this->is_directory) {
+        if ($isDir === 'NOK' && ! $this->is_directory) {
             $chmod = data_get($this, 'chmod');
             $chown = data_get($this, 'chown');
             if ($content) {
@@ -148,7 +148,7 @@ public function saveStorageOnServer()
             if ($chmod) {
                 $commands->push("chmod $chmod $path");
             }
-        } elseif ($isDir == 'NOK' && $this->is_directory) {
+        } elseif ($isDir === 'NOK' && $this->is_directory) {
             $commands->push("mkdir -p $path > /dev/null 2>&1 || true");
         }
 
diff --git a/app/Models/Server.php b/app/Models/Server.php
index a9e3acde4..3dde662aa 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -421,7 +421,7 @@ public function setupDynamicProxyConfiguration()
                     "echo '$base64' | base64 -d | tee $file > /dev/null",
                 ], $this);
 
-                if (config('app.env') == 'local') {
+                if (config('app.env') === 'local') {
                     // ray($yaml);
                 }
             }
@@ -597,7 +597,7 @@ public function getCpuMetrics(int $mins = 5)
             if (str($cpu)->contains('error')) {
                 $error = json_decode($cpu, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-                if ($error == 'Unauthorized') {
+                if ($error === 'Unauthorized') {
                     $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
                 }
                 throw new \Exception($error);
@@ -619,7 +619,7 @@ public function getMemoryMetrics(int $mins = 5)
             if (str($memory)->contains('error')) {
                 $error = json_decode($memory, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-                if ($error == 'Unauthorized') {
+                if ($error === 'Unauthorized') {
                     $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
                 }
                 throw new \Exception($error);
diff --git a/app/Models/StandaloneClickhouse.php b/app/Models/StandaloneClickhouse.php
index c9d3ea031..fa27d50d8 100644
--- a/app/Models/StandaloneClickhouse.php
+++ b/app/Models/StandaloneClickhouse.php
@@ -275,7 +275,7 @@ public function getCpuMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
@@ -297,7 +297,7 @@ public function getMemoryMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
diff --git a/app/Models/StandaloneDragonfly.php b/app/Models/StandaloneDragonfly.php
index 2bde51080..fa0bd4b44 100644
--- a/app/Models/StandaloneDragonfly.php
+++ b/app/Models/StandaloneDragonfly.php
@@ -275,7 +275,7 @@ public function getCpuMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
@@ -297,7 +297,7 @@ public function getMemoryMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
diff --git a/app/Models/StandaloneKeydb.php b/app/Models/StandaloneKeydb.php
index fbee9789a..56ee4d4a2 100644
--- a/app/Models/StandaloneKeydb.php
+++ b/app/Models/StandaloneKeydb.php
@@ -275,7 +275,7 @@ public function getCpuMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
@@ -297,7 +297,7 @@ public function getMemoryMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
diff --git a/app/Models/StandaloneMariadb.php b/app/Models/StandaloneMariadb.php
index 00f635faf..c55a76af7 100644
--- a/app/Models/StandaloneMariadb.php
+++ b/app/Models/StandaloneMariadb.php
@@ -275,7 +275,7 @@ public function getCpuMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
@@ -297,7 +297,7 @@ public function getMemoryMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
diff --git a/app/Models/StandaloneMongodb.php b/app/Models/StandaloneMongodb.php
index c225011c5..3f12a8557 100644
--- a/app/Models/StandaloneMongodb.php
+++ b/app/Models/StandaloneMongodb.php
@@ -295,7 +295,7 @@ public function getCpuMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
@@ -317,7 +317,7 @@ public function getMemoryMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
diff --git a/app/Models/StandaloneMysql.php b/app/Models/StandaloneMysql.php
index 52725ffc7..0d8359f88 100644
--- a/app/Models/StandaloneMysql.php
+++ b/app/Models/StandaloneMysql.php
@@ -276,7 +276,7 @@ public function getCpuMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
@@ -298,7 +298,7 @@ public function getMemoryMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
diff --git a/app/Models/StandalonePostgresql.php b/app/Models/StandalonePostgresql.php
index 3dd13b633..f31582c35 100644
--- a/app/Models/StandalonePostgresql.php
+++ b/app/Models/StandalonePostgresql.php
@@ -281,7 +281,7 @@ public function getCpuMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
@@ -303,7 +303,7 @@ public function getMemoryMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
diff --git a/app/Models/StandaloneRedis.php b/app/Models/StandaloneRedis.php
index 5b6993b9a..119978530 100644
--- a/app/Models/StandaloneRedis.php
+++ b/app/Models/StandaloneRedis.php
@@ -286,7 +286,7 @@ public function getCpuMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
@@ -308,7 +308,7 @@ public function getMemoryMetrics(int $mins = 5)
         if (str($metrics)->contains('error')) {
             $error = json_decode($metrics, true);
             $error = data_get($error, 'error', 'Something is not okay, are you okay?');
-            if ($error == 'Unauthorized') {
+            if ($error === 'Unauthorized') {
                 $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
             }
             throw new \Exception($error);
diff --git a/bootstrap/helpers/github.php b/bootstrap/helpers/github.php
index 0b5f7034b..b1ac9178c 100644
--- a/bootstrap/helpers/github.php
+++ b/bootstrap/helpers/github.php
@@ -57,7 +57,7 @@ function githubApi(GithubApp|GitlabApp|null $source, string $endpoint, string $m
     if (is_null($source)) {
         throw new \Exception('Not implemented yet.');
     }
-    if ($source->getMorphClass() == \App\Models\GithubApp::class) {
+    if ($source->getMorphClass() === \App\Models\GithubApp::class) {
         if ($source->is_public) {
             $response = Http::github($source->api_url)->$method($endpoint);
         } else {
diff --git a/bootstrap/helpers/services.php b/bootstrap/helpers/services.php
index 94c3c5f45..18ef4cb6b 100644
--- a/bootstrap/helpers/services.php
+++ b/bootstrap/helpers/services.php
@@ -51,7 +51,7 @@ function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase|Appli
             // Exists and is a directory
             $isDir = instant_remote_process(["test -d $fileLocation && echo OK || echo NOK"], $server);
 
-            if ($isFile == 'OK') {
+            if ($isFile === 'OK') {
                 // If its a file & exists
                 $filesystemContent = instant_remote_process(["cat $fileLocation"], $server);
                 if ($fileVolume->is_based_on_git) {
@@ -59,12 +59,12 @@ function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase|Appli
                 }
                 $fileVolume->is_directory = false;
                 $fileVolume->save();
-            } elseif ($isDir == 'OK') {
+            } elseif ($isDir === 'OK') {
                 // If its a directory & exists
                 $fileVolume->content = null;
                 $fileVolume->is_directory = true;
                 $fileVolume->save();
-            } elseif ($isFile == 'NOK' && $isDir == 'NOK' && ! $fileVolume->is_directory && $isInit && $content) {
+            } elseif ($isFile === 'NOK' && $isDir === 'NOK' && ! $fileVolume->is_directory && $isInit && $content) {
                 // Does not exists (no dir or file), not flagged as directory, is init, has content
                 $fileVolume->content = $content;
                 $fileVolume->is_directory = false;
@@ -75,13 +75,13 @@ function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase|Appli
                     "mkdir -p $dir",
                     "echo '$content' | base64 -d | tee $fileLocation",
                 ], $server);
-            } elseif ($isFile == 'NOK' && $isDir == 'NOK' && $fileVolume->is_directory && $isInit) {
+            } elseif ($isFile === 'NOK' && $isDir === 'NOK' && $fileVolume->is_directory && $isInit) {
                 // Does not exists (no dir or file), flagged as directory, is init
                 $fileVolume->content = null;
                 $fileVolume->is_directory = true;
                 $fileVolume->save();
                 instant_remote_process(["mkdir -p $fileLocation"], $server);
-            } elseif ($isFile == 'NOK' && $isDir == 'NOK' && ! $fileVolume->is_directory && $isInit && is_null($content)) {
+            } elseif ($isFile === 'NOK' && $isDir === 'NOK' && ! $fileVolume->is_directory && $isInit && is_null($content)) {
                 // Does not exists (no dir or file), not flagged as directory, is init, has no content => create directory
                 $fileVolume->content = null;
                 $fileVolume->is_directory = true;
diff --git a/bootstrap/helpers/socialite.php b/bootstrap/helpers/socialite.php
index a23dc24d3..cad9de7fa 100644
--- a/bootstrap/helpers/socialite.php
+++ b/bootstrap/helpers/socialite.php
@@ -7,7 +7,7 @@ function get_socialite_provider(string $provider)
 {
     $oauth_setting = OauthSetting::firstWhere('provider', $provider);
 
-    if ($provider == 'azure') {
+    if ($provider === 'azure') {
         $azure_config = new \SocialiteProviders\Manager\Config(
             $oauth_setting->client_id,
             $oauth_setting->client_secret,

From 0c133b113c1a0eab0b465831e4a19df13c7828d8 Mon Sep 17 00:00:00 2001
From: Lucas Michot <lucas@semalead.com>
Date: Thu, 31 Oct 2024 16:33:49 +0100
Subject: [PATCH 15/21] Delete some useless imports

---
 app/Actions/Docker/GetContainersStatus.php | 1 -
 app/Http/Controllers/UploadController.php  | 1 -
 app/Livewire/ActivityMonitor.php           | 1 -
 app/Livewire/Source/Github/Change.php      | 1 -
 app/Models/Server.php                      | 1 -
 routes/channels.php                        | 1 -
 routes/web.php                             | 1 -
 7 files changed, 7 deletions(-)

diff --git a/app/Actions/Docker/GetContainersStatus.php b/app/Actions/Docker/GetContainersStatus.php
index 1cabc6418..6c1a53f3a 100644
--- a/app/Actions/Docker/GetContainersStatus.php
+++ b/app/Actions/Docker/GetContainersStatus.php
@@ -8,7 +8,6 @@
 use App\Models\Server;
 use App\Models\ServiceDatabase;
 use App\Notifications\Container\ContainerRestarted;
-use App\Notifications\Container\ContainerStopped;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Lorisleiva\Actions\Concerns\AsAction;
diff --git a/app/Http/Controllers/UploadController.php b/app/Http/Controllers/UploadController.php
index 21fdd2ef8..4d34a1000 100644
--- a/app/Http/Controllers/UploadController.php
+++ b/app/Http/Controllers/UploadController.php
@@ -5,7 +5,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Support\Facades\Storage;
 use Pion\Laravel\ChunkUpload\Exceptions\UploadMissingFileException;
 use Pion\Laravel\ChunkUpload\Handler\HandlerFactory;
 use Pion\Laravel\ChunkUpload\Receiver\FileReceiver;
diff --git a/app/Livewire/ActivityMonitor.php b/app/Livewire/ActivityMonitor.php
index bd1e30088..2e36f34ee 100644
--- a/app/Livewire/ActivityMonitor.php
+++ b/app/Livewire/ActivityMonitor.php
@@ -2,7 +2,6 @@
 
 namespace App\Livewire;
 
-use App\Enums\ProcessStatus;
 use App\Models\User;
 use Livewire\Component;
 use Spatie\Activitylog\Models\Activity;
diff --git a/app/Livewire/Source/Github/Change.php b/app/Livewire/Source/Github/Change.php
index 7df6f968f..22cabcd0b 100644
--- a/app/Livewire/Source/Github/Change.php
+++ b/app/Livewire/Source/Github/Change.php
@@ -4,7 +4,6 @@
 
 use App\Jobs\GithubAppPermissionJob;
 use App\Models\GithubApp;
-use Illuminate\Support\Facades\Http;
 use Livewire\Component;
 
 class Change extends Component
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 3dde662aa..1980bc429 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -15,7 +15,6 @@
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Stringable;
 use OpenApi\Attributes as OA;
diff --git a/routes/channels.php b/routes/channels.php
index d60b9590a..2b9f33728 100644
--- a/routes/channels.php
+++ b/routes/channels.php
@@ -11,7 +11,6 @@
 |
 */
 
-use App\Models\Application;
 use App\Models\User;
 use Illuminate\Support\Facades\Broadcast;
 
diff --git a/routes/web.php b/routes/web.php
index 6f442e0fe..5e0b4af36 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -69,7 +69,6 @@
 use App\Livewire\Team\Index as TeamIndex;
 use App\Livewire\Team\Member\Index as TeamMemberIndex;
 use App\Livewire\Terminal\Index as TerminalIndex;
-use App\Livewire\Waitlist\Index as WaitlistIndex;
 use App\Models\GitlabApp;
 use App\Models\ScheduledDatabaseBackupExecution;
 use App\Models\Server;

From 702ee5cd70f68c02dce3d821c9886aeade2cd3fb Mon Sep 17 00:00:00 2001
From: Lucas Michot <lucas@semalead.com>
Date: Thu, 31 Oct 2024 16:47:08 +0100
Subject: [PATCH 16/21] Prefer Carbon methods when possible.

---
 app/Livewire/Project/Application/Previews.php | 5 +++--
 app/Livewire/Server/Proxy/Deploy.php          | 5 +++--
 bootstrap/helpers/github.php                  | 5 +++--
 bootstrap/helpers/shared.php                  | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/Livewire/Project/Application/Previews.php b/app/Livewire/Project/Application/Previews.php
index b1ba035dc..d42bf03d7 100644
--- a/app/Livewire/Project/Application/Previews.php
+++ b/app/Livewire/Project/Application/Previews.php
@@ -5,6 +5,7 @@
 use App\Actions\Docker\GetContainersStatus;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
+use Carbon\Carbon;
 use Illuminate\Process\InvokedProcess;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Process;
@@ -239,7 +240,7 @@ private function stopContainers(array $containers, $server, int $timeout)
             $processes[$containerName] = $this->stopContainer($containerName, $timeout);
         }
 
-        $startTime = time();
+        $startTime = Carbon::now()->getTimestamp();
         while (count($processes) > 0) {
             $finishedProcesses = array_filter($processes, function ($process) {
                 return ! $process->running();
@@ -249,7 +250,7 @@ private function stopContainers(array $containers, $server, int $timeout)
                 $this->removeContainer($containerName, $server);
             }
 
-            if (time() - $startTime >= $timeout) {
+            if (Carbon::now()->getTimestamp() - $startTime >= $timeout) {
                 $this->forceStopRemainingContainers(array_keys($processes), $server);
                 break;
             }
diff --git a/app/Livewire/Server/Proxy/Deploy.php b/app/Livewire/Server/Proxy/Deploy.php
index eaa312663..8fcff85d6 100644
--- a/app/Livewire/Server/Proxy/Deploy.php
+++ b/app/Livewire/Server/Proxy/Deploy.php
@@ -6,6 +6,7 @@
 use App\Actions\Proxy\StartProxy;
 use App\Events\ProxyStatusChanged;
 use App\Models\Server;
+use Carbon\Carbon;
 use Illuminate\Process\InvokedProcess;
 use Illuminate\Support\Facades\Process;
 use Livewire\Component;
@@ -102,9 +103,9 @@ public function stop(bool $forceStop = true)
 
             $process = $this->stopContainer($containerName, $timeout);
 
-            $startTime = time();
+            $startTime = Carbon::now()->getTimestamp();
             while ($process->running()) {
-                if (time() - $startTime >= $timeout) {
+                if (Carbon::now()->getTimestamp() - $startTime >= $timeout) {
                     $this->forceStopContainer($containerName);
                     break;
                 }
diff --git a/bootstrap/helpers/github.php b/bootstrap/helpers/github.php
index b1ac9178c..fee7cb8bf 100644
--- a/bootstrap/helpers/github.php
+++ b/bootstrap/helpers/github.php
@@ -3,6 +3,7 @@
 use App\Models\GithubApp;
 use App\Models\GitlabApp;
 use Carbon\Carbon;
+use Carbon\CarbonImmutable;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Str;
 use Lcobucci\JWT\Encoding\ChainedFormatter;
@@ -16,7 +17,7 @@ function generate_github_installation_token(GithubApp $source)
     $signingKey = InMemory::plainText($source->privateKey->private_key);
     $algorithm = new Sha256;
     $tokenBuilder = (new Builder(new JoseEncoder, ChainedFormatter::default()));
-    $now = new DateTimeImmutable;
+    $now = CarbonImmutable::now();
     $now = $now->setTime($now->format('H'), $now->format('i'));
     $issuedToken = $tokenBuilder
         ->issuedBy($source->app_id)
@@ -40,7 +41,7 @@ function generate_github_jwt_token(GithubApp $source)
     $signingKey = InMemory::plainText($source->privateKey->private_key);
     $algorithm = new Sha256;
     $tokenBuilder = (new Builder(new JoseEncoder, ChainedFormatter::default()));
-    $now = new DateTimeImmutable;
+    $now = CarbonImmutable::now();
     $now = $now->setTime($now->format('H'), $now->format('i'));
     $issuedToken = $tokenBuilder
         ->issuedBy($source->app_id)
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index e260491ba..67ce353d2 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -28,6 +28,7 @@
 use App\Notifications\Channels\EmailChannel;
 use App\Notifications\Channels\TelegramChannel;
 use App\Notifications\Internal\GeneralNotification;
+use Carbon\CarbonImmutable;
 use DanHarrin\LivewireRateLimiting\Exceptions\TooManyRequestsException;
 use Illuminate\Database\UniqueConstraintViolationException;
 use Illuminate\Mail\Message;
@@ -949,7 +950,7 @@ function generateEnvValue(string $command, Service|Application|null $service = n
             $key = InMemory::plainText($signingKey);
             $algorithm = new Sha256;
             $tokenBuilder = (new Builder(new JoseEncoder, ChainedFormatter::default()));
-            $now = new DateTimeImmutable;
+            $now = CarbonImmutable::now();
             $now = $now->setTime($now->format('H'), $now->format('i'));
             $token = $tokenBuilder
                 ->issuedBy('supabase')
@@ -969,7 +970,7 @@ function generateEnvValue(string $command, Service|Application|null $service = n
             $key = InMemory::plainText($signingKey);
             $algorithm = new Sha256;
             $tokenBuilder = (new Builder(new JoseEncoder, ChainedFormatter::default()));
-            $now = new DateTimeImmutable;
+            $now = CarbonImmutable::now();
             $now = $now->setTime($now->format('H'), $now->format('i'));
             $token = $tokenBuilder
                 ->issuedBy('supabase')

From e420c3398284096c7512005d3510d7f2960f5b37 Mon Sep 17 00:00:00 2001
From: Lucas Michot <lucas@semalead.com>
Date: Thu, 31 Oct 2024 17:23:49 +0100
Subject: [PATCH 17/21] Update the license to Apache-2.0

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d593ca220..40eec4882 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "coollabsio/coolify",
     "description": "The Coolify project.",
-    "license": "MIT",
+    "license": "Apache-2.0",
     "type": "project",
     "keywords": [
         "coolify",

From 8e1444eaa7b7d98a3fcbb1616904c01d4a629203 Mon Sep 17 00:00:00 2001
From: Lucas Michot <lucas@semalead.com>
Date: Thu, 31 Oct 2024 17:44:01 +0100
Subject: [PATCH 18/21] Get rid of many useless blank lines

---
 app/Actions/CoolifyTask/RunRemoteProcess.php              | 1 -
 app/Actions/Proxy/StartProxy.php                          | 1 -
 app/Actions/Server/ConfigureCloudflared.php               | 1 -
 app/Console/Commands/CleanupDatabase.php                  | 1 -
 app/Console/Commands/CleanupRedis.php                     | 1 -
 app/Console/Commands/CleanupStuckedResources.php          | 1 -
 app/Console/Commands/CloudCleanupSubscriptions.php        | 2 --
 app/Console/Commands/Dev.php                              | 1 -
 app/Console/Commands/Init.php                             | 2 --
 app/Console/Commands/OpenApi.php                          | 1 -
 app/Http/Controllers/Api/ApplicationsController.php       | 8 --------
 app/Http/Controllers/Api/DatabasesController.php          | 4 ----
 app/Http/Controllers/Api/ProjectController.php            | 1 -
 app/Http/Controllers/Api/ServicesController.php           | 1 -
 app/Http/Controllers/Webhook/Gitea.php                    | 1 -
 app/Jobs/CheckHelperImageJob.php                          | 1 -
 app/Jobs/DatabaseBackupJob.php                            | 1 -
 app/Jobs/PushServerUpdateJob.php                          | 2 --
 app/Jobs/ScheduledTaskJob.php                             | 1 -
 app/Jobs/ServerCheckJob.php                               | 2 --
 app/Jobs/ServerCleanupMux.php                             | 2 --
 app/Jobs/ServerStorageCheckJob.php                        | 2 --
 app/Jobs/UpdateCoolifyJob.php                             | 1 -
 app/Livewire/Project/Database/Import.php                  | 1 -
 app/Livewire/Project/Database/Keydb/General.php           | 1 -
 app/Livewire/Project/Database/Mariadb/General.php         | 1 -
 app/Livewire/Project/Database/Mongodb/General.php         | 1 -
 app/Livewire/Project/New/PublicGitRepository.php          | 1 -
 app/Livewire/Project/Resource/Create.php                  | 1 -
 app/Livewire/Project/Service/Index.php                    | 1 -
 app/Livewire/Project/Shared/ExecuteContainerCommand.php   | 3 ---
 app/Livewire/Project/Shared/Logs.php                      | 2 --
 app/Livewire/Project/Shared/ResourceOperations.php        | 1 -
 app/Livewire/Project/Shared/Storages/Add.php              | 3 ---
 app/Livewire/Project/Shared/Terminal.php                  | 1 -
 app/Livewire/Project/Shared/UploadConfig.php              | 1 -
 app/Livewire/Server/Charts.php                            | 1 -
 app/Livewire/Server/Form.php                              | 2 --
 app/Livewire/Server/LogDrains.php                         | 2 --
 app/Livewire/Server/Proxy.php                             | 1 -
 app/Livewire/SettingsEmail.php                            | 1 -
 app/Livewire/Source/Github/Change.php                     | 1 -
 app/Livewire/Upgrade.php                                  | 2 --
 app/Livewire/VerifyEmail.php                              | 1 -
 app/Models/Environment.php                                | 1 -
 app/Models/EnvironmentVariable.php                        | 1 -
 app/Models/InstanceSettings.php                           | 1 -
 app/Models/LocalFileVolume.php                            | 1 -
 app/Models/Service.php                                    | 2 --
 app/Notifications/ScheduledTask/TaskFailed.php            | 1 -
 bootstrap/helpers/api.php                                 | 2 --
 bootstrap/helpers/docker.php                              | 2 --
 bootstrap/helpers/proxy.php                               | 1 -
 bootstrap/helpers/shared.php                              | 4 ----
 ...2023_08_22_071051_add_stripe_plan_to_subscriptions.php | 1 -
 .../migrations/2023_08_22_071054_add_stripe_reasons.php   | 1 -
 .../2023_08_22_071059_add_stripe_trial_ended.php          | 1 -
 .../2023_08_22_071060_change_invitation_link_length.php   | 1 -
 .../2023_09_20_082541_update_services_table.php           | 1 -
 ...23_09_20_083549_update_environment_variables_table.php | 1 -
 ...9_23_111809_remove_destination_from_services_table.php | 1 -
 .../migrations/2023_09_23_111819_add_server_emails.php    | 1 -
 database/migrations/2023_11_16_220647_add_log_drains.php  | 1 -
 .../migrations/2023_12_13_110214_add_soft_deletes.php     | 1 -
 ..._17_155616_add_custom_docker_compose_start_command.php | 1 -
 ...24_04_09_095517_make_custom_docker_commands_longer.php | 1 -
 ..._073615_add_docker_network_to_application_settings.php | 1 -
 ...024_05_23_091713_add_gitea_webhook_to_applications.php | 1 -
 ...add_server_cleanup_fields_to_server_settings_table.php | 1 -
 .../2024_09_16_111428_encrypt_existing_private_keys.php   | 1 -
 database/seeders/ProductionSeeder.php                     | 2 --
 routes/api.php                                            | 1 -
 72 files changed, 103 deletions(-)

diff --git a/app/Actions/CoolifyTask/RunRemoteProcess.php b/app/Actions/CoolifyTask/RunRemoteProcess.php
index c75a30ae8..51c5a1f9e 100644
--- a/app/Actions/CoolifyTask/RunRemoteProcess.php
+++ b/app/Actions/CoolifyTask/RunRemoteProcess.php
@@ -39,7 +39,6 @@ class RunRemoteProcess
      */
     public function __construct(Activity $activity, bool $hide_from_output = false, bool $ignore_errors = false, $call_event_on_finish = null, $call_event_data = null)
     {
-
         if ($activity->getExtraProperty('type') !== ActivityTypes::INLINE->value && $activity->getExtraProperty('type') !== ActivityTypes::COMMAND->value) {
             throw new \RuntimeException('Incompatible Activity to run a remote command.');
         }
diff --git a/app/Actions/Proxy/StartProxy.php b/app/Actions/Proxy/StartProxy.php
index 2a6ec7d03..8b584833f 100644
--- a/app/Actions/Proxy/StartProxy.php
+++ b/app/Actions/Proxy/StartProxy.php
@@ -70,6 +70,5 @@ public function handle(Server $server, bool $async = true, bool $force = false):
 
             return 'OK';
         }
-
     }
 }
diff --git a/app/Actions/Server/ConfigureCloudflared.php b/app/Actions/Server/ConfigureCloudflared.php
index 0819da07a..fc04e67a4 100644
--- a/app/Actions/Server/ConfigureCloudflared.php
+++ b/app/Actions/Server/ConfigureCloudflared.php
@@ -50,7 +50,6 @@ public function handle(Server $server, string $cloudflare_token)
                 'rm -fr /tmp/cloudflared',
             ]);
             instant_remote_process($commands, $server);
-
         }
     }
 }
diff --git a/app/Console/Commands/CleanupDatabase.php b/app/Console/Commands/CleanupDatabase.php
index 6f130626b..0b2b766f4 100644
--- a/app/Console/Commands/CleanupDatabase.php
+++ b/app/Console/Commands/CleanupDatabase.php
@@ -64,6 +64,5 @@ public function handle()
         if ($this->option('yes')) {
             $webhooks->delete();
         }
-
     }
 }
diff --git a/app/Console/Commands/CleanupRedis.php b/app/Console/Commands/CleanupRedis.php
index ed0740d34..5fc2b4e61 100644
--- a/app/Console/Commands/CleanupRedis.php
+++ b/app/Console/Commands/CleanupRedis.php
@@ -26,6 +26,5 @@ public function handle()
         collect($queueOverlaps)->each(function ($key) {
             Redis::connection()->del($key);
         });
-
     }
 }
diff --git a/app/Console/Commands/CleanupStuckedResources.php b/app/Console/Commands/CleanupStuckedResources.php
index da757c99f..9d36ce9b8 100644
--- a/app/Console/Commands/CleanupStuckedResources.php
+++ b/app/Console/Commands/CleanupStuckedResources.php
@@ -36,7 +36,6 @@ public function handle()
 
     private function cleanup_stucked_resources()
     {
-
         try {
             $servers = Server::all()->filter(function ($server) {
                 return $server->isFunctional();
diff --git a/app/Console/Commands/CloudCleanupSubscriptions.php b/app/Console/Commands/CloudCleanupSubscriptions.php
index 5054d125c..8bb420ab8 100644
--- a/app/Console/Commands/CloudCleanupSubscriptions.php
+++ b/app/Console/Commands/CloudCleanupSubscriptions.php
@@ -73,7 +73,6 @@ public function handle()
                     }
                 }
             }
-
         } catch (\Exception $e) {
             $this->error($e->getMessage());
 
@@ -95,6 +94,5 @@ private function disableServers(Team $team)
                 ]);
             }
         }
-
     }
 }
diff --git a/app/Console/Commands/Dev.php b/app/Console/Commands/Dev.php
index 20a2667c3..f5f1233fe 100644
--- a/app/Console/Commands/Dev.php
+++ b/app/Console/Commands/Dev.php
@@ -25,7 +25,6 @@ public function handle()
 
             return;
         }
-
     }
 
     public function generateOpenApi()
diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php
index 8f68966a5..ccb864e1f 100644
--- a/app/Console/Commands/Init.php
+++ b/app/Console/Commands/Init.php
@@ -32,7 +32,6 @@ public function handle()
 
         $this->servers = Server::all();
         if (isCloud()) {
-
         } else {
             $this->send_alive_signal();
             get_public_ips();
@@ -120,7 +119,6 @@ private function cleanup_unnecessary_dynamic_proxy_configuration()
             } catch (\Throwable $e) {
                 echo "Error in cleaning up unnecessary dynamic proxy configuration: {$e->getMessage()}\n";
             }
-
         }
     }
 
diff --git a/app/Console/Commands/OpenApi.php b/app/Console/Commands/OpenApi.php
index e8d73ef47..e248aa2c0 100644
--- a/app/Console/Commands/OpenApi.php
+++ b/app/Console/Commands/OpenApi.php
@@ -21,6 +21,5 @@ public function handle()
         $error = preg_replace('/^\h*\v+/m', '', $error);
         echo $error;
         echo $process->output();
-
     }
 }
diff --git a/app/Http/Controllers/Api/ApplicationsController.php b/app/Http/Controllers/Api/ApplicationsController.php
index 46dd8120e..5c0024af1 100644
--- a/app/Http/Controllers/Api/ApplicationsController.php
+++ b/app/Http/Controllers/Api/ApplicationsController.php
@@ -1213,7 +1213,6 @@ private function create_application(Request $request, $type)
         }
 
         return response()->json(['message' => 'Invalid type.'], 400);
-
     }
 
     #[OA\Get(
@@ -1869,18 +1868,15 @@ public function update_env_by_uuid(Request $request)
 
                 return response()->json($this->removeSensitiveData($env))->setStatusCode(201);
             } else {
-
                 return response()->json([
                     'message' => 'Environment variable not found.',
                 ], 404);
-
             }
         }
 
         return response()->json([
             'message' => 'Something is not okay. Are you okay?',
         ], 500);
-
     }
 
     #[OA\Patch(
@@ -2225,14 +2221,12 @@ public function create_env(Request $request)
                 return response()->json([
                     'uuid' => $env->uuid,
                 ])->setStatusCode(201);
-
             }
         }
 
         return response()->json([
             'message' => 'Something went wrong.',
         ], 500);
-
     }
 
     #[OA\Delete(
@@ -2580,7 +2574,6 @@ public function action_restart(Request $request)
                 'deployment_uuid' => $deployment_uuid->toString(),
             ],
         );
-
     }
 
     #[OA\Post(
@@ -2746,7 +2739,6 @@ private function validateDataApplications(Request $request, Server $server)
                         'custom_labels' => 'The custom_labels should be base64 encoded.',
                     ],
                 ], 422);
-
             }
         }
         if ($request->has('domains') && $server->isProxyShouldRun()) {
diff --git a/app/Http/Controllers/Api/DatabasesController.php b/app/Http/Controllers/Api/DatabasesController.php
index 65873f818..ce658d2a2 100644
--- a/app/Http/Controllers/Api/DatabasesController.php
+++ b/app/Http/Controllers/Api/DatabasesController.php
@@ -471,7 +471,6 @@ public function update_by_uuid(Request $request)
                     $request->offsetSet('mysql_conf', $mysqlConf);
                 }
                 break;
-
         }
         $extraFields = array_diff(array_keys($request->all()), $allowedFields);
         if ($validator->fails() || ! empty($extraFields)) {
@@ -506,7 +505,6 @@ public function update_by_uuid(Request $request)
         return response()->json([
             'message' => 'Database updated.',
         ]);
-
     }
 
     #[OA\Post(
@@ -1165,7 +1163,6 @@ public function create_database(Request $request, NewDatabaseTypes $type)
             }
 
             return response()->json(serializeApiResponse($payload))->setStatusCode(201);
-
         } elseif ($type === NewDatabaseTypes::MARIADB) {
             $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'mariadb_conf', 'mariadb_root_password', 'mariadb_user', 'mariadb_password', 'mariadb_database'];
             $validator = customApiValidator($request->all(), [
@@ -1826,6 +1823,5 @@ public function action_restart(Request $request)
             ],
             200
         );
-
     }
 }
diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index f1958de2c..491179d5d 100644
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -356,7 +356,6 @@ public function update_project(Request $request)
             'name' => $project->name,
             'description' => $project->description,
         ])->setStatusCode(201);
-
     }
 
     #[OA\Delete(
diff --git a/app/Http/Controllers/Api/ServicesController.php b/app/Http/Controllers/Api/ServicesController.php
index 89418517b..91595adb8 100644
--- a/app/Http/Controllers/Api/ServicesController.php
+++ b/app/Http/Controllers/Api/ServicesController.php
@@ -1238,6 +1238,5 @@ public function action_restart(Request $request)
             ],
             200
         );
-
     }
 }
diff --git a/app/Http/Controllers/Webhook/Gitea.php b/app/Http/Controllers/Webhook/Gitea.php
index 3689ca7b3..cc53f2034 100644
--- a/app/Http/Controllers/Webhook/Gitea.php
+++ b/app/Http/Controllers/Webhook/Gitea.php
@@ -174,7 +174,6 @@ public function manual(Request $request)
                                         'pull_request_html_url' => $pull_request_html_url,
                                     ]);
                                 }
-
                             }
                             queue_application_deployment(
                                 application: $application,
diff --git a/app/Jobs/CheckHelperImageJob.php b/app/Jobs/CheckHelperImageJob.php
index d62ad601f..6abb8a150 100644
--- a/app/Jobs/CheckHelperImageJob.php
+++ b/app/Jobs/CheckHelperImageJob.php
@@ -31,7 +31,6 @@ public function handle(): void
                     $settings->update(['helper_version' => $latest_version]);
                 }
             }
-
         } catch (\Throwable $e) {
             send_internal_notification('CheckHelperImageJob failed with: '.$e->getMessage());
             throw $e;
diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
index 196af2a83..fcfe2fe3d 100644
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -129,7 +129,6 @@ public function handle(): void
                     if ($this->postgres_password) {
                         $this->postgres_password = str($this->postgres_password)->after('POSTGRES_PASSWORD=')->value();
                     }
-
                 } elseif (str($databaseType)->contains('mysql')) {
                     $this->container_name = "{$this->database->name}-$serviceUuid";
                     $this->directory_name = $serviceName.'-'.$this->container_name;
diff --git a/app/Jobs/PushServerUpdateJob.php b/app/Jobs/PushServerUpdateJob.php
index 74ab8fa40..24f8d1e6b 100644
--- a/app/Jobs/PushServerUpdateJob.php
+++ b/app/Jobs/PushServerUpdateJob.php
@@ -167,7 +167,6 @@ public function handle()
                         $this->foundServiceDatabaseIds->push($subId);
                         $this->updateServiceSubStatus($serviceId, $subType, $subId, $containerStatus);
                     }
-
                 } else {
                     $uuid = $labels->get('com.docker.compose.service');
                     $type = $labels->get('coolify.type');
@@ -265,7 +264,6 @@ private function updateProxyStatus()
                 instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
             }
         }
-
     }
 
     private function updateDatabaseStatus(string $databaseUuid, string $containerStatus, bool $tcpProxy = false)
diff --git a/app/Jobs/ScheduledTaskJob.php b/app/Jobs/ScheduledTaskJob.php
index b2788a351..c68b02c59 100644
--- a/app/Jobs/ScheduledTaskJob.php
+++ b/app/Jobs/ScheduledTaskJob.php
@@ -68,7 +68,6 @@ private function getServerTimezone(): string
 
     public function handle(): void
     {
-
         try {
             $this->task_log = ScheduledTaskExecution::create([
                 'scheduled_task_id' => $this->task->id,
diff --git a/app/Jobs/ServerCheckJob.php b/app/Jobs/ServerCheckJob.php
index 553796e87..26cb3c4f5 100644
--- a/app/Jobs/ServerCheckJob.php
+++ b/app/Jobs/ServerCheckJob.php
@@ -94,11 +94,9 @@ public function handle()
                     }
                 }
             }
-
         } catch (\Throwable $e) {
             return handleError($e);
         }
-
     }
 
     private function checkLogDrainContainer()
diff --git a/app/Jobs/ServerCleanupMux.php b/app/Jobs/ServerCleanupMux.php
index 70ea59752..b793c3eca 100644
--- a/app/Jobs/ServerCleanupMux.php
+++ b/app/Jobs/ServerCleanupMux.php
@@ -33,10 +33,8 @@ public function handle()
                 return 'Server is not reachable or not ready.';
             }
             SshMultiplexingHelper::removeMuxFile($this->server);
-
         } catch (\Throwable $e) {
             return handleError($e);
         }
-
     }
 }
diff --git a/app/Jobs/ServerStorageCheckJob.php b/app/Jobs/ServerStorageCheckJob.php
index 32737cc47..cc838c77f 100644
--- a/app/Jobs/ServerStorageCheckJob.php
+++ b/app/Jobs/ServerStorageCheckJob.php
@@ -58,10 +58,8 @@ function () use ($team, $serverDiskUsageNotificationThreshold) {
             } else {
                 RateLimiter::hit('high-disk-usage:'.$this->server->id, 600);
             }
-
         } catch (\Throwable $e) {
             return handleError($e);
         }
-
     }
 }
diff --git a/app/Jobs/UpdateCoolifyJob.php b/app/Jobs/UpdateCoolifyJob.php
index 2cc705e4a..1e5197b6f 100644
--- a/app/Jobs/UpdateCoolifyJob.php
+++ b/app/Jobs/UpdateCoolifyJob.php
@@ -41,7 +41,6 @@ public function handle(): void
 
             $settings->update(['new_version_available' => false]);
             Log::info('Coolify update completed successfully.');
-
         } catch (\Throwable $e) {
             Log::error('UpdateCoolifyJob failed: '.$e->getMessage());
             // Consider implementing a notification to administrators
diff --git a/app/Livewire/Project/Database/Import.php b/app/Livewire/Project/Database/Import.php
index 39db28d9b..663e7a6d7 100644
--- a/app/Livewire/Project/Database/Import.php
+++ b/app/Livewire/Project/Database/Import.php
@@ -88,7 +88,6 @@ public function getContainers()
 
     public function runImport()
     {
-
         if ($this->filename === '') {
             $this->dispatch('error', 'Please select a file to import.');
 
diff --git a/app/Livewire/Project/Database/Keydb/General.php b/app/Livewire/Project/Database/Keydb/General.php
index f976e1edd..df04f70d7 100644
--- a/app/Livewire/Project/Database/Keydb/General.php
+++ b/app/Livewire/Project/Database/Keydb/General.php
@@ -51,7 +51,6 @@ public function mount()
         $this->db_url = $this->database->internal_db_url;
         $this->db_url_public = $this->database->external_db_url;
         $this->server = data_get($this->database, 'destination.server');
-
     }
 
     public function instantSaveAdvanced()
diff --git a/app/Livewire/Project/Database/Mariadb/General.php b/app/Livewire/Project/Database/Mariadb/General.php
index 12d4882f3..c9d473223 100644
--- a/app/Livewire/Project/Database/Mariadb/General.php
+++ b/app/Livewire/Project/Database/Mariadb/General.php
@@ -57,7 +57,6 @@ public function mount()
         $this->db_url = $this->database->internal_db_url;
         $this->db_url_public = $this->database->external_db_url;
         $this->server = data_get($this->database, 'destination.server');
-
     }
 
     public function instantSaveAdvanced()
diff --git a/app/Livewire/Project/Database/Mongodb/General.php b/app/Livewire/Project/Database/Mongodb/General.php
index ac40e7dfa..e19895dae 100644
--- a/app/Livewire/Project/Database/Mongodb/General.php
+++ b/app/Livewire/Project/Database/Mongodb/General.php
@@ -55,7 +55,6 @@ public function mount()
         $this->db_url = $this->database->internal_db_url;
         $this->db_url_public = $this->database->external_db_url;
         $this->server = data_get($this->database, 'destination.server');
-
     }
 
     public function instantSaveAdvanced()
diff --git a/app/Livewire/Project/New/PublicGitRepository.php b/app/Livewire/Project/New/PublicGitRepository.php
index 49f017270..bd35dccef 100644
--- a/app/Livewire/Project/New/PublicGitRepository.php
+++ b/app/Livewire/Project/New/PublicGitRepository.php
@@ -99,7 +99,6 @@ public function updatedBaseDirectory()
                 $this->base_directory = '/'.$this->base_directory;
             }
         }
-
     }
 
     public function updatedDockerComposeLocation()
diff --git a/app/Livewire/Project/Resource/Create.php b/app/Livewire/Project/Resource/Create.php
index 5c6a37d6d..9266a57fc 100644
--- a/app/Livewire/Project/Resource/Create.php
+++ b/app/Livewire/Project/Resource/Create.php
@@ -100,7 +100,6 @@ public function mount()
                                     'is_preview' => false,
                                 ]);
                             }
-
                         });
                     }
                     $service->parse(isNew: true);
diff --git a/app/Livewire/Project/Service/Index.php b/app/Livewire/Project/Service/Index.php
index 0a7b6ec90..ba4ebe2fc 100644
--- a/app/Livewire/Project/Service/Index.php
+++ b/app/Livewire/Project/Service/Index.php
@@ -48,7 +48,6 @@ public function mount()
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
-
     }
 
     public function generateDockerCompose()
diff --git a/app/Livewire/Project/Shared/ExecuteContainerCommand.php b/app/Livewire/Project/Shared/ExecuteContainerCommand.php
index 574dfa969..621ab1bac 100644
--- a/app/Livewire/Project/Shared/ExecuteContainerCommand.php
+++ b/app/Livewire/Project/Shared/ExecuteContainerCommand.php
@@ -132,7 +132,6 @@ public function loadContainers()
                     }
                 });
             }
-
         }
         if ($this->containers->count() > 0) {
             $this->container = $this->containers->first();
@@ -155,7 +154,6 @@ public function connectToServer()
                 data_get($this->server, 'name'),
                 data_get($this->server, 'uuid')
             );
-
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -185,7 +183,6 @@ public function connectToContainer()
                 data_get($container, 'container.Names'),
                 data_get($container, 'server.uuid')
             );
-
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
diff --git a/app/Livewire/Project/Shared/Logs.php b/app/Livewire/Project/Shared/Logs.php
index e2b57aab3..12022b1ee 100644
--- a/app/Livewire/Project/Shared/Logs.php
+++ b/app/Livewire/Project/Shared/Logs.php
@@ -109,9 +109,7 @@ public function mount()
                 $this->containers = $this->containers->filter(function ($container) {
                     return str_contains($container, $this->query['pull_request_id']);
                 });
-
             }
-
         } catch (\Exception $e) {
             return handleError($e, $this);
         }
diff --git a/app/Livewire/Project/Shared/ResourceOperations.php b/app/Livewire/Project/Shared/ResourceOperations.php
index 414ebba03..e67df6aa9 100644
--- a/app/Livewire/Project/Shared/ResourceOperations.php
+++ b/app/Livewire/Project/Shared/ResourceOperations.php
@@ -147,7 +147,6 @@ public function cloneTo($destination_id)
 
             return redirect()->to($route);
         }
-
     }
 
     public function moveTo($environment_id)
diff --git a/app/Livewire/Project/Shared/Storages/Add.php b/app/Livewire/Project/Shared/Storages/Add.php
index afa27a6bd..6e250bd90 100644
--- a/app/Livewire/Project/Shared/Storages/Add.php
+++ b/app/Livewire/Project/Shared/Storages/Add.php
@@ -100,7 +100,6 @@ public function submitFileStorage()
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
-
     }
 
     public function submitFileStorageDirectory()
@@ -127,7 +126,6 @@ public function submitFileStorageDirectory()
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
-
     }
 
     public function submitPersistentVolume()
@@ -144,7 +142,6 @@ public function submitPersistentVolume()
                 'mount_path' => $this->mount_path,
                 'host_path' => $this->host_path,
             ]);
-
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
diff --git a/app/Livewire/Project/Shared/Terminal.php b/app/Livewire/Project/Shared/Terminal.php
index 916db650f..5af8f057e 100644
--- a/app/Livewire/Project/Shared/Terminal.php
+++ b/app/Livewire/Project/Shared/Terminal.php
@@ -26,7 +26,6 @@ public function closeTerminal()
     #[On('send-terminal-command')]
     public function sendTerminalCommand($isContainer, $identifier, $serverUuid)
     {
-
         $server = Server::ownedByCurrentTeam()->whereUuid($serverUuid)->firstOrFail();
 
         if ($isContainer) {
diff --git a/app/Livewire/Project/Shared/UploadConfig.php b/app/Livewire/Project/Shared/UploadConfig.php
index 3859b387a..1b10f588b 100644
--- a/app/Livewire/Project/Shared/UploadConfig.php
+++ b/app/Livewire/Project/Shared/UploadConfig.php
@@ -37,7 +37,6 @@ public function uploadConfig()
 
             return;
         }
-
     }
 
     public function render()
diff --git a/app/Livewire/Server/Charts.php b/app/Livewire/Server/Charts.php
index d879de65d..d0db87f57 100644
--- a/app/Livewire/Server/Charts.php
+++ b/app/Livewire/Server/Charts.php
@@ -49,7 +49,6 @@ public function loadData()
             $this->dispatch("refreshChartData-{$this->chartId}-memory", [
                 'seriesData' => $memoryMetrics,
             ]);
-
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
diff --git a/app/Livewire/Server/Form.php b/app/Livewire/Server/Form.php
index 697c7b76f..740421373 100644
--- a/app/Livewire/Server/Form.php
+++ b/app/Livewire/Server/Form.php
@@ -86,7 +86,6 @@ public function mount(Server $server)
         $this->server = $server;
         $this->timezones = collect(timezone_identifiers_list())->sort()->values()->toArray();
         $this->wildcard_domain = $this->server->settings->wildcard_domain;
-
     }
 
     public function checkSyncStatus()
@@ -169,7 +168,6 @@ public function updatedServerSettingsIsSentinelDebugEnabled()
     public function instantSave()
     {
         try {
-
             $this->validate();
             refresh_server_connection($this->server->privateKey);
             $this->validateServer(false);
diff --git a/app/Livewire/Server/LogDrains.php b/app/Livewire/Server/LogDrains.php
index 2bc24eff8..fb8ef329f 100644
--- a/app/Livewire/Server/LogDrains.php
+++ b/app/Livewire/Server/LogDrains.php
@@ -51,7 +51,6 @@ public function mount(string $server_uuid)
 
     public function syncData(bool $toModel = false)
     {
-
         if ($toModel) {
             $this->validate();
             $this->server->settings->is_logdrain_newrelic_enabled = $this->isLogDrainNewRelicEnabled;
@@ -78,7 +77,6 @@ public function syncData(bool $toModel = false)
             $this->logDrainCustomConfig = $this->server->settings->logdrain_custom_config;
             $this->logDrainCustomConfigParser = $this->server->settings->logdrain_custom_config_parser;
         }
-
     }
 
     public function instantSave()
diff --git a/app/Livewire/Server/Proxy.php b/app/Livewire/Server/Proxy.php
index 55d0c4966..94ea3509a 100644
--- a/app/Livewire/Server/Proxy.php
+++ b/app/Livewire/Server/Proxy.php
@@ -99,7 +99,6 @@ public function loadProxyConfiguration()
             } else {
                 $this->dispatch('traefikDashboardAvailable', false);
             }
-
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
diff --git a/app/Livewire/SettingsEmail.php b/app/Livewire/SettingsEmail.php
index 2b515bf68..fe329f270 100644
--- a/app/Livewire/SettingsEmail.php
+++ b/app/Livewire/SettingsEmail.php
@@ -47,7 +47,6 @@ public function mount()
         } else {
             return redirect()->route('dashboard');
         }
-
     }
 
     public function submitFromFields()
diff --git a/app/Livewire/Source/Github/Change.php b/app/Livewire/Source/Github/Change.php
index 22cabcd0b..07cef54f9 100644
--- a/app/Livewire/Source/Github/Change.php
+++ b/app/Livewire/Source/Github/Change.php
@@ -140,7 +140,6 @@ public function mount()
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
-
     }
 
     public function submit()
diff --git a/app/Livewire/Upgrade.php b/app/Livewire/Upgrade.php
index dfbd945f5..88ed88cb7 100644
--- a/app/Livewire/Upgrade.php
+++ b/app/Livewire/Upgrade.php
@@ -23,11 +23,9 @@ public function checkUpdate()
         try {
             $this->latestVersion = get_latest_version_of_coolify();
             $this->isUpgradeAvailable = data_get(InstanceSettings::get(), 'new_version_available', false);
-
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
-
     }
 
     public function upgrade()
diff --git a/app/Livewire/VerifyEmail.php b/app/Livewire/VerifyEmail.php
index 9d1fdab98..fab3265b6 100644
--- a/app/Livewire/VerifyEmail.php
+++ b/app/Livewire/VerifyEmail.php
@@ -15,7 +15,6 @@ public function again()
             $this->rateLimit(1, 300);
             auth()->user()->sendVerificationEmail();
             $this->dispatch('success', 'Email verification link sent!');
-
         } catch (\Exception $e) {
             return handleError($e, $this);
         }
diff --git a/app/Models/Environment.php b/app/Models/Environment.php
index d0bb5d2a6..71e8bbd21 100644
--- a/app/Models/Environment.php
+++ b/app/Models/Environment.php
@@ -29,7 +29,6 @@ protected static function booted()
             foreach ($shared_variables as $shared_variable) {
                 $shared_variable->delete();
             }
-
         });
     }
 
diff --git a/app/Models/EnvironmentVariable.php b/app/Models/EnvironmentVariable.php
index f9e09941d..08f23d7ab 100644
--- a/app/Models/EnvironmentVariable.php
+++ b/app/Models/EnvironmentVariable.php
@@ -162,7 +162,6 @@ private function get_real_environment_variables(?string $environment_variable =
         $environment_variable = trim($environment_variable);
         $sharedEnvsFound = str($environment_variable)->matchAll('/{{(.*?)}}/');
         if ($sharedEnvsFound->isEmpty()) {
-
             return $environment_variable;
         }
 
diff --git a/app/Models/InstanceSettings.php b/app/Models/InstanceSettings.php
index 339daed2a..eeb803925 100644
--- a/app/Models/InstanceSettings.php
+++ b/app/Models/InstanceSettings.php
@@ -36,7 +36,6 @@ protected static function booted(): void
                 });
             }
         });
-
     }
 
     public function fqdn(): Attribute
diff --git a/app/Models/LocalFileVolume.php b/app/Models/LocalFileVolume.php
index 97a1e4cbb..2c223be77 100644
--- a/app/Models/LocalFileVolume.php
+++ b/app/Models/LocalFileVolume.php
@@ -72,7 +72,6 @@ public function deleteStorageOnServer()
         if ($path && $path != '/' && $path != '.' && $path != '..') {
             if ($isFile === 'OK') {
                 $commands->push("rm -rf $path > /dev/null 2>&1 || true");
-
             } elseif ($isDir === 'OK') {
                 $commands->push("rm -rf $path > /dev/null 2>&1 || true");
                 $commands->push("rmdir $path > /dev/null 2>&1 || true");
diff --git a/app/Models/Service.php b/app/Models/Service.php
index c4f4c2d3c..fe2ebcbd6 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -1095,7 +1095,6 @@ public function extraFields()
                     }
                     $fields->put('MariaDB', $data->toArray());
                     break;
-
             }
         }
 
@@ -1304,7 +1303,6 @@ public function parse(bool $isNew = false): Collection
         } else {
             return collect([]);
         }
-
     }
 
     public function networks()
diff --git a/app/Notifications/ScheduledTask/TaskFailed.php b/app/Notifications/ScheduledTask/TaskFailed.php
index 2cc33f2ba..c3501a8eb 100644
--- a/app/Notifications/ScheduledTask/TaskFailed.php
+++ b/app/Notifications/ScheduledTask/TaskFailed.php
@@ -30,7 +30,6 @@ public function __construct(public ScheduledTask $task, public string $output)
 
     public function via(object $notifiable): array
     {
-
         return setNotificationChannels($notifiable, 'scheduled_tasks');
     }
 
diff --git a/bootstrap/helpers/api.php b/bootstrap/helpers/api.php
index d7c16b607..a1dae612c 100644
--- a/bootstrap/helpers/api.php
+++ b/bootstrap/helpers/api.php
@@ -28,7 +28,6 @@ function serializeApiResponse($data)
             if ($created_at) {
                 unset($d['created_at']);
                 $d['created_at'] = $created_at;
-
             }
             if ($updated_at) {
                 unset($d['updated_at']);
@@ -59,7 +58,6 @@ function serializeApiResponse($data)
         if ($created_at) {
             unset($d['created_at']);
             $d['created_at'] = $created_at;
-
         }
         if ($updated_at) {
             unset($d['updated_at']);
diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index 77070128d..f262b3cd8 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -581,7 +581,6 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
                     redirect_direction: $application->redirect
                 ));
             }
-
         }
     } else {
         if (data_get($preview, 'fqdn')) {
@@ -633,7 +632,6 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
                 is_stripprefix_enabled: $application->isStripprefixEnabled()
             ));
         }
-
     }
 
     return $labels->all();
diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php
index 496017217..8da537807 100644
--- a/bootstrap/helpers/proxy.php
+++ b/bootstrap/helpers/proxy.php
@@ -21,7 +21,6 @@ function collectProxyDockerNetworksByServer(Server $server)
     })->flatten()->unique();
 
     return $networks;
-
 }
 function collectDockerNetworksByServer(Server $server)
 {
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 67ce353d2..273dd8c55 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -3188,7 +3188,6 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                             'is_build_time' => false,
                             'is_preview' => false,
                         ]);
-
                     } else {
                         $value = generateEnvValue($command, $resource);
                         $resource->environment_variables()->where('key', $key->value())->where($nameOfId, $resource->id)->firstOrCreate([
@@ -3616,7 +3615,6 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                         'is_required' => $isRequired,
                     ]);
                 }
-
             }
         }
         if ($isApplication) {
@@ -3980,7 +3978,6 @@ function convertComposeEnvironmentToArray($environment)
     }
 
     return $convertedServiceVariables;
-
 }
 function instanceSettings()
 {
@@ -3989,7 +3986,6 @@ function instanceSettings()
 
 function loadConfigFromGit(string $repository, string $branch, string $base_directory, int $server_id, int $team_id)
 {
-
     $server = Server::find($server_id)->where('team_id', $team_id)->first();
     if (! $server) {
         return;
diff --git a/database/migrations/2023_08_22_071051_add_stripe_plan_to_subscriptions.php b/database/migrations/2023_08_22_071051_add_stripe_plan_to_subscriptions.php
index 3da187320..a04eaf983 100644
--- a/database/migrations/2023_08_22_071051_add_stripe_plan_to_subscriptions.php
+++ b/database/migrations/2023_08_22_071051_add_stripe_plan_to_subscriptions.php
@@ -13,7 +13,6 @@ public function up(): void
     {
         Schema::table('subscriptions', function (Blueprint $table) {
             $table->string('stripe_plan_id')->nullable()->after('stripe_cancel_at_period_end');
-
         });
     }
 
diff --git a/database/migrations/2023_08_22_071054_add_stripe_reasons.php b/database/migrations/2023_08_22_071054_add_stripe_reasons.php
index efd611aac..6ffe37e98 100644
--- a/database/migrations/2023_08_22_071054_add_stripe_reasons.php
+++ b/database/migrations/2023_08_22_071054_add_stripe_reasons.php
@@ -14,7 +14,6 @@ public function up(): void
         Schema::table('subscriptions', function (Blueprint $table) {
             $table->string('stripe_feedback')->nullable()->after('stripe_cancel_at_period_end');
             $table->string('stripe_comment')->nullable()->after('stripe_feedback');
-
         });
     }
 
diff --git a/database/migrations/2023_08_22_071059_add_stripe_trial_ended.php b/database/migrations/2023_08_22_071059_add_stripe_trial_ended.php
index c22317e6b..61fcbda6b 100644
--- a/database/migrations/2023_08_22_071059_add_stripe_trial_ended.php
+++ b/database/migrations/2023_08_22_071059_add_stripe_trial_ended.php
@@ -13,7 +13,6 @@ public function up(): void
     {
         Schema::table('subscriptions', function (Blueprint $table) {
             $table->boolean('stripe_trial_already_ended')->default(false)->after('stripe_cancel_at_period_end');
-
         });
     }
 
diff --git a/database/migrations/2023_08_22_071060_change_invitation_link_length.php b/database/migrations/2023_08_22_071060_change_invitation_link_length.php
index 4efb03351..9d14c3f26 100644
--- a/database/migrations/2023_08_22_071060_change_invitation_link_length.php
+++ b/database/migrations/2023_08_22_071060_change_invitation_link_length.php
@@ -13,7 +13,6 @@ public function up(): void
     {
         Schema::table('team_invitations', function (Blueprint $table) {
             $table->text('link')->change();
-
         });
     }
 
diff --git a/database/migrations/2023_09_20_082541_update_services_table.php b/database/migrations/2023_09_20_082541_update_services_table.php
index 8c6b350f7..c70cd28f7 100644
--- a/database/migrations/2023_09_20_082541_update_services_table.php
+++ b/database/migrations/2023_09_20_082541_update_services_table.php
@@ -16,7 +16,6 @@ public function up(): void
             $table->longText('description')->nullable();
             $table->longText('docker_compose_raw');
             $table->longText('docker_compose')->nullable();
-
         });
     }
 
diff --git a/database/migrations/2023_09_20_083549_update_environment_variables_table.php b/database/migrations/2023_09_20_083549_update_environment_variables_table.php
index 40eb6aa44..a96d096bb 100644
--- a/database/migrations/2023_09_20_083549_update_environment_variables_table.php
+++ b/database/migrations/2023_09_20_083549_update_environment_variables_table.php
@@ -13,7 +13,6 @@ public function up(): void
     {
         Schema::table('environment_variables', function (Blueprint $table) {
             $table->foreignId('service_id')->nullable();
-
         });
     }
 
diff --git a/database/migrations/2023_09_23_111809_remove_destination_from_services_table.php b/database/migrations/2023_09_23_111809_remove_destination_from_services_table.php
index 920f44a72..729146a4a 100644
--- a/database/migrations/2023_09_23_111809_remove_destination_from_services_table.php
+++ b/database/migrations/2023_09_23_111809_remove_destination_from_services_table.php
@@ -14,7 +14,6 @@ public function up(): void
         Schema::table('services', function (Blueprint $table) {
             $table->dropColumn('destination_type');
             $table->dropColumn('destination_id');
-
         });
     }
 
diff --git a/database/migrations/2023_09_23_111819_add_server_emails.php b/database/migrations/2023_09_23_111819_add_server_emails.php
index 03c1e6bd2..775e82010 100644
--- a/database/migrations/2023_09_23_111819_add_server_emails.php
+++ b/database/migrations/2023_09_23_111819_add_server_emails.php
@@ -26,6 +26,5 @@ public function down(): void
             $table->dropColumn('unreachable_email_sent');
             $table->integer('unreachable_count')->default(0);
         });
-
     }
 };
diff --git a/database/migrations/2023_11_16_220647_add_log_drains.php b/database/migrations/2023_11_16_220647_add_log_drains.php
index 05b1ed054..f5161b3d7 100644
--- a/database/migrations/2023_11_16_220647_add_log_drains.php
+++ b/database/migrations/2023_11_16_220647_add_log_drains.php
@@ -22,7 +22,6 @@ public function up(): void
             $table->boolean('is_logdrain_axiom_enabled')->default(false);
             $table->string('logdrain_axiom_dataset_name')->nullable();
             $table->string('logdrain_axiom_api_key')->nullable();
-
         });
     }
 
diff --git a/database/migrations/2023_12_13_110214_add_soft_deletes.php b/database/migrations/2023_12_13_110214_add_soft_deletes.php
index ab7b562b4..72350b77f 100644
--- a/database/migrations/2023_12_13_110214_add_soft_deletes.php
+++ b/database/migrations/2023_12_13_110214_add_soft_deletes.php
@@ -66,6 +66,5 @@ public function down(): void
         Schema::table('service_databases', function (Blueprint $table) {
             $table->dropSoftDeletes();
         });
-
     }
 };
diff --git a/database/migrations/2023_12_17_155616_add_custom_docker_compose_start_command.php b/database/migrations/2023_12_17_155616_add_custom_docker_compose_start_command.php
index eeb2769fe..f28b2670e 100644
--- a/database/migrations/2023_12_17_155616_add_custom_docker_compose_start_command.php
+++ b/database/migrations/2023_12_17_155616_add_custom_docker_compose_start_command.php
@@ -14,7 +14,6 @@ public function up(): void
         Schema::table('applications', function (Blueprint $table) {
             $table->string('docker_compose_custom_start_command')->nullable();
             $table->string('docker_compose_custom_build_command')->nullable();
-
         });
     }
 
diff --git a/database/migrations/2024_04_09_095517_make_custom_docker_commands_longer.php b/database/migrations/2024_04_09_095517_make_custom_docker_commands_longer.php
index 7df53ec06..b3f2c1920 100644
--- a/database/migrations/2024_04_09_095517_make_custom_docker_commands_longer.php
+++ b/database/migrations/2024_04_09_095517_make_custom_docker_commands_longer.php
@@ -13,7 +13,6 @@ public function up(): void
     {
         Schema::table('applications', function (Blueprint $table) {
             $table->text('custom_docker_run_options')->nullable()->change();
-
         });
     }
 
diff --git a/database/migrations/2024_04_25_073615_add_docker_network_to_application_settings.php b/database/migrations/2024_04_25_073615_add_docker_network_to_application_settings.php
index aeae6f77d..bea410eab 100644
--- a/database/migrations/2024_04_25_073615_add_docker_network_to_application_settings.php
+++ b/database/migrations/2024_04_25_073615_add_docker_network_to_application_settings.php
@@ -13,7 +13,6 @@ public function up(): void
     {
         Schema::table('application_settings', function (Blueprint $table) {
             $table->boolean('connect_to_docker_network')->default(false);
-
         });
     }
 
diff --git a/database/migrations/2024_05_23_091713_add_gitea_webhook_to_applications.php b/database/migrations/2024_05_23_091713_add_gitea_webhook_to_applications.php
index 716f1f44c..b46a07203 100644
--- a/database/migrations/2024_05_23_091713_add_gitea_webhook_to_applications.php
+++ b/database/migrations/2024_05_23_091713_add_gitea_webhook_to_applications.php
@@ -13,7 +13,6 @@ public function up(): void
     {
         Schema::table('applications', function (Blueprint $table) {
             $table->string('manual_webhook_secret_gitea')->nullable();
-
         });
     }
 
diff --git a/database/migrations/2024_08_09_215659_add_server_cleanup_fields_to_server_settings_table.php b/database/migrations/2024_08_09_215659_add_server_cleanup_fields_to_server_settings_table.php
index b5300c905..e3bdc68c6 100644
--- a/database/migrations/2024_08_09_215659_add_server_cleanup_fields_to_server_settings_table.php
+++ b/database/migrations/2024_08_09_215659_add_server_cleanup_fields_to_server_settings_table.php
@@ -30,7 +30,6 @@ public function up()
             $serverSetting->docker_cleanup_threshold = $serverSetting->cleanup_after_percentage;
             $serverSetting->save();
         }
-
     }
 
     /**
diff --git a/database/migrations/2024_09_16_111428_encrypt_existing_private_keys.php b/database/migrations/2024_09_16_111428_encrypt_existing_private_keys.php
index 19274ad9b..e16181ac7 100644
--- a/database/migrations/2024_09_16_111428_encrypt_existing_private_keys.php
+++ b/database/migrations/2024_09_16_111428_encrypt_existing_private_keys.php
@@ -20,6 +20,5 @@ public function up()
             echo 'Encrypting private keys failed.';
             echo $e->getMessage();
         }
-
     }
 }
diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php
index 90b9d46ff..3e820a162 100644
--- a/database/seeders/ProductionSeeder.php
+++ b/database/seeders/ProductionSeeder.php
@@ -126,7 +126,6 @@ public function run(): void
                     echo "Your localhost connection won't work until then.";
                 }
             }
-
         }
         if (config('coolify.is_windows_docker_desktop')) {
             PrivateKey::updateOrCreate(
@@ -187,6 +186,5 @@ public function run(): void
         $this->call(OauthSettingSeeder::class);
         $this->call(PopulateSshKeysDirectorySeeder::class);
         $this->call(SentinelSeeder::class);
-
     }
 }
diff --git a/routes/api.php b/routes/api.php
index b63fde871..572325810 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -128,7 +128,6 @@
     Route::match(['get', 'post'], '/services/{uuid}/start', [ServicesController::class, 'action_deploy'])->middleware([IgnoreReadOnlyApiToken::class]);
     Route::match(['get', 'post'], '/services/{uuid}/restart', [ServicesController::class, 'action_restart'])->middleware([IgnoreReadOnlyApiToken::class]);
     Route::match(['get', 'post'], '/services/{uuid}/stop', [ServicesController::class, 'action_stop'])->middleware([IgnoreReadOnlyApiToken::class]);
-
 });
 
 Route::group([

From 1ec224fde16db002fe5eb7520172767dc53de38b Mon Sep 17 00:00:00 2001
From: Lucas Michot <lucas@semalead.com>
Date: Thu, 31 Oct 2024 18:20:11 +0100
Subject: [PATCH 19/21] 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 @@ public function handle(Server $server, bool $async = true, bool $force = false):
         }
 
         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 @@ public function handle(Service $service)
                 $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 @@ public function envs(Request $request)
                 '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 @@ public function envs(Request $request)
                 '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 @@ public function __construct($task)
     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 @@ public function getServerTimezone()
         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 @@ public function getServerTimezone()
         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 @@ public function server()
     {
         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 @@ public function getCpuMetrics(int $mins = 5)
                 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 @@ public function user(): Attribute
     {
         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 @@ public function validateConnection(bool $isManualCheck = true, bool $justCheckin
 
     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 @@ public function parse(bool $isNew = false): Collection
 
     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 @@ public function getRecepients($notification)
     {
         $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 @@ public function sources()
         $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 @@ public function toMail(): MailMessage
 
     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()
 {

From 5ce2422b9006d0bce66a1f48e98b974d1d2b1d8e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 31 Oct 2024 23:25:16 +0100
Subject: [PATCH 20/21] fix: stripe webhooks fix: add custome created webhook

---
 app/Http/Controllers/Webhook/Stripe.php       |  62 +++--
 app/Livewire/Subscription/PricingPlans.php    |  60 ++---
 .../subscription/pricing-plans.blade.php      | 212 +++++++-----------
 3 files changed, 130 insertions(+), 204 deletions(-)

diff --git a/app/Http/Controllers/Webhook/Stripe.php b/app/Http/Controllers/Webhook/Stripe.php
index 55c94a618..dce73b2c5 100644
--- a/app/Http/Controllers/Webhook/Stripe.php
+++ b/app/Http/Controllers/Webhook/Stripe.php
@@ -13,7 +13,6 @@
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Sleep;
 use Illuminate\Support\Str;
 
 class Stripe extends Controller
@@ -64,22 +63,18 @@ public function events(Request $request)
                     $piData = $stripe->paymentIntents->retrieve($pi, []);
                     $customerId = data_get($piData, 'customer');
                     $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                    if (! $subscription) {
-                        Sleep::for(5)->seconds();
-                        $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                    }
-                    if (! $subscription) {
-                        Sleep::for(5)->seconds();
-                        $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                    }
                     if ($subscription) {
                         $subscriptionId = data_get($subscription, 'stripe_subscription_id');
                         $stripe->subscriptions->cancel($subscriptionId, []);
                         $subscription->update([
                             'stripe_invoice_paid' => false,
                         ]);
+                        send_internal_notification("Early fraud warning created Refunded, subscription canceled. Charge: {$charge}, id: {$id}, pi: {$pi}");
+                    } else {
+                        send_internal_notification("Early fraud warning: subscription not found. Charge: {$charge}, id: {$id}, pi: {$pi}");
+
+                        return response("Early fraud warning: subscription not found. Charge: {$charge}, id: {$id}, pi: {$pi}", 400);
                     }
-                    send_internal_notification("Early fraud warning created Refunded, subscription canceled. Charge: {$charge}, id: {$id}, pi: {$pi}");
                     break;
                 case 'checkout.session.completed':
                     $clientReferenceId = data_get($data, 'client_reference_id');
@@ -95,7 +90,8 @@ public function events(Request $request)
                     $found = $team->members->where('id', $userId)->first();
                     if (! $found->isAdmin()) {
                         send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
-                        throw new Exception("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
+
+                        return response("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.", 400);
                     }
                     $subscription = Subscription::where('team_id', $teamId)->first();
                     if ($subscription) {
@@ -123,13 +119,13 @@ public function events(Request $request)
                         break;
                     }
                     $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                    if (! $subscription) {
-                        Sleep::for(5)->seconds();
-                        $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                    if ($subscription) {
+                        $subscription->update([
+                            'stripe_invoice_paid' => true,
+                        ]);
+                    } else {
+                        return response("No subscription found for customer: {$customerId}", 400);
                     }
-                    $subscription->update([
-                        'stripe_invoice_paid' => true,
-                    ]);
                     break;
                 case 'invoice.payment_failed':
                     $customerId = data_get($data, 'customer');
@@ -167,6 +163,30 @@ public function events(Request $request)
                     }
                     send_internal_notification('Subscription payment failed for customer: '.$customerId);
                     break;
+                case 'customer.subscription.created':
+                    $customerId = data_get($data, 'customer');
+                    $subscriptionId = data_get($data, 'id');
+                    $teamId = data_get($data, 'metadata.team_id');
+                    $userId = data_get($data, 'metadata.user_id');
+                    $team = Team::find($teamId);
+                    $found = $team->members->where('id', $userId)->first();
+                    if (! $found->isAdmin()) {
+                        send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
+
+                        return response("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.", 400);
+                    }
+                    $subscription = Subscription::where('team_id', $teamId)->first();
+                    if ($subscription) {
+                        return response("Subscription already exists for team: {$teamId}", 400);
+                    } else {
+                        Subscription::create([
+                            'team_id' => $teamId,
+                            'stripe_subscription_id' => $subscriptionId,
+                            'stripe_customer_id' => $customerId,
+                            'stripe_invoice_paid' => false,
+                        ]);
+                    }
+                    break;
                 case 'customer.subscription.updated':
                     $customerId = data_get($data, 'customer');
                     $status = data_get($data, 'status');
@@ -177,10 +197,6 @@ public function events(Request $request)
                         break;
                     }
                     $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                    if (! $subscription) {
-                        Sleep::for(5)->seconds();
-                        $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                    }
                     if (! $subscription) {
                         if ($status === 'incomplete_expired') {
                             // send_internal_notification('Subscription incomplete expired for customer: '.$customerId);
@@ -268,7 +284,7 @@ public function events(Request $request)
                     $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
                     $team = data_get($subscription, 'team');
                     if (! $team) {
-                        throw new Exception('No team found for subscription: '.$subscription->id);
+                        return response('No team found for subscription: '.$subscription->id, 400);
                     }
                     SubscriptionTrialEndsSoonJob::dispatch($team);
                     break;
@@ -277,7 +293,7 @@ public function events(Request $request)
                     $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
                     $team = data_get($subscription, 'team');
                     if (! $team) {
-                        throw new Exception('No team found for subscription: '.$subscription->id);
+                        return response('No team found for subscription: '.$subscription->id, 400);
                     }
                     $team->trialEnded();
                     $subscription->update([
diff --git a/app/Livewire/Subscription/PricingPlans.php b/app/Livewire/Subscription/PricingPlans.php
index 09d11038d..9186cc978 100644
--- a/app/Livewire/Subscription/PricingPlans.php
+++ b/app/Livewire/Subscription/PricingPlans.php
@@ -8,31 +8,14 @@
 
 class PricingPlans extends Component
 {
-    public bool $isTrial = false;
-
-    public function mount()
-    {
-        $this->isTrial = ! data_get(currentTeam(), 'subscription.stripe_trial_already_ended');
-        if (config('constants.limits.trial_period') == 0) {
-            $this->isTrial = false;
-        }
-    }
-
     public function subscribeStripe($type)
     {
-        $team = currentTeam();
         Stripe::setApiKey(config('subscription.stripe_api_key'));
 
         $priceId = match ($type) {
-            'basic-monthly' => config('subscription.stripe_price_id_basic_monthly'),
-            'basic-yearly' => config('subscription.stripe_price_id_basic_yearly'),
-            'pro-monthly' => config('subscription.stripe_price_id_pro_monthly'),
-            'pro-yearly' => config('subscription.stripe_price_id_pro_yearly'),
-            'ultimate-monthly' => config('subscription.stripe_price_id_ultimate_monthly'),
-            'ultimate-yearly' => config('subscription.stripe_price_id_ultimate_yearly'),
             'dynamic-monthly' => config('subscription.stripe_price_id_dynamic_monthly'),
             'dynamic-yearly' => config('subscription.stripe_price_id_dynamic_yearly'),
-            default => config('subscription.stripe_price_id_basic_monthly'),
+            default => config('subscription.stripe_price_id_dynamic_monthly'),
         };
 
         if (! $priceId) {
@@ -46,7 +29,11 @@ public function subscribeStripe($type)
             'client_reference_id' => auth()->user()->id.':'.currentTeam()->id,
             'line_items' => [[
                 'price' => $priceId,
-                'quantity' => 1,
+                'adjustable_quantity' => [
+                    'enabled' => true,
+                    'minimum' => 2,
+                ],
+                'quantity' => 2,
             ]],
             'tax_id_collection' => [
                 'enabled' => true,
@@ -54,39 +41,18 @@ public function subscribeStripe($type)
             'automatic_tax' => [
                 'enabled' => true,
             ],
-
+            'subscription_data' => [
+                'metadata' => [
+                    'user_id' => auth()->user()->id,
+                    'team_id' => currentTeam()->id,
+                ],
+            ],
+            'payment_method_collection' => 'if_required',
             'mode' => 'subscription',
             'success_url' => route('dashboard', ['success' => true]),
             'cancel_url' => route('subscription.index', ['cancelled' => true]),
         ];
-        if (str($type)->contains('ultimate')) {
-            $payload['line_items'][0]['adjustable_quantity'] = [
-                'enabled' => true,
-                'minimum' => 10,
-            ];
-            $payload['line_items'][0]['quantity'] = 10;
-        }
-        if (str($type)->contains('dynamic')) {
-            $payload['line_items'][0]['adjustable_quantity'] = [
-                'enabled' => true,
-                'minimum' => 2,
-            ];
-            $payload['line_items'][0]['quantity'] = 2;
-        }
 
-        if (! data_get($team, 'subscription.stripe_trial_already_ended')) {
-            if (config('constants.limits.trial_period') > 0) {
-                $payload['subscription_data'] = [
-                    'trial_period_days' => config('constants.limits.trial_period'),
-                    'trial_settings' => [
-                        'end_behavior' => [
-                            'missing_payment_method' => 'cancel',
-                        ],
-                    ],
-                ];
-            }
-            $payload['payment_method_collection'] = 'if_required';
-        }
         $customer = currentTeam()->subscription?->stripe_customer_id ?? null;
         if ($customer) {
             $payload['customer'] = $customer;
diff --git a/resources/views/livewire/subscription/pricing-plans.blade.php b/resources/views/livewire/subscription/pricing-plans.blade.php
index 384a09369..82b491eb1 100644
--- a/resources/views/livewire/subscription/pricing-plans.blade.php
+++ b/resources/views/livewire/subscription/pricing-plans.blade.php
@@ -14,21 +14,18 @@ class="sr-only">
                     :class="selected === 'yearly' ? 'dark:bg-coollabs-100 bg-warning dark:text-white' : ''">
                     <input type="radio" x-on:click="selected = 'yearly'" name="frequency" value="annually"
                         class="sr-only">
-                    <span>Annually <span class="text-xs dark:text-warning text-coollabs">(save ~20%)</span
-                        ></span>
+                    <span>Annually <span class="text-xs dark:text-warning text-coollabs">(save ~20%)</span></span>
                 </label>
             </fieldset>
         </div>
         <div class="flow-root mt-12">
-            {{-- <div class="pb-10 text-xl text-center">For the detailed list of features, please visit our landing page: <a
-                    class="font-bold underline dark:text-white" href="https://coolify.io">coolify.io</a></div> --}}
             <div
                 class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-neutral-200 dark:divide-coolgray-500 isolate gap-y-16 sm:mx-auto lg:-mx-8 lg:mt-0 lg:max-w-none lg:grid-cols-1 lg:divide-x lg:divide-y-0 xl:-mx-4">
                 <div class="pt-16 lg:px-8 lg:pt-0 xl:px-14">
                     <h3 id="tier-dynamic" class="text-4xl font-semibold leading-7 dark:text-white">Pay-as-you-go</h3>
                     <p class="mt-4 text-sm leading-6 dark:text-neutral-400">
                         Dynamic pricing based on the number of servers you connect.
-                      </p>
+                    </p>
                     <p class="flex items-baseline mt-6 gap-x-1">
                         <span x-show="selected === 'monthly'" x-cloak>
                             <span class="text-4xl font-bold tracking-tight dark:text-white">$5</span>
@@ -43,43 +40,38 @@ class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-neutral-200 dark:divide-
                     <p class="flex items-baseline mb-4 gap-x-1">
                         <span x-show="selected === 'monthly'" x-cloak>
                             <span class="text-base font-semibold tracking-tight dark:text-white">$3</span>
-                            <span class="text-sm font-semibold leading-6 "> per additional servers <span class="font-normal dark:text-white">billed monthly (+VAT)</span></span>
+                            <span class="text-sm font-semibold leading-6 "> per additional servers <span
+                                    class="font-normal dark:text-white">billed monthly (+VAT)</span></span>
                         </span>
 
                         <span x-show="selected === 'yearly'" x-cloak>
                             <span class="text-base font-semibold tracking-tight dark:text-white">$2.7</span>
-                            <span class="text-sm font-semibold leading-6 "> per additional servers <span class="font-normal dark:text-white">billed annually (+VAT)</span></span>
+                            <span class="text-sm font-semibold leading-6 "> per additional servers <span
+                                    class="font-normal dark:text-white">billed annually (+VAT)</span></span>
                         </span>
                     </p>
                     <div class="flex items-center pt-6">
-                        <svg
-                          xmlns="http://www.w3.org/2000/svg"
-                          class="flex-none w-8 h-8 mr-3 text-warning"
-                          fill="currentColor"
-                          viewBox="0 0 256 256"
-                          ><path
-                            d="M236.8,188.09,149.35,36.22h0a24.76,24.76,0,0,0-42.7,0L19.2,188.09a23.51,23.51,0,0,0,0,23.72A24.35,24.35,0,0,0,40.55,224h174.9a24.35,24.35,0,0,0,21.33-12.19A23.51,23.51,0,0,0,236.8,188.09ZM222.93,203.8a8.5,8.5,0,0,1-7.48,4.2H40.55a8.5,8.5,0,0,1-7.48-4.2,7.59,7.59,0,0,1,0-7.72L120.52,44.21a8.75,8.75,0,0,1,15,0l87.45,151.87A7.59,7.59,0,0,1,222.93,203.8ZM120,144V104a8,8,0,0,1,16,0v40a8,8,0,0,1-16,0Zm20,36a12,12,0,1,1-12-12A12,12,0,0,1,140,180Z"
-                          ></path></svg
-                        >
+                        <svg xmlns="http://www.w3.org/2000/svg" class="flex-none w-8 h-8 mr-3 text-warning"
+                            fill="currentColor" viewBox="0 0 256 256">
+                            <path
+                                d="M236.8,188.09,149.35,36.22h0a24.76,24.76,0,0,0-42.7,0L19.2,188.09a23.51,23.51,0,0,0,0,23.72A24.35,24.35,0,0,0,40.55,224h174.9a24.35,24.35,0,0,0,21.33-12.19A23.51,23.51,0,0,0,236.8,188.09ZM222.93,203.8a8.5,8.5,0,0,1-7.48,4.2H40.55a8.5,8.5,0,0,1-7.48-4.2,7.59,7.59,0,0,1,0-7.72L120.52,44.21a8.75,8.75,0,0,1,15,0l87.45,151.87A7.59,7.59,0,0,1,222.93,203.8ZM120,144V104a8,8,0,0,1,16,0v40a8,8,0,0,1-16,0Zm20,36a12,12,0,1,1-12-12A12,12,0,0,1,140,180Z">
+                            </path>
+                        </svg>
 
                         <div class="flex flex-col text-sm dark:text-white">
-                          <div>
-                            You need to bring your own servers from any cloud provider (such as <a
-                              class="underline"
-                              href="https://coolify.io/hetzner"
-                              target="_blank">Hetzner</a
-                            >, DigitalOcean, AWS, etc.)
-                          </div>
-                          <div>
-                            (You can connect your RPi, old laptop, or any other device that runs
-                            the <a
-                              class="underline"
-                              href="https://coolify.io/docs/installation#supported-operating-systems"
-                              target="_blank">supported operating systems</a
-                            >.)
-                          </div>
+                            <div>
+                                You need to bring your own servers from any cloud provider (such as <a class="underline"
+                                    href="https://coolify.io/hetzner" target="_blank">Hetzner</a>, DigitalOcean, AWS,
+                                etc.)
+                            </div>
+                            <div>
+                                (You can connect your RPi, old laptop, or any other device that runs
+                                the <a class="underline"
+                                    href="https://coolify.io/docs/installation#supported-operating-systems"
+                                    target="_blank">supported operating systems</a>.)
+                            </div>
                         </div>
-                      </div>
+                    </div>
                     <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-basic"
                         class="w-full h-10 buyme" wire:click="subscribeStripe('dynamic-monthly')">
                         Subscribe
@@ -90,120 +82,72 @@ class="w-full h-10 buyme" wire:click="subscribeStripe('dynamic-yearly')">
                     </x-forms.button>
                     <ul role="list" class="mt-8 space-y-3 text-sm leading-6 dark:text-neutral-400">
                         <li class="flex">
-                          <svg
-                            class="flex-none w-5 h-6 mr-3 text-warning"
-                            viewBox="0 0 20 20"
-                            fill="currentColor"
-                            aria-hidden="true"
-                          >
-                            <path
-                              fill-rule="evenodd"
-                              d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
-                              clip-rule="evenodd"
-                            />
-                          </svg>
-                          Connect
-                          <span class="px-1 font-bold dark:text-white">unlimited</span> servers
+                            <svg class="flex-none w-5 h-6 mr-3 text-warning" viewBox="0 0 20 20" fill="currentColor"
+                                aria-hidden="true">
+                                <path fill-rule="evenodd"
+                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
+                                    clip-rule="evenodd" />
+                            </svg>
+                            Connect
+                            <span class="px-1 font-bold dark:text-white">unlimited</span> servers
                         </li>
                         <li class="flex">
-                          <svg
-                            class="flex-none w-5 h-6 mr-3 text-warning"
-                            viewBox="0 0 20 20"
-                            fill="currentColor"
-                            aria-hidden="true"
-                          >
-                            <path
-                              fill-rule="evenodd"
-                              d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
-                              clip-rule="evenodd"
-                            />
-                          </svg>
-                          Deploy
-                          <span class="px-1 font-bold dark:text-white">unlimited</span> applications per server
+                            <svg class="flex-none w-5 h-6 mr-3 text-warning" viewBox="0 0 20 20" fill="currentColor"
+                                aria-hidden="true">
+                                <path fill-rule="evenodd"
+                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
+                                    clip-rule="evenodd" />
+                            </svg>
+                            Deploy
+                            <span class="px-1 font-bold dark:text-white">unlimited</span> applications per server
                         </li>
                         <li class="flex gap-x-3">
-                          <svg
-                            class="flex-none w-5 h-6 text-warning"
-                            viewBox="0 0 20 20"
-                            fill="currentColor"
-                            aria-hidden="true"
-                          >
-                            <path
-                              fill-rule="evenodd"
-                              d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
-                              clip-rule="evenodd"
-                            />
-                          </svg>
-                          Free email notifications
+                            <svg class="flex-none w-5 h-6 text-warning" viewBox="0 0 20 20" fill="currentColor"
+                                aria-hidden="true">
+                                <path fill-rule="evenodd"
+                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
+                                    clip-rule="evenodd" />
+                            </svg>
+                            Free email notifications
                         </li>
                         <li class="flex gap-x-3">
-                          <svg
-                            class="flex-none w-5 h-6 text-warning"
-                            viewBox="0 0 20 20"
-                            fill="currentColor"
-                            aria-hidden="true"
-                          >
-                            <path
-                              fill-rule="evenodd"
-                              d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
-                              clip-rule="evenodd"
-                            />
-                          </svg>
-                          Support by email
+                            <svg class="flex-none w-5 h-6 text-warning" viewBox="0 0 20 20" fill="currentColor"
+                                aria-hidden="true">
+                                <path fill-rule="evenodd"
+                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
+                                    clip-rule="evenodd" />
+                            </svg>
+                            Support by email
                         </li>
                         <li class="flex font-bold dark:text-white gap-x-3">
-                          <svg
-                            width="512"
-                            height="512"
-                            class="flex-none w-5 h-6 text-green-500"
-                            viewBox="0 0 24 24"
-                            xmlns="http://www.w3.org/2000/svg"
-                          >
-                            <g
-                              fill="none"
-                              stroke="currentColor"
-                              stroke-linecap="round"
-                              stroke-linejoin="round"
-                              stroke-width="2"
-                            >
-                              <path
-                                d="M4 13a8 8 0 0 1 7 7a6 6 0 0 0 3-5a9 9 0 0 0 6-8a3 3 0 0 0-3-3a9 9 0 0 0-8 6a6 6 0 0 0-5 3"
-                              />
-                              <path
-                                d="M7 14a6 6 0 0 0-3 6a6 6 0 0 0 6-3m4-8a1 1 0 1 0 2 0a1 1 0 1 0-2 0"
-                              />
-                            </g>
-                          </svg>
-                          + All Upcoming Features
+                            <svg width="512" height="512" class="flex-none w-5 h-6 text-green-500"
+                                viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                                <g fill="none" stroke="currentColor" stroke-linecap="round"
+                                    stroke-linejoin="round" stroke-width="2">
+                                    <path
+                                        d="M4 13a8 8 0 0 1 7 7a6 6 0 0 0 3-5a9 9 0 0 0 6-8a3 3 0 0 0-3-3a9 9 0 0 0-8 6a6 6 0 0 0-5 3" />
+                                    <path d="M7 14a6 6 0 0 0-3 6a6 6 0 0 0 6-3m4-8a1 1 0 1 0 2 0a1 1 0 1 0-2 0" />
+                                </g>
+                            </svg>
+                            + All Upcoming Features
                         </li>
                         <li class="flex dark:text-white gap-x-3">
-                          <svg
-                            xmlns="http://www.w3.org/2000/svg"
-                            class="flex-none w-5 h-6 text-green-500"
-                            viewBox="0 0 256 256"
-                            ><rect width="256" height="256" fill="none" /><polyline
-                              points="32 136 72 136 88 112 120 160 136 136 160 136"
-                              fill="none"
-                              stroke="currentColor"
-                              stroke-linecap="round"
-                              stroke-linejoin="round"
-                              stroke-width="16"
-                            /><path
-                              d="M24,104c0-.67,0-1.33,0-2A54,54,0,0,1,78,48c22.59,0,41.94,12.31,50,32,8.06-19.69,27.41-32,50-32a54,54,0,0,1,54,54c0,66-104,122-104,122s-42-22.6-72.58-56"
-                              fill="none"
-                              stroke="currentColor"
-                              stroke-linecap="round"
-                              stroke-linejoin="round"
-                              stroke-width="16"
-                            /></svg
-                          >
+                            <svg xmlns="http://www.w3.org/2000/svg" class="flex-none w-5 h-6 text-green-500"
+                                viewBox="0 0 256 256">
+                                <rect width="256" height="256" fill="none" />
+                                <polyline points="32 136 72 136 88 112 120 160 136 136 160 136" fill="none"
+                                    stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                                    stroke-width="16" />
+                                <path
+                                    d="M24,104c0-.67,0-1.33,0-2A54,54,0,0,1,78,48c22.59,0,41.94,12.31,50,32,8.06-19.69,27.41-32,50-32a54,54,0,0,1,54,54c0,66-104,122-104,122s-42-22.6-72.58-56"
+                                    fill="none" stroke="currentColor" stroke-linecap="round"
+                                    stroke-linejoin="round" stroke-width="16" />
+                            </svg>
 
-                          Do you require official support for your self-hosted instance?<a
-                            class="underline"
-                            href="https://coolify.io/docs/contact">Contact Us</a
-                          >
+                            Do you require official support for your self-hosted instance?<a class="underline"
+                                href="https://coolify.io/docs/contact">Contact Us</a>
                         </li>
-                      </ul>
+                    </ul>
                 </div>
             </div>
         </div>

From 4fa533aae8fd1c7fa140cbc33ecf5e3bbcc8767b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 1 Nov 2024 00:07:01 +0100
Subject: [PATCH 21/21] Refactor webhook event handling logic

---
 app/Http/Controllers/Webhook/Stripe.php | 56 +++++++++++--------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/app/Http/Controllers/Webhook/Stripe.php b/app/Http/Controllers/Webhook/Stripe.php
index dce73b2c5..5d297b242 100644
--- a/app/Http/Controllers/Webhook/Stripe.php
+++ b/app/Http/Controllers/Webhook/Stripe.php
@@ -168,6 +168,14 @@ public function events(Request $request)
                     $subscriptionId = data_get($data, 'id');
                     $teamId = data_get($data, 'metadata.team_id');
                     $userId = data_get($data, 'metadata.user_id');
+                    if (! $teamId || ! $userId) {
+                        $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                        if ($subscription) {
+                            return response("Subscription already exists for customer: {$customerId}", 200);
+                        }
+
+                        return response('No team id or user id found', 400);
+                    }
                     $team = Team::find($teamId);
                     $found = $team->members->where('id', $userId)->first();
                     if (! $found->isAdmin()) {
@@ -177,7 +185,7 @@ public function events(Request $request)
                     }
                     $subscription = Subscription::where('team_id', $teamId)->first();
                     if ($subscription) {
-                        return response("Subscription already exists for team: {$teamId}", 400);
+                        return response("Subscription already exists for team: {$teamId}", 200);
                     } else {
                         Subscription::create([
                             'team_id' => $teamId,
@@ -185,9 +193,12 @@ public function events(Request $request)
                             'stripe_customer_id' => $customerId,
                             'stripe_invoice_paid' => false,
                         ]);
+
+                        return response('Subscription created');
                     }
-                    break;
                 case 'customer.subscription.updated':
+                    $teamId = data_get($data, 'metadata.team_id');
+                    $userId = data_get($data, 'metadata.user_id');
                     $customerId = data_get($data, 'customer');
                     $status = data_get($data, 'status');
                     $subscriptionId = data_get($data, 'items.data.0.subscription');
@@ -199,26 +210,25 @@ public function events(Request $request)
                     $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
                     if (! $subscription) {
                         if ($status === 'incomplete_expired') {
-                            // send_internal_notification('Subscription incomplete expired for customer: '.$customerId);
-
                             return response('Subscription incomplete expired', 200);
                         }
-                        // send_internal_notification('No subscription found for: '.$customerId);
-
-                        return response('No subscription found', 400);
+                        if ($teamId) {
+                            $subscription = Subscription::create([
+                                'team_id' => $teamId,
+                                'stripe_subscription_id' => $subscriptionId,
+                                'stripe_customer_id' => $customerId,
+                                'stripe_invoice_paid' => false,
+                            ]);
+                        } else {
+                            return response('No subscription and team id found', 400);
+                        }
                     }
-                    $trialEndedAlready = data_get($subscription, 'stripe_trial_already_ended');
                     $cancelAtPeriodEnd = data_get($data, 'cancel_at_period_end');
-                    $alreadyCancelAtPeriodEnd = data_get($subscription, 'stripe_cancel_at_period_end');
                     $feedback = data_get($data, 'cancellation_details.feedback');
                     $comment = data_get($data, 'cancellation_details.comment');
                     $lookup_key = data_get($data, 'items.data.0.price.lookup_key');
-                    if (str($lookup_key)->contains('ultimate') || str($lookup_key)->contains('dynamic')) {
-                        if (str($lookup_key)->contains('dynamic')) {
-                            $quantity = data_get($data, 'items.data.0.quantity', 2);
-                        } else {
-                            $quantity = data_get($data, 'items.data.0.quantity', 10);
-                        }
+                    if (str($lookup_key)->contains('dynamic')) {
+                        $quantity = data_get($data, 'items.data.0.quantity', 2);
                         $team = data_get($subscription, 'team');
                         if ($team) {
                             $team->update([
@@ -237,28 +247,12 @@ public function events(Request $request)
                         $subscription->update([
                             'stripe_invoice_paid' => false,
                         ]);
-                        // send_internal_notification('Subscription paused or incomplete for customer: '.$customerId);
                     }
-
-                    // Trial ended but subscribed, reactive servers
-                    if ($trialEndedAlready && $status === 'active') {
-                        $team = data_get($subscription, 'team');
-                        $team->trialEndedButSubscribed();
-                    }
-
                     if ($feedback) {
                         $reason = "Cancellation feedback for {$customerId}: '".$feedback."'";
                         if ($comment) {
                             $reason .= ' with comment: \''.$comment."'";
                         }
-                        // send_internal_notification($reason);
-                    }
-                    if ($alreadyCancelAtPeriodEnd !== $cancelAtPeriodEnd) {
-                        if ($cancelAtPeriodEnd) {
-                            // send_internal_notification('Subscription cancelled at period end for team: ' . $subscription->team->id);
-                        } else {
-                            // send_internal_notification('customer.subscription.updated for customer: '.$customerId);
-                        }
                     }
                     break;
                 case 'customer.subscription.deleted':