wip

Author: jszobody

src/Commands/Concerns/InteractsWithFilesystem.php

@@ -10,21 +10,13 @@ trait InteractsWithFilesystem
     protected function writeToFile(string $path, string $content, $overwrite = false, $append = false): bool
     {
         $filePath = $path;
-        $flags = 0;
+        $flags = 0; // Default: overwrite
 
         if (file_exists($filePath)) {
-            if ($overwrite) {
-                $flags = 0; // Overwrite
-            } elseif ($append) {
+            if ($append) {
                 $flags = FILE_APPEND; // Append
-            } else {
-                if (confirm('Output file already exists. Overwrite?', false)) {
-                    $flags = 0; // Overwrite
-                } else {
-                    $this->error("File [$filePath] already exists. Use --overwrite or --append option.");
-
-                    return self::FAILURE;
-                }
+            } elseif (!$overwrite && !confirm('Output file already exists. Overwrite?', false)) {
+                return $this->error("File [$filePath] already exists. Use --overwrite or --append option.");
             }
         }
 
@@ -33,17 +25,4 @@ protected function writeToFile(string $path, string $content, $overwrite = false
 
         return self::SUCCESS;
     }
-
-    protected function findStageOverlayTemplate(): ?string
-    {
-        $stageTemplatesPath = Keep::getSetting('stage_templates');
-        
-        if (! $stageTemplatesPath) {
-            return null;
-        }
-
-        $path = $stageTemplatesPath.'/'.$this->stage().'.env';
-
-        return file_exists($path) && is_readable($path) ? $path : null;
-    }
 }

src/Commands/MergeCommand.php

@@ -57,9 +57,7 @@ public function process()
 
     protected function prepareTemplateContents(): bool
     {
-        $template = $this->argument('template')
-            ?? Keep::getSetting('template')
-            ?? text('Template file with placeholders', required: true);
+        $template = $this->argument('template') ?? text('Template file with placeholders', required: true);
 
         if (! file_exists($template) || ! is_readable($template)) {
             $this->error("Template file [$template] does not exist or is not readable.");
@@ -70,7 +68,7 @@ protected function prepareTemplateContents(): bool
         $this->info("Using base template file [$template].");
         $this->baseTemplate = new Template(file_get_contents($template));
 
-        $overlayTemplate = $this->option('overlay') ?? $this->findStageOverlayTemplate();
+        $overlayTemplate = $this->option('overlay');
 
         if ($overlayTemplate) {
             if (! file_exists($overlayTemplate) || ! is_readable($overlayTemplate)) {