Merge pull request #73 from utopia-php/fix-get-env-type

fix: return type for getEnv
utopia-php · Oct 7, 2022 · 9f35d36 · 9f35d36
2 parents f97e691 + 3b1fa2f
commit 9f35d36
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/App.php b/src/App.php
@@ -265,10 +265,10 @@ public static function error(): Hook
      * Method for querying env varialbles. If $key is not found $default value will be returned.
      *
      * @param string $key
-     * @param mixed  $default
-     * @return mixed
+     * @param string|null $default
+     * @return string|null
      */
-    public static function getEnv(string $key, string $default = null): string
+    public static function getEnv(string $key, string $default = null): ?string
     {
         return $_SERVER[$key] ?? $default;
     }

diff --git a/src/Request.php b/src/Request.php
@@ -71,7 +71,7 @@ public function getParam(string $key, mixed $default = null): mixed
      */
     public function getParams(): array
     {
-        return match($this->getServer('REQUEST_METHOD', '')) {
+        return match ($this->getServer('REQUEST_METHOD', '')) {
             self::METHOD_POST,
             self::METHOD_PUT,
             self::METHOD_PATCH,
@@ -116,10 +116,10 @@ public function getPayload(string $key, mixed $default = null): mixed
      * Method for querying server parameters. If $key is not found $default value will be returned.
      *
      * @param  string $key
-     * @param  mixed  $default
-     * @return string
+     * @param  string|null  $default
+     * @return string|null
      */
-    public function getServer(string $key, string $default = null): string
+    public function getServer(string $key, string $default = null): ?string
     {
         return $_SERVER[$key] ?? $default;
     }
@@ -135,7 +135,8 @@ public function getServer(string $key, string $default = null): string
      */
     public function getIP(): string
     {
-        $ips = explode(',', $this->getHeader('HTTP_X_FORWARDED_FOR', $this->getServer('REMOTE_ADDR', '0.0.0.0')));
+        $ips = explode(',', $this->getHeader('HTTP_X_FORWARDED_FOR', $this->getServer('REMOTE_ADDR') ?? '0.0.0.0'));
+
         return trim($ips[0] ?? '');
     }
 
@@ -150,7 +151,7 @@ public function getIP(): string
      */
     public function getProtocol(): string
     {
-        return $this->getServer('HTTP_X_FORWARDED_PROTO', $this->getServer('REQUEST_SCHEME', 'https'));
+        return $this->getServer('HTTP_X_FORWARDED_PROTO', $this->getServer('REQUEST_SCHEME')) ?? 'https';
     }
 
     /**
@@ -186,7 +187,7 @@ public function getHostname(): string
      */
     public function getMethod(): string
     {
-        return $this->getServer('REQUEST_METHOD', 'UNKNOWN');
+        return $this->getServer('REQUEST_METHOD') ?? 'UNKNOWN';
     }
 
     /**
@@ -198,7 +199,7 @@ public function getMethod(): string
      */
     public function getURI(): string
     {
-        return $this->getServer('REQUEST_URI', '');
+        return $this->getServer('REQUEST_URI') ?? '';
     }
 
     /**