Cleanup Dispatcher.

Signed-off-by: crynobone <crynobone@gmail.com>
orchestral · May 27, 2014 · e054312 · e054312
1 parent a3ed566
commit e054312
Showing 1 changed file with 27 additions and 17 deletions.
diff --git a/src/Resources/Dispatcher.php b/src/Resources/Dispatcher.php
@@ -199,33 +199,43 @@ protected function findRestfulRoutable($verb, array $parameters = array())
      * @param  array    $nested
      * @return array
      */
-    protected function findResourceRoutable(
-        $verb,
-        array $parameters = array(),
-        array $nested = array()
-    ) {
-        $last       = array_pop($parameters);
-        $resources  = array_keys($nested);
+    protected function findResourceRoutable($verb, array $parameters = array(), array $nested = array())
+    {
+        $action = $this->getActionName($verb, $parameters, $nested);
         $parameters = array_values($nested);
 
+        return array($action, $parameters);
+    }
+
+    /**
+     * Get action name.
+     *
+     * @param  string   $verb
+     * @param  array    $parameters
+     * @param  array    $nested
+     * @return string
+     */
+    protected function getActionName($verb, array $parameters = array(), array $nested = array())
+    {
+        $last = array_pop($parameters);
+        $resources = array_keys($nested);
+
         $swappable = array(
-            'post'   => 'store',
-            'put'    => 'update',
-            'patch'  => 'update',
+            'post' => 'store',
+            'put' => 'update',
+            'patch' => 'update',
             'delete' => 'destroy',
         );
 
         if (isset($swappable[$verb])) {
-            $action = $swappable[$verb];
+            return $swappable[$verb];
         } elseif (in_array($last, array('edit', 'create', 'delete'))) {
             // Handle all possible GET routing.
-            $action = $last;
-        } elseif (! in_array($last, $resources) && ! empty($nested)) {
-            $action = 'show';
-        } else {
-            $action = 'index';
+            return $last;
+        } elseif (!in_array($last, $resources) && !empty($nested)) {
+            return 'show';
         }
 
-        return array($action, $parameters);
+        return 'index';
     }
 }