Server::config() frameworks support, Str::trim()update

Author: tamedevelopers

src/Capsule/Artisan.php

@@ -128,7 +128,7 @@ public function run(array $argv): int
 
         if (!isset(self::$commands[$base])) {
             Logger::error("Command \"{$commandInput}\" is not defined.\n\n");
-            return 1;
+            return 0;
         }
 
         // Normalize entries to array of providers for this base command

src/Capsule/CommandHelper.php

@@ -8,6 +8,7 @@
 use Tamedevelopers\Support\Str;
 use Tamedevelopers\Support\Constant;
 use Tamedevelopers\Support\Capsule\Logger;
+use Tamedevelopers\Support\Process\HttpRequest;
 
 
 class CommandHelper
@@ -18,17 +19,34 @@ class CommandHelper
      */
     protected $conn;
 
+    /**
+     * The database connector instance. 
+     * @var bool|null
+     */
+    protected $isConsole;
+
     /**
      * Constructor  
      * @param \Tamedevelopers\Database\Connectors\Connector|null $conn
      */
     public function __construct($conn = null)
     {
-        if(class_exists('Tamedevelopers\Database\DB') && is_null($conn)){
-            $conn = \Tamedevelopers\Database\DB::connection();
+        $instance = "Tamedevelopers\Database\DB";
+        if(class_exists($instance) && is_null($conn)){
+            $conn = $instance::connection();
         }
 
         $this->conn = $conn;
+        $this->isConsole = $this->isConsole();
+    }
+    
+    /**
+     * Checking for incoming CLI type
+     * @param bool
+     */
+    protected function isConsole(): bool
+    {
+        return HttpRequest::runningInConsole();
     }
 
     /**
@@ -40,8 +58,11 @@ protected function checkConnection($conn): void
         $checkConnection = $conn->dbConnection();
 
         if($checkConnection['status'] != Constant::STATUS_200){
-            $this->error($checkConnection['message']);
-            exit();
+            if($this->isConsole()){
+                $this->error($checkConnection['message']);
+                exit(1);
+            }
+            return;
         }
     }
 
@@ -72,7 +93,10 @@ protected function forceChecker(): void
         if ($this->isProduction()) {
             if (!$force) {
                 $this->error("You are in production! Use [--force|-f] flag, to run this command.");
-                exit(1);
+                if($this->isConsole()){
+                    exit(1);
+                }
+                return;
             }
         }
     }
@@ -271,8 +295,8 @@ protected function extractTableName($migration = null)
      */
     protected function confirm(string $question, bool $default = false): bool
     {
-        $yesNo  = $default ? 'Y/n' : 'y/N';
-        $answer = readline("{$question} [{$yesNo}]: ");
+        $yesNo  = $default ? 'y/n' : 'Y/N';
+        $answer = readline("{$question} ({$yesNo}): ");
 
         if (empty($answer)) {
             return $default;

src/Server.php

@@ -19,7 +19,7 @@ class Server{
     /**
      * Get the value of a configuration option.
      *
-     * @param mixed $key 
+     * @param mixed $key
      * The configuration key in dot notation (e.g., 'database.connections.mysql')
      * 
      * @param mixed $default 
@@ -92,7 +92,7 @@ public static function config($key, $default = null, string $base_folder = 'conf
         }
 
         // try merging data if an array
-        if(!empty($config) && is_array($default)){
+        if(!empty($config) && is_array($config) && is_array($default)){
             return array_merge($config, $default);
         }
 

src/Str.php

@@ -875,6 +875,7 @@ public static function slugify(string $value, string $separator = '-')
      */
     public static function trim($string = null, string $characters = " \n\r\t\v\0")
     {
+        $string = is_array($string) ? $string[0] ?? null : $string;
         return trim((string) $string, $characters);
     }