Changeset 2667 for trunk/system/libraries

Timestamp:

05/13/08 02:23:53 (4 months ago)

Author:

Geert

Message:

Follow-up to r2628. Using generic i18n messages for loading of drivers.

Location:

trunk/system/libraries

Files:

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

trunk/system/libraries/Archive.php

@@ -34 +34 @@
         // Load the driver
         if ( ! Kohana::auto_load($driver))
-            throw new Kohana_Exception('archive.driver_not_supported', $type);
+            throw new Kohana_Exception('core.driver_not_found', $type, get_class($this));
 
         // Initialize the driver
@@ -41 +41 @@
         // Validate the driver
         if ( ! ($this->driver instanceof Archive_Driver))
-            throw new Kohana_Exception('archive.driver_implements', $type);
+            throw new Kohana_Exception('core.driver_implements', $type, get_class($this), 'Archive_Driver');
 
         Log::add('debug', 'Archive Library initialized');

trunk/system/libraries/Cache.php

@@ -69 +69 @@
         // Load the driver
         if ( ! Kohana::auto_load($driver))
-            throw new Kohana_Exception('cache.driver_not_supported', $this->config['driver']);
+            throw new Kohana_Exception('core.driver_not_found', $this->config['driver'], get_class($this));
 
         // Initialize the driver
@@ -76 +76 @@
         // Validate the driver
         if ( ! ($this->driver instanceof Cache_Driver))
-            throw new Kohana_Exception('cache.driver_implements', $this->config['driver']);
+            throw new Kohana_Exception('core.driver_implements', $this->config['driver'], get_class($this), 'Cache_Driver');
 
         Log::add('debug', 'Cache Library initialized');

trunk/system/libraries/Database.php

@@ -179 +179 @@
         // Load the driver
         if ( ! Kohana::auto_load($driver))
-            throw new Kohana_Database_Exception('database.driver_not_supported', $this->config['connection']['type']);
+            throw new Kohana_Database_Exception('core.driver_not_found', $this->config['connection']['type'], get_class($this));
 
         // Initialize the driver
@@ -186 +186 @@
         // Validate the driver
         if ( ! ($this->driver instanceof Database_Driver))
-            throw new Kohana_Database_Exception('database.driver_not_supported', 'Database drivers must use the Database_Driver interface.');
+            throw new Kohana_Database_Exception('core.driver_implements', $this->config['connection']['type'], get_class($this), 'Database_Driver');
 
         Log::add('debug', 'Database Library initialized');

trunk/system/libraries/Image.php

@@ -111 +111 @@
         // Load the driver
         if ( ! Kohana::auto_load($driver))
-            throw new Kohana_Exception('image.driver_not_supported', $this->config['driver']);
+            throw new Kohana_Exception('core.driver_not_found', $this->config['driver'], get_class($this));
 
         // Initialize the driver
         $this->driver = new $driver($this->config['params']);
 
+        // Validate the driver
         if ( ! ($this->driver instanceof Image_Driver))
-            throw new Kohana_Exception('image.invalid_driver', $driver);
+            throw new Kohana_Exception('core.driver_implements', $this->config['driver'], get_class($this), 'Image_Driver');
     }
 

trunk/system/libraries/Payment.php

@@ -75 +75 @@
         // Load the driver
         if ( ! Kohana::auto_load($driver))
-            throw new Kohana_Exception('payment.driver_not_supported', $this->config['driver']);
+            throw new Kohana_Exception('core.driver_not_found', $this->config['driver'], get_class($this));
 
         // Get the driver specific settings
@@ -85 +85 @@
         // Validate the driver
         if ( ! ($this->driver instanceof Payment_Driver))
-            throw new Kohana_Exception('payment.driver_implements', $this->config['driver']);
+            throw new Kohana_Exception('core.driver_implements', $this->config['driver'], get_class($this), 'Payment_Driver');
     }
 

trunk/system/libraries/Session.php

@@ -62 +62 @@
                 // Load the driver
                 if ( ! Kohana::auto_load($driver))
-                    throw new Kohana_Exception('session.driver_not_supported', self::$config['driver']);
+                    throw new Kohana_Exception('core.driver_not_found', self::$config['driver'], get_class($this));
 
                 // Initialize the driver
@@ -69 +69 @@
                 // Validate the driver
                 if ( ! (self::$driver instanceof Session_Driver))
-                    throw new Kohana_Exception('session.driver_implements', self::$config['driver']);
+                    throw new Kohana_Exception('core.driver_implements', self::$config['driver'], get_class($this), 'Session_Driver');
 
                 // Register non-native driver as the session handler