Fixed request replacement and added get helpers

Signed-off-by: Tom Wright <[email protected]>

CHANGELOG.md

@@ -1,3 +1,6 @@
+* Fixed Request replacement
+* Added argument get helpers
+
 ## v0.10.0 (2023-10-05)
 * Restructured command / argument interface
 

src/Terminus/Command.php

@@ -51,6 +51,17 @@ public static function loadAsVeneerPlugin(object $instance): static
      * Init with Request
      */
     public function __construct(Request $request)
+    {
+        $this->setRequest($request);
+    }
+
+
+    /**
+     * Set request - must be done early in process
+     *
+     * @return $this
+     */
+    public function setRequest(Request $request): static
     {
         $this->request = $request;
 
@@ -59,8 +70,10 @@ public function __construct(Request $request)
         }
 
         $name = pathinfo((string)$name, \PATHINFO_FILENAME);
+        $this->setName($name);
+        $this->values = null;
 
-        parent::__construct($name);
+        return $this;
     }
 
     /**
@@ -149,6 +162,42 @@ public function get(string $name): bool|string|array|null
         return $this->values[$name] ?? null;
     }
 
+    /**
+     * Get argument as string
+     */
+    public function getString(string $name): string
+    {
+        return Coercion::forceString($this->get($name));
+    }
+
+    /**
+     * Get argument as bool
+     */
+    public function getBool(string $name): bool
+    {
+        return Coercion::toBool($this->get($name));
+    }
+
+    /**
+     * Get argument as list
+     *
+     * @return array<string|bool>
+     */
+    public function getList(string $name): array
+    {
+        $value = $this->get($name);
+
+        if ($value === null) {
+            return [];
+        }
+
+        if (is_array($value)) {
+            return $value;
+        }
+
+        return [$value];
+    }
+
     /**
      * Has argument
      */

src/Terminus/Context.php

@@ -110,6 +110,22 @@ public function newSession(
         );
     }
 
+    /**
+     * Set request - must be done early in process
+     *
+     * @return $this
+     */
+    public function setRequest(Request $request): static
+    {
+        $this->session?->setRequest($request);
+
+        if (isset($this->command)) {
+            $this->command->setRequest($request);
+        }
+
+        return $this;
+    }
+
     /**
      * Create request from environment
      *

stubs/DecodeLabs/Terminus.php

@@ -46,6 +46,9 @@ public static function getSession(): Ref1 {
     public static function newSession(?Ref2 $request = NULL, ?Ref3 $broker = NULL): Ref1 {
         return static::$instance->newSession(...func_get_args());
     }
+    public static function setRequest(Ref2 $request): Inst {
+        return static::$instance->setRequest(...func_get_args());
+    }
     public static function newRequest(?array $argv = NULL, ?array $server = NULL): Ref2 {
         return static::$instance->newRequest(...func_get_args());
     }