Changeset 1773

Timestamp:

01/21/2008 10:56:43 AM (12 months ago)

Author:

Geert

Message:

Follow-up to r1772:

• Kohana::auto_load() must not throw exceptions since that would break other attached auto-loaders (e.g. Swift). Thanks for pointing this out, Woody.
  
• Now manually loading drivers which has the added speed benefit.
  

Location:

trunk/system

Files:

• core/Kohana.php (modified) (1 diff)
• libraries/Archive.php (modified) (2 diffs)
• libraries/Cache.php (modified) (2 diffs)
• libraries/Database.php (modified) (2 diffs)
• libraries/Image.php (modified) (2 diffs)
• libraries/Payment.php (modified) (1 diff)
• libraries/Session.php (modified) (2 diffs)

trunk/system/core/Kohana.php

@@ -597 +597 @@
 
                 // If the file doesn't exist, just return
-                if (($filepath = self::find_file($type, $file, TRUE)) === FALSE)
+                if (($filepath = self::find_file($type, $file)) === FALSE)
                         return;
 

trunk/system/libraries/Archive.php

@@ -34 +34 @@
                         $driver = 'Archive_'.ucfirst(strtolower($type)).'_Driver';
 
-                        // Manually autoload so that exceptions can be caught
-                        Kohana::auto_load($driver);
+                        // Manually load so that exceptions can be caught
+                        require_once Kohana::find_file('libraries/drivers', substr($driver, 0, -7), TRUE);
                 }
                 catch (Kohana_Exception $exception)
@@ -46 +46 @@
 
                 // Validate the driver
-                if ( ! in_array('Archive_Driver', class_implements($this->driver)))
+                if ( ! (self::$driver instanceof Archive_Driver))
                         throw new Kohana_Exception('archive.driver_implements', $type);
 

trunk/system/libraries/Cache.php

@@ -39 +39 @@
                         $driver = 'Cache_'.ucfirst(strtolower($this->config['driver'])).'_Driver';
 
-                        // Manually autoload so that exceptions can be caught
-                        Kohana::auto_load($driver);
+                        // Manually load so that exceptions can be caught
+                        require_once Kohana::find_file('libraries/drivers', substr($driver, 0, -7), TRUE);
                 }
                 catch (Kohana_Exception $e)
@@ -51 +51 @@
 
                 // Validate the driver
-                if ( ! in_array('Cache_Driver', class_implements($this->driver)))
+                if ( ! (self::$driver instanceof Cache_Driver))
                         throw new Kohana_Exception('cache.driver_not_supported', 'Cache drivers must use the Cache_Driver interface.');
 

trunk/system/libraries/Database.php

@@ -157 +157 @@
                         $driver = 'Database_'.ucfirst(strtolower($this->config['connection']['type'])).'_Driver';
 
-                        // Manually autoload so that exceptions can be caught
-                        Kohana::auto_load($driver);
+                        // Manually load so that exceptions can be caught
+                        require_once Kohana::find_file('libraries/drivers', substr($driver, 0, -7), TRUE);
                 }
                 catch (Kohana_Exception $e)
@@ -169 +169 @@
 
                 // Validate the driver
-                if ( ! ($this->driver instanceof Database_Driver))
+                if ( ! (self::$driver instanceof Database_Driver))
                         throw new Kohana_Exception('database.driver_not_supported', 'Database drivers must use the Database_Driver interface.');
 

trunk/system/libraries/Image.php

@@ -69 +69 @@
                         $driver = 'Image_'.ucfirst(strtolower($this->config['driver'])).'_Driver';
 
-                        // Manually autoload so that exceptions can be caught
-                        Kohana::auto_load($driver);
+                        // Manually load so that exceptions can be caught
+                        require_once Kohana::find_file('libraries/drivers', substr($driver, 0, -7), TRUE);
                 }
                 catch (Kohana_Exception $e)
@@ -80 +80 @@
                 $this->driver = new $driver($this->config['params']);
 
-                if ( ! ($this->driver instanceof Image_Driver))
+                if ( ! (self::$driver instanceof Image_Driver))
                         throw new Kohana_Exception('image.invalid_driver', $driver);
         }

trunk/system/libraries/Payment.php

@@ -83 +83 @@
                         $driver = 'Payment_'.ucfirst(strtolower($this->config['driver'])).'_Driver';
 
-                        // Manually autoload so that exceptions can be caught
-                        Kohana::auto_load($driver);
+                        // Manually load so that exceptions can be caught
+                        require_once Kohana::find_file('libraries/drivers', substr($driver, 0, -7), TRUE);
                 }
                 catch (Kohana_Exception $e)

trunk/system/libraries/Session.php

@@ -61 +61 @@
                                         $driver = 'Session_'.ucfirst(strtolower(self::$config['driver'])).'_Driver';
 
-                                        // Manually autoload so that exceptions can be caught
-                                        Kohana::auto_load($driver);
+                                        // Manually load so that exceptions can be caught
+                                        require_once Kohana::find_file('libraries/drivers', substr($driver, 0, -7), TRUE);
                                 }
                                 catch (Kohana_Exception $e)
@@ -73 +73 @@
 
                                 // Validate the driver
-                                if ( ! in_array('Session_Driver', class_implements(self::$driver)))
+                                if ( ! (self::$driver instanceof Session_Driver))
                                         throw new Kohana_Exception('session.driver_must_implement_interface');
                         }