Structural improvement

Author: Wazabii

Environment.php

@@ -17,14 +17,14 @@ public function __construct(array $env = [])
 
     /**
      * Get request/server environment data
-     * @param  string $key     Server key
-     * @param  string $default Default value, returned if Env data is empty
-     * @return string|null
+     * @param  string      $key     Server key
+     * @param  string|null $default Default value, returned if Env data is empty
+     * @return string
      */
-    public function get(string $key, ?string $default = ""): ?string
+    public function get(string $key, ?string $default = ""): string
     {
         $key = strtoupper($key);
-        return ($this->env[$key] ?? $default);
+        return ($this->env[$key] ?? (string)$default);
     }
 
     /**
@@ -62,7 +62,7 @@ public function getUriParts(array $add): array
         $arr['path'] = $this->getPath();
         $arr['query'] = $this->get("QUERY_STRING");
         $arr['fragment'] = null;
-        if (!is_null($arr['port'])) {
+        if (!is_numeric($arr['port'])) {
             $arr['port'] = (int)$arr['port'];
         }
 

Interfaces/EnvironmentInterface.php

@@ -6,11 +6,11 @@ interface EnvironmentInterface
 {
     /**
      * Get request/server environment data
-     * @param  string $key     Server key
-     * @param  string $default Default value, returned if Env data is empty
-     * @return string|null
+     * @param  string      $key     Server key
+     * @param  string|null $default Default value, returned if Env data is empty
+     * @return string
      */
-    public function get(string $key, ?string $default = ""): ?string;
+    public function get(string $key, ?string $default = ""): string;
 
     /**
      * Check if environment data exists

Interfaces/RequestInterface.php

@@ -134,4 +134,9 @@ public function withUri(UriInterface $uri, $preserveHost = false);
      *
      */
 
+    /**
+     * Get Cli arguments
+     * @return array
+     */
+    public function getCliArgs(): array;
 }

Interfaces/ServerRequestInterface.php

@@ -258,17 +258,4 @@ public function withAttribute($name, $value);
      * @return static
      */
     public function withoutAttribute($name);
-
-    /**
-     *
-     * Custom methods outside of PSR
-     * But is used by the framework
-     *
-     */
-
-    /**
-     * Get Cli arguments
-     * @return array
-     */
-    public function getCliArgs(): array;
 }

Request.php

@@ -15,6 +15,8 @@ class Request extends Message implements RequestInterface
     private $requestTarget;
     protected $headers;
     protected $body;
+    protected $cliKeywords;
+    protected $cliArgs;
 
     public function __construct(
         string $method,
@@ -153,4 +155,55 @@ private function resolveRequestStream(StreamInterface|array|string|null $body):
         }
         return $stream;
     }
+
+     /**
+     * Get Cli keyword
+     * @return string|null
+     */
+    public function getCliKeyword(): ?string
+    {
+        if (is_null($this->cliKeywords)) {
+            $new = array();
+            $arg = $this->getUri()->getArgv();
+            foreach ($arg as $val) {
+                if (is_string($val)) {
+                    if ((strpos($val, "--") === 0) || (strpos($val, "-") === 0)) {
+                        break;
+                    } else {
+                        $new[] = $val;
+                    }
+                }
+            }
+            array_shift($new);
+            $this->cliKeywords = implode("/", $new);
+        }
+
+        return $this->cliKeywords;
+    }
+
+    /**
+     * Get Cli arguments
+     * @return array
+     */
+    public function getCliArgs(): array
+    {
+        if (is_null($this->cliArgs)) {
+            $args = $this->getUri()->getArgv();
+            $this->cliArgs = array();
+            foreach ($args as $arg) {
+                if (is_string($arg)) {
+                    $arg = str_replace("&", "#", $arg);
+                    if ((($pos1 = strpos($arg, "--")) === 0) || (strpos($arg, "-") === 0)) {
+                        parse_str(substr($arg, ($pos1 !== false ? 2 : 1)), $result);
+                        foreach ($result as &$val) {
+                            $val = str_replace("#", "&", $val);
+                        }
+                        $this->cliArgs = array_merge($this->cliArgs, $result);
+                    }
+                }
+            }
+        }
+
+        return $this->cliArgs;
+    }
 }

