changes for Kohana 3.3

Author: gimpe

README.md

@@ -1,7 +1,7 @@
 kohana-memcached
 ===============
 
-Kohana 3.2 module for memcached extension (not memcache).
+Kohana 3.3 module for memcached extension (not memcache).
 
 
 See [config file](https://github.com/gimpe/kohana-memcached/blob/master/config/cache.php).
@@ -17,4 +17,4 @@ License:
 * to Remix — to adapt the work
 
 ### Under the following conditions:
-* Attribution - You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).
+* Attribution - You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).

classes/cache/memcached.php renamed to classes/Cache/Memcached.php

@@ -2,7 +2,7 @@
 
 /**
  * Cache_Memcached class
- * 
+ *
  * LICENSE: THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
  * CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED
  * BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
@@ -20,4 +20,6 @@
  * @license   http://creativecommons.org/licenses/by/3.0/ CC BY 3.0
  * @link      http://github.com/gimpe/kohana-memcached
  */
-class Cache_Memcached extends Kohana_Cache_Memcached {}
+class Cache_Memcached extends Kohana_Cache_Memcached
+{
+}

classes/kohana/cache/memcached.php renamed to classes/Kohana/Cache/Memcached.php

@@ -2,7 +2,7 @@
 
 /**
  * Kohana_Cache_Memcached class
- * 
+ *
  * LICENSE: THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
  * CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED
  * BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
@@ -21,7 +21,7 @@
  * @link      http://github.com/gimpe/kohana-memcached
  */
 class Kohana_Cache_Memcached extends Cache
-{ 
+{
     protected $memcached_instance;
 
     protected function __construct(array $config)
@@ -81,7 +81,7 @@ protected function __construct(array $config)
                 // status can be used by an external healthcheck to mark the memcached instance offline
                 if ($status === TRUE)
                 {
-                    $this->memcached_instance->addServer($host, $port, $weight);   
+                    $this->memcached_instance->addServer($host, $port, $weight);
                 }
             }
             else
@@ -91,16 +91,16 @@ protected function __construct(array $config)
             }
         }
     }
-    
+
     /**
      * Retrieve a cached value entry by id.
-     * 
+     *
      *     // Retrieve cache entry from default group
      *     $data = Cache::instance()->get('foo');
-     * 
+     *
      *     // Retrieve cache entry from default group and return 'bar' if miss
      *     $data = Cache::instance()->get('foo', 'bar');
-     * 
+     *
      *     // Retrieve cache entry from memcache group
      *     $data = Cache::instance('memcache')->get('foo');
      *
@@ -123,15 +123,15 @@ public function get($id, $default = NULL)
 
     /**
      * Set a value to cache with id and lifetime
-     * 
+     *
      *     $data = 'bar';
-     * 
+     *
      *     // Set 'bar' to 'foo' in default group, using default expiry
      *     Cache::instance()->set('foo', $data);
-     * 
+     *
      *     // Set 'bar' to 'foo' in default group for 30 seconds
      *     Cache::instance()->set('foo', $data, 30);
-     * 
+     *
      *     // Set 'bar' to 'foo' in memcache group for 10 minutes
      *     if (Cache::instance('memcache')->set('foo', $data, 600))
      *     {
@@ -151,10 +151,10 @@ public function set($id, $data, $lifetime = 3600)
 
     /**
      * Delete a cache entry based on id
-     * 
+     *
      *     // Delete 'foo' entry from the default group
      *     Cache::instance()->delete('foo');
-     * 
+     *
      *     // Delete 'foo' entry from the memcache group
      *     Cache::instance('memcache')->delete('foo')
      *
@@ -168,14 +168,14 @@ public function delete($id)
 
     /**
      * Delete all cache entries.
-     * 
+     *
      * Beware of using this method when
      * using shared memory cache systems, as it will wipe every
      * entry within the system for all clients.
-     * 
+     *
      *     // Delete all cache entries in the default group
      *     Cache::instance()->delete_all();
-     * 
+     *
      *     // Delete all cache entries in the memcache group
      *     Cache::instance('memcache')->delete_all();
      *
@@ -185,4 +185,4 @@ public function delete_all()
     {
         return $this->memcached_instance->flush();
     }
-}
+}

config/cache.php

@@ -138,4 +138,4 @@
         'cache_dir' => APPPATH . 'cache',
         'default_expire' => 3600,
     )
-);
+);