Fix bugs

ignaszak · Apr 21, 2016 · 0dc5bbb · 0dc5bbb
1 parent 4f7054c
commit 0dc5bbb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Collection/Yaml.php b/src/Collection/Yaml.php
@@ -75,7 +75,7 @@ public function getRouteArray(): array
         foreach ($this->fileArray as $file) {
             $result = array_merge(
                 $result,
-                $this->parser->parse(file_get_contents($file))
+                $this->parser->parse(file_get_contents($file)) ?? []
             );
         }
         return $this->converter->convert($result);

diff --git a/src/Host.php b/src/Host.php
@@ -41,8 +41,9 @@ public function __construct(string $baseQuery = '')
      */
     public function getBaseURL(): string
     {
+        $serverName = $_SERVER['SERVER_NAME'] ?? '';
         $url = 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') .
-            "://{$_SERVER['SERVER_NAME']}";
+            "://{$serverName}";
         return !empty($this->baseQuery) ? $url . $this->baseQuery : $url;
     }
 
@@ -52,12 +53,12 @@ public function getBaseURL(): string
      */
     public function getQuery(): string
     {
-        $requestURI = $_SERVER['REQUEST_URI'];
+        $requestURI = $_SERVER['REQUEST_URI'] ?? '';
         if (empty($this->baseQuery)) {
             return $requestURI;
         } else {
             return $requestURI != $this->baseQuery ?
-                substr(
+                (string)substr(
                     $requestURI,
                     strlen($this->baseQuery) - strlen($requestURI)
                 ) : '';
@@ -70,6 +71,6 @@ public function getQuery(): string
      */
     public function getHttpMethod(): string
     {
-        return $_SERVER['REQUEST_METHOD'];
+        return $_SERVER['REQUEST_METHOD'] ?? '';
     }
 }