Update artisan commands

- Change method declaration location (stringToType). - Fixed input argument conversion for set-key command.
JackieDo · Feb 19, 2023 · bc8c7bc · bc8c7bc
1 parent a55eecf
commit bc8c7bc
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 156 deletions.
diff --git a/src/Console/Commands/DotenvBackupCommand.php b/src/Console/Commands/DotenvBackupCommand.php
@@ -48,37 +48,6 @@ public function fire()
         $this->info("Your file was backed up successfully at path [{$backup['filepath']}].");
     }
 
-    /**
-     * Convert string to corresponding type.
-     *
-     * @param string $string
-     *
-     * @return mixed
-     */
-    protected function stringToType($string)
-    {
-        if (is_string($string)) {
-            switch (true) {
-                case 'null' == $string || 'NULL' == $string:
-                    $string = null;
-                    break;
-
-                case 'true' == $string || 'TRUE' == $string:
-                    $string = true;
-                    break;
-
-                case 'false' == $string || 'FALSE' == $string:
-                    $string = false;
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        return $string;
-    }
-
     /**
      * Get the console command arguments.
      *

diff --git a/src/Console/Commands/DotenvDeleteKeyCommand.php b/src/Console/Commands/DotenvDeleteKeyCommand.php
@@ -72,37 +72,6 @@ protected function transferInputsToProperties()
         $this->key      = $this->argument('key');
     }
 
-    /**
-     * Convert string to corresponding type.
-     *
-     * @param string $string
-     *
-     * @return mixed
-     */
-    protected function stringToType($string)
-    {
-        if (is_string($string)) {
-            switch (true) {
-                case 'null' == $string || 'NULL' == $string:
-                    $string = null;
-                    break;
-
-                case 'true' == $string || 'TRUE' == $string:
-                    $string = true;
-                    break;
-
-                case 'false' == $string || 'FALSE' == $string:
-                    $string = false;
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        return $string;
-    }
-
     /**
      * Get the console command arguments.
      *

diff --git a/src/Console/Commands/DotenvGetKeysCommand.php b/src/Console/Commands/DotenvGetKeysCommand.php
@@ -65,37 +65,6 @@ public function fire()
         $this->info("You have total {$total} keys in your file");
     }
 
-    /**
-     * Convert string to corresponding type.
-     *
-     * @param string $string
-     *
-     * @return mixed
-     */
-    protected function stringToType($string)
-    {
-        if (is_string($string)) {
-            switch (true) {
-                case 'null' == $string || 'NULL' == $string:
-                    $string = null;
-                    break;
-
-                case 'true' == $string || 'TRUE' == $string:
-                    $string = true;
-                    break;
-
-                case 'false' == $string || 'FALSE' == $string:
-                    $string = false;
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        return $string;
-    }
-
     /**
      * Get the console command arguments.
      *

diff --git a/src/Console/Commands/DotenvRestoreCommand.php b/src/Console/Commands/DotenvRestoreCommand.php
@@ -72,37 +72,6 @@ protected function transferInputsToProperties()
         $this->restorePath = (is_string($restorePath)) ? base_path($restorePath) : null;
     }
 
-    /**
-     * Convert string to corresponding type.
-     *
-     * @param string $string
-     *
-     * @return mixed
-     */
-    protected function stringToType($string)
-    {
-        if (is_string($string)) {
-            switch (true) {
-                case 'null' == $string || 'NULL' == $string:
-                    $string = null;
-                    break;
-
-                case 'true' == $string || 'TRUE' == $string:
-                    $string = true;
-                    break;
-
-                case 'false' == $string || 'FALSE' == $string:
-                    $string = false;
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        return $string;
-    }
-
     /**
      * Get the console command arguments.
      *

diff --git a/src/Console/Commands/DotenvSetKeyCommand.php b/src/Console/Commands/DotenvSetKeyCommand.php
@@ -114,42 +114,11 @@ protected function transferInputsToProperties()
         $this->restorePath = (is_string($restorePath)) ? base_path($restorePath) : null;
 
         $this->key       = $this->argument('key');
-        $this->value     = $this->stringToType($this->argument('value'));
+        $this->value     = $this->argument('value');
         $this->comment   = $this->stringToType($this->argument('comment'));
         $this->exportKey = $this->option('export-key');
     }
 
-    /**
-     * Convert string to corresponding type.
-     *
-     * @param string $string
-     *
-     * @return mixed
-     */
-    protected function stringToType($string)
-    {
-        if (is_string($string)) {
-            switch (true) {
-                case 'null' == $string || 'NULL' == $string:
-                    $string = null;
-                    break;
-
-                case 'true' == $string || 'TRUE' == $string:
-                    $string = true;
-                    break;
-
-                case 'false' == $string || 'FALSE' == $string:
-                    $string = false;
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        return $string;
-    }
-
     /**
      * Get the console command arguments.
      *

diff --git a/src/Console/Traits/CreateCommandInstanceTrait.php b/src/Console/Traits/CreateCommandInstanceTrait.php
@@ -36,4 +36,35 @@ public function handle()
     {
         return $this->fire();
     }
+
+    /**
+     * Convert string to corresponding type.
+     *
+     * @param string $string
+     *
+     * @return mixed
+     */
+    protected function stringToType($string)
+    {
+        if (is_string($string)) {
+            switch (true) {
+                case 'null' == $string || 'NULL' == $string:
+                    $string = null;
+                    break;
+
+                case 'true' == $string || 'TRUE' == $string:
+                    $string = true;
+                    break;
+
+                case 'false' == $string || 'FALSE' == $string:
+                    $string = false;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        return $string;
+    }
 }