Upgrade to KH 3.3.0

application/bootstrap.php

@@ -3,48 +3,56 @@
 // -- Environment setup --------------------------------------------------------
 
 // Load the core Kohana class
-require SYSPATH.'classes/kohana/core'.EXT;
+require SYSPATH.'classes/Kohana/Core'.EXT;
 
-if (is_file(APPPATH.'classes/kohana'.EXT))
+if (is_file(APPPATH.'classes/Kohana'.EXT))
 {
 	// Application extends the core
-	require APPPATH.'classes/kohana'.EXT;
+	require APPPATH.'classes/Kohana'.EXT;
 }
 else
 {
 	// Load empty core extension
-	require SYSPATH.'classes/kohana'.EXT;
+	require SYSPATH.'classes/Kohana'.EXT;
 }
 
 /**
  * Set the default time zone.
  *
- * @see  http://kohanaframework.org/guide/using.configuration
+ * @link http://kohanaframework.org/guide/using.configuration
- * @see  http://php.net/timezones
+ * @link http://www.php.net/manual/timezones
  */
 date_default_timezone_set('Australia/Melbourne');
 
 /**
  * Set the default locale.
  *
- * @see  http://kohanaframework.org/guide/using.configuration
+ * @link http://kohanaframework.org/guide/using.configuration
- * @see  http://php.net/setlocale
+ * @link http://www.php.net/manual/function.setlocale
  */
 setlocale(LC_ALL, 'en_US.utf-8');
 
 /**
  * Enable the Kohana auto-loader.
  *
- * @see  http://kohanaframework.org/guide/using.autoloading
+ * @link http://kohanaframework.org/guide/using.autoloading
- * @see  http://php.net/spl_autoload_register
+ * @link http://www.php.net/manual/function.spl-autoload-register
  */
 spl_autoload_register(array('Kohana', 'auto_load'));
 
+/**
+ * Optionally, you can enable a compatibility auto-loader for use with
+ * older modules that have not been updated for PSR-0.
+ *
+ * It is recommended to not enable this unless absolutely necessary.
+ */
+//spl_autoload_register(array('Kohana', 'auto_load_lowercase'));
+
 /**
  * Enable the Kohana auto-loader for unserialization.
  *
- * @see  http://php.net/spl_autoload_call
+ * @link http://www.php.net/manual/function.spl-autoload-call
- * @see  http://php.net/manual/var.configuration.php#unserialize-callback-func
+ * @link http://www.php.net/manual/var.configuration#unserialize-callback-func
  */
 ini_set('unserialize_callback_func', 'spl_autoload_call');
 
@@ -75,15 +83,16 @@ if (isset($_SERVER['KOHANA_ENV']))
  * - string   index_file  name of your index file, usually "index.php"       index.php
  * - string   charset     internal character set used for input and output   utf-8
  * - string   cache_dir   set the internal cache directory                   APPPATH/cache
+ * - integer  cache_life  lifetime, in seconds, of items cached              60
  * - boolean  errors      enable or disable error handling                   TRUE
  * - boolean  profile     enable or disable internal profiling               TRUE
  * - boolean  caching     enable or disable internal caching                 FALSE
+ * - boolean  expose      set the X-Powered-By header                        FALSE
  */
 Kohana::init(array(
-	'base_url'   => '/pta',
+	'base_url'   => '/pta/',
-	'index_file' => '',
 	'caching'    => TRUE,
-	'cache_dir'  => '/dev/shm/lnapp',
+	'index_file' => '',
 ));
 
 /**
@@ -102,10 +111,15 @@ Kohana::$config->attach(new Config_File);
 Kohana::modules(array(
 	'auth'       => SMDPATH.'auth',       // Basic authentication
 	'cache'      => SMDPATH.'cache',      // Caching with multiple backends
+	'cron'       => SMDPATH.'cron',       // Kohana Cron Module
 	// 'codebench'  => SMDPATH.'codebench',  // Benchmarking tool
 	'database'   => SMDPATH.'database',   // Database access
+	'gchart'     => MODPATH.'gchart',     // Google Chart Module
 	// 'image'      => SMDPATH.'image',      // Image manipulation
+	'khemail'    => SMDPATH.'khemail',    // Email module for Kohana 3 PHP Framework
+	'minion'     => SMDPATH.'minion',     // CLI Tasks
 	'orm'        => SMDPATH.'orm',        // Object Relationship Mapping
+	'pagination' => SMDPATH.'pagination', // Kohana Pagination module for Kohana 3 PHP Framework
 	// 'unittest'   => SMDPATH.'unittest',   // Unit testing
 	'userguide'  => SMDPATH.'userguide',  // User guide and API documentation
 	));
@@ -115,24 +129,33 @@ Kohana::modules(array(
  */
 Route::set('sections', '<directory>/<controller>(/<action>(/<id>(/<sid>)))',
 	array(
-		'directory' => '('.implode('|',Kohana::config('config.method_directory')).')'
+		'directory' => '('.implode('|',Kohana::$config->load('config')->method_directory).')'
+	))
+	->defaults(array(
+		'action'     => 'index',
 	));
 
 // Static file serving (CSS, JS, images)
 Route::set('default/media', 'media(/<file>)', array('file' => '.+'))
 	->defaults(array(
-		'controller' => 'welcome',
+		'controller' => 'media',
-		'action'     => 'media',
+		'action'     => 'get',
-		'file'       => NULL,
 	));
 
 /**
  * Set the routes. Each route must have a minimum of a name, a URI and a set of
  * defaults for the URI.
  */
-Route::set('default', '(<controller>(/<action>(/<id>)))', array('id' => '[a-zA-Z0-9_.-]+'))
+Route::set('default', '(<controller>(/<action>(/<id>)))', array('id'=>'[a-zA-Z0-9_.-]+'))
 	->defaults(array(
 		'controller' => 'welcome',
 		'action'     => 'index',
 	));
-?>
+
+/**
+ * If APC is enabled, and we need to clear the cache
+ */
+if (file_exists(APPPATH.'cache/CLEAR_APC_CACHE') AND function_exists('apc_clear_cache') AND ! Kohana::$is_cli) {
+	if (! apc_clear_cache() OR ! unlink(APPPATH.'cache/CLEAR_APC_CACHE'))
+		throw new Kohana_Exception('Unable to clear the APC cache.');
+}

includes/kohana/.travis.yml

@@ -0,0 +1,24 @@
+language: php
+
+php:
+  - 5.3
+
+before_install:
+  - "git submodule update --init --recursive"
+
+before_script:
+  - "pear channel-discover pear.phing.info"
+  - "pear install phing/phing"
+  - "phpenv rehash"
+  - "composer install"
+
+script: "phing test"
+
+notifications:
+  irc:
+    channels:
+      - "irc.freenode.org#kohana"
+    template:
+      - "%{repository}/%{branch} (%{commit}) - %{author}: %{message}"
+      - "Build details: %{build_url}"
+  email: false

includes/kohana/LICENSE.md

@@ -2,7 +2,7 @@
 
 This license is a legal agreement between you and the Kohana Team for the use of Kohana Framework (the "Software"). By obtaining the Software you agree to comply with the terms and conditions of this license.
 
-Copyright (c) 2007-2010 Kohana Team  
+Copyright (c) 2007-2011 Kohana Team  
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

includes/kohana/README.md

@@ -1,3 +1,19 @@
-# Kohana PHP Framework, version 3.1 (release)
+# Kohana PHP Framework
 
-This is the current release version of [Kohana](http://kohanaframework.org/).
+[Kohana](http://kohanaframework.org/) is an elegant, open source, and object oriented HMVC framework built using PHP5, by a team of volunteers. It aims to be swift, secure, and small.
+
+Released under a [BSD license](http://kohanaframework.org/license), Kohana can be used legally for any open source, commercial, or personal project.
+
+## Documentation
+Kohana's documentation can be found at <http://kohanaframework.org/documentation> which also contains an API browser.
+
+The `userguide` module included in all Kohana releases also allows you to view the documentation locally. Once the `userguide` module is enabled in the bootstrap, it is accessible from your site via `/index.php/guide` (or just `/guide` if you are rewriting your URLs).
+
+## Reporting bugs
+If you've stumbled across a bug, please help us out by [reporting the bug](http://dev.kohanaframework.org/projects/kohana3/) you have found. Simply log in or register and submit a new issue, leaving as much information about the bug as possible, e.g.
+
+* Steps to reproduce
+* Expected result
+* Actual result
+
+This will help us to fix the bug as quickly as possible, and if you'd like to fix it yourself feel free to [fork us on GitHub](https://github.com/kohana) and submit a pull request!

includes/kohana/application/classes/controller/welcome.php

@@ -1,10 +0,0 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-
-class Controller_Welcome extends Controller {
-
-	public function action_index()
-	{
-		$this->response->body('hello, world!');
-	}
-
-} // End Welcome

includes/kohana/composer.json

@@ -0,0 +1,5 @@
+{
+	"require": {
+		"phpunit/phpunit": "3.7.*"
+	}
+}

includes/kohana/composer.lock

@@ -0,0 +1,413 @@
+{
+    "hash": "11774bed2716724738d66bb56a8a1508",
+    "packages": [
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "1.2.6",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "1.2.6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage/zipball/1.2.6",
+                "reference": "1.2.6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": ">=1.3.0@stable",
+                "phpunit/php-token-stream": ">=1.1.3@stable",
+                "phpunit/php-text-template": ">=1.1.1@stable"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.0.5"
+            },
+            "time": "2012-10-16 22:34:13",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "testing",
+                "coverage",
+                "xunit"
+            ]
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.3.3",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "1.3.3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator/zipball/1.3.3",
+                "reference": "1.3.3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "time": "2012-10-11 04:44:38",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "File/"
+                ]
+            },
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ]
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.1.3",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "1.1.3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/php-text-template/zipball/1.1.3",
+                "reference": "1.1.3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "time": "2012-10-11 04:48:39",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "Text/"
+                ]
+            },
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "template"
+            ]
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/php-timer.git",
+                "reference": "1.0.4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/php-timer/zipball/1.0.4",
+                "reference": "1.0.4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "time": "2012-10-11 04:45:58",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "timer"
+            ]
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.1.5",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "1.1.5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/php-token-stream/zipball/1.1.5",
+                "reference": "1.1.5",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "time": "2012-10-11 04:47:14",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "tokenizer"
+            ]
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "3.7.8",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/phpunit.git",
+                "reference": "3.7.8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/phpunit/zipball/3.7.8",
+                "reference": "3.7.8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": ">=1.3.1",
+                "phpunit/php-text-template": ">=1.1.1",
+                "phpunit/php-code-coverage": ">=1.2.1",
+                "phpunit/php-timer": ">=1.0.2",
+                "phpunit/phpunit-mock-objects": ">=1.2.0",
+                "symfony/yaml": ">=2.1.0",
+                "ext-dom": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*"
+            },
+            "suggest": {
+                "phpunit/php-invoker": ">=1.1.0",
+                "ext-json": "*",
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*"
+            },
+            "time": "2012-10-16 22:37:08",
+            "bin": [
+                "composer/bin/phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.7.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "include-path": [
+                "",
+                "../../symfony/yaml/"
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "testing",
+                "phpunit",
+                "xunit"
+            ]
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "1.2.1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects/zipball/1.2.1",
+                "reference": "1.2.1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": ">=1.1.1@stable",
+                "ext-reflection": "*",
+                "ext-spl": "*"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "time": "2012-10-05 00:00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ]
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.1.2",
+            "target-dir": "Symfony/Component/Yaml",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Yaml",
+                "reference": "v2.1.0-RC2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/symfony/Yaml/zipball/v2.1.0-RC2",
+                "reference": "v2.1.0-RC2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "time": "2012-08-22 06:48:41",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Yaml": ""
+                }
+            },
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "http://symfony.com"
+        }
+    ],
+    "packages-dev": null,
+    "aliases": [
+
+    ],
+    "minimum-stability": "stable",
+    "stability-flags": [
+
+    ]
+}

includes/kohana/install.php

@@ -1,4 +1,20 @@
-<?php defined('SYSPATH') or exit('Install tests must be loaded from within index.php!'); ?>
+<?php
+
+// Sanity check, install should only be checked from index.php
+defined('SYSPATH') or exit('Install tests must be loaded from within index.php!');
+
+if (version_compare(PHP_VERSION, '5.3', '<'))
+{
+	// Clear out the cache to prevent errors. This typically happens on Windows/FastCGI.
+	clearstatcache();
+}
+else
+{
+	// Clearing the realpath() cache is only possible PHP 5.3+
+	clearstatcache(TRUE);
+}
+
+?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
@@ -41,15 +57,15 @@
 	<table cellspacing="0">
 		<tr>
 			<th>PHP Version</th>
-			<?php if (version_compare(PHP_VERSION, '5.2.3', '>=')): ?>
+			<?php if (version_compare(PHP_VERSION, '5.3.3', '>=')): ?>
 				<td class="pass"><?php echo PHP_VERSION ?></td>
 			<?php else: $failed = TRUE ?>
-				<td class="fail">Kohana requires PHP 5.2.3 or newer, this version is <?php echo PHP_VERSION ?>.</td>
+				<td class="fail">Kohana requires PHP 5.3.3 or newer, this version is <?php echo PHP_VERSION ?>.</td>
 			<?php endif ?>
 		</tr>
 		<tr>
 			<th>System Directory</th>
-			<?php if (is_dir(SYSPATH) AND is_file(SYSPATH.'classes/kohana'.EXT)): ?>
+			<?php if (is_dir(SYSPATH) AND is_file(SYSPATH.'classes/Kohana'.EXT)): ?>
 				<td class="pass"><?php echo SYSPATH ?></td>
 			<?php else: $failed = TRUE ?>
 				<td class="fail">The configured <code>system</code> directory does not exist or does not contain required files.</td>

includes/kohana/modules/auth/classes/Auth.php

@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+
+abstract class Auth extends Kohana_Auth { }

includes/kohana/modules/auth/classes/Auth/File.php

@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+
+class Auth_File extends Kohana_Auth_File { }

includes/kohana/modules/auth/classes/Kohana/Auth.php

