Update commands to use arguments instead of .env

Author: Owen Conti

app/Commands/DeleteSite.php

@@ -12,14 +12,19 @@ class DeleteSite extends Command
     use UseForgeSdk;
 
     protected $signature = 'app:delete-site
+        {forge-cli-token : The Forge CLI token to use}
+        {forge-server-id : The Forge server ID to use}
+        {root-domain : The root domain to use (example.com)}
         {branch : The name of the branch to delete.}';
 
     protected $description = 'Deletes the site on the server, including the database.';
 
+    protected string $domain;
+
     public function handle(): void
     {
         $this->buildForge();
-        $domain = $this->argument('branch') . '.' . config('forge.root_domain');
+        $this->domain = $this->argument('branch') . '.' . $this->argument('root-domain');
 
         try {
             $this->deleteSite();
@@ -40,8 +45,7 @@ protected function getDatabase(): Database
 
     protected function deleteSite(): void
     {
-        $domain = $this->argument('branch') . '.' . config('forge.root_domain');
-        $site = $this->getSite($domain);
+        $site = $this->getSite($this->domain);
 
         $this->output->info('Deleting site...');
         $this->forge->deleteSite($this->forgeServerId, $site->id);

app/Commands/DeploySite.php

@@ -10,6 +10,11 @@
 class DeploySite extends Command
 {
     protected $signature = 'app:deploy-site
+        {forge-cli-token : The Forge CLI token to use}
+        {forge-server-id : The Forge server ID to use} 
+        {root-domain : The root domain to use (example.com)}
+        {git-provider : The git provider to use (github, gitlab)}
+        {repository : The repository to use (username/repository)}
         {branch : The name of the branch to deploy (will be used for the subdomain and database name)}
         {php-version : The PHP version to use (php82, php81, php80, php74)}
         {env : Base64 encoded .env file to use for the site}';
@@ -24,7 +29,7 @@ class DeploySite extends Command
     public function handle(): void
     {
         $this->buildForge();
-        $this->domain = $this->argument('branch') . '.' . config('forge.root_domain');
+        $this->domain = $this->argument('branch') . '.' . $this->argument('root-domain');
 
         try {
             $site = $this->getSite();
@@ -63,8 +68,8 @@ protected function createSite(): Site
 
         $this->output->info('Site created, installing git repository...');
         $this->forge->installGitRepositoryOnSite($this->forgeServerId, $site->id, [
-            'provider' => config('forge.git_provider'),
-            'repository' => config('forge.repository'),
+            'provider' => $this->argument('git-provider'),
+            'repository' => $this->argument('repository'),
             'branch' => $this->argument('branch'),
             'composer' => true
          ]);
@@ -87,8 +92,8 @@ protected function deploySite(Site $site): void
 
     protected function buildForge(): void
     {
-        $this->forgeApiToken = config('forge.token');
-        $this->forgeServerId = config('forge.server_id');
+        $this->forgeApiToken = $this->argument('forge-cli-token');
+        $this->forgeServerId = $this->argument('forge-server-id');
 
         if (empty($this->forgeApiToken)) {
             $this->forgeApiToken = $this->ask('What is your Forge API token?');

app/Traits/UseForgeSdk.php

@@ -23,8 +23,8 @@ protected function getSite(string $domain): ?Site
 
     protected function buildForge(): void
     {
-        $this->forgeApiToken = config('forge.token');
-        $this->forgeServerId = config('forge.server_id');
+        $this->forgeApiToken = $this->argument('forge-cli-token');
+        $this->forgeServerId = $this->argument('forge-server-id');
 
         if (empty($this->forgeApiToken)) {
             $this->forgeApiToken = $this->ask('What is your Forge API token?');