Formatting the given db_name internally

mehrancodes · Mar 18, 2024 · ae136d9 · ae136d9
1 parent 0c8344a
commit ae136d9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/app/Actions/FormattedBranchName.php b/app/Actions/FormattedBranchName.php
@@ -24,7 +24,7 @@ class FormattedBranchName
 
     protected const SLUGIFY_DICTIONARY = ['+' => '-', '_' => '-', '@' => '-'];
 
-    public function handle(string $branch, ?string $pattern): string
+    public function handle(string $branch, ?string $pattern = null): string
     {
         if (isset($pattern)) {
             preg_match($pattern, $branch, $matches);

diff --git a/app/Services/Forge/ForgeService.php b/app/Services/Forge/ForgeService.php
@@ -16,6 +16,7 @@
 use App\Actions\FormattedBranchName;
 use App\Actions\GenerateDomainName;
 use App\Actions\GenerateStandardizedBranchName;
+use Illuminate\Support\Str;
 use Laravel\Forge\Forge;
 use Laravel\Forge\Resources\Server;
 use Laravel\Forge\Resources\Site;
@@ -89,9 +90,13 @@ public function getSiteIsolationUsername(): string
 
     public function getFormattedDatabaseName(): string
     {
-        return $this->setting->dbName ?? GenerateStandardizedBranchName::run(
-            $this->getFormattedBranchName()
-        );
+        if ($this->setting->dbName) {
+            $dbName = FormattedBranchName::run($this->setting->dbName);
+        } else {
+            $dbName = $this->getFormattedBranchName();
+        }
+
+        return Str::replace('-', '_', $dbName);
     }
 
     public function siteNginxTemplate(): string