Changeset 2072 for trunk/system/core/Kohana.php

Timestamp:

02/18/2008 11:54:41 AM (9 months ago)

Author:

Shadowhand

Message:

Fixing Kohana::instance() to no longer change Router::$arguments for _remap and _default routes, so that URI::argument_array works with routed methods.

Files:

• trunk/system/core/Kohana.php (modified) (4 diffs)

trunk/system/core/Kohana.php

@@ -219 +219 @@
                         class_exists($controller, FALSE) or Event::run('system.404');
 
-                        // Find the unique controller methods
-                        $methods = array_diff(get_class_methods($controller), get_class_methods('Controller_Core'));
-
-                        // If there are no methods in the controller, it's invalid
-                        empty($methods) and Event::run('system.404');
-
-                        // Combine the methods
-                        $methods = array_combine($methods, $methods);
+                        // Get the controller methods
+                        $methods = array_flip(get_class_methods($controller));
+
 
                         if (isset($methods['_remap']))
                         {
-                                // Change arguments to be $method, $arguments.
-                                // This makes _remap capable of being a much more effecient dispatcher
-                                Router::$arguments = array(Router::$method, Router::$arguments);
+                                // Make the arguments routed
+                                $arguments = array(Router::$method, Router::$arguments);
+
+                                // The method becomes part of the arguments
+                                array_unshift(Router::$arguments, Router::$method);
 
                                 // Set the method to _remap
                                 Router::$method = '_remap';
                         }
-                        elseif (isset($methods[Router::$method]) AND substr(Router::$method, 0, 1) != '_')
-                        {
-                                // A valid route has been found, and nothing needs to be done.
-                                // Amazing that having nothing inside the statement still works.
-                        }
-                        elseif (method_exists($controller, '_default'))
-                        {
-                                // Change arguments to be $method, $arguments.
-                                // This makes _default a much more effecient 404 handler
-                                Router::$arguments = array(Router::$method, Router::$arguments);
+                        elseif (isset($methods[Router::$method]) AND Router::$method{0} !== '_')
+                        {
+                                // Use the arguments normally
+                                $arguments = Router::$arguments;
+                        }
+                        elseif (isset($methods['_default']))
+                        {
+                                // Make the arguments routed
+                                $arguments = array(Router::$method, Router::$arguments);
+
+                                // The method becomes part of the arguments
+                                array_unshift(Router::$arguments, Router::$method);
 
                                 // Set the method to _default
@@ -260 +259 @@
                         $controller = new $controller;
 
+                        // Controller method name, used for calling
+                        $method = Router::$method;
+
                         // Run system.post_controller_constructor
                         Event::run('system.post_controller_constructor');
@@ -269 +271 @@
                         Benchmark::start(SYSTEM_BENCHMARK.'_controller_execution');
 
-                        // Controller method name, used for calling
-                        $method = Router::$method;
-
-                        if (empty(Router::$arguments))
+                        if (empty($arguments))
                         {
                                 // Call the controller method with no arguments
@@ -279 +278 @@
                         else
                         {
-                                // Manually call the controller for up to 4 arguments. Why? Because
-                                // call_user_func_array is ~3 times slower than direct method calls.
-                                switch(count(Router::$arguments))
+                                // Manually call the controller for up to 4 arguments, to increase performance
+                                switch(count($arguments))
                                 {
                                         case 1:
-                                                $controller->$method(Router::$arguments[0]);
+                                                $controller->$method($arguments[0]);
                                         break;
                                         case 2:
-                                                $controller->$method(Router::$arguments[0], Router::$arguments[1]);
+                                                $controller->$method($arguments[0], $arguments[1]);
                                         break;
                                         case 3:
-                                                $controller->$method(Router::$arguments[0], Router::$arguments[1], Router::$arguments[2]);
+                                                $controller->$method($arguments[0], $arguments[1], $arguments[2]);
                                         break;
                                         case 4:
-                                                $controller->$method(Router::$arguments[0], Router::$arguments[1], Router::$arguments[2], Router::$arguments[3]);
+                                                $controller->$method($arguments[0], $arguments[1], $arguments[2], $arguments[3]);
                                         break;
                                         default:
                                                 // Resort to using call_user_func_array for many segments
-                                                call_user_func_array(array($controller, $method), Router::$arguments);
+                                                call_user_func_array(array($controller, $method), $arguments);
                                         break;
                                 }