return type issue fixed

selamiphp · Mar 23, 2017 · 65472e4 · 65472e4
1 parent 42e1a24
commit 65472e4
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/Router.php b/src/Router.php
@@ -162,7 +162,7 @@ private function extractFolder(string $requestPath, string $folder)
     public function add($requestMethods, string $route, string $action, string $returnType = null, string $alias = null)
     {
         $requestMethodsGiven = is_array($requestMethods) ? (array) $requestMethods : [0 => $requestMethods];
-        $returnType = $this->checkReturnType($returnType);
+        $returnType = $this->determineReturnType($returnType);
         foreach ($requestMethodsGiven as $requestMethod) {
             $this->checkRequestMethodParameterType($requestMethod);
             $this->checkRequestMethodIsValid($requestMethod);
@@ -197,11 +197,12 @@ public function __call(string $method, array $args)
      * @param string|null $returnType
      * @return string
      */
-    private function checkReturnType($returnType)
+    private function determineReturnType(string $returnType)
     {
-        return $returnType === null ?
-            $this->defaultReturnType :
-            self::$validReturnTypes[$returnType] ?? $this->defaultReturnType;
+        if ($returnType === null) {
+            return $this->defaultReturnType;
+        }
+        return in_array($returnType, self::$validReturnTypes, true) ? $returnType : $this->defaultReturnType;
     }
 
     /**