ServerRequest.php

@@ -11,9 +11,6 @@ class ServerRequest extends Request implements ServerRequestInterface
 {
     protected $attr = array();
     protected $env;
-    protected $cliKeywords;
-    protected $cliArgs;
-
     protected $queryParams;
     protected $parsedBody;
 
@@ -324,54 +321,6 @@ public function withoutAttribute($name): self
     }
 
 
-    /**
-     * Get Cli keyword
-     * @return string|null
-     */
-    public function getCliKeyword(): ?string
-    {
-        if (is_null($this->cliKeywords)) {
-            $new = array();
-            $arg = $this->getUri()->getArgv();
-            foreach ($arg as $v) {
-                if ((($pos1 = strpos($v, "--")) === 0) || (($pos2 = strpos($v, "-")) === 0)) {
-                    break;
-                } else {
-                    $new[] = $v;
-                }
-            }
-            array_shift($new);
-            $this->cliKeywords = implode("/", $new);
-        }
-
-        return $this->cliKeywords;
-    }
-
-    /**
-     * Get Cli arguments
-     * @return array
-     */
-    public function getCliArgs(): array
-    {
-        if (is_null($this->cliArgs)) {
-            $arg = $this->getUri()->getArgv();
-            $this->cliArgs = array();
-            foreach ($arg as $v) {
-                $v = str_replace("&", "#", $v);
-                if ((($pos1 = strpos($v, "--")) === 0) || (($pos2 = strpos($v, "-")) === 0)) {
-                    parse_str(substr($v, ($pos1 !== false ? 2 : 1)), $result);
-                    foreach ($result as &$val) {
-                        $val = str_replace("#", "&", $val);
-                    }
-                    $this->cliArgs = array_merge($this->cliArgs, $result);
-                }
-            }
-        }
-
-        return $this->cliArgs;
-    }
-
-
     /*
     public function getEnv() {
         return $this->env;

Stream.php

@@ -32,8 +32,6 @@ class Stream implements StreamInterface
     private $readable;
     private $writable;
     private $seekable;
-    //private $output;
-
 
     /**
      * PSR-7 Stream
@@ -49,6 +47,11 @@ public function __construct(mixed $stream = null, string $permission = "r+")
         if (is_resource($stream)) {
             $this->resource = $stream;
             $this->meta = $this->getMetadata();
+
+            if (is_null($this->meta)) {
+                throw new RuntimeException("Could not access the stream meta data.", 1);
+            }
+
             $this->stream = $this->meta['stream_type'];
             $this->permission = $this->meta['mode'];
         } else {

Uri.php

@@ -364,9 +364,9 @@ public function withUriParts(array $parts): self
     /**
      * Return part if object found and has not yet been encoded
      * @param  string  $key
-     * @return string|null
+     * @return string|int|float|null
      */
-    private function getUniquePart(string $key): ?string
+    private function getUniquePart(string $key): string|int|float|null
     {
         return (!is_null($this->{$key}) && is_null($this->encoded[$key])) ? $this->{$key} : null;
     }

Url.php

@@ -175,7 +175,9 @@ public function getRealPath(): string
     public function getDirPath(): string
     {
         if (is_null($this->dirPath)) {
-            $this->dirPath = str_replace($_SERVER['DOCUMENT_ROOT'], "", $this->request->getUri()->getDir());
+            $root = (isset($_SERVER['DOCUMENT_ROOT'])) ? $_SERVER['DOCUMENT_ROOT'] : "";
+            $root = htmlspecialchars($root, ENT_QUOTES, 'UTF-8');
+            $this->dirPath = str_replace($root, "", $this->request->getUri()->getDir());
         }
         if (!is_string($this->dirPath)) {
             throw new \Exception("Could not create dirPath", 1);