@@ -1,11 +1,11 @@
-<?php defined('SYSPATH') or die('No direct access allowed.');
+<?php defined('SYSPATH') OR die('No direct access allowed.');
 /**
  * User authorization library. Handles user login and logout, as well as secure
  * password hashing.
  *
  * @package    Kohana/Auth
  * @author     Kohana Team
- * @copyright  (c) 2007-2010 Kohana Team
+ * @copyright  (c) 2007-2012 Kohana Team
  * @license    http://kohanaframework.org/license
  */
 abstract class Kohana_Auth {
@@ -23,7 +23,7 @@ abstract class Kohana_Auth {
 		if ( ! isset(Auth::$_instance))
 		{
 			// Load the configuration for this type
-			$config = Kohana::config('auth');
+			$config = Kohana::$config->load('auth');
 
 			if ( ! $type = $config->get('driver'))
 			{
@@ -47,6 +47,7 @@ abstract class Kohana_Auth {
 	/**
 	 * Loads Session and configuration options.
 	 *
+	 * @param   array  $config  Config Options
 	 * @return  void
 	 */
 	public function __construct($config = array())
@@ -54,7 +55,7 @@ abstract class Kohana_Auth {
 		// Save the config in the object
 		$this->_config = $config;
 
-		$this->_session = Session::instance();
+		$this->_session = Session::instance($this->_config['session_type']);
 	}
 
 	abstract protected function _login($username, $password, $remember);
@@ -67,6 +68,7 @@ abstract class Kohana_Auth {
 	 * Gets the currently logged in user from the session.
 	 * Returns NULL if no user is currently logged in.
 	 *
+	 * @param   mixed  $default  Default value to return if the user is currently not logged in.
 	 * @return  mixed
 	 */
 	public function get_user($default = NULL)
@@ -77,9 +79,9 @@ abstract class Kohana_Auth {
 	/**
 	 * Attempt to log in a user by using an ORM object and plain-text password.
 	 *
-	 * @param   string   username to log in
+	 * @param   string   $username  Username to log in
-	 * @param   string   password to check against
+	 * @param   string   $password  Password to check against
-	 * @param   boolean  enable autologin
+	 * @param   boolean  $remember  Enable autologin
 	 * @return  boolean
 	 */
 	public function login($username, $password, $remember = FALSE)
@@ -87,20 +89,14 @@ abstract class Kohana_Auth {
 		if (empty($password))
 			return FALSE;
 
-		if (is_string($password))
-		{
-			// Create a hashed password
-			$password = $this->hash($password);
-		}
-
 		return $this->_login($username, $password, $remember);
 	}
 
 	/**
 	 * Log out a user by removing the related session variables.
 	 *
-	 * @param   boolean  completely destroy the session
+	 * @param   boolean  $destroy     Completely destroy the session
-	 * @param   boolean  remove all tokens for user
+	 * @param   boolean  $logout_all  Remove all tokens for user
 	 * @return  boolean
 	 */
 	public function logout($destroy = FALSE, $logout_all = FALSE)
@@ -127,7 +123,7 @@ abstract class Kohana_Auth {
 	 * Check if there is an active session. Optionally allows checking for a
 	 * specific role.
 	 *
-	 * @param   string   role name
+	 * @param   string  $role  role name
 	 * @return  mixed
 	 */
 	public function logged_in($role = NULL)
@@ -140,7 +136,7 @@ abstract class Kohana_Auth {
 	 * method is deprecated, [Auth::hash] should be used instead.
 	 *
 	 * @deprecated
-	 * @param   string  plaintext password
+	 * @param  string  $password Plaintext password
 	 */
 	public function hash_password($password)
 	{
@@ -150,7 +146,7 @@ abstract class Kohana_Auth {
 	/**
 	 * Perform a hmac hash, using the configured method.
 	 *
-	 * @param   string  string to hash
+	 * @param   string  $str  string to hash
 	 * @return  string
 	 */
 	public function hash($str)

includes/kohana/modules/auth/classes/Kohana/Auth/File.php

@@ -1,11 +1,11 @@
-<?php defined('SYSPATH') or die('No direct access allowed.');
+<?php defined('SYSPATH') OR die('No direct access allowed.');
 /**
  * File Auth driver.
  * [!!] this Auth driver does not support roles nor autologin.
  *
  * @package    Kohana/Auth
  * @author     Kohana Team
- * @copyright  (c) 2007-2010 Kohana Team
+ * @copyright  (c) 2007-2012 Kohana Team
  * @license    http://kohanaframework.org/license
  */
 class Kohana_Auth_File extends Auth {
@@ -27,13 +27,19 @@ class Kohana_Auth_File extends Auth {
 	/**
 	 * Logs a user in.
 	 *
-	 * @param   string   username
+	 * @param   string   $username  Username
-	 * @param   string   password
+	 * @param   string   $password  Password
-	 * @param   boolean  enable autologin (not supported)
+	 * @param   boolean  $remember  Enable autologin (not supported)
 	 * @return  boolean
 	 */
 	protected function _login($username, $password, $remember)
 	{
+		if (is_string($password))
+		{
+			// Create a hashed password
+			$password = $this->hash($password);
+		}
+
 		if (isset($this->_users[$username]) AND $this->_users[$username] === $password)
 		{
 			// Complete the login
@@ -47,7 +53,7 @@ class Kohana_Auth_File extends Auth {
 	/**
 	 * Forces a user to be logged in, without specifying a password.
 	 *
-	 * @param   mixed    username
+	 * @param   mixed    $username  Username
 	 * @return  boolean
 	 */
 	public function force_login($username)
@@ -59,7 +65,7 @@ class Kohana_Auth_File extends Auth {
 	/**
 	 * Get the stored password for a username.
 	 *
-	 * @param   mixed   username
+	 * @param   mixed   $username  Username
 	 * @return  string
 	 */
 	public function password($username)
@@ -70,7 +76,7 @@ class Kohana_Auth_File extends Auth {
 	/**
 	 * Compare password with original (plain text). Works for current (logged in) user
 	 *
-	 * @param   string  $password
+	 * @param   string   $password  Password
 	 * @return  boolean
 	 */
 	public function check_password($password)

includes/kohana/modules/auth/classes/auth.php

@@ -1,3 +0,0 @@
-<?php defined('SYSPATH') or die('No direct access allowed.');
-
-abstract class Auth extends Kohana_Auth { }

includes/kohana/modules/auth/classes/auth/file.php

@@ -1,3 +0,0 @@
-<?php defined('SYSPATH') or die('No direct access allowed.');
-
-class Auth_File extends Kohana_Auth_File { }

includes/kohana/modules/auth/config/auth.php

@@ -1,11 +1,12 @@
-<?php defined('SYSPATH') or die('No direct access allowed.');
+<?php defined('SYSPATH') OR die('No direct access allowed.');
 
 return array(
 
-	'driver'       => 'file',
+	'driver'       => 'File',
 	'hash_method'  => 'sha256',
 	'hash_key'     => NULL,
 	'lifetime'     => 1209600,
+	'session_type' => Session::$default,
 	'session_key'  => 'auth_user',
 
 	// Username/password combinations for the Auth File driver

includes/kohana/modules/auth/config/userguide.php

@@ -0,0 +1,23 @@
+<?php defined('SYSPATH') OR die('No direct script access.');
+
+return array(
+	// Leave this alone
+	'modules' => array(
+
+		// This should be the path to this modules userguide pages, without the 'guide/'. Ex: '/guide/modulename/' would be 'modulename'
+		'auth' => array(
+
+			// Whether this modules userguide pages should be shown
+			'enabled' => TRUE,
+
+			// The name that should show up on the userguide index page
+			'name' => 'Auth',
+
+			// A short description of this module, shown on the index page
+			'description' => 'User authentication and authorization.',
+
+			// Copyright message, shown in the footer for this module
+			'copyright' => '&copy; 2008–2012 Kohana Team',
+		)
+	)
+);

includes/kohana/modules/auth/guide/auth/config.md

@@ -0,0 +1,13 @@
+# Configuration
+
+The default configuration file is located in `MODPATH/auth/config/auth.php`. You should copy this file to `APPPATH/config/auth.php` and make changes there, in keeping with the [cascading filesystem](../kohana/files).
+
+[Config merging](../kohana/config#config-merging) allows these default configuration settings to apply if you don't overwrite them in your application configuration file.
+
+Name | Type | Default | Description
+-----|------|---------|------------
+driver | `string` | file | The name of the auth driver to use.
+hash_method | `string` | sha256 | The hashing function to use on the passwords.
+hash_key | `string` | NULL | The key to use when hashing the password.
+session_type | `string` | [Session::$default] | The type of session to use when storing the auth user.
+session_key | `string` | auth_user | The name of the session variable used to save the user.

includes/kohana/modules/auth/guide/auth/driver/develop.md

@@ -0,0 +1,79 @@
+# Developing Drivers
+
+## Real World Example
+
+Sometimes the best way to learn is to jump right in and read the code from another module. The [ORM](https://github.com/kohana/orm/blob/3.2/develop/classes/kohana/auth/orm.php) module comes with an auth driver you can learn from.
+
+[!!] We will be developing an `example` driver. In your own driver you will substitute `example` with your driver name.
+
+This example file would be saved at `APPPATH/classes/auth/example.php` (or `MODPATH` if you are creating a module).
+
+---
+
+## Quick Example
+
+First we will show you a quick example and then break down what is going on.
+
+~~~
+class Auth_Example extends Auth
+{
+	protected function _login($username, $password, $remember)
+	{
+		// Do username/password check here
+	}
+
+	public function password($username)
+	{
+		// Return the password for the username
+	}
+
+	public function check_password($password)
+	{
+		// Check to see if the logged in user has the given password
+	}
+
+	public function logged_in($role = NULL)
+	{
+		// Check to see if the user is logged in, and if $role is set, has all roles
+	}
+
+	public function get_user($default = NULL)
+	{
+		// Get the logged in user, or return the $default if a user is not found
+	}
+}
+~~~
+
+## Extending Auth
+
+All drivers must extend the [Auth] class.
+
+	class Auth_Example extends Auth
+
+## Abstract Methods
+
+The `Auth` class has 3 abstract methods that must be defined in your new driver.
+
+~~~
+abstract protected function _login($username, $password, $remember);
+
+abstract public function password($username);
+
+abstract public function check_password($user);
+~~~
+
+## Extending Functionality
+
+Given that every auth system is going to check if users exist and if they have roles or not you will more than likely have to change some default functionality.
+
+Here are a few functions that you should pay attention to.
+
+~~~
+public function logged_in($role = NULL)
+
+public function get_user($default = NULL)
+~~~
+
+## Activating the Driver
+
+After you create your driver you will want to use it. It is a easy as setting the `driver` [configuration](config) option to the name of your driver (in our case `example`).

includes/kohana/modules/auth/guide/auth/driver/file.md

@@ -0,0 +1,19 @@
+# File Driver
+
+The [Auth::File] driver is included with the auth module.
+
+Below are additional configuration options that can be set for this driver.
+
+Name | Type | Default | Description
+-----|------|---------|-------------
+users | `array` | array() | A user => password (_hashed_) array of all the users in your application
+
+## Forcing Login
+
+[Auth_File::force_login] allows you to force a user login without a password.
+
+~~~
+// Force the user with a username of admin to be logged into your application
+Auth::instance()->force_login('admin');
+$user = Auth::instance()->get_user();
+~~~

includes/kohana/modules/auth/guide/auth/index.md

@@ -0,0 +1,19 @@
+# Auth
+
+User authentication and authorization is provided by the auth module.
+
+The auth module is included with Kohana, but needs to be enabled before you can use it. To enable, open your `application/bootstrap.php` file and modify the call to [Kohana::modules] by including the auth module like so:
+
+~~~
+Kohana::modules(array(
+	...
+	'auth' => MODPATH.'auth',
+	...
+));
+~~~
+
+Next, you will then need to [configure](config) the auth module.
+
+The auth module provides the [Auth::File] driver for you. There is also an auth driver included with the ORM module.
+
+As your application needs change you may need to find another driver or [develop](driver/develop) your own.

includes/kohana/modules/auth/guide/auth/login.md

@@ -0,0 +1,62 @@
+# Log in and out
+
+The auth module provides methods to help you log users in and out of your application.
+
+## Log in
+
+The [Auth::login] method handles the login.
+
+~~~
+// Handled from a form with inputs with names email / password
+$post = $this->request->post();
+$success = Auth::instance()->login($post['email'], $post['password']);
+
+if ($success)
+{
+	// Login successful, send to app
+}
+else
+{
+	// Login failed, send back to form with error message
+}
+~~~
+
+## Logged in User
+
+There are two ways to check if a user is logged in. If you just need to check if the user is logged in use [Auth::logged_in].
+
+~~~
+if (Auth::instance()->logged_in())
+{
+	// User is logged in, continue on
+}
+else
+{
+	// User isn't logged in, redirect to the login form.
+}
+~~~
+
+You can also get the logged in user object by using [Auth::get_user]. If the user is null, then no user was found.
+
+~~~
+$user = Auth::instance()->get_user();
+
+// Check for a user (NULL if not user is found)
+if ($user !== null)
+{
+	 // User is found, continue on
+}
+else
+{
+	// User was not found, redirect to the login form
+}
+~~~
+
+## Log out
+
+The [Auth::logout] method will take care of logging out a user.
+
+~~~
+Auth::instance()->logout();
+// Redirect the user back to login page
+~~~

includes/kohana/modules/auth/guide/auth/menu.md

@@ -1,7 +1,6 @@
 ## [Auth]()
-- [Config](config)
+- [Configuration](config)
-- [User Model](user)
-- [Register Users](register)
 - [Log in and out](login)
-- [Edit User](edit)
+- Drivers
-- [Using Roles](roles)
+  - [File](driver/file)
+  - [Developing](driver/develop)

includes/kohana/modules/cache/README.md

@@ -9,13 +9,11 @@ Supported cache solutions
 Currently this module supports the following cache methods.
 
 1. APC
-2. eAccelerator
+2. Memcache
-3. Memcache
+3. Memcached-tags (Supports tags)
-4. Memcached-tags (Supports tags)
+4. SQLite (Supports tags)
-5. SQLite (Supports tags)
+5. File
-6. File
+6. Wincache
-7. Xcache
-8. Wincache
 
 Planned support
 ---------------

includes/kohana/modules/cache/classes/Cache/Arithmetic.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 
-class Cache_Eaccelerator extends Kohana_Cache_Eaccelerator {}
+interface Cache_Arithmetic extends Kohana_Cache_Arithmetic {}

includes/kohana/modules/cache/classes/Cache/Exception.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 
-abstract class Database extends Kohana_Database {}
+class Cache_Exception extends Kohana_Cache_Exception {}

includes/kohana/modules/cache/classes/Cache/GarbageCollect.php

@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+interface Cache_GarbageCollect extends Kohana_Cache_GarbageCollect {}

includes/kohana/modules/cache/classes/Cache/Tagging.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 
-class Cache_Xcache extends Kohana_Cache_Xcache {}
+interface Cache_Tagging extends Kohana_Cache_Tagging {}

includes/kohana/modules/cache/classes/HTTP/Cache.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 
-abstract class Image extends Kohana_Image {}
+class HTTP_Cache extends Kohana_HTTP_Cache {}

includes/kohana/modules/cache/classes/Kohana/Cache.php

@@ -71,7 +71,7 @@
  * @category   Base
  * @version    2.0
  * @author     Kohana Team
- * @copyright  (c) 2009-2010 Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
  * @license    http://kohanaphp.com/license
  */
 abstract class Kohana_Cache {
@@ -101,9 +101,9 @@ abstract class Kohana_Cache {
 	 *     // Access an instantiated group directly
 	 *     $foo_group = Cache::$instances['default'];
 	 *
-	 * @param   string   the name of the cache group to use [Optional]
+	 * @param   string  $group  the name of the cache group to use [Optional]
-	 * @return  Kohana_Cache
+	 * @return  Cache
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	public static function instance($group = NULL)
 	{
@@ -120,11 +120,14 @@ abstract class Kohana_Cache {
 			return Cache::$instances[$group];
 		}
 
-		$config = Kohana::config('cache');
+		$config = Kohana::$config->load('cache');
 
 		if ( ! $config->offsetExists($group))
 		{
-			throw new Kohana_Cache_Exception('Failed to load Kohana Cache group: :group', array(':group' => $group));
+			throw new Cache_Exception(
+				'Failed to load Kohana Cache group: :group',
+				array(':group' => $group)
+			);
 		}
 
 		$config = $config->get($group);
@@ -140,27 +143,68 @@ abstract class Kohana_Cache {
 	/**
 	 * @var  Config
 	 */
-	protected $_config;
+	protected $_config = array();
 
 	/**
 	 * Ensures singleton pattern is observed, loads the default expiry
 	 *
-	 * @param  array     configuration
+	 * @param  array  $config  configuration
 	 */
 	protected function __construct(array $config)
 	{
-		$this->_config = $config;
+		$this->config($config);
+	}
+
+	/**
+	 * Getter and setter for the configuration. If no argument provided, the
+	 * current configuration is returned. Otherwise the configuration is set
+	 * to this class.
+	 *
+	 *     // Overwrite all configuration
+	 *     $cache->config(array('driver' => 'memcache', '...'));
+	 *
+	 *     // Set a new configuration setting
+	 *     $cache->config('servers', array(
+	 *          'foo' => 'bar',
+	 *          '...'
+	 *          ));
+	 *
+	 *     // Get a configuration setting
+	 *     $servers = $cache->config('servers);
+	 *
+	 * @param   mixed    key to set to array, either array or config path
+	 * @param   mixed    value to associate with key
+	 * @return  mixed
+	 */
+	public function config($key = NULL, $value = NULL)
+	{
+		if ($key === NULL)
+			return $this->_config;
+
+		if (is_array($key))
+		{
+			$this->_config = $key;
+		}
+		else
+		{
+			if ($value === NULL)
+				return Arr::get($this->_config, $key);
+
+			$this->_config[$key] = $value;
+		}
+
+		return $this;
 	}
 
 	/**
 	 * Overload the __clone() method to prevent cloning
 	 *
 	 * @return  void
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
-	public function __clone()
+	final public function __clone()
 	{
-		throw new Kohana_Cache_Exception('Cloning of Kohana_Cache objects is forbidden');
+		throw new Cache_Exception('Cloning of Kohana_Cache objects is forbidden');
 	}
 
 	/**
@@ -175,10 +219,10 @@ abstract class Kohana_Cache {
 	 *     // Retrieve cache entry from memcache group
 	 *     $data = Cache::instance('memcache')->get('foo');
 	 *
-	 * @param   string   id of cache to entry
+	 * @param   string  $id       id of cache to entry
-	 * @param   string   default value to return if cache miss
+	 * @param   string  $default  default value to return if cache miss
 	 * @return  mixed
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	abstract public function get($id, $default = NULL);
 
@@ -200,9 +244,9 @@ abstract class Kohana_Cache {
 	 *          return
 	 *     }
 	 *
-	 * @param   string   id of cache entry
+	 * @param   string   $id        id of cache entry
-	 * @param   string   data to set to cache
+	 * @param   string   $data      data to set to cache
-	 * @param   integer  lifetime in seconds
+	 * @param   integer  $lifetime  lifetime in seconds
 	 * @return  boolean
 	 */
 	abstract public function set($id, $data, $lifetime = 3600);
@@ -216,7 +260,7 @@ abstract class Kohana_Cache {
 	 *     // Delete 'foo' entry from the memcache group
 	 *     Cache::instance('memcache')->delete('foo')
 	 *
-	 * @param   string   id to remove from cache
+	 * @param   string  $id  id to remove from cache
 	 * @return  boolean
 	 */
 	abstract public function delete($id);
@@ -244,7 +288,7 @@ abstract class Kohana_Cache {
 	 *     // Sanitize a cache id
 	 *     $id = $this->_sanitize_id($id);
 	 *
-	 * @param   string   id of cache to sanitize
+	 * @param   string  $id  id of cache to sanitize
 	 * @return  string
 	 */
 	protected function _sanitize_id($id)

includes/kohana/modules/cache/classes/Kohana/Cache/Apc.php

@@ -33,23 +33,23 @@
  * @package    Kohana/Cache
  * @category   Base
  * @author     Kohana Team
- * @copyright  (c) 2009-2010 Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
  * @license    http://kohanaphp.com/license
  */
-class Kohana_Cache_Apc extends Cache {
+class Kohana_Cache_Apc extends Cache implements Cache_Arithmetic {
 
 	/**
 	 * Check for existence of the APC extension This method cannot be invoked externally. The driver must
 	 * be instantiated using the `Cache::instance()` method.
 	 *
-	 * @param  array     configuration
+	 * @param  array  $config  configuration
-	 * @throws Kohana_Cache_Exception
+	 * @throws Cache_Exception
 	 */
 	protected function __construct(array $config)
 	{
 		if ( ! extension_loaded('apc'))
 		{
-			throw new Kohana_Cache_Exception('PHP APC extension is not available.');
+			throw new Cache_Exception('PHP APC extension is not available.');
 		}
 
 		parent::__construct($config);
@@ -64,10 +64,10 @@ class Kohana_Cache_Apc extends Cache {
 	 *     // Retrieve cache entry from apc group and return 'bar' if miss
 	 *     $data = Cache::instance('apc')->get('foo', 'bar');
 	 *
-	 * @param   string   id of cache to entry
+	 * @param   string  $id       id of cache to entry
-	 * @param   string   default value to return if cache miss
+	 * @param   string  $default  default value to return if cache miss
 	 * @return  mixed
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	public function get($id, $default = NULL)
 	{
@@ -87,9 +87,9 @@ class Kohana_Cache_Apc extends Cache {
 	 *     // Set 'bar' to 'foo' in apc group for 30 seconds
 	 *     Cache::instance('apc')->set('foo', $data, 30);
 	 *
-	 * @param   string   id of cache entry
+	 * @param   string   $id        id of cache entry
-	 * @param   string   data to set to cache
+	 * @param   string   $data      data to set to cache
-	 * @param   integer  lifetime in seconds
+	 * @param   integer  $lifetime  lifetime in seconds
 	 * @return  boolean
 	 */
 	public function set($id, $data, $lifetime = NULL)
@@ -108,7 +108,7 @@ class Kohana_Cache_Apc extends Cache {
 	 *     // Delete 'foo' entry from the apc group
 	 *     Cache::instance('apc')->delete('foo');
 	 *
-	 * @param   string   id to remove from cache
+	 * @param   string  $id  id to remove from cache
 	 * @return  boolean
 	 */
 	public function delete($id)
@@ -132,4 +132,35 @@ class Kohana_Cache_Apc extends Cache {
 	{
 		return apc_clear_cache('user');
 	}
-}
+
+	/**
+	 * Increments a given value by the step value supplied.
+	 * Useful for shared counters and other persistent integer based
+	 * tracking.
+	 *
+	 * @param   string    id of cache entry to increment
+	 * @param   int       step value to increment by
+	 * @return  integer
+	 * @return  boolean
+	 */
+	public function increment($id, $step = 1)
+	{
+		return apc_inc($id, $step);
+	}
+
+	/**
+	 * Decrements a given value by the step value supplied.
+	 * Useful for shared counters and other persistent integer based
+	 * tracking.
+	 *
+	 * @param   string    id of cache entry to decrement
+	 * @param   int       step value to decrement by
+	 * @return  integer
+	 * @return  boolean
+	 */
+	public function decrement($id, $step = 1)
+	{
+		return apc_dec($id, $step);
+	}
+
+} // End Kohana_Cache_Apc

includes/kohana/modules/cache/classes/Kohana/Cache/Arithmetic.php

@@ -0,0 +1,39 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Kohana Cache Arithmetic Interface, for basic cache integer based
+ * arithmetic, addition and subtraction
+ * 
+ * @package    Kohana/Cache
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
+ * @license    http://kohanaphp.com/license
+ * @since      3.2.0
+ */
+interface Kohana_Cache_Arithmetic {
+
+	/**
+	 * Increments a given value by the step value supplied.
+	 * Useful for shared counters and other persistent integer based
+	 * tracking.
+	 *
+	 * @param   string    id of cache entry to increment
+	 * @param   int       step value to increment by
+	 * @return  integer
+	 * @return  boolean
+	 */
+	public function increment($id, $step = 1);
+
+	/**
+	 * Decrements a given value by the step value supplied.
+	 * Useful for shared counters and other persistent integer based
+	 * tracking.
+	 *
+	 * @param   string    id of cache entry to decrement
+	 * @param   int       step value to decrement by
+	 * @return  integer
+	 * @return  boolean
+	 */
+	public function decrement($id, $step = 1);
+
+} // End Kohana_Cache_Arithmetic

includes/kohana/modules/cache/classes/Kohana/Cache/Exception.php

@@ -5,7 +5,7 @@
  * @package    Kohana/Cache
  * @category   Base
  * @author     Kohana Team
- * @copyright  (c) 2009-2010 Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
  * @license    http://kohanaphp.com/license
  */
 class Kohana_Cache_Exception extends Kohana_Exception {}

includes/kohana/modules/cache/classes/Kohana/Cache/File.php

@@ -35,10 +35,10 @@
  * @package    Kohana/Cache
  * @category   Base
  * @author     Kohana Team
- * @copyright  (c) 2009-2010 Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
  * @license    http://kohanaphp.com/license
  */
-class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
+class Kohana_Cache_File extends Cache implements Cache_GarbageCollect {
 
 	/**
 	 * Creates a hashed filename based on the string. This is used
@@ -47,12 +47,12 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 	 *     // Create the cache filename
 	 *     $filename = Cache_File::filename($this->_sanitize_id($id));
 	 *
-	 * @param   string   string to hash into filename
+	 * @param   string  $string  string to hash into filename
 	 * @return  string
 	 */
 	protected static function filename($string)
 	{
-		return sha1($string).'.json';
+		return sha1($string).'.cache';
 	}
 
 	/**
@@ -64,8 +64,8 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 	 * Constructs the file cache driver. This method cannot be invoked externally. The file cache driver must
 	 * be instantiated using the `Cache::instance()` method.
 	 *
-	 * @param   array    config 
+	 * @param   array  $config  config
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	protected function __construct(array $config)
 	{
@@ -91,19 +91,19 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 		// If the defined directory is a file, get outta here
 		if ($this->_cache_dir->isFile())
 		{
-			throw new Kohana_Cache_Exception('Unable to create cache directory as a file already exists : :resource', array(':resource' => $this->_cache_dir->getRealPath()));
+			throw new Cache_Exception('Unable to create cache directory as a file already exists : :resource', array(':resource' => $this->_cache_dir->getRealPath()));
 		}
 
 		// Check the read status of the directory
 		if ( ! $this->_cache_dir->isReadable())
 		{
-			throw new Kohana_Cache_Exception('Unable to read from the cache directory :resource', array(':resource' => $this->_cache_dir->getRealPath()));
+			throw new Cache_Exception('Unable to read from the cache directory :resource', array(':resource' => $this->_cache_dir->getRealPath()));
 		}
 
 		// Check the write status of the directory
 		if ( ! $this->_cache_dir->isWritable())
 		{
-			throw new Kohana_Cache_Exception('Unable to write to the cache directory :resource', array(':resource' => $this->_cache_dir->getRealPath()));
+			throw new Cache_Exception('Unable to write to the cache directory :resource', array(':resource' => $this->_cache_dir->getRealPath()));
 		}
 	}
 
@@ -116,10 +116,10 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 	 *     // Retrieve cache entry from file group and return 'bar' if miss
 	 *     $data = Cache::instance('file')->get('foo', 'bar');
 	 *
-	 * @param   string   id of cache to entry
+	 * @param   string   $id       id of cache to entry
-	 * @param   string   default value to return if cache miss
+	 * @param   string   $default  default value to return if cache miss
 	 * @return  mixed
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	public function get($id, $default = NULL)
 	{
@@ -140,24 +140,34 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 			}
 			else
 			{
-				// Open the file and extract the json
+				// Open the file and parse data
-				$json = $file->openFile()->current();
+				$created  = $file->getMTime();
+				$data     = $file->openFile();
+				$lifetime = $data->fgets();
 
-				// Decode the json into PHP object
+				// If we're at the EOF at this point, corrupted!
-				$data = json_decode($json);
+				if ($data->eof())
+				{
+					throw new Cache_Exception(__METHOD__.' corrupted cache file!');
+				}
+
+				$cache = '';
+
+				while ($data->eof() === FALSE)
+				{
+					$cache .= $data->fgets();
+				}
 
 				// Test the expiry
-				if ($data->expiry < time())
+				if (($created + (int) $lifetime) < time())
 				{
 					// Delete the file
 					$this->_delete_file($file, NULL, TRUE);
-
-					// Return default value
 					return $default;
 				}
 				else
 				{
-					return ($data->type === 'string') ? $data->payload : unserialize($data->payload);
+					return unserialize($cache);
 				}
 			}
 
@@ -167,7 +177,7 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 			// Handle ErrorException caused by failed unserialization
 			if ($e->getCode() === E_NOTICE)
 			{
-				throw new Kohana_Cache_Exception(__METHOD__.' failed to unserialize cached object with message : '.$e->getMessage());
+				throw new Cache_Exception(__METHOD__.' failed to unserialize cached object with message : '.$e->getMessage());
 			}
 
 			// Otherwise throw the exception
@@ -186,9 +196,9 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 	 *     // Set 'bar' to 'foo' in file group for 30 seconds
 	 *     Cache::instance('file')->set('foo', $data, 30);
 	 *
-	 * @param   string   id of cache entry
+	 * @param   string   $id        id of cache entry
-	 * @param   string   data to set to cache
+	 * @param   string   $data      data to set to cache
-	 * @param   integer  lifetime in seconds
+	 * @param   integer  $lifetime  lifetime in seconds
 	 * @return  boolean
 	 */
 	public function set($id, $data, $lifetime = NULL)
@@ -212,7 +222,7 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 			// Create the directory
 			if ( ! mkdir($directory, 0777, TRUE))
 			{
-				throw new Kohana_Cache_Exception(__METHOD__.' unable to create directory : :directory', array(':directory' => $directory));
+				throw new Cache_Exception(__METHOD__.' unable to create directory : :directory', array(':directory' => $directory));
 			}
 
 			// chmod to solve potential umask issues
@@ -225,16 +235,9 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 
 		try
 		{
-			$type = gettype($data);
+			$data = $lifetime."\n".serialize($data);
-
+			$file->fwrite($data, strlen($data));
-			// Serialize the data
+			return (bool) $file->fflush();
-			$data = json_encode( (object) array(
-				'payload'  => ($type === 'string') ? $data : serialize($data),
-				'expiry'   => time() + $lifetime,
-				'type'     => $type
-			));
-
-			$size = strlen($data);
 		}
 		catch (ErrorException $e)
 		{
@@ -242,22 +245,12 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 			if ($e->getCode() === E_NOTICE)
 			{
 				// Throw a caching error
-				throw new Kohana_Cache_Exception(__METHOD__.' failed to serialize data for caching with message : '.$e->getMessage());
+				throw new Cache_Exception(__METHOD__.' failed to serialize data for caching with message : '.$e->getMessage());
 			}
 
 			// Else rethrow the error exception
 			throw $e;
 		}
-
-		try
-		{
-			$file->fwrite($data, $size);
-			return (bool) $file->fflush();
-		}
-		catch (Exception $e)
-		{
-			throw $e;
-		}
 	}
 
 	/**
@@ -266,7 +259,7 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 	 *     // Delete 'foo' entry from the file group
 	 *     Cache::instance('file')->delete('foo');
 	 *
-	 * @param   string   id to remove from cache
+	 * @param   string   $id  id to remove from cache
 	 * @return  boolean
 	 */
 	public function delete($id)
@@ -312,12 +305,12 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 	 *     // Delete a file or folder whilst retaining parent directory and ignore all errors
 	 *     $this->_delete_file($folder, TRUE, TRUE);
 	 *
-	 * @param   SplFileInfo  file
+	 * @param   SplFileInfo  $file                     file
-	 * @param   boolean  retain the parent directory
+	 * @param   boolean      $retain_parent_directory  retain the parent directory
-	 * @param   boolean  ignore_errors to prevent all exceptions interrupting exec
+	 * @param   boolean      $ignore_errors            ignore_errors to prevent all exceptions interrupting exec
-	 * @param   boolean  only expired files
+	 * @param   boolean      $only_expired             only expired files
 	 * @return  boolean
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	protected function _delete_file(SplFileInfo $file, $retain_parent_directory = FALSE, $ignore_errors = FALSE, $only_expired = FALSE)
 	{
@@ -329,8 +322,13 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 			{
 				try
 				{
+					// Handle ignore files
+					if (in_array($file->getFilename(), $this->config('ignore_on_delete')))
+					{
+						$delete = FALSE;
+					}
 					// If only expired is not set
-					if ($only_expired === FALSE)
+					elseif ($only_expired === FALSE)
 					{
 						// We want to delete the file
 						$delete = TRUE;
@@ -344,19 +342,18 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 						$delete = $data->expiry < time();
 					}
 
-					// If the delete flag is set
+					// If the delete flag is set delete file
 					if ($delete === TRUE)
-					{
+						return unlink($file->getRealPath());
-						// Try to delete
+					else
-						unlink($file->getRealPath());
+						return FALSE;
-					}
 				}
 				catch (ErrorException $e)
 				{
 					// Catch any delete file warnings
 					if ($e->getCode() === E_WARNING)
 					{
-						throw new Kohana_Cache_Exception(__METHOD__.' failed to delete file : :file', array(':file' => $file->getRealPath()));
+						throw new Cache_Exception(__METHOD__.' failed to delete file : :file', array(':file' => $file->getRealPath()));
 					}
 				}
 			}
@@ -373,7 +370,7 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 					$name = $files->getFilename();
 
 					// If the name is not a dot
-					if ($name != '.' AND $name != '..' AND substr($file->getFilename(), 0, 1) == '.')
+					if ($name != '.' AND $name != '..')
 					{
 						// Create new file resource
 						$fp = new SplFileInfo($files->getRealPath());
@@ -405,9 +402,15 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 					// Catch any delete directory warnings
 					if ($e->getCode() === E_WARNING)
 					{
-						throw new Kohana_Cache_Exception(__METHOD__.' failed to delete directory : :directory', array(':directory' => $file->getRealPath()));
+						throw new Cache_Exception(__METHOD__.' failed to delete directory : :directory', array(':directory' => $file->getRealPath()));
+					}
+					throw $e;
 				}
 			}
+			else
+			{
+				// We get here if a file has already been deleted
+				return FALSE;
 			}
 		}
 		// Catch all exceptions
@@ -430,7 +433,7 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 	 *      // Get the realpath of the cache folder
 	 *      $realpath = $this->_resolve_directory($filename);
 	 *
-	 * @param   string   filename to resolve
+	 * @param   string  $filename  filename to resolve
 	 * @return  string
 	 */
 	protected function _resolve_directory($filename)
@@ -442,22 +445,22 @@ class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
 	 * Makes the cache directory if it doesn't exist. Simply a wrapper for
 	 * `mkdir` to ensure DRY principles
 	 *
-	 * @see     http://php.net/manual/en/function.mkdir.php
+	 * @link    http://php.net/manual/en/function.mkdir.php
-	 * @param   string   directory 
+	 * @param   string    $directory
-	 * @param   string   mode 
+	 * @param   integer   $mode
-	 * @param   string   recursive 
+	 * @param   boolean   $recursive
-	 * @param   string   context 
+	 * @param   resource  $context
 	 * @return  SplFileInfo
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	protected function _make_directory($directory, $mode = 0777, $recursive = FALSE, $context = NULL)
 	{
 		if ( ! mkdir($directory, $mode, $recursive, $context))
 		{
-			throw new Kohana_Cache_Exception('Failed to create the defined cache directory : :directory', array(':directory' => $directory));
+			throw new Cache_Exception('Failed to create the defined cache directory : :directory', array(':directory' => $directory));
 		}
 		chmod($directory, $mode);
 
-		return new SplFileInfo($directory);;
+		return new SplFileInfo($directory);
 	}
 }

includes/kohana/modules/cache/classes/Kohana/Cache/GarbageCollect.php

@@ -8,7 +8,7 @@
  * @category   Base
  * @version    2.0
  * @author     Kohana Team
- * @copyright  (c) 2009-2010 Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
  * @license    http://kohanaphp.com/license
  * @since      3.0.8
  */

includes/kohana/modules/cache/classes/Kohana/Cache/Memcache.php

@@ -77,10 +77,10 @@
  * @category   Base
  * @version    2.0
  * @author     Kohana Team
- * @copyright  (c) 2009-2010 Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
  * @license    http://kohanaphp.com/license
  */
-class Kohana_Cache_Memcache extends Cache {
+class Kohana_Cache_Memcache extends Cache implements Cache_Arithmetic {
 
 	// Memcache has a maximum cache lifetime of 30 days
 	const CACHE_CEILING = 2592000;
@@ -109,15 +109,15 @@ class Kohana_Cache_Memcache extends Cache {
 	/**
 	 * Constructs the memcache Kohana_Cache object
 	 *
-	 * @param   array     configuration
+	 * @param   array  $config  configuration
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	protected function __construct(array $config)
 	{
 		// Check for the memcache extention
 		if ( ! extension_loaded('memcache'))
 		{
-			throw new Kohana_Cache_Exception('Memcache PHP extention not loaded');
+			throw new Cache_Exception('Memcache PHP extention not loaded');
 		}
 
 		parent::__construct($config);
@@ -131,7 +131,7 @@ class Kohana_Cache_Memcache extends Cache {
 		if ( ! $servers)
 		{
 			// Throw an exception if no server found
-			throw new Kohana_Cache_Exception('No Memcache servers defined in configuration');
+			throw new Cache_Exception('No Memcache servers defined in configuration');
 		}
 
 		// Setup default server configuration
@@ -155,7 +155,7 @@ class Kohana_Cache_Memcache extends Cache {
 
 			if ( ! $this->_memcache->addServer($server['host'], $server['port'], $server['persistent'], $server['weight'], $server['timeout'], $server['retry_interval'], $server['status'], $server['failure_callback']))
 			{
-				throw new Kohana_Cache_Exception('Memcache could not connect to host \':host\' using port \':port\'', array(':host' => $server['host'], ':port' => $server['port']));
+				throw new Cache_Exception('Memcache could not connect to host \':host\' using port \':port\'', array(':host' => $server['host'], ':port' => $server['port']));
 			}
 		}
 
@@ -172,10 +172,10 @@ class Kohana_Cache_Memcache extends Cache {
 	 *     // Retrieve cache entry from memcache group and return 'bar' if miss
 	 *     $data = Cache::instance('memcache')->get('foo', 'bar');
 	 *
-	 * @param   string   id of cache to entry
+	 * @param   string  $id       id of cache to entry
-	 * @param   string   default value to return if cache miss
+	 * @param   string  $default  default value to return if cache miss
 	 * @return  mixed
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	public function get($id, $default = NULL)
 	{
@@ -204,9 +204,9 @@ class Kohana_Cache_Memcache extends Cache {
 	 *          return
 	 *     }
 	 *
-	 * @param   string   id of cache entry
+	 * @param   string   $id        id of cache entry
-	 * @param   mixed    data to set to cache
+	 * @param   mixed    $data      data to set to cache
-	 * @param   integer  lifetime in seconds, maximum value 2592000
+	 * @param   integer  $lifetime  lifetime in seconds, maximum value 2592000
 	 * @return  boolean
 	 */
 	public function set($id, $data, $lifetime = 3600)
@@ -242,8 +242,8 @@ class Kohana_Cache_Memcache extends Cache {
 	 *     // Delete the 'bar' cache entry after 30 seconds
 	 *     Cache::instance('memcache')->delete('bar', 30);
 	 *
-	 * @param   string   id of entry to delete
+	 * @param   string   $id       id of entry to delete
-	 * @param   integer  timeout of entry, if zero item is deleted immediately, otherwise the item will delete after the specified value in seconds
+	 * @param   integer  $timeout  timeout of entry, if zero item is deleted immediately, otherwise the item will delete after the specified value in seconds
 	 * @return  boolean
 	 */
 	public function delete($id, $timeout = 0)
@@ -280,8 +280,8 @@ class Kohana_Cache_Memcache extends Cache {
 	 * on a particular server fails. This method switches off that instance of the
 	 * server if the configuration setting `instant_death` is set to `TRUE`.
 	 *
-	 * @param   string   hostname 
+	 * @param   string   $hostname
-	 * @param   integer  port 
+	 * @param   integer  $port
 	 * @return  void|boolean
 	 * @since   3.0.8
 	 */
@@ -321,4 +321,34 @@ class Kohana_Cache_Memcache extends Cache {
 				));
 		}
 	}
+
+	/**
+	 * Increments a given value by the step value supplied.
+	 * Useful for shared counters and other persistent integer based
+	 * tracking.
+	 *
+	 * @param   string    id of cache entry to increment
+	 * @param   int       step value to increment by
+	 * @return  integer
+	 * @return  boolean
+	 */
+	public function increment($id, $step = 1)
+	{
+		return $this->_memcache->increment($id, $step);
+	}
+
+	/**
+	 * Decrements a given value by the step value supplied.
+	 * Useful for shared counters and other persistent integer based
+	 * tracking.
+	 *
+	 * @param   string    id of cache entry to decrement
+	 * @param   int       step value to decrement by
+	 * @return  integer
+	 * @return  boolean
+	 */
+	public function decrement($id, $step = 1)
+	{
+		return $this->_memcache->decrement($id, $step);
+	}
 }

includes/kohana/modules/cache/classes/Kohana/Cache/MemcacheTag.php

@@ -6,16 +6,16 @@
 * @category   Base
 * @version    2.0
 * @author     Kohana Team
-* @copyright  (c) 2009-2010 Kohana Team
+* @copyright  (c) 2009-2012 Kohana Team
 * @license    http://kohanaphp.com/license
  */
-class Kohana_Cache_MemcacheTag extends Cache_Memcache implements Kohana_Cache_Tagging {
+class Kohana_Cache_MemcacheTag extends Cache_Memcache implements Cache_Tagging {
 
 	/**
 	 * Constructs the memcache object
 	 *
-	 * @param  array     configuration
+	 * @param  array  $config  configuration
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	protected function __construct(array $config)
 	{
@@ -23,21 +23,23 @@ class Kohana_Cache_MemcacheTag extends Cache_Memcache implements Kohana_Cache_Ta
 
 		if ( ! method_exists($this->_memcache, 'tag_add'))
 		{
-			throw new Kohana_Cache_Exception('Memcached-tags PHP plugin not present. Please see http://code.google.com/p/memcached-tags/ for more information');
+			throw new Cache_Exception('Memcached-tags PHP plugin not present. Please see http://code.google.com/p/memcached-tags/ for more information');
 		}
 	}
 
 	/**
 	 * Set a value based on an id with tags
 	 *
-	 * @param   string   id 
+	 * @param   string   $id        id
-	 * @param   mixed    data 
+	 * @param   mixed    $data      data
-	 * @param   integer  lifetime [Optional]
+	 * @param   integer  $lifetime  lifetime [Optional]
-	 * @param   array    tags [Optional]
+	 * @param   array    $tags      tags [Optional]
 	 * @return  boolean
 	 */
 	public function set_with_tags($id, $data, $lifetime = NULL, array $tags = NULL)
 	{
+		$id = $this->_sanitize_id($id);
+
 		$result = $this->set($id, $data, $lifetime);
 
 		if ($result and $tags)
@@ -54,7 +56,7 @@ class Kohana_Cache_MemcacheTag extends Cache_Memcache implements Kohana_Cache_Ta
 	/**
 	 * Delete cache entries based on a tag
 	 *
-	 * @param   string   tag 
+	 * @param   string  $tag  tag
 	 * @return  boolean
 	 */
 	public function delete_tag($tag)
@@ -65,12 +67,12 @@ class Kohana_Cache_MemcacheTag extends Cache_Memcache implements Kohana_Cache_Ta
 	/**
 	 * Find cache entries based on a tag
 	 *
-	 * @param   string   tag 
+	 * @param   string  $tag  tag
 	 * @return  void
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	public function find($tag)
 	{
-		throw new Kohana_Cache_Exception('Memcached-tags does not support finding by tag');
+		throw new Cache_Exception('Memcached-tags does not support finding by tag');
 	}
 }

includes/kohana/modules/cache/classes/Kohana/Cache/Sqlite.php

@@ -7,10 +7,10 @@
  * @package    Kohana/Cache
  * @category   Base
  * @author     Kohana Team
- * @copyright  (c) 2009-2010 Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
  * @license    http://kohanaphp.com/license
  */
-class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_Cache_GarbageCollect {
+class Kohana_Cache_Sqlite extends Cache implements Cache_Tagging, Cache_GarbageCollect {
 
 	/**
 	 * Database resource
@@ -23,8 +23,8 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 	 * Sets up the PDO SQLite table and
 	 * initialises the PDO connection
 	 *
-	 * @param  array     configuration
+	 * @param  array  $config  configuration
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	protected function __construct(array $config)
 	{
@@ -34,7 +34,7 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 
 		if ($database === NULL)
 		{
-			throw new Kohana_Cache_Exception('Database path not available in Kohana Cache configuration');
+			throw new Cache_Exception('Database path not available in Kohana Cache configuration');
 		}
 
 		// Load new Sqlite DB
@@ -50,7 +50,7 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 
 			if ($database_schema === NULL)
 			{
-				throw new Kohana_Cache_Exception('Database schema not found in Kohana Cache configuration');
+				throw new Cache_Exception('Database schema not found in Kohana Cache configuration');
 			}
 
 			try
@@ -60,7 +60,7 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 			}
 			catch (PDOException $e)
 			{
-				throw new Kohana_Cache_Exception('Failed to create new SQLite caches table with the following error : :error', array(':error' => $e->getMessage()));
+				throw new Cache_Exception('Failed to create new SQLite caches table with the following error : :error', array(':error' => $e->getMessage()));
 			}
 		}
 	}
@@ -68,10 +68,10 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 	/**
 	 * Retrieve a value based on an id
 	 *
-	 * @param   string   id 
+	 * @param   string  $id       id
-	 * @param   string   default [Optional] Default value to return if id not found
+	 * @param   string  $default  default [Optional] Default value to return if id not found
 	 * @return  mixed
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	public function get($id, $default = NULL)
 	{
@@ -85,7 +85,7 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 		}
 		catch (PDOException $e)
 		{
-			throw new Kohana_Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
+			throw new Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
 		}
 
 		if ( ! $result = $statement->fetch(PDO::FETCH_OBJ))
@@ -120,9 +120,9 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 	/**
 	 * Set a value based on an id. Optionally add tags.
 	 *
-	 * @param   string   id 
+	 * @param   string   $id        id
-	 * @param   mixed    data 
+	 * @param   mixed    $data      data
-	 * @param   integer  lifetime [Optional]
+	 * @param   integer  $lifetime  lifetime [Optional]
 	 * @return  boolean
 	 */
 	public function set($id, $data, $lifetime = NULL)
@@ -133,10 +133,9 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 	/**
 	 * Delete a cache entry based on id
 	 *
-	 * @param   string   id 
+	 * @param   string  $id  id
-	 * @param   integer  timeout [Optional]
 	 * @return  boolean
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	public function delete($id)
 	{
@@ -150,7 +149,7 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 		}
 		catch (PDOException $e)
 		{
-			throw new Kohana_Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
+			throw new Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
 		}
 
 		return (bool) $statement->rowCount();
@@ -182,12 +181,12 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 	/**
 	 * Set a value based on an id. Optionally add tags.
 	 *
-	 * @param   string   id 
+	 * @param   string   $id        id
-	 * @param   mixed    data 
+	 * @param   mixed    $data      data
-	 * @param   integer  lifetime [Optional]
+	 * @param   integer  $lifetime  lifetime [Optional]
-	 * @param   array    tags [Optional]
+	 * @param   array    $tags      tags [Optional]
 	 * @return  boolean
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	public function set_with_tags($id, $data, $lifetime = NULL, array $tags = NULL)
 	{
@@ -200,7 +199,7 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 		// Setup lifetime
 		if ($lifetime === NULL)
 		{
-			$lifetime = (0 === Arr::get('default_expire', NULL)) ? 0 : (Arr::get($this->_config, 'default_expire', Cache::DEFAULT_EXPIRE) + time());
+			$lifetime = (0 === Arr::get($this->_config, 'default_expire', NULL)) ? 0 : (Arr::get($this->_config, 'default_expire', Cache::DEFAULT_EXPIRE) + time());
 		}
 		else
 		{
@@ -208,7 +207,7 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 		}
 
 		// Prepare statement
-		// $this->exists() may throw Kohana_Cache_Exception, no need to catch/rethrow
+		// $this->exists() may throw Cache_Exception, no need to catch/rethrow
 		$statement = $this->exists($id) ? $this->_db->prepare('UPDATE caches SET expiration = :expiration, cache = :cache, tags = :tags WHERE id = :id') : $this->_db->prepare('INSERT INTO caches (id, cache, expiration, tags) VALUES (:id, :cache, :expiration, :tags)');
 
 		// Try to insert
@@ -218,7 +217,7 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 		}
 		catch (PDOException $e)
 		{
-			throw new Kohana_Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
+			throw new Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
 		}
 
 		return (bool) $statement->rowCount();
@@ -227,10 +226,9 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 	/**
 	 * Delete cache entries based on a tag
 	 *
-	 * @param   string   tag 
+	 * @param   string  $tag  tag
-	 * @param   integer  timeout [Optional]
 	 * @return  boolean
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	public function delete_tag($tag)
 	{
@@ -253,9 +251,9 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 	/**
 	 * Find cache entries based on a tag
 	 *
-	 * @param   string   tag 
+	 * @param   string  $tag  tag
 	 * @return  array
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	public function find($tag)
 	{
@@ -272,7 +270,7 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 		}
 		catch (PDOException $e)
 		{
-			throw new Kohana_Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
+			throw new Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
 		}
 
 		$result = array();
@@ -308,16 +306,16 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 		}
 		catch (PDOException $e)
 		{
-			throw new Kohana_Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
+			throw new Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
 		}
 	}
 
 	/**
 	 * Tests whether an id exists or not
 	 *
-	 * @param   string   id 
+	 * @param   string  $id  id
 	 * @return  boolean
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	protected function exists($id)
 	{
@@ -328,7 +326,7 @@ class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_
 		}
 		catch (PDOExeption $e)
 		{
-			throw new Kohana_Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
+			throw new Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
 		}
 
 		return (bool) $statement->fetchAll();

includes/kohana/modules/cache/classes/Kohana/Cache/Tagging.php

@@ -5,7 +5,7 @@
  * @package    Kohana/Cache
  * @category   Base
  * @author     Kohana Team
- * @copyright  (c) 2009-2010 Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
  * @license    http://kohanaphp.com/license
  */
 interface Kohana_Cache_Tagging {
@@ -16,10 +16,10 @@ interface Kohana_Cache_Tagging {
 	 * Note : Some caching engines do not support
 	 * tagging
 	 *
-	 * @param   string   id 
+	 * @param   string   $id        id
-	 * @param   mixed    data 
+	 * @param   mixed    $data      data
-	 * @param   integer  lifetime [Optional]
+	 * @param   integer  $lifetime  lifetime [Optional]
-	 * @param   array    tags [Optional]
+	 * @param   array    $tags      tags [Optional]
 	 * @return  boolean
 	 */
 	public function set_with_tags($id, $data, $lifetime = NULL, array $tags = NULL);
@@ -27,15 +27,14 @@ interface Kohana_Cache_Tagging {
 	/**
 	 * Delete cache entries based on a tag
 	 *
-	 * @param   string   tag 
+	 * @param   string  $tag  tag
-	 * @param   integer  timeout [Optional]
 	 */
 	public function delete_tag($tag);
 
 	/**
 	 * Find cache entries based on a tag
 	 *
-	 * @param   string   tag 
+	 * @param   string  $tag  tag
 	 * @return  array
 	 */
 	public function find($tag);

includes/kohana/modules/cache/classes/Kohana/Cache/Wincache.php

@@ -38,7 +38,7 @@
  * @package    Kohana/Cache
  * @category   Base
  * @author     Kohana Team
- * @copyright  (c) 2009-2010 Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
  * @license    http://kohanaphp.com/license
  */
 class Kohana_Cache_Wincache extends Cache {
@@ -47,14 +47,14 @@ class Kohana_Cache_Wincache extends Cache {
 	 * Check for existence of the wincache extension This method cannot be invoked externally. The driver must
 	 * be instantiated using the `Cache::instance()` method.
 	 *
-	 * @param  array     configuration
+	 * @param  array  $config  configuration
-	 * @throws Kohana_Cache_Exception
+	 * @throws Cache_Exception
 	 */
 	protected function __construct(array $config)
 	{
 		if ( ! extension_loaded('wincache'))
 		{
-			throw new Kohana_Cache_Exception('PHP wincache extension is not available.');
+			throw new Cache_Exception('PHP wincache extension is not available.');
 		}
 
 		parent::__construct($config);
@@ -69,10 +69,10 @@ class Kohana_Cache_Wincache extends Cache {
 	 *     // Retrieve cache entry from wincache group and return 'bar' if miss
 	 *     $data = Cache::instance('wincache')->get('foo', 'bar');
 	 *
-	 * @param   string   id of cache to entry
+	 * @param   string  $id       id of cache to entry
-	 * @param   string   default value to return if cache miss
+	 * @param   string  $default  default value to return if cache miss
 	 * @return  mixed
-	 * @throws  Kohana_Cache_Exception
+	 * @throws  Cache_Exception
 	 */
 	public function get($id, $default = NULL)
 	{
@@ -92,9 +92,9 @@ class Kohana_Cache_Wincache extends Cache {
 	 *     // Set 'bar' to 'foo' in wincache group for 30 seconds
 	 *     Cache::instance('wincache')->set('foo', $data, 30);
 	 *
-	 * @param   string   id of cache entry
+	 * @param   string   $id        id of cache entry
-	 * @param   string   data to set to cache
+	 * @param   string   $data      data to set to cache
-	 * @param   integer  lifetime in seconds
+	 * @param   integer  $lifetime  lifetime in seconds
 	 * @return  boolean
 	 */
 	public function set($id, $data, $lifetime = NULL)
@@ -113,7 +113,7 @@ class Kohana_Cache_Wincache extends Cache {
 	 *     // Delete 'foo' entry from the wincache group
 	 *     Cache::instance('wincache')->delete('foo');
 	 *
-	 * @param   string   id to remove from cache
+	 * @param   string  $id  id to remove from cache
 	 * @return  boolean
 	 */
 	public function delete($id)

includes/kohana/modules/cache/classes/Kohana/HTTP/Cache.php

@@ -0,0 +1,503 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * HTTT Caching adaptor class that provides caching services to the
+ * [Request_Client] class, using HTTP cache control logic as defined in
+ * RFC 2616.
+ *
+ * @package    Kohana
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2012 Kohana Team
+ * @license    http://kohanaframework.org/license
+ * @since      3.2.0
+ */
+class Kohana_HTTP_Cache {
+
+	const CACHE_STATUS_KEY    = 'x-cache-status';
+	const CACHE_STATUS_SAVED  = 'SAVED';
+	const CACHE_STATUS_HIT    = 'HIT';
+	const CACHE_STATUS_MISS   = 'MISS';
+	const CACHE_HIT_KEY       = 'x-cache-hits';
+
+	/**
+	 * Factory method for HTTP_Cache that provides a convenient dependency
+	 * injector for the Cache library.
+	 * 
+	 *      // Create HTTP_Cache with named cache engine
+	 *      $http_cache = HTTP_Cache::factory('memcache', array(
+	 *          'allow_private_cache' => FALSE
+	 *          )
+	 *      );
+	 * 
+	 *      // Create HTTP_Cache with supplied cache engine
+	 *      $http_cache = HTTP_Cache::factory(Cache::instance('memcache'),
+	 *          array(
+	 *              'allow_private_cache' => FALSE
+	 *          )
+	 *      );
+	 *
+	 * @uses    [Cache]
+	 * @param   mixed   $cache      cache engine to use
+	 * @param   array   $options    options to set to this class
+	 * @return  HTTP_Cache
+	 */
+	public static function factory($cache, array $options = array())
+	{
+		if ( ! $cache instanceof Cache)
+		{
+			$cache = Cache::instance($cache);
+		}
+
+		$options['cache'] = $cache;
+
+		return new HTTP_Cache($options);
+	}
+
+	/**
+	 * Basic cache key generator that hashes the entire request and returns
+	 * it. This is fine for static content, or dynamic content where user
+	 * specific information is encoded into the request.
+	 * 
+	 *      // Generate cache key
+	 *      $cache_key = HTTP_Cache::basic_cache_key_generator($request);
+	 *
+	 * @param   Request $request
+	 * @return  string
+	 */
+	public static function basic_cache_key_generator(Request $request)
+	{
+		$uri     = $request->uri();
+		$query   = $request->query();
+		$headers = $request->headers()->getArrayCopy();
+		$body    = $request->body();
+
+		return sha1($uri.'?'.http_build_query($query, NULL, '&').'~'.implode('~', $headers).'~'.$body);
+	}
+
+	/**
+	 * @var     Cache    cache driver to use for HTTP caching
+	 */
+	protected $_cache;
+
+	/**
+	 * @var    callback  Cache key generator callback
+	 */
+	protected $_cache_key_callback;
+
+	/**
+	 * @var    boolean   Defines whether this client should cache `private` cache directives
+	 * @link   http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
+	 */
+	protected $_allow_private_cache = FALSE;
+
+	/**
+	 * @var    int       The timestamp of the request
+	 */
+	protected $_request_time;
+
+	/**
+	 * @var    int       The timestamp of the response
+	 */
+	protected $_response_time;
+
+	/**
+	 * Constructor method for this class. Allows dependency injection of the
+	 * required components such as `Cache` and the cache key generator.
+	 *
+	 * @param   array $options 
+	 */
+	public function __construct(array $options = array())
+	{
+		foreach ($options as $key => $value)
+		{
+			if (method_exists($this, $key))
+			{
+				$this->$key($value);
+			}
+		}
+
+		if ($this->_cache_key_callback === NULL)
+		{
+			$this->cache_key_callback('HTTP_Cache::basic_cache_key_generator');
+		}
+	}
+
+	/**
+	 * Executes the supplied [Request] with the supplied [Request_Client].
+	 * Before execution, the HTTP_Cache adapter checks the request type,
+	 * destructive requests such as `POST`, `PUT` and `DELETE` will bypass
+	 * cache completely and ensure the response is not cached. All other
+	 * Request methods will allow caching, if the rules are met.
+	 *
+	 * @param   Request_Client  $client     client to execute with Cache-Control
+	 * @param   Request         $request    request to execute with client
+	 * @return  [Response]
+	 */
+	public function execute(Request_Client $client, Request $request, Response $response)
+	{
+		if ( ! $this->_cache instanceof Cache)
+			return $client->execute_request($request, $response);
+
+		// If this is a destructive request, by-pass cache completely
+		if (in_array($request->method(), array(
+			HTTP_Request::POST, 
+			HTTP_Request::PUT, 
+			HTTP_Request::DELETE)))
+		{
+			// Kill existing caches for this request
+			$this->invalidate_cache($request);
+
+			$response = $client->execute_request($request, $response);
+
+			$cache_control = HTTP_Header::create_cache_control(array(
+				'no-cache',
+				'must-revalidate'
+			));
+
+			// Ensure client respects destructive action
+			return $response->headers('cache-control', $cache_control);
+		}
+
+		// Create the cache key
+		$cache_key = $this->create_cache_key($request, $this->_cache_key_callback);
+
+		// Try and return cached version
+		if (($cached_response = $this->cache_response($cache_key, $request)) instanceof Response)
+			return $cached_response;
+
+		// Start request time
+		$this->_request_time = time();
+
+		// Execute the request with the Request client
+		$response = $client->execute_request($request, $response);
+
+		// Stop response time
+		$this->_response_time = (time() - $this->_request_time);
+
+		// Cache the response
+		$this->cache_response($cache_key, $request, $response);
+
+		$response->headers(HTTP_Cache::CACHE_STATUS_KEY, 
+			HTTP_Cache::CACHE_STATUS_MISS);
+
+		return $response;
+	}
+
+	/**
+	 * Invalidate a cached response for the [Request] supplied.
+	 * This has the effect of deleting the response from the
+	 * [Cache] entry.
+	 *
+	 * @param   Request  $request Response to remove from cache
+	 * @return  void
+	 */
+	public function invalidate_cache(Request $request)
+	{
+		if (($cache = $this->cache()) instanceof Cache)
+		{
+			$cache->delete($this->create_cache_key($request, $this->_cache_key_callback));
+		}
+
+		return;
+	}
+
+	/**
+	 * Getter and setter for the internal caching engine,
+	 * used to cache responses if available and valid.
+	 *
+	 * @param   Kohana_Cache  $cache    engine to use for caching
+	 * @return  Kohana_Cache
+	 * @return  Kohana_Request_Client
+	 */
+	public function cache(Cache $cache = NULL)
+	{
+		if ($cache === NULL)
+			return $this->_cache;
+
+		$this->_cache = $cache;
+		return $this;
+	}
+
+	/**
+	 * Gets or sets the [Request_Client::allow_private_cache] setting.
+	 * If set to `TRUE`, the client will also cache cache-control directives
+	 * that have the `private` setting.
+	 *
+	 * @link    http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
+	 * @param   boolean $setting    allow caching of privately marked responses
+	 * @return  boolean
+	 * @return  [Request_Client]
+	 */
+	public function allow_private_cache($setting = NULL)
+	{
+		if ($setting === NULL)
+			return $this->_allow_private_cache;
+
+		$this->_allow_private_cache = (bool) $setting;
+		return $this;
+	}
+
+	/**
+	 * Sets or gets the cache key generator callback for this caching
+	 * class. The cache key generator provides a unique hash based on the
+	 * `Request` object passed to it.
+	 * 
+	 * The default generator is [HTTP_Cache::basic_cache_key_generator()], which
+	 * serializes the entire `HTTP_Request` into a unique sha1 hash. This will
+	 * provide basic caching for static and simple dynamic pages. More complex
+	 * algorithms can be defined and then passed into `HTTP_Cache` using this
+	 * method.
+	 * 
+	 *      // Get the cache key callback
+	 *      $callback = $http_cache->cache_key_callback();
+	 * 
+	 *      // Set the cache key callback
+	 *      $http_cache->cache_key_callback('Foo::cache_key');
+	 * 
+	 *      // Alternatively, in PHP 5.3 use a closure
+	 *      $http_cache->cache_key_callback(function (Request $request) {
+	 *            return sha1($request->render());
+	 *      });
+	 *
+	 * @param   callback    $callback
+	 * @return  mixed
+	 * @throws  HTTP_Exception
+	 */
+	public function cache_key_callback($callback = NULL)
+	{
+		if ($callback === NULL)
+			return $this->_cache_key_callback;
+
+		if ( ! is_callable($callback))
+			throw new Kohana_Exception('cache_key_callback must be callable!');
+
+		$this->_cache_key_callback = $callback;
+		return $this;
+	}
+
+	/**
+	 * Creates a cache key for the request to use for caching
+	 * [Kohana_Response] returned by [Request::execute].
+	 * 
+	 * This is the default cache key generating logic, but can be overridden
+	 * by setting [HTTP_Cache::cache_key_callback()].
+	 *
+	 * @param   Request     $request    request to create key for
+	 * @param   callback    $callback   optional callback to use instead of built-in method
+	 * @return  string
+	 */
+	public function create_cache_key(Request $request, $callback = FALSE)
+	{
+		if (is_callable($callback))
+			return call_user_func($callback, $request);
+		else
+			return HTTP_Cache::basic_cache_key_generator($request);
+	}
+
+	/**
+	 * Controls whether the response can be cached. Uses HTTP
+	 * protocol to determine whether the response can be cached.
+	 *
+	 * @link    RFC 2616 http://www.w3.org/Protocols/rfc2616/
+	 * @param   Response  $response The Response
+	 * @return  boolean
+	 */
+	public function set_cache(Response $response)
+	{
+		$headers = $response->headers()->getArrayCopy();
+
+		if ($cache_control = Arr::get($headers, 'cache-control'))
+		{
+			// Parse the cache control
+			$cache_control = HTTP_Header::parse_cache_control($cache_control);
+
+			// If the no-cache or no-store directive is set, return
+			if (array_intersect($cache_control, array('no-cache', 'no-store')))
+				return FALSE;
+
+			// Check for private cache and get out of here if invalid
+			if ( ! $this->_allow_private_cache AND in_array('private', $cache_control))
+			{
+				if ( ! isset($cache_control['s-maxage']))
+					return FALSE;
+
+				// If there is a s-maxage directive we can use that
+				$cache_control['max-age'] = $cache_control['s-maxage'];
+			}
+
+			// Check that max-age has been set and if it is valid for caching
+			if (isset($cache_control['max-age']) AND $cache_control['max-age'] < 1)
+				return FALSE;
+		}
+
+		if ($expires = Arr::get($headers, 'expires') AND ! isset($cache_control['max-age']))
+		{
+			// Can't cache things that have expired already
+			if (strtotime($expires) <= time())
+				return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	/**
+	 * Caches a [Response] using the supplied [Cache]
+	 * and the key generated by [Request_Client::_create_cache_key].
+	 *
+	 * If not response is supplied, the cache will be checked for an existing
+	 * one that is available.
+	 *
+	 * @param   string      $key        the cache key to use
+	 * @param   Request     $request    the HTTP Request
+	 * @param   Response    $response   the HTTP Response
+	 * @return  mixed
+	 */
+	public function cache_response($key, Request $request, Response $response = NULL)
+	{
+		if ( ! $this->_cache instanceof Cache)
+			return FALSE;
+
+		// Check for Pragma: no-cache
+		if ($pragma = $request->headers('pragma'))
+		{
+			if ($pragma  == 'no-cache')
+				return FALSE;
+			elseif (is_array($pragma) AND in_array('no-cache', $pragma))
+				return FALSE;
+		}
+
+		// If there is no response, lookup an existing cached response
+		if ($response === NULL)
+		{
+			$response = $this->_cache->get($key);
+
+			if ( ! $response instanceof Response)
+				return FALSE;
+
+			// Do cache hit arithmetic, using fast arithmetic if available
+			if ($this->_cache instanceof Cache_Arithmetic)
+			{
+				$hit_count = $this->_cache->increment(HTTP_Cache::CACHE_HIT_KEY.$key);
+			}
+			else
+			{
+				$hit_count = $this->_cache->get(HTTP_Cache::CACHE_HIT_KEY.$key);
+				$this->_cache->set(HTTP_Cache::CACHE_HIT_KEY.$key, ++$hit_count);
+			}
+
+			// Update the header to have correct HIT status and count
+			$response->headers(HTTP_Cache::CACHE_STATUS_KEY,
+				HTTP_Cache::CACHE_STATUS_HIT)
+				->headers(HTTP_Cache::CACHE_HIT_KEY, $hit_count);
+
+			return $response;
+		}
+		else
+		{
+			if (($ttl = $this->cache_lifetime($response)) === FALSE)
+				return FALSE;
+
+			$response->headers(HTTP_Cache::CACHE_STATUS_KEY,
+				HTTP_Cache::CACHE_STATUS_SAVED);
+
+			// Set the hit count to zero
+			$this->_cache->set(HTTP_Cache::CACHE_HIT_KEY.$key, 0);
+
+			return $this->_cache->set($key, $response, $ttl);
+		}
+	}
+
+	/**
+	 * Calculates the total Time To Live based on the specification
+	 * RFC 2616 cache lifetime rules.
+	 *
+	 * @param   Response  $response  Response to evaluate
+	 * @return  mixed  TTL value or false if the response should not be cached
+	 */
+	public function cache_lifetime(Response $response)
+	{
+		// Get out of here if this cannot be cached
+		if ( ! $this->set_cache($response))
+			return FALSE;
+
+		// Calculate apparent age
+		if ($date = $response->headers('date'))
+		{
+			$apparent_age = max(0, $this->_response_time - strtotime($date));
+		}
+		else
+		{
+			$apparent_age = max(0, $this->_response_time);
+		}
+
+		// Calculate corrected received age
+		if ($age = $response->headers('age'))
+		{
+			$corrected_received_age = max($apparent_age, intval($age));
+		}
+		else
+		{
+			$corrected_received_age = $apparent_age;
+		}
+
+		// Corrected initial age
+		$corrected_initial_age = $corrected_received_age + $this->request_execution_time();
+
+		// Resident time
+		$resident_time = time() - $this->_response_time;
+
+		// Current age
+		$current_age = $corrected_initial_age + $resident_time;
+
+		// Prepare the cache freshness lifetime
+		$ttl = NULL;
+
+		// Cache control overrides
+		if ($cache_control = $response->headers('cache-control'))
+		{
+			// Parse the cache control header
+			$cache_control = HTTP_Header::parse_cache_control($cache_control);
+
+			if (isset($cache_control['max-age']))
+			{
+				$ttl = $cache_control['max-age'];
+			}
+
+			if (isset($cache_control['s-maxage']) AND isset($cache_control['private']) AND $this->_allow_private_cache)
+			{
+				$ttl = $cache_control['s-maxage'];
+			}
+
+			if (isset($cache_control['max-stale']) AND ! isset($cache_control['must-revalidate']))
+			{
+				$ttl = $current_age + $cache_control['max-stale'];
+			}
+		}
+
+		// If we have a TTL at this point, return
+		if ($ttl !== NULL)
+			return $ttl;
+
+		if ($expires = $response->headers('expires'))
+			return strtotime($expires) - $current_age;
+
+		return FALSE;
+	}
+
+	/**
+	 * Returns the duration of the last request execution.
+	 * Either returns the time of completed requests or
+	 * `FALSE` if the request hasn't finished executing, or
+	 * is yet to be run.
+	 *
+	 * @return  mixed
+	 */
+	public function request_execution_time()
+	{
+		if ($this->_request_time === NULL OR $this->_response_time === NULL)
+			return FALSE;
+
+		return $this->_response_time - $this->_request_time;
+	}
+
+} // End Kohana_HTTP_Cache

includes/kohana/modules/cache/classes/kohana/cache/eaccelerator.php

@@ -1,133 +0,0 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-/**
- * [Kohana Cache](api/Kohana_Cache) Eaccelerator driver. Provides an opcode based
- * driver for the Kohana Cache library.
- * 
- * ### Configuration example
- * 
- * Below is an example of an _eaccelerator_ server configuration.
- * 
- *     return array(
- *          'eaccelerator' => array(                          // Driver group
- *                  'driver'         => 'eaccelerator',         // using Eaccelerator driver
- *           ),
- *     )
- * 
- * In cases where only one cache group is required, if the group is named `default` there is
- * no need to pass the group name when instantiating a cache instance.
- * 
- * #### General cache group configuration settings
- * 
- * Below are the settings available to all types of cache driver.
- * 
- * Name           | Required | Description
- * -------------- | -------- | ---------------------------------------------------------------
- * driver         | __YES__  | (_string_) The driver type to use
- * 
- * ### System requirements
- * 
- * *  Kohana 3.0.x
- * *  PHP 5.2.4 or greater
- * *  Eaccelerator PHP extension
- * 
- * @package    Kohana/Cache
- * @category   Base
- * @author     Kohana Team
- * @copyright  (c) 2009-2010 Kohana Team
- * @license    http://kohanaphp.com/license
- */
-class Kohana_Cache_Eaccelerator extends Cache {
-
-	/**
-	 * Check for existence of the eAccelerator extension This method cannot be invoked externally. The driver must
-	 * be instantiated using the `Cache::instance()` method.
-	 *
-	 * @param  array     configuration
-	 * @throws Kohana_Cache_Exception
-	 */
-	protected function __construct(array $config)
-	{
-		if ( ! extension_loaded('eaccelerator'))
-		{
-			throw new Kohana_Cache_Exception('PHP eAccelerator extension is not available.');
-		}
-
-		parent::__construct($config);
-	}
-
-	/**
-	 * Retrieve a cached value entry by id.
-	 * 
-	 *     // Retrieve cache entry from eaccelerator group
-	 *     $data = Cache::instance('eaccelerator')->get('foo');
-	 * 
-	 *     // Retrieve cache entry from eaccelerator group and return 'bar' if miss
-	 *     $data = Cache::instance('eaccelerator')->get('foo', 'bar');
-	 *
-	 * @param   string   id of cache to entry
-	 * @param   string   default value to return if cache miss
-	 * @return  mixed
-	 * @throws  Kohana_Cache_Exception
-	 */
-	public function get($id, $default = NULL)
-	{
-		return (($data = eaccelerator_get($this->_sanitize_id($id))) === FALSE) ? $default : $data;
-	}
-
-	/**
-	 * Set a value to cache with id and lifetime
-	 * 
-	 *     $data = 'bar';
-	 * 
-	 *     // Set 'bar' to 'foo' in eaccelerator group, using default expiry
-	 *     Cache::instance('eaccelerator')->set('foo', $data);
-	 * 
-	 *     // Set 'bar' to 'foo' in eaccelerator group for 30 seconds
-	 *     Cache::instance('eaccelerator')->set('foo', $data, 30);
-	 *
-	 * @param   string   id of cache entry
-	 * @param   string   data to set to cache
-	 * @param   integer  lifetime in seconds
-	 * @return  boolean
-	 */
-	public function set($id, $data, $lifetime = NULL)
-	{
-		if ($lifetime === NULL)
-		{
-			$lifetime = time() + Arr::get($this->_config, 'default_expire', Cache::DEFAULT_EXPIRE);
-		}
-
-		return eaccelerator_put($this->_sanitize_id($id), $data, $lifetime);
-	}
-
-	/**
-	 * Delete a cache entry based on id
-	 * 
-	 *     // Delete 'foo' entry from the eaccelerator group
-	 *     Cache::instance('eaccelerator')->delete('foo');
-	 *
-	 * @param   string   id to remove from cache
-	 * @return  boolean
-	 */
-	public function delete($id)
-	{
-		return eaccelerator_rm($this->_sanitize_id($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 eaccelerator group
-	 *     Cache::instance('eaccelerator')->delete_all();
-	 *
-	 * @return  boolean
-	 */
-	public function delete_all()
-	{
-		return eaccelerator_clean();
-	}
-}

includes/kohana/modules/cache/classes/kohana/cache/xcache.php

@@ -1,84 +0,0 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-/**
- * Kohana Cache Xcache Driver
- * 
- * Requires Xcache
- * http://xcache.lighttpd.net/
- * 
- * @package    Kohana
- * @category   Cache
- * @author     Kohana Team
- * @copyright  (c) 2009-2010 Kohana Team
- * @license    http://kohanaphp.com/license
- */
-class Kohana_Cache_Xcache extends Cache {
-
-	/**
-	 * Check for existence of the APC extension
-	 *
-	 * @param  array     configuration
-	 * @throws  Kohana_Cache_Exception
-	 */
-	protected function __construct(array $config)
-	{
-		if ( ! extension_loaded('xcache'))
-		{
-			throw new Kohana_Cache_Exception('PHP Xcache extension is not available.');
-		}
-
-		parent::__construct($config);
-	}
-
-	/**
-	 * Retrieve a value based on an id
-	 *
-	 * @param   string   id 
-	 * @param   string   default [Optional] Default value to return if id not found
-	 * @return  mixed
-	 */
-	public function get($id, $default = NULL)
-	{
-		return (($data = xcache_get($this->_sanitize_id($id))) === NULL) ? $default : $data;
-	}
-
-	/**
-	 * Set a value based on an id. Optionally add tags.
-	 * 
-	 * @param   string   id 
-	 * @param   string   data 
-	 * @param   integer  lifetime [Optional]
-	 * @return  boolean
-	 */
-	public function set($id, $data, $lifetime = NULL)
-	{
-		if (NULL === $lifetime)
-		{
-			$lifetime = Arr::get($this->_config, 'default_expire', Cache::DEFAULT_EXPIRE);
-		}
-
-		return xcache_set($this->_sanitize_id($id), $data, $lifetime);
-	}
-
-	/**
-	 * Delete a cache entry based on id
-	 *
-	 * @param   string   id 
-	 * @param   integer  timeout [Optional]
-	 * @return  boolean
-	 */
-	public function delete($id)
-	{
-		return xcache_unset($this->_sanitize_id($id));
-	}
-
-	/**
-	 * Delete all cache entries
-	 * To use this method xcache.admin.enable_auth has to be Off in xcache.ini
-	 *
-	 * @return  void
-	 */
-	public function delete_all()
-	{
-		xcache_clear_cache(XC_TYPE_PHP, 0);
-	}
-}

includes/kohana/modules/cache/config/cache.php

@@ -1,15 +1,12 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 return array
 (
-	'memcache' => array
+/*	'memcache' => array(
-	(
 		'driver'             => 'memcache',
 		'default_expire'     => 3600,
 		'compression'        => FALSE,              // Use Zlib compression (can cause issues with integers)
-		'servers'            => array
+		'servers'            => array(
-		(
+			'local' => array(
-			array
-			(
 				'host'             => 'localhost',  // Memcache Server
 				'port'             => 11211,        // Memcache port number
 				'persistent'       => FALSE,        // Persistent connection
@@ -21,15 +18,12 @@ return array
 		),
 		'instant_death'      => TRUE,               // Take server offline immediately on first fail (no retry)
 	),
-	'memcachetag' => array
+	'memcachetag' => array(
-	(
 		'driver'             => 'memcachetag',
 		'default_expire'     => 3600,
 		'compression'        => FALSE,              // Use Zlib compression (can cause issues with integers)
-		'servers'            => array
+		'servers'            => array(
-		(
+			'local' => array(
-			array
-			(
 				'host'             => 'localhost',  // Memcache Server
 				'port'             => 11211,        // Memcache port number
 				'persistent'       => FALSE,        // Persistent connection
@@ -41,36 +35,36 @@ return array
 		),
 		'instant_death'      => TRUE,
 	),
-	'apc'      => array
+	'apc'      => array(
-	(
 		'driver'             => 'apc',
 		'default_expire'     => 3600,
 	),
-	'wincache' => array
+	'wincache' => array(
-	(
 		'driver'             => 'wincache',
 		'default_expire'     => 3600,
 	),
-	'sqlite'   => array
+	'sqlite'   => array(
-	(
 		'driver'             => 'sqlite',
 		'default_expire'     => 3600,
 		'database'           => APPPATH.'cache/kohana-cache.sql3',
 		'schema'             => 'CREATE TABLE caches(id VARCHAR(127) PRIMARY KEY, tags VARCHAR(255), expiration INTEGER, cache TEXT)',
 	),
-	'eaccelerator'           => array
+	'eaccelerator'           => array(
-	(
 		'driver'             => 'eaccelerator',
 	),
-	'xcache'   => array
+	'xcache'   => array(
-	(
 		'driver'             => 'xcache',
 		'default_expire'     => 3600,
 	),
-	'file'    => array
+	'file'    => array(
-	(
 		'driver'             => 'file',
 		'cache_dir'          => APPPATH.'cache',
 		'default_expire'     => 3600,
+		'ignore_on_delete'   => array(
+			'.gitignore',
+			'.git',
+			'.svn'
 		)
+	)
+*/
 );

includes/kohana/modules/cache/config/userguide.php

@@ -17,7 +17,7 @@ return array(
 			'description' => 'Common interface for caching engines.',
 			
 			// Copyright message, shown in the footer for this module
-			'copyright' => '© 2008–2010 Kohana Team',
+			'copyright' => '© 2008–2012 Kohana Team',
 		)	
 	)
 );

includes/kohana/modules/cache/guide/cache.usage.md

@@ -67,7 +67,7 @@ Certain cache drivers support setting values with tags. To set a value to cache
      $memcache = Cache::instance('memcachetag');
 
      // Test for tagging interface
-     if ($memcache instanceof Kohana_Cache_Tagging)
+     if ($memcache instanceof Cache_Tagging)
      {
           // Set a value with some tags for 30 seconds
           $memcache->set('foo', $object, 30, array('snafu', 'stfu', 'fubar'));
@@ -79,7 +79,7 @@ Certain cache drivers support setting values with tags. To set a value to cache
           $memcache->set('foo', $object, 30);
      }
 
-It is possible to implement custom tagging solutions onto existing or new cache drivers by implementing the [Kohana_Cache_Tagging] interface. Kohana_Cache only applies the interface to drivers that support tagging natively as standard.
+It is possible to implement custom tagging solutions onto existing or new cache drivers by implementing the [Cache_Tagging] interface. Kohana_Cache only applies the interface to drivers that support tagging natively as standard.
 
 ### Getting a value from cache
 
@@ -115,7 +115,7 @@ It is possible to retrieve values from cache grouped by tag, using the [Cache::f
           // Find values based on tag
           return $cache->find('snafu');
      }
-     catch (Kohana_Cache_Exception $e)
+     catch (Cache_Exception $e)
      {
           // Handle gracefully
           return FALSE;
@@ -170,7 +170,7 @@ Some of the caching drivers support deleting by tag. This will remove all the ca
      $cache = Cache::instance();
 
      // Check for tagging interface
-     if ($cache instanceof Kohana_Cache_Tagging)
+     if ($cache instanceof Cache_Tagging)
      {
            // Delete all entries by the tag 'snafu'
            $cache->delete_tag('snafu');
@@ -189,7 +189,7 @@ When not automated, garbage collection is the responsibility of the developer. I
      $gc = 10;
 
      // If the GC probability is a hit
-     if (rand(0,99) <= $gc and $cache_file instanceof Kohana_Cache_GarbageCollect)
+     if (rand(0,99) <= $gc and $cache_file instanceof Cache_GarbageCollect)
      {
           // Garbage Collect
           $cache_file->garbage_collect();
@@ -199,10 +199,10 @@ When not automated, garbage collection is the responsibility of the developer. I
 
 Kohana Cache comes with two interfaces that are implemented where the drivers support them:
 
- - __[Kohana_Cache_Tagging] for tagging support on cache entries__
+ - __[Cache_Tagging] for tagging support on cache entries__
     - [Cache_MemcacheTag]
     - [Cache_Sqlite]
- - __[Kohana_Cache_GarbageCollect] for garbage collection with drivers without native support__
+ - __[Cache_GarbageCollect] for garbage collection with drivers without native support__
     - [Cache_File]
     - [Cache_Sqlite]
 
@@ -212,7 +212,7 @@ When using interface specific caching features, ensure that code checks for the
     $cache = Cache::instance();
 
     // Test for Garbage Collection
-    if ($cache instanceof Kohana_Cache_GarbageCollect)
+    if ($cache instanceof Cache_GarbageCollect)
     {
          // Collect garbage
          $cache->garbage_collect();

includes/kohana/modules/cache/guide/cache/config.md

@@ -58,7 +58,7 @@ failure_callback | __NO__   | (_[callback](http://www.php.net/manual/en/language
 		                                            (can cause issues with integers)
 		'servers'            => array
 		(
-			array
+			'local' => array
 			(
 				'host'             => 'localhost',  // Memcache Server
 				'port'             => 11211,        // Memcache port number
@@ -74,7 +74,7 @@ failure_callback | __NO__   | (_[callback](http://www.php.net/manual/en/language
 		                                            (can cause issues with integers)
 		'servers'            => array
 		(
-			array
+			'local' => array
 			(
 				'host'             => 'localhost',  // Memcache Server
 				'port'             => 11211,        // Memcache port number
@@ -102,21 +102,6 @@ failure_callback | __NO__   | (_[callback](http://www.php.net/manual/en/language
 		                                  tags VARCHAR(255), expiration INTEGER, cache TEXT)',
 	),
 
-## Eaccelerator settings
-
-	'eaccelerator' array
-	(
-		'driver'             => 'eaccelerator',
-	),
-
-## Xcache settings
-
-	'xcache'   => array
-	(
-		'driver'             => 'xcache',
-		'default_expire'     => 3600,
-	),
-
 ## File settings
 
 	'file'    => array
@@ -126,6 +111,15 @@ failure_callback | __NO__   | (_[callback](http://www.php.net/manual/en/language
 		'default_expire'     => 3600,
 	)
 
+## Wincache settings
+
+	'wincache' => array
+	(
+		'driver'             => 'wincache',
+		'default_expire'     => 3600,
+	),
+
+
 ## Override existing configuration group
 
 The following example demonstrates how to override an existing configuration setting, using the config file in `/application/config/cache.php`.

includes/kohana/modules/cache/guide/cache/index.md

@@ -1,18 +1,17 @@
 # About Kohana Cache
 
-[Kohana_Cache] provides a common interface to a variety of caching engines. [Kohana_Cache_Tagging] is
+[Kohana_Cache] provides a common interface to a variety of caching engines. [Cache_Tagging] is
 supported where available natively to the cache system. Kohana Cache supports multiple 
 instances of cache engines through a grouped singleton pattern.
 
 ## Supported cache engines
 
  *  APC ([Cache_Apc])
- *  eAccelerator ([Cache_Eaccelerator])
  *  File ([Cache_File])
  *  Memcached ([Cache_Memcache])
  *  Memcached-tags ([Cache_Memcachetag])
  *  SQLite ([Cache_Sqlite])
- *  Xcache ([Cache_Xcache])
+ *  Wincache
 
 ## Introduction to caching
 
@@ -45,13 +44,12 @@ Getting and setting values to cache is very simple when using the _Kohana Cache_
 Driver           | Storage      | Speed     | Tags     | Distributed | Automatic Garbage Collection | Notes
 ---------------- | ------------ | --------- | -------- | ----------- | ---------------------------- | -----------------------
 APC              | __Memory__   | Excellent | No       | No          | Yes | Widely available PHP opcode caching solution, improves php execution performance
-eAccelerator     | __Memory__   | Excellent | No       | No          | Yes | Limited support and no longer developed. Included for legacy systems
+Wincache         | __Memory__   | Excellent | No       | No          | Yes | Windows variant of APC
 File             | __Disk__     | Poor      | No       | No          | No  | Marginally faster than execution
-Memcache (tag)   | __Memory__   | Good      | No (yes) | Yes         | Yes | Generally fast distributed solution, but has a speed hit due to variable network latency
+Memcache (tag)   | __Memory__   | Good      | No (yes) | Yes         | Yes | Generally fast distributed solution, but has a speed hit due to variable network latency and serialization
 Sqlite           | __Disk__     | Poor      | Yes      | No          | No  | Marginally faster than execution
-Xcache           | __Memory__   | Excellent | Yes      | No          | Yes | Very fast memory solution and alternative to APC
 
-It is possible to have hybrid cache solutions that use a combination of the engines above in different contexts. This is supported with _Kohana Cache_ as well.
+It is possible to have hybrid cache solutions that use a combination of the engines above in different contexts. This is supported with _Kohana Cache_ as well
 
 ## Minimum requirements
 

includes/kohana/modules/cache/guide/cache/usage.md

@@ -67,7 +67,7 @@ Certain cache drivers support setting values with tags. To set a value to cache
      $memcache = Cache::instance('memcachetag');
 
      // Test for tagging interface
-     if ($memcache instanceof Kohana_Cache_Tagging)
+     if ($memcache instanceof Cache_Tagging)
      {
           // Set a value with some tags for 30 seconds
           $memcache->set('foo', $object, 30, array('snafu', 'stfu', 'fubar'));
@@ -79,7 +79,7 @@ Certain cache drivers support setting values with tags. To set a value to cache
           $memcache->set('foo', $object, 30);
      }
 
-It is possible to implement custom tagging solutions onto existing or new cache drivers by implementing the [Kohana_Cache_Tagging] interface. Kohana_Cache only applies the interface to drivers that support tagging natively as standard.
+It is possible to implement custom tagging solutions onto existing or new cache drivers by implementing the [Cache_Tagging] interface. Kohana_Cache only applies the interface to drivers that support tagging natively as standard.
 
 ### Getting a value from cache
 
@@ -115,7 +115,7 @@ It is possible to retrieve values from cache grouped by tag, using the [Cache::f
           // Find values based on tag
           return $cache->find('snafu');
      }
-     catch (Kohana_Cache_Exception $e)
+     catch (Cache_Exception $e)
      {
           // Handle gracefully
           return FALSE;
@@ -170,7 +170,7 @@ Some of the caching drivers support deleting by tag. This will remove all the ca
      $cache = Cache::instance();
 
      // Check for tagging interface
-     if ($cache instanceof Kohana_Cache_Tagging)
+     if ($cache instanceof Cache_Tagging)
      {
            // Delete all entries by the tag 'snafu'
            $cache->delete_tag('snafu');
@@ -189,7 +189,7 @@ When not automated, garbage collection is the responsibility of the developer. I
      $gc = 10;
 
      // If the GC probability is a hit
-     if (rand(0,99) <= $gc and $cache_file instanceof Kohana_Cache_GarbageCollect)
+     if (rand(0,99) <= $gc and $cache_file instanceof Cache_GarbageCollect)
      {
           // Garbage Collect
           $cache_file->garbage_collect();
@@ -199,10 +199,10 @@ When not automated, garbage collection is the responsibility of the developer. I
 
 Kohana Cache comes with two interfaces that are implemented where the drivers support them:
 
- - __[Kohana_Cache_Tagging] for tagging support on cache entries__
+ - __[Cache_Tagging] for tagging support on cache entries__
     - [Cache_MemcacheTag]
     - [Cache_Sqlite]
- - __[Kohana_Cache_GarbageCollect] for garbage collection with drivers without native support__
+ - __[Cache_GarbageCollect] for garbage collection with drivers without native support__
     - [Cache_File]
     - [Cache_Sqlite]
 
@@ -212,7 +212,7 @@ When using interface specific caching features, ensure that code checks for the
     $cache = Cache::instance();
 
     // Test for Garbage Collection
-    if ($cache instanceof Kohana_Cache_GarbageCollect)
+    if ($cache instanceof Cache_GarbageCollect)
     {
          // Collect garbage
          $cache->garbage_collect();

includes/kohana/modules/cache/tests/cache/CacheBasicMethodsTest.php

@@ -0,0 +1,299 @@
+<?php
+
+/**
+ * @package    Kohana/Cache
+ * @group      kohana
+ * @group      kohana.cache
+ * @category   Test
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+abstract class Kohana_CacheBasicMethodsTest extends PHPUnit_Framework_TestCase {
+
+	/**
+	 * @var     Cache driver for this test
+	 */
+	protected $_cache_driver;
+
+	/**
+	 * This method MUST be implemented by each driver to setup the `Cache`
+	 * instance for each test.
+	 * 
+	 * This method should do the following tasks for each driver test:
+	 * 
+	 *  - Test the Cache instance driver is available, skip test otherwise
+	 *  - Setup the Cache instance
+	 *  - Call the parent setup method, `parent::setUp()`
+	 *
+	 * @return  void
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+	}
+
+	/**
+	 * Accessor method to `$_cache_driver`. 
+	 *
+	 * @return  Cache
+	 * @return  self
+	 */
+	public function cache(Cache $cache = NULL)
+	{
+		if ($cache === NULL)
+			return $this->_cache_driver;
+
+		$this->_cache_driver = $cache;
+		return $this;
+	}
+
+	/**
+	 * Data provider for test_set_get()
+	 *
+	 * @return  array
+	 */
+	public function provider_set_get()
+	{
+		$object = new StdClass;
+		$object->foo = 'foo';
+		$object->bar = 'bar';
+
+		$html_text = <<<TESTTEXT
+<!doctype html>  
+<head> 
+</head> 
+
+<body>
+</body>
+</html>
+TESTTEXT;
+
+		return array(
+			array(
+				array(
+					'id'      => 'string',    // Key to set to cache
+					'value'   => 'foobar',    // Value to set to key
+					'ttl'     => 0,           // Time to live
+					'wait'    => FALSE,       // Test wait time to let cache expire
+					'type'    => 'string',    // Type test
+					'default' => NULL         // Default value get should return
+				),
+				'foobar'
+			),
+			array(
+				array(
+					'id'      => 'integer',
+					'value'   => 101010,
+					'ttl'     => 0,
+					'wait'    => FALSE,
+					'type'    => 'integer',
+					'default' => NULL
+				),
+				101010
+			),
+			array(
+				array(
+					'id'      => 'float',
+					'value'   => 10.00,
+					'ttl'     => 0,
+					'wait'    => FALSE,
+					'type'    => 'float',
+					'default' => NULL
+				),
+				10.00
+			),
+			array(
+				array(
+					'id'      => 'array',
+					'value'   => array(
+						'key'   => 'foo',
+						'value' => 'bar'
+					),
+					'ttl'     => 0,
+					'wait'    => FALSE,
+					'type'    => 'array',
+					'default' => NULL
+				),
+				array(
+					'key'   => 'foo',
+					'value' => 'bar'
+				)
+			),
+			array(
+				array(
+					'id'      => 'boolean',
+					'value'   => TRUE,
+					'ttl'     => 0,
+					'wait'    => FALSE,
+					'type'    => 'boolean',
+					'default' => NULL
+				),
+				TRUE
+			),
+			array(
+				array(
+					'id'      => 'null',
+					'value'   => NULL,
+					'ttl'     => 0,
+					'wait'    => FALSE,
+					'type'    => 'null',
+					'default' => NULL
+				),
+				NULL
+			),
+			array(
+				array(
+					'id'      => 'object',
+					'value'   => $object,
+					'ttl'     => 0,
+					'wait'    => FALSE,
+					'type'    => 'object',
+					'default' => NULL
+				),
+				$object
+			),
+			array(
+				array(
+					'id'      => 'bar\\ with / troublesome key',
+					'value'   => 'foo bar snafu',
+					'ttl'     => 0,
+					'wait'    => FALSE,
+					'type'    => 'string',
+					'default' => NULL
+				),
+				'foo bar snafu'
+			),
+			array(
+				array(
+					'id'      => 'bar',
+					'value'   => 'foo',
+					'ttl'     => 3,
+					'wait'    => 5,
+					'type'    => 'null',
+					'default' => NULL
+				),
+				NULL
+			),
+			array(
+				array(
+					'id'      => 'snafu',
+					'value'   => 'fubar',
+					'ttl'     => 3,
+					'wait'    => 5,
+					'type'    => 'string',
+					'default' => 'something completely different!'
+				),
+				'something completely different!'
+			),
+			array(
+				array(
+					'id'      => 'new line test with HTML',
+					'value'   => $html_text,
+					'ttl'     => 10,
+					'wait'    => FALSE,
+					'type'    => 'string',
+					'default' => NULL,
+				),
+				$html_text
+			)
+		);
+	}
+
+	/**
+	 * Tests the [Cache::set()] method, testing;
+	 * 
+	 *  - The value is cached
+	 *  - The lifetime is respected
+	 *  - The returned value type is as expected
+	 *  - The default not-found value is respected
+	 * 
+	 * @dataProvider provider_set_get
+	 *
+	 * @param   array    data 
+	 * @param   mixed    expected 
+	 * @return  void
+	 */
+	public function test_set_get(array $data, $expected)
+	{
+		$cache = $this->cache();
+		extract($data);
+
+		$this->assertTrue($cache->set($id, $value, $ttl));
+
+		if ($wait !== FALSE)
+		{
+			// Lets let the cache expire
+			sleep($wait);
+		}
+
+		$result = $cache->get($id, $default);
+		$this->assertEquals($expected, $result);
+		$this->assertInternalType($type, $result);
+
+		unset($id, $value, $ttl, $wait, $type, $default);
+	}
+
+	/**
+	 * Tests the [Cache::delete()] method, testing;
+	 * 
+	 *  - The a cached value is deleted from cache
+	 *  - The cache returns a TRUE value upon deletion
+	 *  - The cache returns a FALSE value if no value exists to delete
+	 *
+	 * @return  void
+	 */
+	public function test_delete()
+	{
+		// Init
+		$cache = $this->cache();
+		$cache->delete_all();
+
+		// Test deletion if real cached value
+		if ( ! $cache->set('test_delete_1', 'This should not be here!', 0))
+		{
+			$this->fail('Unable to set cache value to delete!');
+		}
+
+		// Test delete returns TRUE and check the value is gone
+		$this->assertTrue($cache->delete('test_delete_1'));
+		$this->assertNull($cache->get('test_delete_1'));
+
+		// Test non-existant cache value returns FALSE if no error
+		$this->assertFalse($cache->delete('test_delete_1'));
+	}
+
+	/**
+	 * Tests [Cache::delete_all()] works as specified
+	 *
+	 * @return  void
+	 * @uses    Kohana_CacheBasicMethodsTest::provider_set_get()
+	 */
+	public function test_delete_all()
+	{
+		// Init
+		$cache = $this->cache();
+		$data = $this->provider_set_get();
+
+		foreach ($data as $key => $values)
+		{
+			extract($values[0]);
+			if ( ! $cache->set($id, $value))
+			{
+				$this->fail('Unable to set: '.$key.' => '.$value.' to cache');
+			}
+			unset($id, $value, $ttl, $wait, $type, $default);
+		}
+
+		// Test delete_all is successful
+		$this->assertTrue($cache->delete_all());
+
+		foreach ($data as $key => $values)
+		{
+			// Verify data has been purged
+			$this->assertSame('Cache Deleted!', $cache->get($values[0]['id'], 
+				'Cache Deleted!'));
+		}
+	}
+
+} // End Kohana_CacheBasicMethodsTest

includes/kohana/modules/cache/tests/cache/CacheTest.php

@@ -0,0 +1,242 @@
+<?php
+
+/**
+ * @package    Kohana/Cache
+ * @group      kohana
+ * @group      kohana.cache
+ * @category   Test
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_CacheTest extends PHPUnit_Framework_TestCase {
+
+	const BAD_GROUP_DEFINITION  = 1010;
+	const EXPECT_SELF           = 1001;
+
+	/**
+	 * Data provider for test_instance
+	 *
+	 * @return  array
+	 */
+	public function provider_instance()
+	{
+		$tmp = realpath(sys_get_temp_dir());
+
+		$base = array();
+
+		if (Kohana::$config->load('cache.file'))
+		{
+			$base = array(
+				// Test default group
+				array(
+					NULL,
+					Cache::instance('file')
+				),
+				// Test defined group
+				array(
+					'file',
+					Cache::instance('file')
+				),
+			);
+		}
+
+
+		return array(
+			// Test bad group definition
+			$base+array(
+				Kohana_CacheTest::BAD_GROUP_DEFINITION,
+				'Failed to load Kohana Cache group: 1010'
+			),
+		);
+	}
+
+	/**
+	 * Tests the [Cache::factory()] method behaves as expected
+	 * 
+	 * @dataProvider provider_instance
+	 *
+	 * @return  void
+	 */
+	public function test_instance($group, $expected)
+	{
+		if (in_array($group, array(
+			Kohana_CacheTest::BAD_GROUP_DEFINITION,
+			)
+		))
+		{
+			$this->setExpectedException('Cache_Exception');
+		}
+
+		try
+		{
+			$cache = Cache::instance($group);
+		}
+		catch (Cache_Exception $e)
+		{
+			$this->assertSame($expected, $e->getMessage());
+			throw $e;
+		}
+
+		$this->assertInstanceOf(get_class($expected), $cache);
+		$this->assertSame($expected->config(), $cache->config());
+	}
+
+	/**
+	 * Tests that `clone($cache)` will be prevented to maintain singleton
+	 *
+	 * @return  void
+	 * @expectedException Cache_Exception
+	 */
+	public function test_cloning_fails()
+	{
+		if ( ! Kohana::$config->load('cache.file'))
+		{
+			$this->markTestSkipped('Unable to load File configuration');
+		}
+
+		try
+		{
+			$cache_clone = clone(Cache::instance('file'));
+		}
+		catch (Cache_Exception $e)
+		{
+			$this->assertSame('Cloning of Kohana_Cache objects is forbidden', 
+				$e->getMessage());
+			throw $e;
+		}
+	}
+
+	/**
+	 * Data provider for test_config
+	 *
+	 * @return  array
+	 */
+	public function provider_config()
+	{
+		return array(
+			array(
+				array(
+					'server'     => 'otherhost',
+					'port'       => 5555,
+					'persistent' => TRUE,
+				),
+				NULL,
+				Kohana_CacheTest::EXPECT_SELF,
+				array(
+					'server'     => 'otherhost',
+					'port'       => 5555,
+					'persistent' => TRUE,
+				),
+			),
+			array(
+				'foo',
+				'bar',
+				Kohana_CacheTest::EXPECT_SELF,
+				array(
+					'foo'        => 'bar'
+				)
+			),
+			array(
+				'server',
+				NULL,
+				NULL,
+				array()
+			),
+			array(
+				NULL,
+				NULL,
+				array(),
+				array()
+			)
+		);
+	}
+
+	/**
+	 * Tests the config method behaviour
+	 * 
+	 * @dataProvider provider_config
+	 *
+	 * @param   mixed    key value to set or get
+	 * @param   mixed    value to set to key
+	 * @param   mixed    expected result from [Cache::config()]
+	 * @param   array    expected config within cache
+	 * @return  void
+	 */
+	public function test_config($key, $value, $expected_result, array $expected_config)
+	{
+		$cache = $this->getMock('Cache_File', NULL, array(), '', FALSE);
+
+		if ($expected_result === Kohana_CacheTest::EXPECT_SELF)
+		{
+			$expected_result = $cache;
+		}
+
+		$this->assertSame($expected_result, $cache->config($key, $value));
+		$this->assertSame($expected_config, $cache->config());
+	}
+
+	/**
+	 * Data provider for test_sanitize_id
+	 *
+	 * @return  array
+	 */
+	public function provider_sanitize_id()
+	{
+		return array(
+			array(
+				'foo',
+				'foo'
+			),
+			array(
+				'foo+-!@',
+				'foo+-!@'
+			),
+			array(
+				'foo/bar',
+				'foo_bar',
+			),
+			array(
+				'foo\\bar',
+				'foo_bar'
+			),
+			array(
+				'foo bar',
+				'foo_bar'
+			),
+			array(
+				'foo\\bar snafu/stfu',
+				'foo_bar_snafu_stfu'
+			)
+		);
+	}
+
+	/**
+	 * Tests the [Cache::_sanitize_id()] method works as expected.
+	 * This uses some nasty reflection techniques to access a protected
+	 * method.
+	 * 
+	 * @dataProvider provider_sanitize_id
+	 *
+	 * @param   string    id 
+	 * @param   string    expected 
+	 * @return  void
+	 */
+	public function test_sanitize_id($id, $expected)
+	{
+		$cache = $this->getMock('Cache', array(
+			'get',
+			'set',
+			'delete',
+			'delete_all'
+			), array(array()),
+			'', FALSE
+		);
+
+		$cache_reflection = new ReflectionClass($cache);
+		$sanitize_id = $cache_reflection->getMethod('_sanitize_id');
+		$sanitize_id->setAccessible(TRUE);
+
+		$this->assertSame($expected, $sanitize_id->invoke($cache, $id));
+	}
+} // End Kohana_CacheTest

includes/kohana/modules/cache/tests/cache/FileTest.php

@@ -0,0 +1,98 @@
+<?php
+include_once(Kohana::find_file('tests/cache', 'CacheBasicMethodsTest'));
+
+/**
+ * @package    Kohana/Cache
+ * @group      kohana
+ * @group      kohana.cache
+ * @category   Test
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Cache_FileTest extends Kohana_CacheBasicMethodsTest {
+
+	/**
+	 * This method MUST be implemented by each driver to setup the `Cache`
+	 * instance for each test.
+	 * 
+	 * This method should do the following tasks for each driver test:
+	 * 
+	 *  - Test the Cache instance driver is available, skip test otherwise
+	 *  - Setup the Cache instance
+	 *  - Call the parent setup method, `parent::setUp()`
+	 *
+	 * @return  void
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+
+		if ( ! Kohana::$config->load('cache.file'))
+		{
+			$this->markTestSkipped('Unable to load File configuration');
+		}
+
+		$this->cache(Cache::instance('file'));
+	}
+
+	/**
+	 * Tests that ignored files are not removed from file cache
+	 *
+	 * @return  void
+	 */
+	public function test_ignore_delete_file()
+	{
+		$cache = $this->cache();
+		$config = Kohana::$config->load('cache')->file;
+		$file = $config['cache_dir'].'/.gitignore';
+
+		// Lets pollute the cache folder
+		file_put_contents($file, 'foobar');
+
+		$this->assertTrue($cache->delete_all());
+		$this->assertTrue(file_exists($file));
+		$this->assertEquals('foobar', file_get_contents($file));
+
+		unlink($file);
+	}
+
+	/**
+	 * Provider for test_utf8
+	 *
+	 * @return  array
+	 */
+	public function provider_utf8()
+	{
+		return array(
+			array(
+				'This is â ütf-8 Ӝ☃ string',
+				'This is â ütf-8 Ӝ☃ string'
+			),
+			array(
+				'㆓㆕㆙㆛',
+				'㆓㆕㆙㆛'
+			),
+			array(
+				'அஆஇஈஊ',
+				'அஆஇஈஊ'
+			)
+		);
+	}
+
+	/**
+	 * Tests the file driver supports utf-8 strings
+	 *
+	 * @dataProvider provider_utf8
+	 *
+	 * @return  void
+	 */
+	public function test_utf8($input, $expected)
+	{
+		$cache = $this->cache();
+		$cache->set('utf8', $input);
+
+		$this->assertSame($expected, $cache->get('utf8'));
+	}
+
+} // End Kohana_SqliteTest

includes/kohana/modules/cache/tests/cache/KohanaCacheTest.php

@@ -1,91 +0,0 @@
-<?php
-
-class KohanaCacheTest extends PHPUnit_Framework_TestCase {
-
-	static protected $test_instance;
-
-	public function setUp()
-	{
-		self::$test_instance = Cache::instance('file');
-		self::$test_instance->delete_all();
-
-		self::$test_instance->set('testGet1', 'foo', 3600);
-	}
-
-	public function tearDown()
-	{
-		self::$test_instance->delete_all();
-		self::$test_instance = NULL;
-	}
-
-	/**
-	 * Tests the cache static instance method
-	 */
-	public function testInstance()
-	{
-		$file_instance  = Cache::instance('file');
-		$file_instance2 = Cache::instance('file');
-
-		// Try and load a Cache instance
-		$this->assertType('Kohana_Cache', Cache::instance());
-		$this->assertType('Kohana_Cache_File', $file_instance);
-
-		// Test instances are only initialised once
-		$this->assertTrue(spl_object_hash($file_instance) == spl_object_hash($file_instance2));
-
-		// Test the publically accessible Cache instance store
-		$this->assertTrue(spl_object_hash(Cache::$instances['file']) == spl_object_hash($file_instance));
-
-		// Get the constructor method
-		$constructorMethod = new ReflectionMethod($file_instance, '__construct');
-
-		// Test the constructor for hidden visibility
-		$this->assertTrue($constructorMethod->isProtected(), '__construct is does not have protected visibility');
-	}
-
-	public function testGet()
-	{
-		// Try and get a non property
-		$this->assertNull(self::$test_instance->get('testGet0'));
-
-		// Try and get a non property with default return value
-		$this->assertEquals('bar', self::$test_instance->get('testGet0', 'bar'));
-
-		// Try and get a real cached property
-		$this->assertEquals('foo', self::$test_instance->get('testGet1'));
-	}
-
-	public function testSet()
-	{
-		$value = 'foobar';
-		$value2 = 'snafu';
-
-		// Set a new property
-		$this->assertTrue(self::$test_instance->set('testSet1', $value));
-
-		// Test the property exists
-		$this->assertEquals(self::$test_instance->get('testSet1'), $value);
-
-		// Test short set
-		$this->assertTrue(self::$test_instance->set('testSet2', $value2, 3));
-
-		// Test the property exists
-		$this->assertEquals(self::$test_instance->get('testSet2'), $value2);
-
-		// Allow test2 to expire
-		sleep(4);
-
-		// Test the property has expired
-		$this->assertNull(self::$test_instance->get('testSet2'));
-	}
-
-	public function testDelete()
-	{
-		
-	}
-
-	public function testDeleteAll()
-	{
-		
-	}
-}

includes/kohana/modules/cache/tests/cache/SqliteTest.php

@@ -0,0 +1,44 @@
+<?php
+include_once(Kohana::find_file('tests/cache', 'CacheBasicMethodsTest'));
+
+/**
+ * @package    Kohana/Cache
+ * @group      kohana
+ * @group      kohana.cache
+ * @category   Test
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_SqliteTest extends Kohana_CacheBasicMethodsTest {
+
+	/**
+	 * This method MUST be implemented by each driver to setup the `Cache`
+	 * instance for each test.
+	 * 
+	 * This method should do the following tasks for each driver test:
+	 * 
+	 *  - Test the Cache instance driver is available, skip test otherwise
+	 *  - Setup the Cache instance
+	 *  - Call the parent setup method, `parent::setUp()`
+	 *
+	 * @return  void
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+
+		if ( ! extension_loaded('pdo_sqlite'))
+		{
+			$this->markTestSkipped('SQLite PDO PHP Extension is not available');
+		}
+
+		if ( ! Kohana::$config->load('cache.sqlite'))
+		{
+			$this->markTestIncomplete('Unable to load sqlite configuration');
+		}
+
+		$this->cache(Cache::instance('sqlite'));
+	}
+
+} // End Kohana_SqliteTest

includes/kohana/modules/cache/tests/cache/WincacheTest.php

@@ -0,0 +1,39 @@
+<?php
+include_once(Kohana::find_file('tests/cache', 'CacheBasicMethodsTest'));
+
+/**
+ * @package    Kohana/Cache
+ * @group      kohana
+ * @group      kohana.cache
+ * @category   Test
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_WincacheTest extends Kohana_CacheBasicMethodsTest {
+
+	/**
+	 * This method MUST be implemented by each driver to setup the `Cache`
+	 * instance for each test.
+	 * 
+	 * This method should do the following tasks for each driver test:
+	 * 
+	 *  - Test the Cache instance driver is available, skip test otherwise
+	 *  - Setup the Cache instance
+	 *  - Call the parent setup method, `parent::setUp()`
+	 *
+	 * @return  void
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+
+		if ( ! extension_loaded('wincache'))
+		{
+			$this->markTestSkipped('Wincache PHP Extension is not available');
+		}
+
+		$this->cache(Cache::instance('wincache'));
+	}
+
+} // End Kohana_WincacheTest

includes/kohana/modules/cache/tests/cache/arithmetic/ApcTest.php

@@ -0,0 +1,75 @@
+<?php
+include_once(Kohana::find_file('tests/cache/arithmetic', 'CacheArithmeticMethods'));
+
+/**
+ * @package    Kohana/Cache
+ * @group      kohana
+ * @group      kohana.cache
+ * @category   Test
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_ApcTest extends Kohana_CacheArithmeticMethodsTest {
+
+	/**
+	 * This method MUST be implemented by each driver to setup the `Cache`
+	 * instance for each test.
+	 * 
+	 * This method should do the following tasks for each driver test:
+	 * 
+	 *  - Test the Cache instance driver is available, skip test otherwise
+	 *  - Setup the Cache instance
+	 *  - Call the parent setup method, `parent::setUp()`
+	 *
+	 * @return  void
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+
+		if ( ! extension_loaded('apc'))
+		{
+			$this->markTestSkipped('APC PHP Extension is not available');
+		}
+
+		if (ini_get('apc.enable_cli') != '1')
+		{
+			$this->markTestSkipped('Unable to test APC in CLI mode. To fix '.
+				'place "apc.enable_cli=1" in your php.ini file');
+		}
+
+		$this->cache(Cache::instance('apc'));
+	}
+
+	/**
+	 * Tests the [Cache::set()] method, testing;
+	 * 
+	 *  - The value is cached
+	 *  - The lifetime is respected
+	 *  - The returned value type is as expected
+	 *  - The default not-found value is respected
+	 * 
+	 * This test doesn't test the TTL as there is a known bug/feature
+	 * in APC that prevents the same request from killing cache on timeout.
+	 * 
+	 * @link   http://pecl.php.net/bugs/bug.php?id=16814
+	 * 
+	 * @dataProvider provider_set_get
+	 *
+	 * @param   array    data 
+	 * @param   mixed    expected 
+	 * @return  void
+	 */
+	public function test_set_get(array $data, $expected)
+	{
+		if ($data['wait'] !== FALSE)
+		{
+			$this->markTestSkipped('Unable to perform TTL test in CLI, see: '.
+				'http://pecl.php.net/bugs/bug.php?id=16814 for more info!');
+		}
+
+		parent::test_set_get($data, $expected);
+	}
+
+} // End Kohana_ApcTest

includes/kohana/modules/cache/tests/cache/arithmetic/CacheArithmeticMethods.php

@@ -0,0 +1,173 @@
+<?php
+include_once(Kohana::find_file('tests/cache', 'CacheBasicMethodsTest'));
+
+/**
+ * @package    Kohana/Cache/Memcache
+ * @group      kohana
+ * @group      kohana.cache
+ * @category   Test
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+abstract class Kohana_CacheArithmeticMethodsTest extends Kohana_CacheBasicMethodsTest {
+
+	public function tearDown()
+	{
+		parent::tearDown();
+
+		// Cleanup
+		$cache = $this->cache();
+
+		if ($cache instanceof Cache)
+		{
+			$cache->delete_all();
+		}
+	}
+
+	/**
+	 * Provider for test_increment
+	 *
+	 * @return  array
+	 */
+	public function provider_increment()
+	{
+		return array(
+			array(
+				0,
+				array(
+					'id'    => 'increment_test_1',
+					'step'  => 1
+				),
+				1
+			),
+			array(
+				1,
+				array(
+					'id'    => 'increment_test_2',
+					'step'  => 1
+				),
+				2
+			),
+			array(
+				5,
+				array(
+					'id'    => 'increment_test_3',
+					'step'  => 5
+				),
+				10
+			),
+			array(
+				NULL,
+				array(
+					'id'    => 'increment_test_4',
+					'step'  => 1
+				),
+				FALSE
+			),
+		);
+	}
+
+	/**
+	 * Test for [Cache_Arithmetic::increment()]
+	 * 
+	 * @dataProvider provider_increment
+	 *
+	 * @param   integer  start state
+	 * @param   array    increment arguments
+	 * @return  void
+	 */
+	public function test_increment(
+		$start_state = NULL,
+		array $inc_args,
+		$expected)
+	{
+		$cache = $this->cache();
+
+		if ($start_state !== NULL)
+		{
+			$cache->set($inc_args['id'], $start_state, 0);
+		}
+
+		$this->assertSame(
+			$expected,
+			$cache->increment(
+				$inc_args['id'],
+				$inc_args['step']
+			)
+		);
+	}
+
+	/**
+	 * Provider for test_decrement
+	 *
+	 * @return  array
+	 */
+	public function provider_decrement()
+	{
+		return array(
+			array(
+				10,
+				array(
+					'id'    => 'decrement_test_1',
+					'step'  => 1
+				),
+				9
+			),
+			array(
+				10,
+				array(
+					'id'    => 'decrement_test_2',
+					'step'  => 2
+				),
+				8
+			),
+			array(
+				50,
+				array(
+					'id'    => 'decrement_test_3',
+					'step'  => 5
+				),
+				45
+			),
+			array(
+				NULL,
+				array(
+					'id'    => 'decrement_test_4',
+					'step'  => 1
+				),
+				FALSE
+			),
+		);	}
+
+	/**
+	 * Test for [Cache_Arithmetic::decrement()]
+	 * 
+	 * @dataProvider provider_decrement
+	 *
+	 * @param   integer  start state
+	 * @param   array    decrement arguments
+	 * @return  void
+	 */
+	public function test_decrement(
+		$start_state = NULL,
+		array $dec_args,
+		$expected)
+	{
+		$cache = $this->cache();
+
+		if ($start_state !== NULL)
+		{
+			$cache->set($dec_args['id'], $start_state, 0);
+		}
+
+		$this->assertSame(
+			$expected,
+			$cache->decrement(
+				$dec_args['id'],
+				$dec_args['step']
+			)
+		);
+	}
+
+} // End Kohana_CacheArithmeticMethodsTest

includes/kohana/modules/cache/tests/cache/arithmetic/MemcacheTest.php

@@ -0,0 +1,103 @@
+<?php
+include_once(Kohana::find_file('tests/cache/arithmetic', 'CacheArithmeticMethods'));
+
+/**
+ * @package    Kohana/Cache/Memcache
+ * @group      kohana
+ * @group      kohana.cache
+ * @category   Test
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_CacheArithmeticMemcacheTest extends Kohana_CacheArithmeticMethodsTest {
+
+
+	/**
+	 * This method MUST be implemented by each driver to setup the `Cache`
+	 * instance for each test.
+	 * 
+	 * This method should do the following tasks for each driver test:
+	 * 
+	 *  - Test the Cache instance driver is available, skip test otherwise
+	 *  - Setup the Cache instance
+	 *  - Call the parent setup method, `parent::setUp()`
+	 *
+	 * @return  void
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+
+		if ( ! extension_loaded('memcache'))
+		{
+			$this->markTestSkipped('Memcache PHP Extension is not available');
+		}
+		if ( ! $config = Kohana::$config->load('cache.memcache'))
+		{
+			$this->markTestSkipped('Unable to load Memcache configuration');
+		}
+
+		$memcache = new Memcache;
+		if ( ! $memcache->connect($config['servers']['local']['host'], 
+			$config['servers']['local']['port']))
+		{
+			$this->markTestSkipped('Unable to connect to memcache server @ '.
+				$config['servers']['local']['host'].':'.
+				$config['servers']['local']['port']);
+		}
+
+		if ($memcache->getVersion() === FALSE)
+		{
+			$this->markTestSkipped('Memcache server @ '.
+				$config['servers']['local']['host'].':'.
+				$config['servers']['local']['port'].
+				' not responding!');
+		}
+
+		unset($memcache);
+
+		$this->cache(Cache::instance('memcache'));
+	}
+
+	/**
+	 * Tests that multiple values set with Memcache do not cause unexpected
+	 * results. For accurate results, this should be run with a memcache
+	 * configuration that includes multiple servers.
+	 * 
+	 * This is to test #4110
+	 *
+	 * @link    http://dev.kohanaframework.org/issues/4110
+	 * @return  void
+	 */
+	public function test_multiple_set()
+	{
+		$cache = $this->cache();
+		$id_set = 'set_id';
+		$ttl = 300;
+
+		$data = array(
+			'foobar',
+			0,
+			1.0,
+			new stdClass,
+			array('foo', 'bar' => 1),
+			TRUE,
+			NULL,
+			FALSE
+		);
+
+		$previous_set = $cache->get($id_set, NULL);
+
+		foreach ($data as $value)
+		{
+			// Use Equals over Sames as Objects will not be equal
+			$this->assertEquals($previous_set, $cache->get($id_set, NULL));
+			$cache->set($id_set, $value, $ttl);
+
+			$previous_set = $value;
+		}
+	}
+
+
+} // End Kohana_CacheArithmeticMemcacheTest

includes/kohana/modules/cache/tests/cache/request/client/CacheTest.php

@@ -0,0 +1,265 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+/**
+ * Unit tests for request client cache logic
+ *
+ * @group kohana
+ * @group kohana.request
+ * @group kohana.request.client
+ * @group kohana.request.client.cache
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2012 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Request_Client_CacheTest extends Unittest_TestCase {
+
+	/**
+	 * Sets up a test route for caching
+	 *
+	 * @return void
+	 */
+	public function setUp()
+	{
+		Route::set('welcome', 'welcome/index')
+			->defaults(array(
+				'controller' => 'welcome',
+				'action'     => 'index'
+			));
+
+		parent::setUp();
+	}
+
+	/**
+	 * Tests the Client does not attempt to load cache if no Cache library
+	 * is present
+	 *
+	 * @return void
+	 */
+	public function test_cache_not_called_with_no_cache()
+	{
+		$request       = new Request('welcome/index');
+		$response      = new Response;
+
+		$client_mock   = $this->getMock('Request_Client_Internal');
+
+		$request->client($client_mock);
+		$client_mock->expects($this->exactly(0))
+			->method('execute_request');
+		$client_mock->expects($this->once())
+			->method('execute')
+			->will($this->returnValue($response));
+
+		$this->assertSame($response, $request->execute());
+	}
+
+	/**
+	 * Tests that the client attempts to load a cached response from the
+	 * cache library, but fails.
+	 *
+	 * @return void
+	 */
+	public function test_cache_miss()
+	{
+		$route = new Route('welcome/index');
+		$route->defaults(array(
+			'controller' => 'Kohana_Request_CacheTest_Dummy',
+			'action'     => 'index',
+		));
+
+		$request       = new Request('welcome/index', NULL, array($route));
+		$cache_mock    = $this->_get_cache_mock();
+
+		$request->client()->cache(HTTP_Cache::factory($cache_mock));
+
+		$cache_mock->expects($this->once())
+			->method('get')
+			->with($request->client()->cache()->create_cache_key($request))
+			->will($this->returnValue(FALSE));
+
+		$response = $request->client()->execute($request);
+
+		$this->assertSame(HTTP_Cache::CACHE_STATUS_MISS, 
+			$response->headers(HTTP_Cache::CACHE_STATUS_KEY));
+	}
+
+	/**
+	 * Tests the client saves a response if the correct headers are set
+	 *
+	 * @return void
+	 */
+	public function test_cache_save()
+	{
+		$lifetime      = 800;
+		$request       = new Request('welcome/index');
+		$cache_mock    = $this->_get_cache_mock();
+		$response      = Response::factory();
+
+		$request->client()->cache(new HTTP_Cache(array(
+			'cache' => $cache_mock
+			)
+		));
+
+		$response->headers('cache-control', 'max-age='.$lifetime);
+
+		$key = $request->client()->cache()->create_cache_key($request);
+
+		$cache_mock->expects($this->at(0))
+			->method('set')
+			->with($this->stringEndsWith($key), $this->identicalTo(0));
+
+		$cache_mock->expects($this->at(1))
+			->method('set')
+			->with($this->identicalTo($key), $this->anything(), $this->identicalTo($lifetime))
+			->will($this->returnValue(TRUE));
+
+		$this->assertTrue(
+			$request->client()->cache()
+				->cache_response($key, $request, $response)
+		);
+
+		$this->assertSame(HTTP_Cache::CACHE_STATUS_SAVED, 
+			$response->headers(HTTP_Cache::CACHE_STATUS_KEY));
+	}
+
+	/**
+	 * Tests the client handles a cache HIT event correctly
+	 *
+	 * @return void
+	 */
+	public function test_cache_hit()
+	{
+		$lifetime      = 800;
+		$request       = new Request('welcome/index');
+		$cache_mock    = $this->_get_cache_mock();
+
+		$request->client()->cache(new HTTP_Cache(array(
+			'cache' => $cache_mock
+			)
+		));
+
+		$response = Response::factory();
+
+		$response->headers(array(
+			'cache-control'                  => 'max-age='.$lifetime,
+			HTTP_Cache::CACHE_STATUS_KEY => 
+				HTTP_Cache::CACHE_STATUS_HIT
+		));
+
+		$key = $request->client()->cache()->create_cache_key($request);
+
+		$cache_mock->expects($this->exactly(2))
+			->method('get')
+			->with($this->stringContains($key))
+			->will($this->returnValue($response));
+
+		$request->client()->cache()->cache_response($key, $request);
+
+		$this->assertSame(HTTP_Cache::CACHE_STATUS_HIT,
+			$response->headers(HTTP_Cache::CACHE_STATUS_KEY));
+	}
+
+
+	/**
+	 * Data provider for test_set_cache
+	 *
+	 * @return array
+	 */
+	public function provider_set_cache()
+	{
+		return array(
+			array(
+				new HTTP_Header(array('cache-control' => 'no-cache')),
+				array('no-cache' => NULL),
+				FALSE,
+			),
+			array(
+				new HTTP_Header(array('cache-control' => 'no-store')),
+				array('no-store' => NULL),
+				FALSE,
+			),
+			array(
+				new HTTP_Header(array('cache-control' => 'max-age=100')),
+				array('max-age' => '100'),
+				TRUE
+			),
+			array(
+				new HTTP_Header(array('cache-control' => 'private')),
+				array('private' => NULL),
+				FALSE
+			),
+			array(
+				new HTTP_Header(array('cache-control' => 'private, max-age=100')),
+				array('private' => NULL, 'max-age' => '100'),
+				FALSE
+			),
+			array(
+				new HTTP_Header(array('cache-control' => 'private, s-maxage=100')),
+				array('private' => NULL, 's-maxage' => '100'),
+				TRUE
+			),
+			array(
+				new HTTP_Header(array(
+					'expires' => date('m/d/Y', strtotime('-1 day')),
+				)),
+				array(),
+				FALSE
+			),
+			array(
+				new HTTP_Header(array(
+					'expires' => date('m/d/Y', strtotime('+1 day')),
+				)),
+				array(),
+				TRUE
+			),
+			array(
+				new HTTP_Header(array()),
+				array(),
+				TRUE
+			),
+		);
+	}
+
+	/**
+	 * Tests the set_cache() method
+	 *
+	 * @test
+	 * @dataProvider provider_set_cache
+	 *
+	 * @return null
+	 */
+	public function test_set_cache($headers, $cache_control, $expected)
+	{
+		/**
+		 * Set up a mock response object to test with
+		 */
+		$response = $this->getMock('Response');
+
+		$response->expects($this->any())
+			->method('headers')
+			->will($this->returnValue($headers));
+
+		$request = new Request_Client_Internal;
+		$request->cache(new HTTP_Cache);
+		$this->assertEquals($request->cache()->set_cache($response), $expected);
+	}
+
+	/**
+	 * Returns a mock object for Cache
+	 *
+	 * @return Cache
+	 */
+	protected function _get_cache_mock()
+	{
+		return $this->getMock('Cache_File', array(), array(), '', FALSE);
+	}
+} // End Kohana_Request_Client_CacheTest
+
+class Controller_Kohana_Request_CacheTest_Dummy extends Controller 
+{
+	public function action_index()
+	{
+	
+	}
+}

includes/kohana/modules/cache/tests/phpunit.xml

@@ -7,7 +7,10 @@
 
 	Any options you specify when calling phpunit will override the ones in here
 -->
-<phpunit colors="true" bootstrap="../../../articles/public/index.php">
+<php>
+	<includePath>./cache</includePath>
+</php>
+<phpunit colors="true" bootstrap="/path/to/your/unittest/bootstrap.php">
 	<testsuites>
 		<testsuite name="Kohana Cache Tests">
 			<directory suffix=".php">cache/</directory>

includes/kohana/modules/codebench/classes/Controller/Codebench.php

@@ -13,12 +13,14 @@ class Controller_Codebench extends Kohana_Controller_Template {
 	// The codebench view
 	public $template = 'codebench';
 
-	public function action_index($class)
+	public function action_index()
 	{
+		$class = $this->request->param('class');
+
 		// Convert submitted class name to URI segment
 		if (isset($_POST['class']))
 		{
-			$this->request->redirect('codebench/'.trim($_POST['class']));
+			throw HTTP_Exception::factory(302)->location('codebench/'.trim($_POST['class']));
 		}
 
 		// Pass the class name on to the view

includes/kohana/modules/codebench/classes/Kohana/Codebench.php

@@ -47,7 +47,7 @@ abstract class Kohana_Codebench {
 	public function __construct()
 	{
 		// Set the maximum execution time
-		set_time_limit(Kohana::config('codebench')->max_execution_time);
+		set_time_limit(Kohana::$config->load('codebench')->max_execution_time);
 	}
 
 	/**

includes/kohana/modules/codebench/config/userguide.php

@@ -17,7 +17,7 @@ return array(
 			'description' => 'Code benchmarking tool.',
 			
 			// Copyright message, shown in the footer for this module
-			'copyright' => '© 2008–2010 Kohana Team',
+			'copyright' => '© 2008–2012 Kohana Team',
 		)	
 	)
 );

includes/kohana/modules/codebench/init.php

@@ -3,6 +3,6 @@
 // Catch-all route for Codebench classes to run
 Route::set('codebench', 'codebench(/<class>)')
 	->defaults(array(
-		'controller' => 'codebench',
+		'controller' => 'Codebench',
 		'action' => 'index',
 		'class' => NULL));

includes/kohana/modules/codebench/views/codebench.php

@@ -111,7 +111,7 @@
 				}
 			});
 
-			<?php if (Kohana::config('codebench')->expand_all) { ?>
+			<?php if (Kohana::$config->load('codebench')->expand_all) { ?>
 				// Expand all benchmark details by default
 				$toggle_all.click();
 			<?php } ?>
@@ -245,7 +245,7 @@
 			<?php echo Text::auto_p(Text::auto_link($codebench['description']), FALSE) ?>
 		<?php } ?>
 
-		<?php // echo '<h2>Raw output:</h2>', Kohana::debug($codebench) ?>
+		<?php // echo '<h2>Raw output:</h2>', Debug::vars($codebench) ?>
 
 	<?php } ?>
 

includes/kohana/modules/cron/README.markdown

@@ -0,0 +1,86 @@
+# Kohana-Cron
+
+This module provides a way to schedule tasks (jobs) within your Kohana application.
+
+
+## Installation
+
+Step 1: Download the module into your modules subdirectory.
+
+Step 2: Enable the module in your bootstrap file:
+
+	/**
+	 * Enable modules. Modules are referenced by a relative or absolute path.
+	 */
+	Kohana::modules(array(
+		'cron'       => MODPATH.'cron',
+		// 'auth'       => MODPATH.'auth',       // Basic authentication
+		// 'codebench'  => MODPATH.'codebench',  // Benchmarking tool
+		// 'database'   => MODPATH.'database',   // Database access
+		// 'image'      => MODPATH.'image',      // Image manipulation
+		// 'orm'        => MODPATH.'orm',        // Object Relationship Mapping
+		// 'pagination' => MODPATH.'pagination', // Paging of results
+		// 'userguide'  => MODPATH.'userguide',  // User guide and API documentation
+	));
+
+
+Step 3: Make sure the settings in `config/cron.php` are correct for your environment.
+If not, copy the file to `application/config/cron.php` and change the values accordingly.
+
+
+## Usage
+
+In its simplest form, a task is a [PHP callback][1] and times at which it should run.
+To configure a task call `Cron::set($name, array($frequency, $callback))` where
+`$frequency` is a string of date and time fields identical to those found in [crontab][2].
+For example,
+
+	Cron::set('reindex_catalog', array('@daily', 'Catalog::regenerate_index'));
+	Cron::set('calendar_notifications', array('*/5 * * * *', 'Calendar::send_emails'));
+
+Configured tasks are run with their appropriate frequency by calling `Cron::run()`. Call
+this method in your bootstrap file, and you're done!
+
+
+## Advanced Usage
+
+A task can also be an instance of `Cron` that extends `next()` and/or `execute()` as
+needed. Such a task is configured by calling `Cron::set($name, $instance)`.
+
+If you have access to the system crontab, you can run Cron less (or more) than once
+every request. You will need to modify the lines where the request is handled in your
+bootstrap file to prevent extraneous output. The default is:
+
+	/**
+	 * Execute the main request. A source of the URI can be passed, eg: $_SERVER['PATH_INFO'].
+	 * If no source is specified, the URI will be automatically detected.
+	 */
+	echo Request::instance()
+		->execute()
+		->send_headers()
+		->response;
+
+Change it to:
+
+	if ( ! defined('SUPPRESS_REQUEST'))
+	{
+		/**
+		 * Execute the main request. A source of the URI can be passed, eg: $_SERVER['PATH_INFO'].
+		 * If no source is specified, the URI will be automatically detected.
+		 */
+		echo Request::instance()
+			->execute()
+			->send_headers()
+			->response;
+	}
+
+Then set up a system cron job to run your application's Cron once a minute:
+
+	* * * * * /usr/bin/php -f /path/to/kohana/modules/cron/run.php
+
+The included `run.php` should work for most cases, but you are free to call `Cron::run()`
+in any way you see fit.
+
+
+  [1]: http://php.net/manual/language.pseudo-types.php#language.types.callback
+  [2]: http://linux.die.net/man/5/crontab

includes/kohana/modules/cron/classes/cron.php

@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+/**
+ * @package Cron
+ *
+ * @author      Chris Bandy
+ * @copyright   (c) 2010 Chris Bandy
+ * @license     http://www.opensource.org/licenses/isc-license.txt
+ */
+class Cron extends Kohana_Cron {}

includes/kohana/modules/cron/classes/kohana/cron.php

@@ -0,0 +1,621 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+/**
+ * @package Cron
+ *
+ * @author      Chris Bandy
+ * @copyright   (c) 2010 Chris Bandy
+ * @license     http://www.opensource.org/licenses/isc-license.txt
+ */
+class Kohana_Cron
+{
+	protected static $_jobs = array();
+	protected static $_times = array();
+
+	/**
+	 * Registers a job to be run
+	 *
+	 * @param   string      Unique name
+	 * @param   array|Cron  Job to run
+	 */
+	public static function set($name, $job)
+	{
+		if (is_array($job))
+		{
+			$job = new Cron(reset($job), next($job));
+		}
+
+		Cron::$_jobs[$name] = $job;
+	}
+
+	/**
+	 * Retrieve the timestamps of when jobs should run
+	 */
+	protected static function _load()
+	{
+		Cron::$_times = Kohana::cache("Cron::run()");
+	}
+
+	/**
+	 * Acquire the Cron mutex
+	 *
+	 * @return  boolean
+	 */
+	protected static function _lock()
+	{
+		$config = Kohana::$config->load('cron');
+		$result = FALSE;
+
+		if (file_exists($config->lock) AND ($stat = @stat($config->lock)) AND time() - $config->window < $stat['mtime'])
+		{
+			// Lock exists and has not expired
+			return $result;
+		}
+
+		$fh = fopen($config->lock, 'a');
+
+		if (flock($fh, LOCK_EX))
+		{
+			fseek($fh, 0, SEEK_END);
+
+			if (ftell($fh) === (empty($stat) ? 0 : $stat['size']))
+			{
+				// Current size matches expected size
+				// Claim the file by changing the size
+				fwrite($fh, '.');
+
+				$result = TRUE;
+			}
+
+			// else, Another process acquired during flock()
+		}
+
+		fclose($fh);
+
+		return $result;
+	}
+
+	/**
+	 * Store the timestamps of when jobs should run next
+	 */
+	protected static function _save()
+	{
+		Kohana::cache("Cron::run()", Cron::$_times, Kohana::$config->load('cron')->window * 2);
+	}
+
+	/**
+	 * Release the Cron mutex
+	 */
+	protected static function _unlock()
+	{
+		return @unlink(Kohana::$config->load('cron')->lock);
+	}
+
+	/**
+	 * @return  boolean FALSE when another instance is running
+	 */
+	public static function run()
+	{
+		if (empty(Cron::$_jobs))
+			return TRUE;
+
+		if ( ! Cron::_lock())
+			return FALSE;
+
+		try
+		{
+			Cron::_load();
+
+			$now = time();
+			$threshold = $now - Kohana::$config->load('cron')->window;
+
+			foreach (Cron::$_jobs as $name => $job)
+			{
+				if (empty(Cron::$_times[$name]) OR Cron::$_times[$name] < $threshold)
+				{
+					// Expired
+
+					Cron::$_times[$name] = $job->next($now);
+
+					if ($job->next($threshold) < $now)
+					{
+						// Within the window
+
+						$job->execute();
+					}
+				}
+				elseif (Cron::$_times[$name] < $now)
+				{
+					// Within the window
+
+					Cron::$_times[$name] = $job->next($now);
+
+					$job->execute();
+				}
+			}
+		}
+		catch (Exception $e) {}
+
+		Cron::_save();
+		Cron::_unlock();
+
+		if (isset($e))
+			throw $e;
+
+		return TRUE;
+	}
+
+	protected $_callback;
+	protected $_period;
+
+	public function __construct($period, $callback)
+	{
+		$this->_period = $period;
+		$this->_callback = $callback;
+	}
+
+	/**
+	 * Execute this job
+	 */
+	public function execute()
+	{
+		call_user_func($this->_callback);
+	}
+
+	/**
+	 * Calculates the next timestamp in this period
+	 *
+	 * @param   integer Timestamp from which to calculate
+	 * @return  integer Next timestamp in this period
+	 */
+	public function next($from)
+	{
+		// PHP >= 5.3.0
+		//if ($this->_period instanceof DatePeriod) { return; }
+		//if (is_string($this->_period) AND preg_match('/^P[\dDHMSTWY]+$/', $period)) { $this->_period = new DateInterval($this->_period); }
+		//if ($this->_period instanceof DateInterval) { return; }
+
+		return $this->_next_crontab($from);
+	}
+
+	/**
+	 * Calculates the next timestamp of this crontab period
+	 *
+	 * @param   integer Timestamp from which to calculate
+	 * @return  integer Next timestamp in this period
+	 */
+	protected function _next_crontab($from)
+	{
+		if (is_string($this->_period))
+		{
+			// Convert string to lists of valid values
+
+			if ($this->_period[0] === '@')
+			{
+				switch (substr($this->_period, 1))
+				{
+					case 'annually':
+					case 'yearly':
+						// '0 0 1 1 *'
+						$this->_period = array('minutes' => array(0), 'hours' => array(0), 'monthdays' => array(1), 'months' => array(1), 'weekdays' => range(0,6));
+					break;
+
+					case 'daily':
+					case 'midnight':
+						// '0 0 * * *'
+						$this->_period = array('minutes' => array(0), 'hours' => array(0), 'monthdays' => range(1,31), 'months' => range(1,12), 'weekdays' => range(0,6));
+					break;
+
+					case 'hourly':
+						// '0 * * * *'
+						$this->_period = array('minutes' => array(0), 'hours' => range(0,23), 'monthdays' => range(1,31), 'months' => range(1,12), 'weekdays' => range(0,6));
+					break;
+
+					case 'monthly':
+						// '0 0 1 * *'
+						$this->_period = array('minutes' => array(0), 'hours' => array(0), 'monthdays' => array(1), 'months' => range(1,12), 'weekdays' => range(0,6));
+					break;
+
+					case 'weekly':
+						// '0 0 * * 0'
+						$this->_period = array('minutes' => array(0), 'hours' => array(0), 'monthdays' => range(1,31), 'months' => range(1,12), 'weekdays' => array(0));
+					break;
+				}
+			}
+			else
+			{
+				list($minutes, $hours, $monthdays, $months, $weekdays) = explode(' ', $this->_period);
+
+				$months = strtr(strtolower($months), array(
+					'jan' => 1,
+					'feb' => 2,
+					'mar' => 3,
+					'apr' => 4,
+					'may' => 5,
+					'jun' => 6,
+					'jul' => 7,
+					'aug' => 8,
+					'sep' => 9,
+					'oct' => 10,
+					'nov' => 11,
+					'dec' => 12,
+				));
+
+				$weekdays = strtr(strtolower($weekdays), array(
+					'sun' => 0,
+					'mon' => 1,
+					'tue' => 2,
+					'wed' => 3,
+					'thu' => 4,
+					'fri' => 5,
+					'sat' => 6,
+				));
+
+				$this->_period = array(
+					'minutes'   => $this->_parse_crontab_field($minutes, 0, 59),
+					'hours'     => $this->_parse_crontab_field($hours, 0, 23),
+					'monthdays' => $this->_parse_crontab_field($monthdays, 1, 31),
+					'months'    => $this->_parse_crontab_field($months, 1, 12),
+					'weekdays'  => $this->_parse_crontab_field($weekdays, 0, 7)
+				);
+
+				// Ensure Sunday is zero
+				if (end($this->_period['weekdays']) === 7)
+				{
+					array_pop($this->_period['weekdays']);
+
+					if (reset($this->_period['weekdays']) !== 0)
+					{
+						array_unshift($this->_period['weekdays'], 0);
+					}
+				}
+			}
+		}
+
+		$from = getdate($from);
+
+		if ( ! in_array($from['mon'], $this->_period['months']))
+			return $this->_next_crontab_month($from);
+
+		if (count($this->_period['weekdays']) === 7)
+		{
+			// Day of Week is unrestricted, defer to Day of Month
+			if ( ! in_array($from['mday'], $this->_period['monthdays']))
+				return $this->_next_crontab_monthday($from);
+		}
+		elseif (count($this->_period['monthdays']) === 31)
+		{
+			// Day of Month is unrestricted, use Day of Week
+			if ( ! in_array($from['wday'], $this->_period['weekdays']))
+				return $this->_next_crontab_weekday($from);
+		}
+		else
+		{
+			// Both Day of Week and Day of Month are restricted
+			if ( ! in_array($from['mday'], $this->_period['monthdays']) AND ! in_array($from['wday'], $this->_period['weekdays']))
+				return $this->_next_crontab_day($from);
+		}
+
+		if ( ! in_array($from['hours'], $this->_period['hours']))
+			return $this->_next_crontab_hour($from);
+
+		return $this->_next_crontab_minute($from);
+	}
+
+	/**
+	 * Calculates the first timestamp in the next day of this period when both
+	 * Day of Week and Day of Month are restricted
+	 *
+	 * @uses    _next_crontab_month()
+	 *
+	 * @param   array   Date array from getdate()
+	 * @return  integer Timestamp of next restricted Day
+	 */
+	protected function _next_crontab_day(array $from)
+	{
+		// Calculate effective Day of Month for next Day of Week
+
+		if ($from['wday'] >= end($this->_period['weekdays']))
+		{
+			$next = reset($this->_period['weekdays']) + 7;
+		}
+		else
+		{
+			foreach ($this->_period['weekdays'] as $next)
+			{
+				if ($from['wday'] < $next)
+					break;
+			}
+		}
+
+		$monthday = $from['mday'] + $next - $from['wday'];
+
+		if ($monthday <= (int) date('t', mktime(0, 0, 0, $from['mon'], 1, $from['year'])))
+		{
+			// Next Day of Week is in this Month
+
+			if ($from['mday'] >= end($this->_period['monthdays']))
+			{
+				// No next Day of Month, use next Day of Week
+				$from['mday'] = $monthday;
+			}
+			else
+			{
+				// Calculate next Day of Month
+				foreach ($this->_period['monthdays'] as $next)
+				{
+					if ($from['mday'] < $next)
+						break;
+				}
+
+				// Use earliest day
+				$from['mday'] = min($monthday, $next);
+			}
+		}
+		else
+		{
+			if ($from['mday'] >= end($this->_period['monthdays']))
+			{
+				// No next Day of Month, use next Month
+				return $this->_next_crontab_month($from);
+			}
+
+			// Calculate next Day of Month
+			foreach ($this->_period['monthdays'] as $next)
+			{
+				if ($from['mday'] < $next)
+					break;
+			}
+
+			// Use next Day of Month
+			$from['mday'] = $next;
+		}
+
+		// Use first Hour and first Minute
+		return mktime(reset($this->_period['hours']), reset($this->_period['minutes']), 0, $from['mon'], $from['mday'], $from['year']);
+	}
+
+	/**
+	 * Calculates the first timestamp in the next hour of this period
+	 *
+	 * @uses    _next_crontab_day()
+	 * @uses    _next_crontab_monthday()
+	 * @uses    _next_crontab_weekday()
+	 *
+	 * @param   array   Date array from getdate()
+	 * @return  integer Timestamp of next Hour
+	 */
+	protected function _next_crontab_hour(array $from)
+	{
+		if ($from['hours'] >= end($this->_period['hours']))
+		{
+			// No next Hour
+
+			if (count($this->_period['weekdays']) === 7)
+			{
+				// Day of Week is unrestricted, defer to Day of Month
+				return $this->_next_crontab_monthday($from);
+			}
+
+			if (count($this->_period['monthdays']) === 31)
+			{
+				// Day of Month is unrestricted, use Day of Week
+				return $this->_next_crontab_weekday($from);
+			}
+
+			// Both Day of Week and Day of Month are restricted
+			return $this->_next_crontab_day($from);
+		}
+
+		// Calculate next Hour
+		foreach ($this->_period['hours'] as $next)
+		{
+			if ($from['hours'] < $next)
+				break;
+		}
+
+		// Use next Hour and first Minute
+		return mktime($next, reset($this->_period['minutes']), 0, $from['mon'], $from['mday'], $from['year']);
+	}
+
+	/**
+	 * Calculates the timestamp of the next minute in this period
+	 *
+	 * @uses    _next_crontab_hour()
+	 *
+	 * @param   array   Date array from getdate()
+	 * @return  integer Timestamp of next Minute
+	 */
+	protected function _next_crontab_minute(array $from)
+	{
+		if ($from['minutes'] >= end($this->_period['minutes']))
+		{
+			// No next Minute, use next Hour
+			return $this->_next_crontab_hour($from);
+		}
+
+		// Calculate next Minute
+		foreach ($this->_period['minutes'] as $next)
+		{
+			if ($from['minutes'] < $next)
+				break;
+		}
+
+		// Use next Minute
+		return mktime($from['hours'], $next, 0, $from['mon'], $from['mday'], $from['year']);
+	}
+
+	/**
+	 * Calculates the first timestamp in the next month of this period
+	 *
+	 * @param   array   Date array from getdate()
+	 * @return  integer Timestamp of next Month
+	 */
+	protected function _next_crontab_month(array $from)
+	{
+		if ($from['mon'] >= end($this->_period['months']))
+		{
+			// No next Month, increment Year and use first Month
+			++$from['year'];
+			$from['mon'] = reset($this->_period['months']);
+		}
+		else
+		{
+			// Calculate next Month
+			foreach ($this->_period['months'] as $next)
+			{
+				if ($from['mon'] < $next)
+					break;
+			}
+
+			// Use next Month
+			$from['mon'] = $next;
+		}
+
+		if (count($this->_period['weekdays']) === 7)
+		{
+			// Day of Week is unrestricted, use first Day of Month
+			$from['mday'] = reset($this->_period['monthdays']);
+		}
+		else
+		{
+			// Calculate Day of Month for the first Day of Week
+			$indices = array_flip($this->_period['weekdays']);
+
+			$monthday = 1;
+			$weekday = (int) date('w', mktime(0, 0, 0, $from['mon'], 1, $from['year']));
+
+			while ( ! isset($indices[$weekday % 7]) AND $monthday < 7)
+			{
+				++$monthday;
+				++$weekday;
+			}
+
+			if (count($this->_period['monthdays']) === 31)
+			{
+				// Day of Month is unrestricted, use first Day of Week
+				$from['mday'] = $monthday;
+			}
+			else
+			{
+				// Both Day of Month and Day of Week are restricted, use earliest one
+				$from['mday'] = min($monthday, reset($this->_period['monthdays']));
+			}
+		}
+
+		// Use first Hour and first Minute
+		return mktime(reset($this->_period['hours']), reset($this->_period['minutes']), 0, $from['mon'], $from['mday'], $from['year']);
+	}
+
+	/**
+	 * Calculates the first timestamp in the next day of this period when only
+	 * Day of Month is restricted
+	 *
+	 * @uses    _next_crontab_month()
+	 *
+	 * @param   array   Date array from getdate()
+	 * @return  integer Timestamp of next Day of Month
+	 */
+	protected function _next_crontab_monthday(array $from)
+	{
+		if ($from['mday'] >= end($this->_period['monthdays']))
+		{
+			// No next Day of Month, use next Month
+			return $this->_next_crontab_month($from);
+		}
+
+		// Calculate next Day of Month
+		foreach ($this->_period['monthdays'] as $next)
+		{
+			if ($from['mday'] < $next)
+				break;
+		}
+
+		// Use next Day of Month, first Hour, and first Minute
+		return mktime(reset($this->_period['hours']), reset($this->_period['minutes']), 0, $from['mon'], $next, $from['year']);
+	}
+
+	/**
+	 * Calculates the first timestamp in the next day of this period when only
+	 * Day of Week is restricted
+	 *
+	 * @uses    _next_crontab_month()
+	 *
+	 * @param   array   Date array from getdate()
+	 * @return  integer Timestamp of next Day of Week
+	 */
+	protected function _next_crontab_weekday(array $from)
+	{
+		// Calculate effective Day of Month for next Day of Week
+
+		if ($from['wday'] >= end($this->_period['weekdays']))
+		{
+			$next = reset($this->_period['weekdays']) + 7;
+		}
+		else
+		{
+			foreach ($this->_period['weekdays'] as $next)
+			{
+				if ($from['wday'] < $next)
+					break;
+			}
+		}
+
+		$monthday = $from['mday'] + $next - $from['wday'];
+
+		if ($monthday > (int) date('t', mktime(0, 0, 0, $from['mon'], 1, $from['year'])))
+		{
+			// Next Day of Week is not in this Month, use next Month
+			return $this->_next_crontab_month($from);
+		}
+
+		// Use next Day of Week, first Hour, and first Minute
+		return mktime(reset($this->_period['hours']), reset($this->_period['minutes']), 0, $from['mon'], $monthday, $from['year']);
+	}
+
+	/**
+	 * Returns a sorted array of all the values indicated in a Crontab field
+	 * @link http://linux.die.net/man/5/crontab
+	 *
+	 * @param   string  Crontab field
+	 * @param   integer Minimum value for this field
+	 * @param   integer Maximum value for this field
+	 * @return  array
+	 */
+	protected function _parse_crontab_field($value, $min, $max)
+	{
+		$result = array();
+
+		foreach (explode(',', $value) as $value)
+		{
+			if ($slash = strrpos($value, '/'))
+			{
+				$step = (int) substr($value, $slash + 1);
+				$value = substr($value, 0, $slash);
+			}
+
+			if ($value === '*')
+			{
+				$result = array_merge($result, range($min, $max, $slash ? $step : 1));
+			}
+			elseif ($dash = strpos($value, '-'))
+			{
+				$result = array_merge($result, range(max($min, (int) substr($value, 0, $dash)), min($max, (int) substr($value, $dash + 1)), $slash ? $step : 1));
+			}
+			else
+			{
+				$value = (int) $value;
+
+				if ($min <= $value AND $value <= $max)
+				{
+					$result[] = $value;
+				}
+			}
+		}
+
+		sort($result);
+
+		return array_unique($result);
+	}
+
+}

includes/kohana/modules/cron/config/cron.php

@@ -0,0 +1,28 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+
+/**
+ * @package Cron
+ *
+ * @author      Chris Bandy
+ * @copyright   (c) 2010 Chris Bandy
+ * @license     http://www.opensource.org/licenses/isc-license.txt
+ */
+
+return array
+(
+	// Path to a writable directory and lock file
+	'lock' => Kohana::$cache_dir.DIRECTORY_SEPARATOR.'cron.lck',
+
+	/**
+	 * Cron does not run EXACTLY when tasks are scheduled.
+	 * A task can be executed up to this many seconds AFTER its scheduled time.
+	 *
+	 * For example, Cron is run at 10:48 and a task was scheduled to execute at
+	 * 10:45, 180 seconds ago. If window is greater than 180, the task will be
+	 * executed.
+	 *
+	 * This value should always be larger than the time it takes to run all
+	 * your tasks.
+	 */
+	'window' => 300,
+);

includes/kohana/modules/cron/run.php

@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @package Cron
+ *
+ * @author      Chris Bandy
+ * @copyright   (c) 2010 Chris Bandy
+ * @license     http://www.opensource.org/licenses/isc-license.txt
+ */
+
+// Path to Kohana's index.php
+$system = dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'index.php';
+
+if (file_exists($system))
+{
+	defined('SUPPRESS_REQUEST') or define('SUPPRESS_REQUEST', TRUE);
+
+	include $system;
+
+	// If Cron has been run in APPPATH/bootstrap.php, this second call is harmless
+	Cron::run();
+}

includes/kohana/modules/cron/tests/kohana/cron.php

@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * @package Cron
+ * @group   kohana
+ * @group   kohana.cron
+ *
+ * @author      Chris Bandy
+ * @copyright   (c) 2010 Chris Bandy
+ * @license     http://www.opensource.org/licenses/isc-license.txt
+ */
+class Kohana_Cron_Test extends PHPUnit_Framework_TestCase
+{
+	/**
+	 * @test
+	 * @dataProvider    provider_next
+	 *
+	 * @param   string  Period
+	 * @param   integer Timestamp from which to calculate
+	 * @param   integer Next timestamp in period
+	 */
+	public function test_next($period, $from, $expected_result)
+	{
+		$cron = new Cron($period, NULL);
+		$result = $cron->next($from);
+
+		$this->assertSame($expected_result, $result);
+	}
+
+	public function provider_next()
+	{
+		return array
+		(
+			array('@annually',  mktime(8, 45, 0, 11, 19, 2009), mktime(0, 0, 0, 1, 1, 2010)),
+			array('@monthly',   mktime(8, 45, 0, 11, 19, 2009), mktime(0, 0, 0, 12, 1, 2009)),
+			array('@weekly',    mktime(8, 45, 0, 11, 19, 2009), mktime(0, 0, 0, 11, 22, 2009)),
+			array('@daily',     mktime(8, 45, 0, 11, 19, 2009), mktime(0, 0, 0, 11, 20, 2009)),
+			array('@hourly',    mktime(8, 45, 0, 11, 19, 2009), mktime(9, 0, 0, 11, 19, 2009)),
+
+			array('* * * * *',  mktime(8, 45, 0, 11, 19, 2009), mktime(8, 46, 0, 11, 19, 2009)),
+
+			array(
+				'* * * * 0',                    // Sundays
+				mktime(0, 0, 0, 11, 30, 2009),  // Monday, Nov 30, 2009
+				mktime(0, 0, 0, 12, 6, 2009)    // Sunday, Dec 6, 2009
+			),
+
+			array(
+				'* * 15 * 6',                   // 15th and Saturdays
+				mktime(0, 0, 0, 11, 29, 2009),  // Sunday, Nov 29, 2009
+				mktime(0, 0, 0, 12, 5, 2009)    // Saturday, Dec 5, 2009
+			),
+
+			array(
+				'* * * * 1,5',                  // Mondays and Fridays
+				mktime(0, 0, 0, 11, 24, 2009),  // Tuesday, Nov 24, 2009
+				mktime(0, 0, 0, 11, 27, 2009)   // Friday, Nov 27, 2009
+			),
+
+			array(
+				'* * 15 * 6-7',                 // 15th, Saturdays, and Sundays
+				mktime(0, 0, 0, 11, 23, 2009),  // Monday, Nov 23, 2009
+				mktime(0, 0, 0, 11, 28, 2009)   // Saturday, Nov 28, 2009
+			),
+
+			array(
+				'* * 15,30 * 2',                // 15th, 30th, and Tuesdays
+				mktime(0, 0, 0, 11, 29, 2009),  // Sunday, Nov 29, 2009
+				mktime(0, 0, 0, 11, 30, 2009)   // Monday, Nov 30, 2009
+			),
+
+			array(
+				'0 0 * * 4',                    // Midnight on Thursdays
+				mktime(1, 0, 0, 11, 19, 2009),  // 01:00 Thursday, Nov 19, 2009
+				mktime(0, 0, 0, 11, 26, 2009)   // 00:00 Thursday, Nov 26, 2009
+			),
+
+			array(
+				'0 0 */2 * 4',                  // Midnight on odd days and Thursdays
+				mktime(1, 0, 0, 11, 19, 2009),  // 01:00 Thursday, Nov 19, 2009
+				mktime(0, 0, 0, 11, 21, 2009)   // 00:00 Saturday, Nov 21, 2009
+			),
+		);
+	}
+}

includes/kohana/modules/database/classes/Config/Database.php

@@ -0,0 +1,12 @@
+<?php defined('SYSPATH') OR die('No direct script access.');
+
+/**
+ * Transparent extension for the Kohana_Config_Database class
+ *
+ * @package    Kohana/Database
+ * @category   Configuration
+ * @author     Kohana Team
+ * @copyright  (c) 2012 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Config_Database extends Kohana_Config_Database {}

includes/kohana/modules/database/classes/Config/Database/Reader.php

@@ -0,0 +1,15 @@
+<?php defined('SYSPATH') OR die('No direct script access.');
+
+/**
+ * Transparent extension of the Kohana_Config_Database_Reader class
+ *
+ * @package    Kohana/Database
+ * @category   Configuration
+ * @author     Kohana Team
+ * @copyright  (c) 2012 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Config_Database_Reader extends Kohana_Config_Database_Reader
+{
+	
+}

includes/kohana/modules/database/classes/Config/Database/Writer.php

@@ -0,0 +1,15 @@
+<?php defined('SYSPATH') OR die('No direct script access.');
+
+/**
+ * Transparent extension for the Kohana_Config_Database_Writer class
+ *
+ * @package    Kohana/Database
+ * @category   Configuration
+ * @author     Kohana Team
+ * @copyright  (c) 2012 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Config_Database_Writer extends Kohana_Config_Database_Writer
+{
+	
+}

includes/kohana/modules/database/classes/DB.php

@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') OR die('No direct script access.');
+
+class DB extends Kohana_DB {}

includes/kohana/modules/database/classes/Database.php

@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') OR die('No direct script access.');
+
+abstract class Database extends Kohana_Database {}