Changeset 1772 for trunk/system/libraries/Payment.php

Timestamp:

01/21/2008 10:33:19 AM (10 months ago)

Author:

Geert

Message:

Kohana::auto_load() now throws an exception if the needed file does not exist.

This fixes proper exception handling on all the driver based libraries: Archive, Cache, Database, Image, Payment and Session.
See for example: http://trac.kohanaphp.com/browser/trunk/system/libraries/Session.php?rev=1745#L63

Also changed code and lang files to be more consistent.

Files:

• trunk/system/libraries/Payment.php (modified) (1 diff)

trunk/system/libraries/Payment.php

@@ -78 +78 @@
                 $this->config = array_merge($this->config, Config::item('payment.'.$this->config['driver']));
 
-                // Set driver name
-                $driver = 'Payment_'.ucfirst($this->config['driver']).'_Driver';
+                try
+                {
+                        // Set driver name
+                        $driver = 'Payment_'.ucfirst(strtolower($this->config['driver'])).'_Driver';
 
-                // Manually call auto-loading, for proper exception handling
-                Kohana::auto_load($driver);
+                        // Manually autoload so that exceptions can be caught
+                        Kohana::auto_load($driver);
+                }
+                catch (Kohana_Exception $e)
+                {
+                        throw new Kohana_Exception('payment.driver_not_supported', $this->config['driver']);
+                }
 
                 // Initialize the driver