Merge pull request #23 from abbadon1334/refactor-route-handlers

Refactor route handlers
abbadon1334 · Jul 31, 2019 · 86594f9 · 86594f9
2 parents 240386e + 1e28f1e
commit 86594f9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/Route/Route.php b/src/Route/Route.php
@@ -65,18 +65,16 @@ private static function getHandlerFromArray(array $array): iOnRoute
         $first_element = $array[0];
         $second_element = $array[1] ?? null;
 
-        if (null === $second_element) {
-            return new RoutedCallable(...$array);
-        }
+        switch (true) {
 
-        if (is_string($second_element)) {
-            return RoutedMethod::fromArray($array);
-        }
+            case is_callable($first_element):
+                return new RoutedCallable($first_element);
 
-        switch (true) {
+            case is_string($first_element) && is_string($second_element):
+                return RoutedMethod::fromArray($array);
 
             case is_a($first_element, RoutedServeStatic::class, true):
-                return RoutedServeStatic::fromArray($array);
+                return RoutedServeStatic::fromArray($second_element);
 
             case is_a($first_element, jsExpressionable::class, true):
                 return RoutedUI::fromArray($array);

diff --git a/tests/RouterTest.php b/tests/RouterTest.php
@@ -73,6 +73,7 @@ public function dataProviderTestDemos()
         ];
 
         $cases = [
+            ['GET', '/callable', 200, false],
             ['GET', '/callable', 200, false],
             ['GET', '/test', 200, false],
             ['GET', '/testStatic', 200, false],