Changeset 1249

Timestamp:

11/23/2007 04:14:42 PM (11 months ago)

Author:

Shadowhand

Message:

Small changes to core:

• Optimized Kohana::instance(), avoiding a call_user_func_array, which is extremely slow (woot PHP!)
  
• Fixed the "private" controller method prefixing (using "_" should prevent the method from being called via the URL)
  
• Moved Controller::kohana_include_view() to Controller::_kohana_load_view(), for consistency
  
• Updated View::render() to use the renamed Controller method
  
• Small logic fix in Encrypt
  

Location:

trunk/system

Files:

• core/Event.php (modified) (1 diff)
• core/Kohana.php (modified) (5 diffs)
• libraries/Controller.php (modified) (2 diffs)
• libraries/Encrypt.php (modified) (1 diff)
• libraries/View.php (modified) (1 diff)

trunk/system/core/Event.php

@@ -260 +260 @@
         public static function run($name, & $data = NULL)
         {
-                if ($name == FALSE)
+                if ($name == FALSE OR empty(self::$events[$name]))
                         return FALSE;
 

trunk/system/core/Kohana.php

@@ -186 +186 @@
                                 Router::$method = '_remap';
                         }
-                        elseif (isset($methods[Router::$method]) AND Router::$method != 'kohana_include_view')
-                        {
-                                /**
-                                 * Do nothing. Exciting! Honestly, I am surprised having only
-                                 * a comment here works.
-                                 */
+                        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 statment still works.
                         }
                         elseif (method_exists($controller, '_default'))
@@ -217 +215 @@
                         );
 
-                        // Call the controller method
-                        if (is_array(Router::$arguments) AND ! empty(Router::$arguments))
-                        {
-                                call_user_func_array(array($controller, Router::$method), Router::$arguments);
+                        // Run system.post_controller_constructor
+                        Event::run('system.post_controller_constructor');
+
+                        // Controller method name, used for calling
+                        $method = Router::$method;
+
+                        if (empty(Router::$arguments))
+                        {
+                                // Call the controller method with no arguments
+                                $controller->$method();
                         }
                         else
                         {
-                                call_user_func(array($controller, Router::$method));
-                        }
-
-                        // Run system.pre_controller
+                                // 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))
+                                {
+                                        case 1:
+                                                $controller->$method(Router::$arguments[0]);
+                                        break;
+                                        case 2:
+                                                $controller->$method(Router::$arguments[0], Router::$arguments[1]);
+                                        break;
+                                        case 3:
+                                                $controller->$method(Router::$arguments[0], Router::$arguments[1], Router::$arguments[2]);
+                                        break;
+                                        case 4:
+                                                $controller->$method(Router::$arguments[0], Router::$arguments[1], Router::$arguments[2], Router::$arguments[3]);
+                                        break;
+                                        default:
+                                                // Resort to using call_user_func_array for many segments
+                                                call_user_func_array(array($controller, $method), Router::$arguments);
+                                        break;
+                                }
+                        }
+
+                        // Run system.post_controller
                         Event::run('system.post_controller');
                 }
@@ -467 +491 @@
                         case 'Controller':
                                 $type = 'controllers';
-                                $file = substr($class, 0, -11);
+                                // Lowercase filename
+                                $file = strtolower(substr($class, 0, -11));
                         break;
                         case 'Model':
                                 $type = 'models';
-                                $file = substr($class, 0, -6);
-                                // Models are always lowercase
-                                $file = strtolower($file);
+                                // Lowercase filename
+                                $file = strtolower(substr($class, 0, -6));
                         break;
                         case 'Driver':
@@ -488 +512 @@
                 }
 
+                // Load the requested file
                 require_once self::find_file($type, $file, TRUE);
 
@@ -525 +550 @@
 
                 $search = $directory.'/'.$filename;
-                $hash   = md5($search);
+                $hash   = sha1($search);
 
                 if (isset($found[$hash]))

trunk/system/libraries/Controller.php

@@ -30 +30 @@
 
         /**
-         * Method: kohana_include_view
-         *  Includes a View within the controller scope.
+         * Includes a View within the controller scope.
          *
          * Parameters:
@@ -40 +39 @@
          *  Output of view file
          */
-        public function kohana_include_view($kohana_view_filename, $kohana_input_data)
+        public function _kohana_load_view($kohana_view_filename, $kohana_input_data)
         {
                 if ($kohana_view_filename == '')

trunk/system/libraries/Encrypt.php

@@ -40 +40 @@
 
                 // Different random seeds must be used for Windows and UNIX
-                $rand = (strpos(PHP_OS, 'WIN') !== FALSE) ? MCRYPT_RAND : MCRYPT_DEV_RANDOM;
+                $rand = (strpos(PHP_OS, 'WIN') === FALSE) ? MCRYPT_DEV_RANDOM : MCRYPT_RAND;
 
                 // Create an initialization vector

trunk/system/libraries/View.php

@@ -140 +140 @@
                 {
                         // Load the view in the controller for access to $this
-                        $output = Kohana::instance()->kohana_include_view($this->kohana_filename, $this->data);
+                        $output = Kohana::instance()->_kohana_load_view($this->kohana_filename, $this->data);
 
                         // Pass the output through the user defined renderer