Patch issue with ENV values that already quotes

popphp · Dec 21, 2023 · 76a54a1 · 76a54a1
1 parent 61011f0
commit 76a54a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Controller/ApplicationController.php b/src/Controller/ApplicationController.php
@@ -54,7 +54,7 @@ public function init(string $namespace, array $options = []): void
         $name = $this->console->prompt('What is the name of your app? [Pop] ', null, true);
         if ($name == '') {
             $name = 'Pop';
-        } else if (str_contains($name, ' ')) {
+        } else if (str_contains($name, ' ') && !str_starts_with($name, '"') && !str_ends_with($name, '"')) {
             $name = '"' . $name . '"';
         }
 

diff --git a/src/Model/Application.php b/src/Model/Application.php
@@ -143,7 +143,7 @@ public function install(
             );
         }
 
-        if (str_contains($name, ' ')) {
+        if (str_contains($name, ' ') && !str_starts_with($name, '"') && !str_ends_with($name, '"')) {
             $name = '"' . $name . '"';
         }
 

diff --git a/src/Model/Database.php b/src/Model/Database.php
@@ -198,13 +198,13 @@ public function configure(Console $console, string $location, string $database =
         if ($sqliteDb !== null) {
             $realDbName = $sqliteDb;
         }
-        if (str_contains($realDbName, ' ')) {
+        if (str_contains($realDbName, ' ') && !str_starts_with($realDbName, '"') && !str_ends_with($realDbName, '"')) {
             $realDbName = '"' . $realDbName . '"';
         }
-        if (str_contains($dbUser, ' ')) {
+        if (str_contains($dbUser, ' ') && !str_starts_with($dbUser, '"') && !str_ends_with($dbUser, '"')) {
             $dbUser = '"' . $dbUser . '"';
         }
-        if (str_contains($dbPass, ' ')) {
+        if (str_contains($dbPass, ' ') && !str_starts_with($dbPass, '"') && !str_ends_with($dbPass, '"')) {
             $dbPass = '"' . $dbPass . '"';
         }